]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
handle --disable-parser such that the parser is not even compiled
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Apr 2005 12:47:44 +0000 (12:47 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Apr 2005 12:47:44 +0000 (12:47 +0000)
git-svn-id: https://svn.dealii.org/trunk@10582 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/configure
deal.II/configure.in
deal.II/contrib/Makefile.in

index b2c3781b2965cb8988fa7ef538d366552361d53b..3e03c0384b49f29864ea2096a9a35fe4735153c5 100755 (executable)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.199 .
+# From configure.in Revision: 1.200 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -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 CFLAGSPIC 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_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 CFLAGSPIC enablemultithreading withmultithreading F77 F77_VERSION F77FLAGSO F77FLAGSG F77FLAGSPIC F77LIBS enableshared static_lib_suffix shared_lib_suffix AR RANLIB ac_ct_RANLIB enableparser 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.
@@ -8870,18 +8870,25 @@ 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
+   enableparser=$enableval
+               echo "$as_me:$LINENO: result: Function parser disabled" >&5
+echo "${ECHO_T}Function parser disabled" >&6
+               if test "x$enableval" = "xno" ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define DEAL_II_DISABLE_PARSER 1
 _ACEOF
 
                fi
+else
+  enableparser=yes
 fi;
 
 
 
 
+
+
   # Check whether --enable-compat-blocker or --disable-compat-blocker was given.
 if test "${enable_compat_blocker+set}" = set; then
   enableval="$enable_compat_blocker"
@@ -10798,6 +10805,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,@enableparser@,$enableparser,;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
index 280e4fa491c79e2c800d70d0235cdf6c668d9cba..9af80310b6fbdd331791412fa335511ac23a4f01 100644 (file)
@@ -324,10 +324,15 @@ AC_ARG_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
+             [ enableparser=$enableval
+               AC_MSG_RESULT(Function parser disabled)
+               if test "x$enableval" = "xno" ; then
                AC_DEFINE(DEAL_II_DISABLE_PARSER,1,[disable the function parser in contrib])
-               fi])
+               fi],
+             enableparser=yes)
 
+
+AC_SUBST(enableparser)
 AC_SUBST(DEAL_II_DISABLE_PARSER)
 
 dnl --------------------------------------------------------------
index 2cbc62561f91a3a1bbbfae807619ef841f10920f..3d266e0f8539580e16051eccb772e550a3bad01f 100644 (file)
@@ -12,10 +12,10 @@ default: hsl umfpack
 
 ifeq ($(USE_CONTRIB_HSL),yes)
 hsl:
-       cd hsl ; $(MAKE)
+       @cd hsl ; $(MAKE)
 
 hsl-clean:
-       cd hsl ; $(MAKE) clean
+       @cd hsl ; $(MAKE) clean
 else
 hsl:
 hsl-clean:
@@ -24,17 +24,22 @@ endif
 
 ifeq ($(USE_CONTRIB_UMFPACK),yes)
 umfpack:
-       cd umfpack ; $(MAKE)
+       @cd umfpack ; $(MAKE)
 else
 umfpack:
 endif
 
 
+ifeq ($(enable-parser),yes)
 functionparser:
        @cd functionparser ; $(MAKE)
+else
+functionparser:
+endif
 
 
 # generic targets
 clean: hsl-clean
+       rm ../lib/contrib/*/*.o 
 
 .PHONY: default hsl clean umfpack functionparser

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.