Changeset 2095 for stable

Timestamp:

Jan 19, 2011 5:57:49 AM (10 years ago)

Author:

stefan

Message:

sync with trunk rev2094

Location:

stable/0.7

Files:

• . (modified) (1 prop)
• coin.m4 (modified) (4 diffs)
• compile_f2c (modified) (1 prop)

stable/0.7/coin.m4

@@ -2739 +2739 @@
 # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
 if test "x${prefix}" = xNONE ; then
-  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
 else
-  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
 fi
 
@@ -2750 +2750 @@
      AC_MSG_ERROR([argument for --with-coin-instdir not a directory])
    fi
-   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
+   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
   ],[])
 
@@ -3707 +3707 @@
 #    LAPACK_LIBS to its value
 # 4. tries standard libraries
-# 5. calls COIN_CHECK_PACKAGE(Lapack, [lapack], [$1]) to check for
+# 5. calls COIN_CHECK_PACKAGE(Lapack, [coinlapack], [$1]) to check for
 #    ThirdParty/Lapack
 # The makefile conditional and preprocessor macro COIN_HAS_LAPACK is defined.
@@ -3714 +3714 @@
 # In case 3 and 4, the flags to link to Lapack are added to X_PCLIBS too.
 # In case 5, Lapack is added to X_PCREQUIRES.
+#
+# TODO: Lapack usually depends on Blas, so if we check for a system lapack library,
+#   shouldn't we include AC_COIN_CHECK_PACKAGE_BLAS first?
+#   However, if we look for coinlapack via AC_COIN_CHECK_PACKAGE(Lapack, [coinlapack], [$1]),
+#   then we will get Blas as dependency of coinlapack.
 
 AC_DEFUN([AC_COIN_CHECK_PACKAGE_LAPACK],