]> https://gitweb.dealii.org/ - dealii.git/commitdiff
remove ANOTHER variable again
authorGuido Kanschat <dr.guido.kanschat@gmail.com>
Thu, 30 Mar 2006 11:57:31 +0000 (11:57 +0000)
committerGuido Kanschat <dr.guido.kanschat@gmail.com>
Thu, 30 Mar 2006 11:57:31 +0000 (11:57 +0000)
git-svn-id: https://svn.dealii.org/trunk@12767 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/aclocal.m4

index cb7b48390e261ad61c2d196128d1772a487f73aa..2c7e00ae5e2151bff789433c3b244e9e6b72c756 100644 (file)
@@ -4760,7 +4760,7 @@ AC_DEFUN(DEAL_II_CONFIGURE_NETCDF, dnl
      ])
   
   if test "x$DEAL_II_NETCDF_DIR" != "x" ; then
-    CPPFLAGS="-I$DEAL_II_NETCDF_DIR/include $CPPFLAGS"
+    CXXFLAGS="-I$DEAL_II_NETCDF_DIR/include $CXXFLAGS"
     LDFLAGS="-L$DEAL_II_NETCDF_DIR/lib $LDFLAGS"
     if test "$LD_PATH_OPTION" != "no" ; then
       LDFLAGS="$LD_PATH_OPTION$DEAL_II_NETCDF_DIR/lib $LDFLAGS"
@@ -4773,13 +4773,11 @@ AC_DEFUN(DEAL_II_CONFIGURE_NETCDF, dnl
   dnl introduce second variable NETCDF_HEADER_AND_LIB_FOUND
   dnl
   dnl if the C++ library is missing, the test will fail
-  AC_CHECK_HEADER(netcdfcpp.h, AC_CHECK_LIB(netcdf, nc_open,
-       NETCDF_HEADER_AND_LIB_FOUND=1))
-
+  AC_CHECK_HEADER(netcdfcpp.h, AC_CHECK_LIB(netcdf, nc_open))
   dnl If the C library was found, but not the C++ library
   dnl abort configure with an error message
-  if test "x$NETCDF_HEADER_AND_LIB_FOUND" == "x1" ; then
-    LIBS="-lnetcdf_c++ -lnetcdf $LIBS"
+  if perl -e ["exit(1) if (\"$LIBS\" =~ m/netcdf/)"] ; then
+    LIBS="-lnetcdf_c++ $LIBS"
     AC_LINK_IFELSE(
     [  AC_LANG_PROGRAM([[#include <netcdfcpp.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.