]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Revert last patch because configure always broke, even if no netcdf used.
authorRalf Hartmann <Ralf.Hartmann@dlr.de>
Thu, 30 Mar 2006 08:36:31 +0000 (08:36 +0000)
committerRalf Hartmann <Ralf.Hartmann@dlr.de>
Thu, 30 Mar 2006 08:36:31 +0000 (08:36 +0000)
git-svn-id: https://svn.dealii.org/trunk@12763 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4
deal.II/configure

index 267f28ca612c2d50956cfa99d8d75fd460e5f8ed..b9f2da61d5fa6dbc454be793b6e7818379dfe373 100644 (file)
@@ -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 <netcdfcpp.h>
index be9367475465182ce9849ddaaec32af0bef669b8..3f0c139d5cac15ea65aa40bd87585c341ef41b99 100755 (executable)
@@ -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.  */

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.