Changeset f99714

Timestamp:

Dec 28, 2011, 3:24:58 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, AddingActions_SaveParseParticleParameters, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_ParticleName_to_Atom, Adding_StructOpt_integration_tests, AtomFragments, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, CombiningParticlePotentialParsing, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_BoundInBox_CenterInBox_MoleculeActions, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, FragmentAction_writes_AtomFragments, FragmentMolecule_checks_bonddegrees, GeometryObjects, Gui_Fixes, Gui_displays_atomic_force_velocity, ImplicitCharges, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, MoreRobust_FragmentAutomation, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PdbParser_setsAtomName, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, Rewrite_FitPartialCharges, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, TremoloParser_setsAtomName, Ubuntu_1604_changes, stable

Children:

30c753, 908dc7

Parents:

d103d3

git-author:

Frederik Heber <heber@…> (12/21/11 15:01:47)

git-committer:

Frederik Heber <heber@…> (12/28/11 15:24:58)

Message:

FIX: Finally correctly implemented all --enable-... switches in configure.

• The principle is: AC_ARG_ENABLE([option], [help], [if present], [if not present]). In the last we set the default value of our own variable (e.g. enable_...="no"), in the last but one we simply set enable_...=$enableval to get the value from the command line.
• also I used AS_IF everywhere in checking the enable_... value.

Files:

• LinearAlgebra/configure.ac (modified) (3 diffs)
• configure.ac (modified) (5 diffs)

LinearAlgebra/configure.ac

@@ -38 +38 @@
 dnl Check if we have enable debug support.
 AC_MSG_CHECKING(whether to enable debugging)
-AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes/full] turn on debugging
-                     [default=yes]],, enable_debug=$enableval)
+have_debug="no"
+AC_ARG_ENABLE(
+        [debug],
+        AS_HELP_STRING([--enable-debug],[turn on debugging [default=no]]),
+        enable_debug=$enableval,
+        enable_debug="no")
 AC_MSG_RESULT($enable_debug)
-if test "x$enable_debug" = "xyes"; then
+AS_IF([test x"$enable_debug" = x"yes"],[
   AC_DEFINE(MEMDEBUG,1, ["Use memory debugger."])
   AC_DEFINE(HAVE_DEBUG,1, ["Use debug setting to compile code."])
-elif test "x$enable_debug" = "xfull"; then
-  AC_DEFINE(MEMDEBUG,1, ["Use memory debugger."])
-  AC_DEFINE(LOG_OBSERVER,1, ["Use observer log."])
-  AC_DEFINE(HAVE_DEBUG,2, ["Use debug setting to compile code."])
-else
-  AC_DEFINE(NDEBUG,1, ["Don't compile in debugging code."])
-  AC_DEFINE(HAVE_DEBUG,0, ["Use debug setting to compile code."])
-fi
+  have_debug="yes"
+],[
+        AS_IF([test x"$enable_debug" = x"full"],[
+          AC_DEFINE(MEMDEBUG,1, ["Use memory debugger."])
+          AC_DEFINE(LOG_OBSERVER,1, ["Use observer log."])
+          AC_DEFINE(HAVE_DEBUG,2, ["Use debug setting to compile code."])
+          AC_DEFINE(QT_DEBUG,, ["Enable Qt debug messages."])
+          have_debug="full"
+        ],[
+          AC_DEFINE(NDEBUG,1, ["Don't compile in debugging code."])
+          AC_DEFINE(HAVE_DEBUG,0, ["Use debug setting to compile code."])
+          AC_DEFINE(QT_NO_DEBUG,, ["Disable Qt debug messages."])
+          have_debug="no"
+        ])
+])
 AC_SUBST(HAVE_DEBUG)
 
@@ -57 +68 @@
 dnl to the configure script (./configure --enable-debug)
 dnl Check if we have enable debug support.
-AC_MSG_CHECKING([whether to enable internal caching of values (speedup!)])
-AC_ARG_ENABLE(cache, [  --enable-cache=[no/yes] turn on caching
-                     [default=yes]],, enable_cache=$enableval)
+AC_MSG_CHECKING(whether to enable internal caching/lazy evaluation)
+AC_ARG_ENABLE(
+        [cache],
+        AS_HELP_STRING([--enable-cache],[turn on internal lazy evaluation [default=yes]]),
+        enable_cache=$enableval,
+        enable_cache="yes")
 AC_MSG_RESULT($enable_cache)
