Changeset 1331

Timestamp:

Jul 16, 2009 12:00:50 PM (12 years ago)

Author:

andreasw

Message:

synchronizing BuildTools? stable/0.5 with trunk rev 1330

Location:

stable/0.5

Files:

• coin.m4 (modified) (4 diffs)
• set_externals (added)

stable/0.5/coin.m4

@@ -294 +294 @@
 AC_SUBST(ADDLIBS)
 
+# As backup, we make sure we don't loose an FLIBS if it has been set
+# by the user
+save_FLIBS="$FLIBS"
+
 # Initialize the FADDLIBS variable (which is to be used with a fortran
 # compiler and will not include FLIBS)
@@ -1359 +1363 @@
 AC_LANG_PUSH([Fortran 77])
 
-save_FLIBS="$FLIBS"
-
 AC_F77_WRAPPERS
 
+# If FLIBS has been set by the user, we just restore its value here
 if test x"$save_FLIBS" != x; then
   FLIBS="$save_FLIBS"
@@ -1372 +1375 @@
       case $flag in
         -lcrt*.o) ;;
+        -lcygwin) ;;
                *) my_flibs="$my_flibs $flag" ;;
       esac
@@ -3319 +3323 @@
     m4_tolower(coin_has_$1)=true
     m4_tolower($1_libcheck)=no
+    m4_toupper($1OBJDIR)=`cd $coin_glpkobjdir; pwd`
+    AC_SUBST(m4_toupper($1OBJDIR))
     AC_MSG_NOTICE([Using $1 in ThirdParty/Glpk])
   fi