Changeset c015b3 for configure.ac

Timestamp:

Dec 28, 2011, 3:24:57 PM (14 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:

db1a72

Parents:

f3b8a5

git-author:

Frederik Heber <heber@…> (11/11/11 12:16:24)

git-committer:

Frederik Heber <heber@…> (12/28/11 15:24:57)

Message:

Added enable-switches for Qt-based GUI and python module and scripts.

• note that encapsulation in AS_IF is absolutely required as otherwise lateron checks will produce strange errors as required checks reside in an unseen if ..; then branch, initiated by AC_PROG() ... or other contained macros.
• Added AM_CONDITIIONAL's to modify Makefile.ams depending on above enable switches.
• AM_COND_IF controls whether certain Makefile's are produced or not.
• moved Python regression tests into own folder to control whether they are executed or not.
• molecuildergui and libMolecuilderQtUI are only compiled with qtgui enabled.
• same for pyMoleCuilder and its scripts only when python enabled.

File:

• configure.ac (modified) (7 diffs)

configure.ac

@@ -21 +21 @@
 AC_PROG_INSTALL
 
+dnl Check if we have enable python
+# python module
+AC_MSG_CHECKING(whether to enable python module)
+AC_ARG_ENABLE(python, [  --enable-python=[no/yes] turn on python module
+                     [default=yes]],, enable_python=$enableval)
+AC_MSG_RESULT($enable_python)
+AS_IF([test x"$enable_python" != x"no"],[
+  # Python (for boost::python)
+  AM_PATH_PYTHON([2.2])
+  AX_PYTHON
+  AC_DEFINE(HAVE_PYTHON,1, ["Build python module and scripts."])
+])
+AM_CONDITIONAL([CONDPYTHON], [test x"$enable_python" != x"no"])
+AC_SUBST(HAVE_PYTHON)
+
+dnl Check if we have enable qtgui
 # Qt programs
+have_qtgui_path=""
 AC_ARG_WITH([Qt-bin],
         [AC_HELP_STRING([--with-Qt-bin], [give path to Qt binaries])],
-        echo "Looking for binaries in $withval ... "
-        [AC_PATH_PROGS([QT_MOC], 
+        [have_qtgui_path=$withval
+        enable_qtgui="yes"],,)
+
+AC_MSG_CHECKING(whether to enable Qt-based GUI)
+AC_ARG_ENABLE(qtgui, [  --enable-qtgui=[no/yes] turn on Qt GUI compilation
+                     [default=yes]],, enable_qtgui=$enableval)
+AC_MSG_RESULT($enable_qtgui)
+AS_IF([test x"$enable_qtgui" != x"no"],[
+        AC_PATH_PROGS([QT_MOC],
                 [moc-qt4 moc], 
                 [AC_MSG_ERROR(["Qts moc not found, please use --with-Qt-bin."])],
-                [$withval]
+                [$have_qtgui_path]
         )
         AC_PATH_PROGS([QT_UIC], 
                 [uic-qt4 uic], 
                 [AC_MSG_ERROR(["Qts uic not found, please use --with-Qt-bin."])],
-                [$withval]
-        )],
-        [AC_PATH_PROGS([QT_MOC], 
-                [moc-qt4 moc], 
-                [AC_MSG_ERROR(["Qts moc not found, please use --with-Qt-bin."])]
+                [$have_qtgui_path]
         )
-        AC_PATH_PROGS([QT_UIC], 
-                [uic-qt4 uic], 
-                [AC_MSG_ERROR(["Qts uic not found, please use --with-Qt-bin."])]
-        )]
-)
-PKG_CHECK_MODULES([QT], [QtCore QtGui Qt3D], [
-])
-AC_SUBST([QT_CFLAGS])
-AC_SUBST([QT_LIBS])
+        PKG_CHECK_MODULES([QT], [QtCore QtGui Qt3D], [
+        ])
+        AC_SUBST([QT_CFLAGS])
+        AC_SUBST([QT_LIBS])
+        AC_DEFINE(HAVE_QTGUI,1, ["Build Qt-based GUI"])
+])
+AM_CONDITIONAL([CONDQTGUI], [test x"$enable_qtgui" != x"no"])
+AC_SUBST(HAVE_QTGUI)
 
 # use doxygen
@@ -54 +73 @@
 DX_PDF_FEATURE(OFF)
 DX_INIT_DOXYGEN(MoleCuilder, Doxyfile, ${docdir})
-
-# Python (for boost::python)
-AM_PATH_PYTHON([2.2])
-AX_PYTHON
 
 # use libtool
@@ -74 +89 @@
 AC_MSG_CHECKING(whether to enable debugging)
 have_debug="no"
-AC_MSG_RESULT($have_debug)
 AC_ARG_ENABLE(debug, [  --enable-debug=[no/yes/full] turn on debugging
                      [default=no]],, enable_debug=$enableval)
@@ -93 +107 @@
   have_debug="no"
 fi
+AC_MSG_RESULT($have_debug)
 AC_SUBST(HAVE_DEBUG)
 
@@ -132 +147 @@
 BOOST_FILESYSTEM
 BOOST_PROGRAM_OPTIONS
-BOOST_PYTHON
+AS_IF([test x"$enable_python" != x"no"], [BOOST_PYTHON])
 BOOST_SERIALIZATION
 BOOST_THREADS
@@ -233 +248 @@
         tests/regression/atlocal 
         tests/regression/Makefile])
-AC_CONFIG_FILES([tests/regression/Python/run], [chmod +x tests/regression/Python/run])
 AC_CONFIG_FILES([tests/regression/molecuilder], [chmod +x tests/regression/molecuilder])
 
@@ -255 +269 @@
         src/unittests/Makefile
 ])
-AC_CONFIG_FILES([utils/boxmaker.py:utils/boxmaker.py.in], [chmod +x utils/boxmaker.py])
-AC_CONFIG_FILES([utils/python_wrapper:utils/python_wrapper.in], [chmod +x utils/python_wrapper])
+# produce python scripts and tests only when python's present
+AM_COND_IF([CONDPYTHON],[
+        AC_CONFIG_TESTDIR([tests/Python])
+        AC_CONFIG_FILES([utils/boxmaker.py:utils/boxmaker.py.in], [chmod +x utils/boxmaker.py])
+        AC_CONFIG_FILES([utils/python_wrapper:utils/python_wrapper.in], [chmod +x utils/python_wrapper])
+        AC_CONFIG_FILES([tests/Python/run], [chmod +x tests/Python/run])
+        AC_CONFIG_FILES([tests/Python/atlocal])
+        AC_CONFIG_FILES([tests/Python/Makefile])
+])
 AC_OUTPUT