From bbd828aa9b61bfe7917efaad43e95ff4b25085de Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 4 May 2004 13:34:50 +0000 Subject: [PATCH] Only generate PETSc documentation if PETSc is present. git-svn-id: https://svn.dealii.org/trunk@9172 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 6 ++++++ deal.II/configure | 5 ++++- deal.II/configure.in | 1 + deal.II/doc/doxygen/options.dox.in | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 54c686da12..81b4885b41 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -3773,6 +3773,12 @@ AC_DEFUN(DEAL_II_CONFIGURE_PETSC, dnl AC_DEFINE(DEAL_II_USE_PETSC, 1, [Defined if a PETSc installation was found and is going to be used]) + dnl Set an additional variable (not via AC_DEFINE, since we don't want + dnl to have it in config.h) which we can use in doc/doxygen/options.dox.in. + dnl If we have PETSc, then the value of this variable expands to + dnl defining the string "DEAL_II_USE_PETSC" for the preprocessor. If + dnl we don't have no PETSc, then it does not define this string. + DEAL_II_DEFINE_DEAL_II_USE_PETSC=DEAL_II_USE_PETSC fi diff --git a/deal.II/configure b/deal.II/configure index f4d8fef1be..8adb8ef960 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -273,7 +273,7 @@ PACKAGE_BUGREPORT= ac_unique_file="deal.II" 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_VERSION 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 CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD LDFLAGSPIC enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared lib_suffix AR RANLIB ac_ct_RANLIB enablemultigrid TECPLOT_LIBRARY_PATH TECPLOT_INCLUDE_PATH USE_CONTRIB_HSL 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 USE_CONTRIB_METIS DEAL_II_METIS_DIR kdocdir kdocversion DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs 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_VERSION 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 CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD LDFLAGSPIC enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared lib_suffix AR RANLIB ac_ct_RANLIB enablemultigrid TECPLOT_LIBRARY_PATH TECPLOT_INCLUDE_PATH USE_CONTRIB_HSL 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_DEFINE_DEAL_II_USE_PETSC USE_CONTRIB_METIS DEAL_II_METIS_DIR kdocdir kdocversion DOXYGEN DOT DEAL_II_HAVE_DOT PERL subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -7860,6 +7860,7 @@ cat >>confdefs.h <<\_ACEOF #define DEAL_II_USE_PETSC 1 _ACEOF + DEAL_II_DEFINE_DEAL_II_USE_PETSC=DEAL_II_USE_PETSC fi @@ -7940,6 +7941,7 @@ echo "${ECHO_T}$PETSC_VERSION" >&6 + echo "$as_me:$LINENO: checking for Metis library directory" >&5 echo $ECHO_N "checking for Metis library directory... $ECHO_C" >&6 @@ -8999,6 +9001,7 @@ s,@DEAL_II_PETSC_ARCH@,$DEAL_II_PETSC_ARCH,;t t s,@DEAL_II_PETSC_VERSION_MAJOR@,$DEAL_II_PETSC_VERSION_MAJOR,;t t s,@DEAL_II_PETSC_VERSION_MINOR@,$DEAL_II_PETSC_VERSION_MINOR,;t t s,@DEAL_II_PETSC_VERSION_SUBMINOR@,$DEAL_II_PETSC_VERSION_SUBMINOR,;t t +s,@DEAL_II_DEFINE_DEAL_II_USE_PETSC@,$DEAL_II_DEFINE_DEAL_II_USE_PETSC,;t t s,@USE_CONTRIB_METIS@,$USE_CONTRIB_METIS,;t t s,@DEAL_II_METIS_DIR@,$DEAL_II_METIS_DIR,;t t s,@kdocdir@,$kdocdir,;t t diff --git a/deal.II/configure.in b/deal.II/configure.in index d35a5893b8..09d9497c46 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -345,6 +345,7 @@ AC_SUBST(DEAL_II_PETSC_ARCH) AC_SUBST(DEAL_II_PETSC_VERSION_MAJOR) AC_SUBST(DEAL_II_PETSC_VERSION_MINOR) AC_SUBST(DEAL_II_PETSC_VERSION_SUBMINOR) +AC_SUBST(DEAL_II_DEFINE_DEAL_II_USE_PETSC) DEAL_II_CONFIGURE_METIS AC_SUBST(USE_CONTRIB_METIS) diff --git a/deal.II/doc/doxygen/options.dox.in b/deal.II/doc/doxygen/options.dox.in index 4db1eaff38..8d75853322 100644 --- a/deal.II/doc/doxygen/options.dox.in +++ b/deal.II/doc/doxygen/options.dox.in @@ -914,7 +914,7 @@ INCLUDE_FILE_PATTERNS = # or name=definition (no spaces). If the definition and the = are # omitted =1 is assumed. -PREDEFINED = DEBUG=1 DEAL_II_USE_PETSC=7 +PREDEFINED = DEBUG=1 @DEAL_II_DEFINE_DEAL_II_USE_PETSC@ # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then # this tag can be used to specify a list of macro names that should be expanded. -- 2.39.5