Changeset 2f5562 for configure.ac

Timestamp:

Mar 2, 2017, 7:25:26 AM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChronosMutex, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids_IntegrationTest, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, StoppableMakroAction, Subpackage_JobMarket, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

99689b

Parents:

363f28

git-author:

Frederik Heber <heber@…> (11/16/16 08:03:32)

git-committer:

Frederik Heber <heber@…> (03/02/17 07:25:26)

Message:

Added JobMarket as ThirdParty module, Missing CodePatterns_LDFLAGS in JobMarket.

File:

• configure.ac (modified) (2 diffs)

configure.ac

@@ -285 +285 @@
   enable_jobmarket="yes")
 AC_MSG_RESULT($enable_jobmarket)
+compile_jobmarket="no"
 AS_IF([test x"$enable_jobmarket" != x"no"],[
   # JobMarket library (needs SystemCommandJob with suffix)
@@ -292 +293 @@
     AC_DEFINE(HAVE_JOBMARKET,1, ["use JobMarket to calculate fragment jobs."])
     ],[
-      enable_jobmarket="no"
+        AC_CONFIG_SUBDIRS([ThirdParty/JobMarket])
+        compile_jobmarket="yes"
+        [JobMarket_CFLAGS='-I$(top_srcdir)/ThirdParty/JobMarket/src']
+        [JobMarket_LDFLAGS='-L$(top_builddir)/ThirdParty/JobMarket/src/JobMarket']
+        [JobMarket_LIBS='-lJobMarket']
+        [JobMarket_Controller_LIBS='-lJobMarketController']
+        [JobMarket_Server_LIBS='-lJobMarketServer']
+        [JobMarket_PoolWorker_LIBS='-lJobMarketPoolWorker']
+        AC_SUBST(JobMarket_CFLAGS)
+        AC_SUBST(JobMarket_LDFLAGS)
+        AC_SUBST(JobMarket_LIBS)
+        AC_SUBST(JobMarket_Controller_LIBS)
+        AC_SUBST(JobMarket_Server_LIBS)
+        AC_SUBST(JobMarket_PoolWorker_LIBS)
     ])
 ]
+AM_CONDITIONAL([COND_COMPILE_JOBMARKET], [test x"$compile_jobmarket" = x"yes"])
 #[
 #  AC_DEFINE(HAVE_JOBMARKET,0, ["use JobMarket to calculate fragment jobs."])