Changeset 004ae7 for m4

Timestamp:

Nov 3, 2011, 7:21:42 PM (13 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:

862b6a

Parents:

bbff92

git-author:

Frederik Heber <heber@…> (11/03/11 15:44:19)

git-committer:

Frederik Heber <heber@…> (11/03/11 19:21:42)

Message:

FIX: Changes to bnv_have_qt.m4 and boost.m4.

• moved search in /opt to very end of list, wherever occurring. /opt is often a network drive and hence fails in case of network outtage.
• bnv_have_qt.m4: Moved Libs in test compile to end, gcc 4.6 is picky and we are checking specifically for QtCore, QtGui, and Qt3D libs, not just any.

Location:

m4

Files:

• bnv_have_qt.m4 (modified) (3 diffs)
• boost.m4 (modified) (2 diffs)

m4/bnv_have_qt.m4

@@ -102 +102 @@
 dnl   - removed libXt and libXi which are just shared libs linked in
 dnl     the other libs
+dnl
+dnl Fifth note by Frederik Heber <heber@ins.uni-bonn.de>
+dnl Some changes to get it working with Ubuntu 11.10:
+dnl   - Replace [[Qq]]t* by simply the two variants and piping errors to
+dnl     /dev/null
+dnl   - The new gcc version (4.6) does not like libs specified before objects.
+dnl     Hence, $LIBS is given at the very end of the link attempt.
+dnl   - First lib in alphabetical order is Qt3Support, hence use QtGui and
+dnl     QtCore by hand
 
 dnl Copyright (C) 2001, 2002, 2003, 2005, 2006 Bastiaan Veelo
@@ -207 +216 @@
       # Only search for the lib if the user did not define one already
       if test x"$bnv_qt_lib" = x; then
-        bnv_qt_lib="`ls $bnv_qt_lib_dir/lib[[Qq]]t* | sed -n 1p |
+        bnv_qt_libs=""
+        for lib in [[gG]]ui [[Cc]]ore 3D
+        do
+          bnv_qt_lib="`ls $bnv_qt_lib_dir/libqt${lib}* $bnv_qt_lib_dir/libQt${lib}* 2>/dev/null | sed -n 1p |
                      sed s@$bnv_qt_lib_dir/lib@@ | [sed s@[.].*@@]`"
-      fi
-      bnv_qt_LIBS="-L$bnv_qt_lib_dir -l$bnv_qt_lib $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
+          echo "LIB $lib: $bnv_qt_lib"
+          if test ! -z $bnv_qt_lib; then
+            bnv_qt_libs="$bnv_qt_libs -l$bnv_qt_lib"
+          fi
+        done
+      fi
+      bnv_qt_LIBS="-L$bnv_qt_lib_dir $bnv_qt_libs $X_PRE_LIBS $X_LIBS -lX11 -lXext $X_EXTRA_LIBS"
     else
       # Use cached value or do search, starting with suggestions from
@@ -360 +377 @@
             cat bnv_qt_main.$ac_ext >&AC_FD_CC
           else
-            bnv_try_4="$CXX $QT_LIBS $LIBS -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o >/dev/null 2>/dev/null"
+            bnv_try_4="$CXX -o bnv_qt_main bnv_qt_main.o moc_bnv_qt_test.o $QT_LIBS $LIBS >/dev/null 2>/dev/null"
             AC_TRY_EVAL(bnv_try_4)
             if test x"$ac_status" != x0; then

m4/boost.m4

@@ -135 +135 @@
     # If the user provided a value to --with-boost, use it and only it.
     case $with_boost in #(
-      ''|yes) set x '' /opt/local/include /usr/local/include /opt/include \
-                 /usr/include C:/Boost/include;; #(
+      ''|yes) set x '' /usr/local/include /usr/include \
+              /opt/local/include /opt/include \
+              C:/Boost/include;; #(
       *)      set x "$with_boost/include" "$with_boost";;
     esac
@@ -380 +381 @@
     test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
     for boost_ldpath in "$boost_tmp_lib/lib" '' \
-             /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
-             "$with_boost" C:/Boost/lib /lib*
+             /usr/local/lib* /usr/lib* \
+             "$with_boost" C:/Boost/lib /lib* \
+             /opt/local/lib* /opt/lib*
     do
       test -e "$boost_ldpath" || continue