Changeset 2166

Timestamp:

Apr 3, 2011 8:07:35 AM (9 years ago)

Author:

stefan

Message:

merge chgsets 2128-2165 from trunk

Location:

stable/0.6

Files:

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

stable/0.6/coin.m4

@@ -342 +342 @@
 if test "x$have_svnversion" = xyes && test "x$1" != x; then
   AC_SUBST(m4_toupper($1_SVN_REV))
-  svn_rev_tmp=`cd $srcdir/$m4_tolower(coin_has_$1) ; svnversion`
-  m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'`
-  if test $m4_toupper($1_SVN_REV) != exported; then
-    AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), $m4_toupper($1_SVN_REV),
-                       [SVN revision number of project])
+  svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
+  if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
+    m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'`
+    AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), $m4_toupper($1_SVN_REV), [SVN revision number of project])
   fi
 fi
@@ -948 +947 @@
 fi
 
-# add automake conditional so we can recognize cl compiler in makefile
-coin_cc_is_cl=false
-if test x"$CXX" != x; then
-  case "$CXX" in
-    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
-      coin_cc_is_cl=true
-      ;;
-  esac
-fi
-AM_CONDITIONAL(COIN_CC_IS_CL, [test $coin_cc_is_cl = true])
-
 AC_ARG_VAR(CDEFS,[Additional -D flags to be used when compiling C code.])
 AC_ARG_VAR(ADD_CFLAGS,[Additional C compiler options])
@@ -1010 +998 @@
 esac
 CFLAGS="$save_cflags"
+
+# add automake conditional so we can recognize cl compiler in makefile
+coin_cc_is_cl=false
+case "$CC" in
+  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
+    coin_cc_is_cl=true
+    ;;
+esac
+AM_CONDITIONAL(COIN_CC_IS_CL, [test $coin_cc_is_cl = true])
 
 # Check if a project specific CFLAGS variable has been set
@@ -1417 +1414 @@
 ###########################################################################
 
-# Calls autoconfs AC_F77_WRAPPERS and does additional corrections to FLIBS
-
-AC_DEFUN([AC_COIN_F77_WRAPPERS],
-[AC_BEFORE([AC_COIN_PROG_F77],[$0])dnl
-AC_BEFORE([AC_PROG_F77],[$0])dnl
-
-AC_LANG_PUSH([Fortran 77])
-
-AC_F77_WRAPPERS
+# Calls autoconfs AC_F77_LIBRARY_LDFLAGS and does additional corrections to FLIBS.
+# Then calls AC_F77_WRAPPERS to get Fortran namemangling scheme.
+#
+# To ensure that the FLIBS are determined and corrected before linking against
+# Fortran compilers is attempted by other macros, we put it into an extra macro
+# and call it via AC_REQUIRE. This way it seems to be called before the macros
+# required by AC_F77_WRAPPERS.
+
+AC_DEFUN([_AC_COIN_F77_LIBRARY_LDFLAGS],
+[AC_BEFORE([AC_PROG_F77],[$0])dnl
+
+# get FLIBS
+AC_F77_LIBRARY_LDFLAGS
+orig_FLIBS="$FLIBS"
 
 # If FLIBS has been set by the user, we just restore its value here
@@ -1450 +1452 @@
   # This is seem to be unnecessary, libifcorert(d).lib has been removed from the link line.
   # Further, excluding libc.lib from the default libs seemed to be necessary only for VS < 8.
-  # Since the corresponding flag seems to make more trouble that it avoid, it has been removed now.
+  # Since the corresponding flag seems to make more trouble than it avoids, it has been removed now.
      *-cygwin* | *-mingw*)
        case "$F77" in
@@ -1479 +1481 @@
 fi
 
+if test "x$orig_FLIBS" != "x$FLIBS" ; then
+  AC_MSG_NOTICE([Corrected Fortran libraries: $FLIBS])
+fi
+]) # _AC_COIN_F77_LIBRARY_LDFLAGS
+
+AC_DEFUN([AC_COIN_F77_WRAPPERS],
+[AC_BEFORE([AC_COIN_PROG_F77],[$0])dnl
+AC_REQUIRE([_AC_COIN_F77_LIBRARY_LDFLAGS])dnl
+
+AC_LANG_PUSH([Fortran 77])
+AC_F77_WRAPPERS
 AC_LANG_POP([Fortran 77])