Changeset f3b8a5


Ignore:
Timestamp:
Dec 28, 2011, 3:24:56 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:
c015b3
Parents:
e06010
git-author:
Frederik Heber <heber@…> (11/11/11 12:12:50)
git-committer:
Frederik Heber <heber@…> (12/28/11 15:24:56)
Message:

Changed enable switches in configure.ac.

  • with-valgrind is protected by AS_IF now.
  • corrected AC_MESSAGE for debug and cache.
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • LinearAlgebra/configure.ac

    re06010 rf3b8a5  
    3838dnl Check if we have enable debug support.
    3939AC_MSG_CHECKING(whether to enable debugging)
    40 default="no"
    41 have_debug="no"
    4240AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes/full] turn on debugging
    43                      [default=$default]],, enable_debug=$default)
     41                     [default=yes]],, enable_debug=$enableval)
     42AC_MSG_RESULT($enable_debug)
    4443if test "x$enable_debug" = "xyes"; then
    4544  AC_DEFINE(MEMDEBUG,1, ["Use memory debugger."])
    4645  AC_DEFINE(HAVE_DEBUG,1, ["Use debug setting to compile code."])
    47   have_debug="yes"
    4846elif test "x$enable_debug" = "xfull"; then
    4947  AC_DEFINE(MEMDEBUG,1, ["Use memory debugger."])
    5048  AC_DEFINE(LOG_OBSERVER,1, ["Use observer log."])
    5149  AC_DEFINE(HAVE_DEBUG,2, ["Use debug setting to compile code."])
    52   have_debug="full"
    5350else
    5451  AC_DEFINE(NDEBUG,1, ["Don't compile in debugging code."])
    5552  AC_DEFINE(HAVE_DEBUG,0, ["Use debug setting to compile code."])
    56   have_debug="no"
    5753fi
    58 AC_MSG_RESULT($have_debug)
    5954AC_SUBST(HAVE_DEBUG)
    6055
    … …  
    6358dnl Check if we have enable debug support.
    6459AC_MSG_CHECKING([whether to enable internal caching of values (speedup!)])
    65 default="yes"
    6660AC_ARG_ENABLE(cache, [  --enable-cache=[no/yes] turn on caching
    67                      [default=$default]],, enable_cache=$default)
     61                     [default=yes]],, enable_cache=$enableval)
     62AC_MSG_RESULT($enable_cache)
    6863if test "x$enable_cache" = "xno"; then
    6964  AC_DEFINE(NO_CACHING,1, ["Don't use caching code."])
    7065  AC_DEFINE(HAVE_CACHE,0, ["cache variables to speed up the code."])
    71   AC_MSG_RESULT(no)
    7266else
    7367  AC_DEFINE(HAVE_CACHE,1, ["cache variables to speed up the code."])
    … …  
    7569fi
    7670AC_SUBST(HAVE_CACHE)
    77 
    78 #AC_MSG_CHECKING(whether to enable profiling)
    79 #default="no"
    80 #AC_ARG_ENABLE(debug, [  --enable-profile=[no/yes] turn on profiling
    81 #                       [default=$default]],, enable_profile=$default)
    82 #if test "x$enable_profile" = "xyes"; then
    83 #  CXXFLAGS="$CXXFLAGS -g -DDEBUG -pg"
    84 #  DEBUG=-pg;
    85 #  AC_MSG_RESULT(yes)
    86 #else
    87 #  AC_MSG_RESULT(no)
    88 #fi
    89 
    90 #AC_MSG_CHECKING(whether to enable serialization)
    91 #default="no"
    92 #AC_ARG_ENABLE(debug, [  --enable-serialization=[no/yes] turn on serialization support
    93 #                       [default=$default]],, enable_serialization=$default)
    94 #if test "x$enable_serialization" = "xyes"; then
    95 #  CXXFLAGS="$CXXFLAGS -DSERIALIZATION"
    96 #  serialization=yes;
    97 #  AC_MSG_RESULT(yes)
    98 #else
    99 #  serialization=no;
    100 #  AC_MSG_RESULT(no)
    101 #fi
    10271
    10372# Checks for libraries.
    … …  
    150119
    151120# with valgrinding testsuite or not
     121AC_MSG_CHECKING(whether to enable valgrind memory checking in testsuite)
    152122AC_ARG_WITH([valgrind],AS_HELP_STRING([--with-valgrind],[Use Valgrind on the testsuite (default is no)]),
    153123              [with_valgrind=$withval], [with_valgrind=no])
    154 if test x"$with_valgrind" = xyes; then
     124AC_MSG_RESULT($with_valgrind)
     125AS_IF([test "$with_valgrind" = yes],[
    155126  AC_CHECK_HEADER([valgrind/valgrind.h],
    156127    [
    … …  
    167138    ]
    168139  )
    169 fi
     140])
    170141
    171142# Check for "extern inline", using a modified version

  • configure.ac

    re06010 rf3b8a5  
    7373dnl Check if we have enable debug support.
    7474AC_MSG_CHECKING(whether to enable debugging)
    75 default="no"
    7675have_debug="no"
     76AC_MSG_RESULT($have_debug)
    7777AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes/full] turn on debugging
    78                      [default=$default]],, enable_debug=$default)
     78                     [default=no]],, enable_debug=$enableval)
    7979if test "x$enable_debug" = "xyes"; then
    8080  AC_DEFINE(MEMDEBUG,1, ["Use memory debugger."])
    … …  
    9393  have_debug="no"
    9494fi
    95 AC_MSG_RESULT($have_debug)
    9695AC_SUBST(HAVE_DEBUG)
    9796
    … …  
    9998dnl to the configure script (./configure --enable-debug)
    10099dnl Check if we have enable debug support.
    101 AC_MSG_CHECKING([whether to enable internal caching of values (speedup!)])
    102 default="yes"
     100AC_MSG_CHECKING(whether to enable internal caching/lazy evaluation)
    103101AC_ARG_ENABLE(cache, [  --enable-cache=[no/yes] turn on caching
    104                      [default=$default]],, enable_cache=$default)
     102                     [default=yes]],, enable_cache=$enableval)
     103AC_MSG_RESULT($enable_cache)
    105104if test "x$enable_cache" = "xno"; then
    106105  AC_DEFINE(NO_CACHING,1, ["Don't use caching code."])
    107106  AC_DEFINE(HAVE_CACHE,0, ["cache variables to speed up the code."])
    108   AC_MSG_RESULT(no)
    109107else
    110108  AC_DEFINE(HAVE_CACHE,1, ["cache variables to speed up the code."])
    111   AC_MSG_RESULT(yes)
    112109fi
    113110AC_SUBST(HAVE_CACHE)
    114 
    115 #AC_MSG_CHECKING(whether to enable profiling)
    116 #default="no"
    117 #AC_ARG_ENABLE(debug, [  --enable-profile=[no/yes] turn on profiling
    118 #                       [default=$default]],, enable_profile=$default)
    119 #if test "x$enable_profile" = "xyes"; then
    120 #  CXXFLAGS="$CXXFLAGS -g -DDEBUG -pg"
    121 #  DEBUG=-pg;
    122 #  AC_MSG_RESULT(yes)
    123 #else
    124 #  AC_MSG_RESULT(no)
    125 #fi
    126 
    127 #AC_MSG_CHECKING(whether to enable serialization)
    128 #default="no"
    129 #AC_ARG_ENABLE(debug, [  --enable-serialization=[no/yes] turn on serialization support
    130 #                       [default=$default]],, enable_serialization=$default)
    131 #if test "x$enable_serialization" = "xyes"; then
    132 #  CXXFLAGS="$CXXFLAGS -DSERIALIZATION"
    133 #  serialization=yes;
    134 #  AC_MSG_RESULT(yes)
    135 #else
    136 #  serialization=no;
    137 #  AC_MSG_RESULT(no)
    138 #fi
    139111
    140112# Checks for libraries.
    … …  
    200172
    201173# with valgrinding testsuite or not
     174AC_MSG_CHECKING(whether to enable valgrind memory checking in testsuite)
    202175AC_ARG_WITH([valgrind],AS_HELP_STRING([--with-valgrind],[Use Valgrind on the testsuite (default is no)]),
    203176              [with_valgrind=$withval], [with_valgrind=no])
    204 if test x"$with_valgrind" = xyes; then
     177AC_MSG_RESULT($with_valgrind)
     178AS_IF([test "$with_valgrind" = "yes"], [
    205179  AC_CHECK_HEADER([valgrind/valgrind.h],
    206180    [
    … …  
    217191    ]
    218192  )
    219 fi
     193])
    220194
    221195# Check for "extern inline", using a modified version
Note: See TracChangeset for help on using the changeset viewer.