Changeset 41

Timestamp:

Jun 12, 2006 1:23:26 PM (14 years ago)

Author:

andreasw

Message:

some BuildTools? fixes to make things work on MinGW

File:

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

trunk/coin.m4

@@ -141 +141 @@
 # We set the following variable so that we know later in AC_COIN_FINALIZE
 # that we are in a project main directory
-coin_projectdir=yes
+
 ]) # AC_COIN_PROJECTDIR_INIT
 
@@ -187 +187 @@
 ]) # AC_COIN_DEBUG_COMPILE
 
+###########################################################################
+#                          COIN_MINGW_LD_FIX                              #
+###########################################################################
+
+# This macro is included by any PROG_compiler macro, to set the LD
+# environment variable on MinWG to the correct value (link)
+
+AC_DEFUN([AC_COIN_MINGW_LD_FIX],
+[case $build in
+  *-mingw*)
+    if test "${LD+set}" = set; then :; else
+      LD=link
+    fi
+    ;;
+esac
+])
 
 ###########################################################################
@@ -198 +214 @@
 
 AC_DEFUN([AC_COIN_PROG_CXX],
-[AC_REQUIRE([AC_COIN_PROG_CC]) #Let's try if that overcomes configuration problem with VC++ 6.0
+[AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
+AC_REQUIRE([AC_COIN_PROG_CC]) #Let's try if that overcomes configuration problem with VC++ 6.0
 AC_LANG_PUSH(C++)
 
@@ -443 +460 @@
 
 AC_DEFUN([AC_COIN_PROG_CC],
-[AC_LANG_PUSH(C)
+[AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
+AC_LANG_PUSH(C)
 
 # For consistency, we set the C compiler to the same value of the C++
@@ -610 +628 @@
 
 AC_DEFUN([AC_COIN_PROG_F77],
-[AC_LANG_PUSH([Fortran 77])
+[AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
+AC_LANG_PUSH([Fortran 77])
 
 coin_has_f77=yes
@@ -987 +1006 @@
   ;;
   *-mingw*)
-    case $CXX in
+    case "$CXX" in
       cl*)
         coin_disable_shared=yes
@@ -999 +1018 @@
     AC_MSG_WARN([On $platform, shared objects are not supported. I'm disabling your choice.])
   fi
-#  enable_shared=no
+  enable_shared=no
 fi
 # By default, we only want the shared objects to be compiled