From: Ralf Hartmann Date: Thu, 30 Mar 2006 08:36:31 +0000 (+0000) Subject: Revert last patch because configure always broke, even if no netcdf used. X-Git-Tag: v8.0.0~11955 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ea995d3e786e204d16f13fcad9efc03707f882d;p=dealii.git Revert last patch because configure always broke, even if no netcdf used. git-svn-id: https://svn.dealii.org/trunk@12763 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 267f28ca61..b9f2da61d5 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -4775,8 +4775,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_NETCDF, dnl dnl If the C library was found, but not the C++ library dnl abort configure with an error message - AC_MSG_NOTICE("HAVE_LIBNETCDF = $LIBS) - if expr "x$LIBS : netcdf" ; then + if test "x$HAVE_LIBNETCDF" == "x1" ; then LIBS="-lnetcdf_c++ $LIBS" AC_LINK_IFELSE( [ AC_LANG_PROGRAM([[#include diff --git a/deal.II/configure b/deal.II/configure index be93674754..3f0c139d5c 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -11268,9 +11268,7 @@ fi - { echo "$as_me:$LINENO: \"HAVE_LIBNETCDF = $LIBS" >&5 -echo "$as_me: \"HAVE_LIBNETCDF = $LIBS" >&6;} - if expr "x$LIBS : netcdf" ; then + if test "x$HAVE_LIBNETCDF" == "x1" ; then LIBS="-lnetcdf_c++ $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */