Changeset 2659

Timestamp:

Dec 1, 2012 1:33:08 PM (7 years ago)

Author:

stefan

Message:

add --enable-static-standardlibs to add flags like --static-libgcc/stdc++/gfortran to LDFLAGS

File:

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

trunk/coin.m4

@@ -303 +303 @@
 [AC_REQUIRE([AC_COIN_PROG_CC]) #Let's try if that overcomes configuration problem with VC++ 6.0
 AC_REQUIRE([AC_COIN_ENABLE_DOSCOMPILE])
+AC_REQUIRE([AC_COIN_ENABLE_STATICSTDLIBS])
 AC_LANG_PUSH(C++)
 
@@ -576 +577 @@
 esac
 
+# check whether to add flag for static linking against standard libraries to LDFLAGS
+if test x$use_static_standardlibs != xno ; then
+  case $build in
+    *-mingw*)
+      static_standardlib_flag=-static
+      ;;
+    *)
+      static_standardlib_flag=-static-libstdc++
+      ;;
+  esac
+  case " $LDFLAGS " in
+    *" $static_standardlib_flag "* ) ;;
+    *)
+    AC_MSG_CHECKING([whether linking with $static_standardlib_flag works])
+    coin_save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $static_standardlib_flag"
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(, [int i=0;])],
+      [AC_MSG_RESULT(yes)],
+      [AC_MSG_RESULT(no)
+       LDFLAGS="$coin_save_LDFLAGS"
+       if test $use_static_standardlibs = yes ; then
+         AC_MSG_ERROR([failed to link with $static_standardlib_flag])
+       fi
+      ])
+    ;;
+  esac
+fi
+
 AC_LANG_POP(C++)
 ]) # AC_COIN_PROG_CXX
@@ -691 +721 @@
 
 ###########################################################################
+#                   COIN_ENABLE_STATICSTDLIBS                             #
+###########################################################################
+
+# This macro defines the --enable-static-standardlibs flag and determines
+# its default value according to the setting of --enable-shared.
+# That is, if static libraries are build, then we also try to link against
+# static standard libraries, unless the corresponding flags do not work.
+
+AC_DEFUN([AC_COIN_ENABLE_STATICSTDLIBS],
+[
+
+# check whether to add flags for static linking against standard libraries
+AC_ARG_ENABLE([static-standardlibs],
+  [AC_HELP_STRING([--enable-static-standardlibs],
+                  [whether to link against static standard libraries (libgcc, libgfortran, libstdc++)])],
+  [case "$enableval" in
+     no | yes | auto ) ;;
+     *)
+       AC_MSG_ERROR([invalid argument for --enable-static-standardlibs: $enableval]) ;;
+   esac
+   use_static_standardlibs=$enableval],
+  [if test $enable_shared = yes ; then
+     use_static_standardlibs = no
+   else
+     use_static_standardlibs = auto
+   fi
+  ]
+)
+
+]);
+
+###########################################################################
 #                             COIN_PROG_CC                                #
 ###########################################################################
@@ -702 +764 @@
 [AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
 AC_REQUIRE([AC_COIN_ENABLE_DOSCOMPILE])
+AC_REQUIRE([AC_COIN_ENABLE_STATICSTDLIBS])
 AC_LANG_PUSH(C)
 
@@ -912 +975 @@
     CFLAGS="$OPT_CFLAGS"
   fi
+
 else
   CFLAGS="$CFLAGS $ADD_CFLAGS $CDEFS"
@@ -972 +1036 @@
 esac
 
+# check whether to add flags for static linking against standard libraries to LDFLAGS
+if test x$use_static_standardlibs != xno ; then
+  case $build in
+    *-mingw*)
+      static_standardlib_flag=-static
+      ;;
+    *)
+      static_standardlib_flag=-static-libgcc
+      ;;
+  esac
+  case " $LDFLAGS " in
+    *" $static_standardlib_flag "* ) ;;
+    *)
+    AC_MSG_CHECKING([whether linking with $static_standardlib_flag works])
+    coin_save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $static_standardlib_flag"
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(, [int i=0;])],
+      [AC_MSG_RESULT(yes)],
+      [AC_MSG_RESULT(no)
+       LDFLAGS="$coin_save_LDFLAGS"
+       if test $use_static_standardlibs = yes ; then
+         AC_MSG_ERROR([failed to link with $static_standardlib_flag])
+       fi
+      ])
+    ;;
+  esac
+fi
+
 AC_LANG_POP(C)
 ]) # AC_COIN_PROG_CC
@@ -986 +1079 @@
 [AC_REQUIRE([AC_COIN_MINGW_LD_FIX])
 AC_REQUIRE([AC_COIN_ENABLE_DOSCOMPILE])
+AC_REQUIRE([AC_COIN_ENABLE_STATICSTDLIBS])
 AC_REQUIRE([AC_COIN_PROG_CC])
 AC_REQUIRE([AC_COIN_F77_COMPS])
@@ -1133 +1227 @@
     FFLAGS="$OPT_FFLAGS"
   fi
+
 else
   FFLAGS="$FFLAGS $ADD_FFLAGS"
@@ -1186 +1281 @@
     ;;
 esac
+
+# check whether to add flag for static linking against standard libraries to LDFLAGS
+if test x$use_static_standardlibs != xno ; then
+  case $build in
+    *-mingw*)
+      static_standardlib_flag=-static
+      ;;
+    *)
+      static_standardlib_flag=-static-libgfortran
+      ;;
+  esac
+  case " $LDFLAGS " in
+    *" $static_standardlib_flag "* ) ;;
+    *)
+    AC_MSG_CHECKING([whether linking with $static_standardlib_flag works])
+    coin_save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $static_standardlib_flag"
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(,[      integer i])],
+      [AC_MSG_RESULT(yes)],
+      [AC_MSG_RESULT(no)
+       LDFLAGS="$coin_save_LDFLAGS"
+       if test $use_static_standardlibs = yes ; then
+         AC_MSG_ERROR([failed to link with $static_standardlib_flag])
+       fi
+      ])
+    ;;
+  esac
+fi
 
 AC_LANG_POP([Fortran 77])