From 890e60e0cf64fd43747cf20ae2dfbcc998ce1b1d Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Thu, 30 Mar 2006 11:57:31 +0000 Subject: [PATCH] remove ANOTHER variable again git-svn-id: https://svn.dealii.org/trunk@12767 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index cb7b48390e..2c7e00ae5e 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -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 ]], -- 2.39.5