Changeset 93ea13d for configure.ac

Timestamp:

Mar 2, 2017, 1:59:54 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, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

206fa9

Parents:

8ce1a9

git-author:

Frederik Heber <heber@…> (02/15/17 12:44:18)

git-committer:

Frederik Heber <heber@…> (03/02/17 13:59:54)

Message:

Added levmar as another subdir.

File:

• configure.ac (modified) (3 diffs)

configure.ac

@@ -371 +371 @@
 # don't use AS_IF here as it expands (and tests) AC_F77_FUN even if levmar
 # is disabled.
-if test x"$enable_levmar" = xyes; then
-        AX_LAPACK([enable_levmar=yes],
-                [enable_levmar=no
-                AC_MSG_WARN(["Missing LAPACK, disabling off levmar"])
-                ]
-        )
-fi
+compile_levmar="no"
 AS_IF([test x"$enable_levmar" = xyes],[
         AC_MSG_CHECKING(for levmar presence via given path )
@@ -385 +379 @@
                 [have_levmar_path=$withval
                 enable_levmar=yes],
-                [enable_levmar=no])
+        [
+                enable_levmar=no
+        ])
         AC_MSG_RESULT($enable_levmar)
         AS_IF([test -n "$have_levmar_path"],[
                 LEVMAR_CPPFLAGS="-I${have_levmar_path}/include"
                 LEVMAR_LDFLAGS="-L${have_levmar_path}/lib"
-                LEVMAR_LIBS="-llevmar"],[
-                PKG_CHECK_MODULES([LEVMAR],[levmar],[enable_levmar=yes],[
-                        AC_MSG_CHECKING(for levmar presence via locate)
-                        enable_levmar=no
-                        levmar_lib=`locate liblevmar.a | head -n 1 | xargs dirname`
-                        levmar_include=`locate levmar.h | head -n 1 | xargs dirname`
-                        if test -n "$levmar_lib"; then
-                                if test -n "$levmar_include"; then
-                                        enable_levmar=yes
-                                        LEVMAR_CPPFLAGS="-I${levmar_include}"
-                                        LEVMAR_LDFLAGS="-L${levmar_lib}"
-                                        LEVMAR_LIBS="-llevmar"
-                                fi
-                        fi
-                        AC_MSG_RESULT($enable_levmar)
-                ])
+                LEVMAR_LIBS="-llevmar"],
+                [PKG_CHECK_MODULES([LEVMAR],[levmar],[enable_levmar=yes],[enable_levmar=no])
         ])
         ],[enable_levmar=no]
 )
+if test x"$enable_levmar" = xyes; then
+        AX_LAPACK([enable_levmar=yes],
+                [enable_levmar=no
+                AC_MSG_WARN(["Missing LAPACK, disabling off levmar"])
+                ]
+        )
+else
+                        AC_CONFIG_SUBDIRS([ThirdParty/levmar])
+                        compile_levmar="yes"
+                        enable_levmar="yes"
+                        LEVMAR_CPPFLAGS='-I$(top_srcdir)/ThirdParty/levmar/src'
+                        LEVMAR_LDFLAGS='-L$(top_builddir)/ThirdParty/levmar/src'
+                        LEVMAR_LIBS='-llevmar'
+fi
 AC_MSG_CHECKING(for levmar usability)
 AS_IF([test x"$enable_levmar" = xyes],[
@@ -417 +413 @@
 AC_MSG_RESULT($enable_levmar)
 AM_CONDITIONAL([CONDLEVMAR], [test x"$enable_levmar" = x"yes"])
+AM_CONDITIONAL([COND_COMPILE_LEVMAR], [test x"$compile_levmar" = x"yes"])
 
 # Checks for header files.