-if test "x$enable_cache" = "xno"; then
+AS_IF([test x"$enable_cache" != x"no"],[
+  AC_DEFINE(HAVE_CACHE,1, ["cache variables to speed up the code."])
+],[
   AC_DEFINE(NO_CACHING,1, ["Don't use caching code."])
   AC_DEFINE(HAVE_CACHE,0, ["cache variables to speed up the code."])
-else
-  AC_DEFINE(HAVE_CACHE,1, ["cache variables to speed up the code."])
-  AC_MSG_RESULT(yes)
-fi
+])
 AC_SUBST(HAVE_CACHE)
 
@@ -111 +124 @@
 
 # use CppUnit TestRunner or not
-AC_ARG_ENABLE([ecut],AS_HELP_STRING([--enable-ecut],[Use ECut TestRunnerClient (default is no)]),
-              [enable_ecut=$enableval], [enable_ecut=no])
-if test x"$enable_ecut" = xyes; then
+AC_MSG_CHECKING(whether to enable ECut TestRunnerClient)
+AC_ARG_ENABLE(
+        [ecut],
+        AS_HELP_STRING([--enable-ecut],[Use ECut TestRunnerClient [default=no]]),
+        enable_ecut=$disableval,
+        enable_ecut="no")
+AC_MSG_RESULT($enable_ecut)
+AS_IF([test x"$enable_ecut" = x"yes"],[
   AC_DEFINE(HAVE_ECUT,1, ["Use ECut TestRunnerClient instead of our own."])
   AC_SUBST(HAVE_ECUT)
-fi
+])
 
 # with valgrinding testsuite or not
 AC_MSG_CHECKING(whether to enable valgrind memory checking in testsuite)
