Changeset 79b089 for configure.ac

Timestamp:

Mar 2, 2017, 2:00:41 PM (8 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, 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_vmg, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

dfeb7c

Parents:

7faa5c

git-author:

Frederik Heber <heber@…> (02/16/17 21:19:06)

git-committer:

Frederik Heber <heber@…> (03/02/17 14:00:41)

Message:

Added vmg as another subpackage.

File:

• configure.ac (modified) (6 diffs)

configure.ac

@@ -276 +276 @@
         #AC_MSG_ERROR([Missing CodePatterns library, please specify PKG_CONFIG_PATH or use --with-codepatterns...])
 ])
+AC_MSG_CHECKING(whether to compile codepatterns)
+AC_MSG_RESULT($compile_codepatterns)
 AM_CONDITIONAL([COND_COMPILE_CODEPATTERNS], [test x"$compile_codepatterns" = x"yes"])
 
@@ -287 +289 @@
 AC_MSG_RESULT($enable_jobmarket)
 compile_jobmarket="no"
+AC_MSG_CHECKING(whether to compile jobmarket)
 AS_IF([test x"$enable_jobmarket" != x"no"],[
   # the following is only required if we use JobMarket
@@ -310 +313 @@
     ])
 ]
+AC_MSG_RESULT($compile_jobmarket)
 AM_CONDITIONAL([COND_COMPILE_JOBMARKET], [test x"$compile_jobmarket" = x"yes"])
 #[
@@ -319 +323 @@
 
 # VMG library
-AC_MSG_CHECKING(whether to compile in long-range support via VMG)
+AC_MSG_CHECKING(whether to compile in long-range support via vmg)
 AC_ARG_ENABLE(
   [vmg],
@@ -326 +330 @@
   enable_vmg="no")
 AC_MSG_RESULT($enable_vmg)
+compile_vmg="no"
+AC_MSG_CHECKING(whether to compile vmg library)
 AS_IF([test x"$enable_vmg" != x"no"],[
-  PKG_CHECK_MODULES(VMG, VMG >= 0.1)
+  PKG_CHECK_MODULES(VMG, VMG >= 0.1, [enable_vmg="yes"], [enable_vmg="no"])
+  AS_IF([test x"$enable_vmg" = x"no"],[
+        AC_CONFIG_SUBDIRS([ThirdParty/vmg])
+        compile_vmg="yes"
+        enable_vmg="yes"
+        [VMG_CFLAGS='-I$(top_srcdir)/ThirdParty/vmg/src']
+        [VMG_LDFLAGS='-L$(top_builddir)/ThirdParty/vmg/src']
+        [VMG_LIBS='-lvmg']
+  ])
   AC_SUBST(VMG_CFLAGS)
+  AC_SUBST(VMG_LDFLAGS)
   AC_SUBST(VMG_LIBS)
   AC_DEFINE(HAVE_VMG,1, ["use VMG to calculate long-range contributions."])
@@ -357 +372 @@
     [])
 ])
+AC_MSG_RESULT($compile_vmg)
 AM_CONDITIONAL([CONDVMG], [test x"$enable_vmg" = x"yes"])
 AM_CONDITIONAL([CONDVMGMPI], [test x"$have_CXX_mpi" = x"yes"])
+AM_CONDITIONAL([COND_COMPILE_VMG], [test x"$compile_vmg" = x"yes"])