Changeset 856d05 for m4

Timestamp:

Sep 26, 2012, 5:24:47 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:

a98122

Parents:

c3ecde

git-author:

Frederik Heber <heber@…> (09/05/12 14:10:32)

git-committer:

Frederik Heber <heber@…> (09/26/12 17:24:47)

Message:

MEMFIX: Added WorldTime and ObserverLog ::purgeInstance() calls.

• added several memory fixes:
  • XmlParser has VectorContent in static instance
  • ObserverLog must always be purged in case of --enable-debug.
  • WorldTime was not purged.
  • mpqc does not had BOOST_CPPFLAGS although CodePatterns includes.
  • we now require CodePatterns 1.2.3 to fix two ill-reported static instances.
  • fixing ax_jobmarket to include boost dependency and we now require JobMarket 1.1.1.
• added ObserverLog include to GLMoleculeObject_bond, _molecule, and GLWorldView.
• TESTFIX: due to changes with new JobMarket, we need to give jobids in regression test mpqc-jobs.

File:

• m4/ax_jobmarket.m4 (modified) (2 diffs)

m4/ax_jobmarket.m4

@@ -6 +6 @@
 [
 AC_REQUIRE([AM_PATH_CODEPATTERNS])
+AC_REQUIRE([BOOST_THREADS])
 
 AC_ARG_WITH(jobmarket,[  --with-jobmarket=PFX   Prefix where JobMarket is installed (optional)],
@@ -211 +212 @@
   SAVE_CPPFLAGS="$CPPFLAGS"
   SAVE_LIBS="$LIBS"
-  CPPFLAGS="$JobMarket_CFLAGS  ${CodePatterns_CFLAGS}"
-  LIBS="$JobMarket_LIBS $CodePatterns_LDFLAGS $CodePatterns_LIBS"
+  CPPFLAGS="$JobMarket_CFLAGS  $CodePatterns_CFLAGS $BOOST_CPPFLAGS"
+  LIBS="$JobMarket_LIBS $CodePatterns_LIBS $BOOST_THREAD_LDFLAGS $BOOST_THREAD_LIBS"
   if test x$jobmarket_version = xyes; then
     AC_CACHE_CHECK(for $jobmarket_libname lib, cp_cv_jobmarket_lib, [