[libcvd-members] libcvd configure.in configure

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      08/05/13 08:58:28

Modified files:
        .              : configure.in configure 

Log message:
        test on Mac OSX to link against Accelerate framework for lapack before 
anything else. this appears to be the right way to do it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.117&r2=1.118

Patches:
Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- configure.in        13 May 2008 08:06:04 -0000      1.118
+++ configure.in        13 May 2008 08:58:27 -0000      1.119
@@ -583,6 +583,13 @@
 ])
 
 CHECK_FOR_LIBRARY(lapack, [
+       AC_MSG_CHECKING(if Accelerate framework is needed for LAPACK)
+       AC_MSG_RESULT()
+       APPEND(LIBS, -framework Accelerate)
+       AC_CHECK_FUNC(dgesvd_, [], [a=1])
+])
+
+CHECK_FOR_LIBRARY(lapack, [
        AC_CHECK_LIB(lapack, dgesvd_, [], [a=1])
 ])
 
@@ -607,13 +614,6 @@
        AC_CHECK_LIB(lapack, dgesvd_, [], [a=1])
 ])
 
-CHECK_FOR_LIBRARY(lapack, [
-       AC_MSG_CHECKING(if veclib is needed for LAPACK)
-       AC_MSG_RESULT()
-       APPEND(LIBS, -framework veclib)
-       AC_CHECK_FUNC(dgesvd_, [], [a=1])
-])
-
 CHECK_FOR_LIBRARY(pthread, [
        APPEND(CXXFLAGS, -pthread)
        APPEND(LIBS, -pthread)

Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- configure   13 May 2008 08:06:04 -0000      1.117
+++ configure   13 May 2008 08:58:27 -0000      1.118
@@ -7700,20 +7700,38 @@
                save_CXXFLAGS="$CXXFLAGS"
                a=
 
-
-{ echo "$as_me:$LINENO: checking for dgesvd_ in -llapack" >&5
-echo $ECHO_N "checking for dgesvd_ in -llapack... $ECHO_C" >&6; }
-if test "${ac_cv_lib_lapack_dgesvd_+set}" = set; then
+       { echo "$as_me:$LINENO: checking if Accelerate framework is needed for 
LAPACK" >&5
+echo $ECHO_N "checking if Accelerate framework is needed for LAPACK... 
$ECHO_C" >&6; }
+       { echo "$as_me:$LINENO: result: " >&5
+echo "${ECHO_T}" >&6; }
+       LIBS="$LIBS -framework Accelerate"
+       { echo "$as_me:$LINENO: checking for dgesvd_" >&5
+echo $ECHO_N "checking for dgesvd_... $ECHO_C" >&6; }
+if test "${ac_cv_func_dgesvd_+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-llapack  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define dgesvd_ to an innocuous variant, in case <limits.h> declares dgesvd_.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dgesvd_ innocuous_dgesvd_
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char dgesvd_ (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef dgesvd_
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -7722,6 +7740,13 @@
 extern "C"
 #endif
 char dgesvd_ ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_dgesvd_ || defined __stub___dgesvd_
+choke me
+#endif
+
 int
 main ()
 {
@@ -7748,27 +7773,21 @@
         test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_lapack_dgesvd_=yes
+  ac_cv_func_dgesvd_=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_lib_lapack_dgesvd_=no
+       ac_cv_func_dgesvd_=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_lapack_dgesvd_" >&5
-echo "${ECHO_T}$ac_cv_lib_lapack_dgesvd_" >&6; }
-if test $ac_cv_lib_lapack_dgesvd_ = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBLAPACK 1
-_ACEOF
-
-  LIBS="-llapack $LIBS"
-
+{ echo "$as_me:$LINENO: result: $ac_cv_func_dgesvd_" >&5
+echo "${ECHO_T}$ac_cv_func_dgesvd_" >&6; }
+if test $ac_cv_func_dgesvd_ = yes; then
+  :
 else
   a=1
 fi
@@ -7810,11 +7829,6 @@
                save_CXXFLAGS="$CXXFLAGS"
                a=
 
-       { echo "$as_me:$LINENO: checking if f2c is needed for LAPACK" >&5
-echo $ECHO_N "checking if f2c is needed for LAPACK... $ECHO_C" >&6; }
-       { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
-       LIBS="$LIBS -lf2c"
 
 { echo "$as_me:$LINENO: checking for dgesvd_ in -llapack" >&5
 echo $ECHO_N "checking for dgesvd_ in -llapack... $ECHO_C" >&6; }
@@ -7929,7 +7943,7 @@
 echo $ECHO_N "checking if f2c is needed for LAPACK... $ECHO_C" >&6; }
        { echo "$as_me:$LINENO: result: " >&5
 echo "${ECHO_T}" >&6; }
-       LIBS="$LIBS -lg2c"
+       LIBS="$LIBS -lf2c"
 
 { echo "$as_me:$LINENO: checking for dgesvd_ in -llapack" >&5
 echo $ECHO_N "checking for dgesvd_ in -llapack... $ECHO_C" >&6; }
@@ -8044,7 +8058,7 @@
 echo $ECHO_N "checking if f2c is needed for LAPACK... $ECHO_C" >&6; }
        { echo "$as_me:$LINENO: result: " >&5
 echo "${ECHO_T}" >&6; }
-       LIBS="$LIBS -lgfortran"
+       LIBS="$LIBS -lg2c"
 
 { echo "$as_me:$LINENO: checking for dgesvd_ in -llapack" >&5
 echo $ECHO_N "checking for dgesvd_ in -llapack... $ECHO_C" >&6; }
@@ -8155,38 +8169,25 @@
                save_CXXFLAGS="$CXXFLAGS"
                a=
 
-       { echo "$as_me:$LINENO: checking if veclib is needed for LAPACK" >&5
-echo $ECHO_N "checking if veclib is needed for LAPACK... $ECHO_C" >&6; }
+       { echo "$as_me:$LINENO: checking if f2c is needed for LAPACK" >&5
+echo $ECHO_N "checking if f2c is needed for LAPACK... $ECHO_C" >&6; }
        { echo "$as_me:$LINENO: result: " >&5
 echo "${ECHO_T}" >&6; }
-       LIBS="$LIBS -framework veclib"
-       { echo "$as_me:$LINENO: checking for dgesvd_" >&5
-echo $ECHO_N "checking for dgesvd_... $ECHO_C" >&6; }
-if test "${ac_cv_func_dgesvd_+set}" = set; then
+       LIBS="$LIBS -lgfortran"
+
+{ echo "$as_me:$LINENO: checking for dgesvd_ in -llapack" >&5
+echo $ECHO_N "checking for dgesvd_ in -llapack... $ECHO_C" >&6; }
+if test "${ac_cv_lib_lapack_dgesvd_+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-llapack  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-/* Define dgesvd_ to an innocuous variant, in case <limits.h> declares dgesvd_.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dgesvd_ innocuous_dgesvd_
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dgesvd_ (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dgesvd_
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -8195,13 +8196,6 @@
 extern "C"
 #endif
 char dgesvd_ ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dgesvd_ || defined __stub___dgesvd_
-choke me
-#endif
-
 int
 main ()
 {
@@ -8228,21 +8222,27 @@
         test ! -s conftest.err
        } && test -s conftest$ac_exeext &&
        $as_test_x conftest$ac_exeext; then
-  ac_cv_func_dgesvd_=yes
+  ac_cv_lib_lapack_dgesvd_=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-       ac_cv_func_dgesvd_=no
+       ac_cv_lib_lapack_dgesvd_=no
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_dgesvd_" >&5
-echo "${ECHO_T}$ac_cv_func_dgesvd_" >&6; }
-if test $ac_cv_func_dgesvd_ = yes; then
-  :
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lapack_dgesvd_" >&5
+echo "${ECHO_T}$ac_cv_lib_lapack_dgesvd_" >&6; }
+if test $ac_cv_lib_lapack_dgesvd_ = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBLAPACK 1
+_ACEOF
+
+  LIBS="-llapack $LIBS"
+
 else
   a=1
 fi