Changeset 594

Timestamp:

Oct 6, 2007 9:52:22 PM (12 years ago)

Author:

lou

Message:

Correctly handle Solaris x86. Change handling of libsunperf to be compatible
with Studio 11 and Studio 12.

File:

• trunk/coin.m4 (modified) (13 diffs)

trunk/coin.m4

@@ -508 +508 @@
 
 save_cxxflags="$CXXFLAGS"
-# For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.
+# For *-*-solaris*, promote Studio/Workshop compiler to front of list.
 case $build in
   *-cygwin* | *-mingw*)
@@ -516 +516 @@
                comps="g++ cl"
              fi ;;
-  sparc-sun-solaris*)
+  *-*-solaris*)
              comps="CC xlC aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
   *-darwin*) comps="g++ c++ CC" ;;
@@ -636 +636 @@
         esac
         ;;
-      *-sun-*)
+      *-*-solaris*)
           coin_opt_cxxflags="-O4"
           coin_dbg_cxxflags="-g"
@@ -779 +779 @@
       CXXLIBS="-L/opt/aCC/lib -l++ -lstd_v2 -lCsup_v2 -lm -lcl -lc"
       ;;
-    *-sun-*)
+    *-*-solaris*)
       CXXLIBS="-lCstd -lCrun"
     esac
@@ -880 +880 @@
 
 save_cflags="$CFLAGS"
-# For sparc-sun-solaris, promote Studio/Workshop compiler to front of list.
+# For *-*-solaris*, promote Studio/Workshop compiler to front of list.
 # ToDo: If Studio/Workshop cc is not present, we may find /usr/ucb/cc, which
 # is likely to be a non-functional shell. But many installations will have
@@ -891 +891 @@
                comps="gcc cl"
              fi ;;
-  sparc-sun-solaris*)
+  *-*-solaris*)
              comps="cc xlc gcc pgcc icc" ;;
   *-linux-*) comps="xlc gcc cc pgcc icc" ;;
@@ -992 +992 @@
         coin_dbg_cflags="-g"
         ;;
-      *-sun-*)
+      *-*-solaris*)
         coin_opt_cflags="-xO4"
         coin_dbg_cflags="-g"
@@ -1208 +1208 @@
         coin_dbg_fflags="-C -g"
         ;;
-      *-sun-*)
+      *-*-solaris*)
         coin_opt_fflags="-O4"
         coin_dbg_fflags="-g"
@@ -1381 +1381 @@
 # Auxilliary macro to make sure both COIN_PROG_F77 and COIN_FIND_F77 use
 # the same search lists for compiler names.
-# For sparc-sun-solaris, promote Studio/Workshop compilers to front of list.
+# For *-*-solaris*, promote Studio/Workshop compilers to front of list.
 AC_DEFUN([AC_COIN_F77_COMPS],
 [case $build in
@@ -1390 +1390 @@
        coin_f77_comps="gfortran g77 ifort fl32 compile_f2c"
      fi ;;
-  sparc-sun-solaris*)
+  *-*-solaris*)
      coin_f77_comps="f95 f90 f77 xlf fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
   *) coin_f77_comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;
@@ -1935 +1935 @@
     *-mingw32)
         RPATH_FLAGS=nothing ;;
-    *-sun-*)
+    *-*-solaris*)
         RPATH_FLAGS=
         for dir in $1; do
@@ -2761 +2761 @@
                          SAVE_LIBS="$LIBS"])
       ;;
-    *-sun-*)
+
+# Ideally, we'd use -library=sunperf, but it's an imperfect world. Studio
+# cc doesn't recognise -library, it wants -xlic_lib. Studio 12 CC doesn't
+# recognise -xlic_lib. Libtool doesn't like -xlic_lib anyway. Sun claims
+# that CC and cc will understand -library in Studio 13. The main extra
+# function of -xlic_lib and -library is to arrange for the Fortran run-time
+# libraries to be linked for C++ and C. We can arrange that explicitly.
+    *-*-solaris*)
       SAVE_LIBS="$LIBS"
-      AC_MSG_CHECKING([whether -xlic_lib=sunperf has BLAS])
-      LIBS="-xlic_lib=sunperf $LIBS"
+      AC_MSG_CHECKING([for BLAS in libsunperf])
+      LIBS="-lsunperf $FLIBS $LIBS"
       AC_COIN_TRY_FLINK([daxpy],
                         [AC_MSG_RESULT([yes])
-                         use_blas='-xlic_lib=sunperf'
-                         ADDLIBS="-xlic_lib=sunperf $ADDLIBS"],
+                         use_blas='-lsunperf'
+                         ADDLIBS="-lsunperf $ADDLIBS"
+                         coin_need_flibs=yes],
                         [AC_MSG_RESULT([no])
                          LIBS="$SAVE_LIBS"])
@@ -2882 +2890 @@
                            SAVE_LIBS="$LIBS"])
         ;;
-      *-sun-*)
-        SAVE_LIBS="$LIBS"
-        AC_MSG_CHECKING([whether -xlic_lib=sunperf has LAPACK])
-        LIBS="-xlic_lib=sunperf $LIBS"
-        AC_COIN_TRY_FLINK([dsyev],
-                          [AC_MSG_RESULT([yes])
-                           use_lapack='-xlic_lib=sunperf'
-                           ADDLIBS="-xlic_lib=sunperf $ADDLIBS"],
-                          [AC_MSG_RESULT([no])
-                           LIBS="$SAVE_LIBS"])
+
+# See comments in COIN_HAS_BLAS.
+      *-*-solaris*)
+      SAVE_LIBS="$LIBS"
+      AC_MSG_CHECKING([for LAPACK in libsunperf])
+      LIBS="-lsunperf $FLIBS $LIBS"
+      AC_COIN_TRY_FLINK([dsyev],
+                        [AC_MSG_RESULT([yes])
+                         use_blas='-lsunperf'
+                         ADDLIBS="-lsunperf $ADDLIBS"
+                         coin_need_flibs=yes],
+                        [AC_MSG_RESULT([no])
+                         LIBS="$SAVE_LIBS"])
         ;;
 # On cygwin, do this check only if doscompile is disabled. The prebuilt library