Changeset 196702

Timestamp:

Aug 13, 2015, 9:52:27 PM (10 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:

57c253

Parents:

65ca73

git-author:

Frederik Heber <heber@…> (08/13/15 21:51:14)

git-committer:

Frederik Heber <heber@…> (08/13/15 21:52:27)

Message:

FIX: Qt can now be found even without --with-Qtbin...

File:

• configure.ac (modified) (1 diff)

configure.ac

@@ -71 +71 @@
                 [have_qtgui_path=$withval],
                 have_qtgui_path="")
-        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_RCC],
-                [rcc-qt4 rcc], 
-                [AC_MSG_ERROR(["Qts rcc 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."])],
-                [$have_qtgui_path]
-        )
+        AS_IF([test x"$have_qtgui_path" != x""],[
+                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_RCC],
+                        [rcc-qt4 rcc], 
+                        [AC_MSG_ERROR(["Qts rcc 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."])],
+                        [$have_qtgui_path]
+                )
+        ],[
+                AC_PATH_PROGS([QT_MOC],
+                        [moc-qt4 moc], 
+                        [AC_MSG_ERROR(["Qts moc not found, please use --with-Qt-bin."])]
+                )
+                AC_PATH_PROGS([QT_RCC],
+                        [rcc-qt4 rcc], 
+                        [AC_MSG_ERROR(["Qts rcc not found, please use --with-Qt-bin."])]
+                )
+                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], [
         ])