Changeset 2039

Timestamp:

Dec 31, 2010 8:18:14 AM (9 years ago)

Author:

stefan

Message:

merge chgset 2038 from trunk

Location:

stable/0.6

Files:

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

stable/0.6/coin.m4

@@ -3805 +3805 @@
 AC_DEFUN([AC_COIN_MAIN_PACKAGEDIR],
 [AC_REQUIRE([AC_COIN_HAS_PKGCONFIG])
-AC_MSG_CHECKING([whether project m4_ifval([$2],[$2/])$1 is available])
+AC_MSG_CHECKING([whether project $1 is available])
 
 m4_tolower(coin_has_$1)=notGiven
@@ -3825 +3825 @@
 if test $m4_tolower(coin_has_$1) != skipping; then
   if test $PACKAGE_TARNAME = m4_tolower($1); then
-    m4_tolower(coin_has_$1)=.
+    m4_tolower(coin_has_$1)=yes
     coin_have_project_dir=yes
   fi
@@ -3832 +3832 @@
     AC_HELP_STRING([--with-m4_tolower($1)-lib],
                    [linker flags for using project $1]),
-      [m4_tolower(coin_has_$1)=installed],
+      [m4_tolower(coin_has_$1)="yes, via --with-m4_tolower($1)-lib"],
       [])
 
@@ -3838 +3838 @@
     AC_HELP_STRING([--with-m4_tolower($1)-incdir],
                    [directory with header files for using project $1]),
-    [m4_tolower(coin_has_$1)=installed],
+    [m4_tolower(coin_has_$1)="yes, via --with-m4_tolower($1)-incdir"],
     [])
 
@@ -3844 +3844 @@
     AC_HELP_STRING([--with-m4_tolower($1)-datadir],
                    [directory with data files for using project $1]),
-    [m4_tolower(coin_has_$1)=installed],
+    [m4_tolower(coin_has_$1)="yes, via --with-m4_tolower($1)-datadir"],
     [])
 
@@ -3854 +3854 @@
            coin_has_blas=notGiven
          else
-           coin_has_blas=installed
+           coin_has_blas="yes, via --with-blas"
          fi],
         [])])
@@ -3865 +3865 @@
            coin_has_lapack=notGiven
          else
-           coin_has_lapack=installed
+           coin_has_lapack="yes, via --with-lapack"
          fi],
         [])])
@@ -3885 +3885 @@
       [ coin_have_project_dir=yes ])
     if test $coin_have_project_dir = yes; then
-      m4_tolower(coin_has_$1)=m4_ifval($2,[$2/],)$1
+      m4_tolower(coin_has_$1)="yes, source in m4_ifval($2,[$2/],)$1"
     fi
   fi
@@ -3891 +3891 @@
 
 # check for project by using pkg-config, if pkg-config is available
-if test $m4_tolower(coin_has_$1) = notGiven; then
+if test "$m4_tolower(coin_has_$1)" = notGiven; then
   #we are only interested in installed packages here, so we do not search in $COIN_PKG_CONFIG_PATH_UNINSTALLED
   if test -n "$PKG_CONFIG" ; then
@@ -3898 +3898 @@
       m4_ifval([$4],
         [AC_COIN_PKG_CHECK_PROJECT_EXISTS([$4],
-                [m4_tolower(coin_has_$1)="$m4_toupper([$4])_VERSION"])],
+                [m4_tolower(coin_has_$1)="yes, found installed version $m4_toupper([$4])_VERSION"])],
               [AC_COIN_PKG_CHECK_PROJECT_EXISTS([$1],
-                [m4_tolower(coin_has_$1)="$m4_toupper([$1])_VERSION"])])
+                [m4_tolower(coin_has_$1)="yes, found installed version $m4_toupper([$1])_VERSION"])])
     PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
     export PKG_CONFIG_PATH
@@ -3906 +3906 @@
 fi
 
-AC_MSG_RESULT([$m4_tolower(coin_has_$1)])
+if test "$m4_tolower(coin_has_$1)" = notGiven; then
+  m4_case(m4_tolower($1),
+    [blas],
+    [AC_MSG_RESULT([no (but will check for system blas later)])],
+    [lapack],
+    [AC_MSG_RESULT([no (but will check for system lapack later)])],
+    [AC_MSG_RESULT([not given])]
+  )
+else
+  AC_MSG_RESULT([$m4_tolower(coin_has_$1)])
+fi
 
 AC_MSG_CHECKING(whether project m4_ifval([$2],[$2/])$1 needs to be configured)