-AC_ARG_WITH([valgrind],AS_HELP_STRING([--with-valgrind],[Use Valgrind on the testsuite (default is no)]),
-              [with_valgrind=$withval], [with_valgrind=no])
-AC_MSG_RESULT($with_valgrind)
-AS_IF([test "$with_valgrind" = yes],[
+AC_ARG_ENABLE(
+        [valgrind],
+        AS_HELP_STRING([--enable-valgrind],[Use Valgrind on the testsuite [default=no]]),
+        enable_valgrind=$enableval,
+        enable_valgrind="no")
+AC_MSG_RESULT($enable_valgrind)
+AS_IF([test x"$enable_valgrind" = x"yes"], [
   AC_CHECK_HEADER([valgrind/valgrind.h],
     [

configure.ac

@@ -24 +24 @@
 # python module
 AC_MSG_CHECKING(whether to enable python module)
-AC_ARG_ENABLE(python, [  --enable-python=[no/yes] turn on python module
-                     [default=yes]],, enable_python=$enableval)
+AC_ARG_ENABLE(
+        [python],
+        AS_HELP_STRING([--enable-python],[turn on python module [default=yes]]),
+        enable_python=$enableval,
+        enable_python="yes")
 AC_MSG_RESULT($enable_python)
 AS_IF([test x"$enable_python" != x"no"],[
@@ -38 +41 @@
 dnl Check if we have enable qtgui
 # Qt programs
-have_qtgui_path=""
-AC_ARG_WITH([Qt-bin],
-        [AC_HELP_STRING([--with-Qt-bin], [give path to Qt binaries])],
+AC_ARG_WITH(
+        [Qt-bin],
+        [AS_HELP_STRING([--with-Qt-bin], [give path to Qt binaries])],
         [have_qtgui_path=$withval
-        enable_qtgui="yes"],,)
-
+         enable_qtgui="yes"],
+        have_qtgui_path="")
 AC_MSG_CHECKING(whether to enable Qt-based GUI)
-AC_ARG_ENABLE(qtgui, [  --enable-qtgui=[no/yes] turn on Qt GUI compilation
-                     [default=yes]],, enable_qtgui=$enableval)
+AC_ARG_ENABLE(
+        [qtgui], 
+        AS_HELP_STRING([--enable-qtgui],[turn on Qt GUI compilation [default=yes]]),
+        enable_qtgui=$enableval,
+        enable_qtgui="yes")
 AC_MSG_RESULT($enable_qtgui)
 AS_IF([test x"$enable_qtgui" != x"no"],[
@@ -89 +95 @@
 AC_MSG_CHECKING(whether to enable debugging)
 have_debug="no"
-AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes/full] turn on debugging
-                     [default=no]],, enable_debug=$enableval)
-if test "x$enable_debug" = "xyes"; then
+AC_ARG_ENABLE(
+        [debug],
+        AS_HELP_STRING([--enable-debug],[turn on debugging [default=no]]),
+        enable_debug=$enableval,
+        enable_debug="no")
+AC_MSG_RESULT($enable_debug)
+AS_IF([test x"$enable_debug" = x"yes"],[
   AC_DEFINE(MEMDEBUG,1, ["Use memory debugger."])
   AC_DEFINE(HAVE_DEBUG,1, ["Use debug setting to compile code."])
   have_debug="yes"
-elif test "x$enable_debug" = "xfull"; then
-  AC_DEFINE(MEMDEBUG,1, ["Use memory debugger."])
-  AC_DEFINE(LOG_OBSERVER,1, ["Use observer log."])
-  AC_DEFINE(HAVE_DEBUG,2, ["Use debug setting to compile code."])
-  AC_DEFINE(QT_DEBUG,, ["Enable Qt debug messages."])
-  have_debug="full"
-else
-  AC_DEFINE(NDEBUG,1, ["Don't compile in debugging code."])
-  AC_DEFINE(HAVE_DEBUG,0, ["Use debug setting to compile code."])
-  AC_DEFINE(QT_NO_DEBUG,, ["Disable Qt debug messages."])
-  have_debug="no"
-fi
-AC_MSG_RESULT($have_debug)
+],[
+        AS_IF([test x"$enable_debug" = x"full"],[
+          AC_DEFINE(MEMDEBUG,1, ["Use memory debugger."])
+          AC_DEFINE(LOG_OBSERVER,1, ["Use observer log."])
+          AC_DEFINE(HAVE_DEBUG,2, ["Use debug setting to compile code."])
+          AC_DEFINE(QT_DEBUG,, ["Enable Qt debug messages."])
+          have_debug="full"
+        ],[
+          AC_DEFINE(NDEBUG,1, ["Don't compile in debugging code."])
+          AC_DEFINE(HAVE_DEBUG,0, ["Use debug setting to compile code."])
+          AC_DEFINE(QT_NO_DEBUG,, ["Disable Qt debug messages."])
+          have_debug="no"
+        ])
+])
 AC_SUBST(HAVE_DEBUG)
 
@@ -114 +125 @@
 dnl Check if we have enable debug support.
 AC_MSG_CHECKING(whether to enable internal caching/lazy evaluation)
-AC_ARG_ENABLE(cache, [  --enable-cache=[no/yes] turn on caching
-                     [default=yes]],, enable_cache=$enableval)
+AC_ARG_ENABLE(
+        [cache],
+        AS_HELP_STRING([--enable-cache],[turn on internal lazy evaluation [default=yes]]),
+        enable_cache=$enableval,
+        enable_cache="yes")
 AC_MSG_RESULT($enable_cache)
-if test "x$enable_cache" = "xno"; then
+AS_IF([test x"$enable_cache" != x"no"],[
+  AC_DEFINE(HAVE_CACHE,1, ["cache variables to speed up the code."])
+],[
   AC_DEFINE(NO_CACHING,1, ["Don't use caching code."])
   AC_DEFINE(HAVE_CACHE,0, ["cache variables to speed up the code."])
-else
-  AC_DEFINE(HAVE_CACHE,1, ["cache variables to speed up the code."])
-fi
+])
 AC_SUBST(HAVE_CACHE)
 
@@ -180 +194 @@
 
 # use CppUnit TestRunner or not
-AC_ARG_ENABLE([ecut],AS_HELP_STRING([--enable-ecut],[Use ECut TestRunnerClient (default is no)]),
-              [enable_ecut=$enableval], [enable_ecut=no])
-if test x"$enable_ecut" = xyes; then
+AC_MSG_CHECKING(whether to enable ECut TestRunnerClient)
+AC_ARG_ENABLE(
+        [ecut],
+        AS_HELP_STRING([--enable-ecut],[Use ECut TestRunnerClient [default=no]]),
+        enable_ecut=$disableval,
+        enable_ecut="no")
+AC_MSG_RESULT($enable_ecut)
+AS_IF([test x"$enable_ecut" = x"yes"],[
   AC_DEFINE(HAVE_ECUT,1, ["Use ECut TestRunnerClient instead of our own."])
   AC_SUBST(HAVE_ECUT)
-fi
+])
 
 # with valgrinding testsuite or not
 AC_MSG_CHECKING(whether to enable valgrind memory checking in testsuite)
-AC_ARG_WITH([valgrind],AS_HELP_STRING([--with-valgrind],[Use Valgrind on the testsuite (default is no)]),
-              [with_valgrind=$withval], [with_valgrind=no])
-AC_MSG_RESULT($with_valgrind)
-AS_IF([test "$with_valgrind" = "yes"], [
+AC_ARG_ENABLE(
+        [valgrind],
+        AS_HELP_STRING([--enable-valgrind],[Use Valgrind on the testsuite [default=no]]),
+        enable_valgrind=$enableval,
+        enable_valgrind="no")
+AC_MSG_RESULT($enable_valgrind)
+AS_IF([test x"$enable_valgrind" = x"yes"], [
   AC_CHECK_HEADER([valgrind/valgrind.h],
     [