Changes in configure.ac [bff5e2:b61bd5]

File:

• configure.ac (modified) (1 diff)

configure.ac

@@ -319 +319 @@
   enable_levmar="no")
 AC_MSG_RESULT($enable_levmar)
-# don't use AS_IF here as it expands (and tests) AC_F77_FUN evene if levmar
+# don't use AS_IF here as it expands (and tests) AC_F77_FUN even if levmar
 # is disabled.
-if test x"$enable_levmar" = x"yes"; then
-        AX_LAPACK([enable_levmar=yes],[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"])
+                ]
+        )
 fi
-AS_IF([test x"$enable_levmar" = x"yes"],[
+AS_IF([test x"$enable_levmar" = xyes],[
+        AC_MSG_CHECKING(for levmar presence via given path )
         AC_ARG_WITH(
                 [levmar],
                 [AS_HELP_STRING([--with-levmar], [give path to LevMar package])],
-                [have_levmar_path=$withval],
+                [have_levmar_path=$withval
+                enable_levmar=yes],
                 [enable_levmar=no])
-                ],[enable_levmar=no])
-AS_IF([test x"$enable_levmar" = x"yes"],[
-        LEVMAR_CPPFLAGS="-I${have_levmar_path}/include"
-        LEVMAR_LDFLAGS="-L${have_levmar_path}/lib"
-        LEVMAR_LIBS="-llevmar"
+        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)
+                ])
+        ])
+        ],[enable_levmar=no]
+)
+AC_MSG_CHECKING(for levmar usability)
+AS_IF([test x"$enable_levmar" = xyes],[
         AC_SUBST(LEVMAR_CPPFLAGS)
         AC_SUBST(LEVMAR_LDFLAGS)
         AC_SUBST(LEVMAR_LIBS)
-        AC_DEFINE(HAVE_LEVMAR,1, ["use levmar for non-linear minimisation/potential fitting."])
-        ],[AC_MSG_WARN(["Missing LAPACK, disabling off levmar"])])
+        AC_DEFINE(HAVE_LEVMAR,1, ["use levmar for non-linear minimisation/potential fitting."])])
+AC_MSG_RESULT($enable_levmar)
 AM_CONDITIONAL([CONDLEVMAR], [test x"$enable_levmar" = x"yes"])