Changeset bbc982 for ThirdParty/mpqc_open/src/lib/Makefile.am

Timestamp:

Mar 2, 2017, 12:28:37 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_levmar, Subpackage_vmg, ThirdParty_MPQC_rebuilt_buildsystem, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

c2debc

Parents:

0035ea

git-author:

Frederik Heber <heber@…> (02/11/17 08:17:10)

git-committer:

Frederik Heber <heber@…> (03/02/17 12:28:37)

Message:

Various fixes to mpqc_open's configure.ac.

• using AC_CANONICAL_SYSTEM to set host and target.
• adding missing DEFINES to config header.
• adding more conditionals for mpi, armci, ...
• consolidating rename of several conditionals as COND_...
• src/lib/Makefile.am: conditionals are now generally prefixed with COND_.

File:

• ThirdParty/mpqc_open/src/lib/Makefile.am (modified) (3 diffs)

ThirdParty/mpqc_open/src/lib/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib $(MPI_CXXFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src/lib $(EXTRADEFINES) $(MPI_CXXFLAGS)
 AM_LDFLAGS = $(MPI_LDFLAGS)
 
@@ -16 +16 @@
 MKF77SYM= $(PERL) $(top_builddir)/bin/mkf77sym.pl
 
-if CONDCCA
+if COND_CCA
 include chemistry/cca/Makefile.am
 endif
@@ -22 +22 @@
 include chemistry/molecule/Makefile.am
 include chemistry/qc/basis/Makefile.am
-#include chemistry/qc/cints/Makefile.am
+
+if COND_LIBINT
+include chemistry/qc/cints/Makefile.am
+endif
+
 include chemistry/qc/dft/Makefile.am
-#include chemistry/qc/intcca/Makefile.am
+
+if COND_CCA
+include chemistry/qc/intcca/Makefile.am
+endif
+
 include chemistry/qc/intv3/Makefile.am
 include chemistry/qc/mbpt/Makefile.am
 
-if CONDLIBINT
+if COND_LIBINT
 include chemistry/qc/mbptr12/Makefile.am
 endif