ass option for disabling function parser

git-svn-id: https://svn.dealii.org/trunk@10424 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/base/include/base/config.h.in b/deal.II/base/include/base/config.h.in
index 2f8f55a4a1dced72cd06a48c170dc4801ce820f6..01a51cd98e9e41a379298d5a996fbbf63f216e42 100644 (file)
--- a/deal.II/base/include/base/config.h.in
+++ b/deal.II/base/include/base/config.h.in
@@ -5,7 +5,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2001, 2002, 2003, 2004 by the deal.II authors
+//    Copyright (C) 2001, 2002, 2003, 2004, 2005 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -62,6 +62,9 @@
    */
 #undef DEAL_II_COMPAT_MAPPING
 
+/* disable the function parser in contrib */
+#undef DEAL_II_DISABLE_PARSER
+
 /* Defined if the compiler does not honor the explicit keyword on template
    constructors. */
 #undef DEAL_II_EXPLICIT_CONSTRUCTOR_BUG

diff --git a/deal.II/configure b/deal.II/configure
index ee59b7fdd444a60768d923c54b27bc698fe89219..e1a5b2b9f94943238c30484c4ec0d8cd650f281e 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -274,7 +274,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 GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR 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 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_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 GXX_VERSION_DETAILED CXXFLAGSG CXXFLAGSO CXXFLAGSPIC SHLIBLD CC_VERSION enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB DEAL_II_DISABLE_PARSER NEEDS_F77LIBS HSL_INCLUDE_DIR USE_CONTRIB_HSL TECPLOT_INCLUDE_DIR 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 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.
@@ -817,6 +817,9 @@ Optional Features:
   --enable-multithreading set compiler flags to allow for
                           multithreaded programs
   --enable-shared         set compiler flags to generate shared libraries
+  --enable-parser         While switched on by default, this option allows to
+                          switch off support for the function parser in the
+                          contrib directory.
   --enable-compat-blocker=mapping block functions that implicitely
                           assume a Q1 mapping
 
@@ -8856,6 +8859,20 @@ fi
 
 
 
+# Check whether --enable-parser or --disable-parser was given.
+if test "${enable_parser+set}" = set; then
+  enableval="$enable_parser"
+   if test "x$enableval" = "xno" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define DEAL_II_DISABLE_PARSER 1
+_ACEOF
+
+               fi
+fi;
+
+
+
 
   # Check whether --enable-compat-blocker or --disable-compat-blocker was given.
 if test "${enable_compat_blocker+set}" = set; then
@@ -10767,6 +10784,7 @@ s,@shared_lib_suffix@,$shared_lib_suffix,;t t
 s,@AR@,$AR,;t t
 s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+s,@DEAL_II_DISABLE_PARSER@,$DEAL_II_DISABLE_PARSER,;t t
 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

diff --git a/deal.II/configure.in b/deal.II/configure.in
index 327e4b59b4721b596c62240596317a0ae7bd0bbd..f1afbe142cc04299fde09f2424434f7610ea26a3 100644 (file)
--- a/deal.II/configure.in
+++ b/deal.II/configure.in
@@ -307,6 +307,20 @@ AC_SUBST(AR)
 AC_SUBST(RANLIB)
 
 
+dnl --------------------------------------------------------------
+dnl                       Optinal features
+dnl --------------------------------------------------------------
+
+AC_ARG_ENABLE(parser,
+              AS_HELP_STRING([--enable-parser],
+                             [While switched on by default, this option allows
+                              to switch off support for the function parser
+                             in the contrib directory.]),
+             [ if test "x$enableval" = "xno" ; then
+               AC_DEFINE(DEAL_II_DISABLE_PARSER,1,[disable the function parser in contrib])
+               fi])
+
+AC_SUBST(DEAL_II_DISABLE_PARSER)
 
 dnl --------------------------------------------------------------
 dnl                   Backward compatibility functions