* libtool.m4 (CFLAGS): check whether -belf is needed on SCO, as

	suggested by Robert Lipe <robertl@dgii.com>

diff --git a/ChangeLog b/ChangeLog
index 16aeb4149a3084a2bd4f95ab248bc304e59ee170..649a5b90a345598568bd69180af5082a93f66031 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-11-02  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * libtool.m4 (CFLAGS): check whether -belf is needed on SCO, as
+       suggested by Robert Lipe <robertl@dgii.com>
+
 1998-10-31  Gordon Matzigkeit  <gord@trick.fig.org>
 
        * demo/Makefile.am (hc-libpath): Use parameters from the libtool

diff --git a/libtool.m4 b/libtool.m4
index b3554edc7f2ed45586e2b5cc2c972f1dcd9a5166..159a2076537cd403edfeee57c738a8bf560e6293 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -21,7 +21,7 @@
 ## configuration script generated by Autoconf, you may include it under
 ## the same distribution terms that you use for the rest of that program.
 
-# serial 25 AM_PROG_LIBTOOL
+# serial 26 AM_PROG_LIBTOOL
 AC_DEFUN(AM_PROG_LIBTOOL,
 [AC_REQUIRE([AM_ENABLE_SHARED])dnl
 AC_REQUIRE([AM_ENABLE_STATIC])dnl
@@ -68,7 +68,14 @@ case "$host" in
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])])
+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS="$SAVED_CFLAGS"
+  fi
   ;;
 esac