Changeset 16

Timestamp:

May 18, 2006 6:23:07 PM (14 years ago)

Author:

andreasw

Message:

several fixes for Cygwin; corrected -no-undefined for Darwin

Location:

trunk

Files:

• coin.m4 (modified) (4 diffs)
• headers/configall_system_msc.h (modified) (4 diffs)

trunk/coin.m4

@@ -136 +136 @@
 # A useful makefile conditional that is always false
 AM_CONDITIONAL(ALWAYS_FALSE, false)
-
-# A makefile conditional that is set to true if 
 ]) # AC_COIN_SRCDIR_INIT
 
@@ -193 +191 @@
 
 AC_DEFUN([AC_COIN_PROG_CXX],
-[AC_LANG_PUSH(C++)
+[AC_REQUIRE([AC_COIN_PROG_CC]) #Let's try if that overcomes configuration problem with VC++ 6.0
+AC_LANG_PUSH(C++)
 
 AC_ARG_VAR(CXXDEFS,[Additional -D flags to be used when compiling C++ code.])
@@ -246 +245 @@
           cl | */cl)
             coin_opt_cxxflags='-O2'
-            coin_add_cxxflags='-nologo -GX -GR -MT'
+            coin_add_cxxflags='-nologo -EHsc -GR -MT'
             coin_dbg_cxxflags='-Yd'
             ;;
@@ -432 +431 @@
 AC_DEFUN([AC_COIN_PROG_CC],
 [AC_LANG_PUSH(C)
+
+# For consistency, we set the C compiler to the same value of the C++
+# compiler, if the C++ is set, but the C compiler isn't (only for CXX=cl)
+if test x"$CXX" != x; then
+  case $CXX in
+    cl*)
+      if test x"$CC" = x; then
+        CC="$CXX"
+        AC_MSG_WARN([C++ compiler name provided as $CXX, but CC is unset. Setting CC to $CXX])
+      fi
+      ;;
+  esac
+fi
 
 AC_ARG_VAR(CDEFS,[Additional -D flags to be used when compiling C code.])

trunk/headers/configall_system_msc.h

@@ -9 +9 @@
 
 /* Define to 1 if you have the <memory.h> header file. */
-/* #define HAVE_MEMORY_H */
+#define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the <stdint.h> header file. */
@@ -15 +15 @@
 
 /* Define to 1 if you have the <stdlib.h> header file. */
-/* #define HAVE_STDLIB_H */
+#define HAVE_STDLIB_H 1
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -21 +21 @@
 
 /* Define to 1 if you have the <string.h> header file. */
-/* #define HAVE_STRING_H */
+#define HAVE_STRING_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
-/* #define HAVE_SYS_STAT_H */
+#define HAVE_SYS_STAT_H 1
 
 /* Define to 1 if you have the <sys/types.h> header file. */
-/* #define HAVE_SYS_TYPES_H */
+#define HAVE_SYS_TYPES_H 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
@@ -33 +33 @@
 
 /* Define to 1 if you have the ANSI C header files. */
-/* #define STDC_HEADERS */
+#define STDC_HEADERS 1
+