From: Ralf Hartmann Date: Thu, 30 Mar 2006 08:58:07 +0000 (+0000) Subject: Make CPPFLAGS visible in Make.global_options. NETCDF_INCLUDE_DIR not needed any more... X-Git-Tag: v8.0.0~11954 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd704c7c259fbd8b80da814659217925f126c5a3;p=dealii.git Make CPPFLAGS visible in Make.global_options. NETCDF_INCLUDE_DIR not needed any more. Netcdf config fixed. git-svn-id: https://svn.dealii.org/trunk@12764 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index b9f2da61d5..1fb802ee03 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -4775,7 +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 - if test "x$HAVE_LIBNETCDF" == "x1" ; then + if test "x$DEAL_II_NETCDF_DIR" != "x" ; then LIBS="-lnetcdf_c++ $LIBS" AC_LINK_IFELSE( [ AC_LANG_PROGRAM([[#include diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index 632eade05f..bff3759b48 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -156,7 +156,7 @@ include-path-metis = $(DEAL_II_METIS_DIR)/Lib INCLUDE = -I$D/base/include -I$D/lac/include -I$D/deal.II/include \ @BOOST_INCLUDE_DIR@ \ - @TECPLOT_INCLUDE_DIR@ @NETCDF_INCLUDE_DIR@ \ + @TECPLOT_INCLUDE_DIR@ @CPPFLAGS@ \ @UMFPACK_INCLUDE_DIR@ @HSL_INCLUDE_DIR@ \ -I$D/contrib diff --git a/deal.II/configure b/deal.II/configure index 3f0c139d5c..8256144f01 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -313,7 +313,7 @@ ac_includes_default="\ #endif" ac_subdirs_all="$ac_subdirs_all contrib tests" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD SHLIBFLAGS CC_VERSION CFLAGSPIC enablemultithreading withmultithreading CXXCPP EGREP BOOST_INCLUDE_DIR F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB enableparser DEAL_II_DISABLE_PARSER USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_PETSC_MPIUNI_LIB DEAL_II_DEFINE_DEAL_II_USE_PETSC NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR NETCDF_INCLUDE_DIR USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS DEAL_II_MAJOR DEAL_II_MINOR DEAL_II_PATH DEAL2_DIR build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX GXX_VERSION GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD SHLIBFLAGS CC_VERSION CFLAGSPIC enablemultithreading withmultithreading CXXCPP EGREP BOOST_INCLUDE_DIR F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB enableparser DEAL_II_DISABLE_PARSER USE_CONTRIB_PETSC DEAL_II_PETSC_DIR DEAL_II_PETSC_ARCH DEAL_II_PETSC_VERSION_MAJOR DEAL_II_PETSC_VERSION_MINOR DEAL_II_PETSC_VERSION_SUBMINOR DEAL_II_PETSC_MPIUNI_LIB DEAL_II_DEFINE_DEAL_II_USE_PETSC NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR USE_CONTRIB_METIS DEAL_II_METIS_DIR UMFPACK_LIB UMFPACK_INCLUDE_DIR USE_CONTRIB_UMFPACK DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LDFLAGSPIC LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -11268,7 +11268,7 @@ fi - if test "x$HAVE_LIBNETCDF" == "x1" ; then + if test "x$DEAL_II_NETCDF_DIR" != "x" ; then LIBS="-lnetcdf_c++ $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -11326,7 +11326,6 @@ rm -f conftest.err conftest.$ac_objext \ - echo "$as_me:$LINENO: checking for Metis library directory" >&5 echo $ECHO_N "checking for Metis library directory... $ECHO_C" >&6 @@ -11918,6 +11917,12 @@ fi fi; + + + + + + echo "$as_me:$LINENO: result: " >&5 echo "${ECHO_T}" >&6 echo "$as_me:$LINENO: result: ------------------ checking compiler flags ------------------" >&5 @@ -12927,7 +12932,6 @@ s,@NEEDS_F77LIBS@,$NEEDS_F77LIBS,;t t s,@HSL_INCLUDE_DIR@,$HSL_INCLUDE_DIR,;t t s,@USE_CONTRIB_HSL@,$USE_CONTRIB_HSL,;t t s,@TECPLOT_INCLUDE_DIR@,$TECPLOT_INCLUDE_DIR,;t t -s,@NETCDF_INCLUDE_DIR@,$NETCDF_INCLUDE_DIR,;t t s,@USE_CONTRIB_METIS@,$USE_CONTRIB_METIS,;t t s,@DEAL_II_METIS_DIR@,$DEAL_II_METIS_DIR,;t t s,@UMFPACK_LIB@,$UMFPACK_LIB,;t t diff --git a/deal.II/configure.in b/deal.II/configure.in index b8bc819450..3aba37d5a3 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -469,7 +469,6 @@ DEAL_II_CONFIGURE_TECPLOT AC_SUBST(TECPLOT_INCLUDE_DIR) DEAL_II_CONFIGURE_NETCDF -AC_SUBST(NETCDF_INCLUDE_DIR) DEAL_II_CONFIGURE_METIS AC_SUBST(USE_CONTRIB_METIS) @@ -509,6 +508,15 @@ AC_ARG_WITH(zlib, Make sure the library is in the search path of ld.], DEAL_II_WITH_ZLIB($withval)) +dnl ------------------------------------------------------------- +dnl set include paths of several libraries +dnl ------------------------------------------------------------- + + +AC_SUBST(CPPFLAGS) + + + dnl ------------------------------------------------------------- dnl Optimizations and consistency of compiler flags dnl -------------------------------------------------------------