Support for Intel icc.

diff --git a/ChangeLog b/ChangeLog
index 47986c46a74ee9843f3fb9827db2a87a61b644c6..22599b67eab3337292585bb6210d8b1a863e4f97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * INSTALL: Add instructions for using Intel icc.
+
 2002-01-11  Bruno Haible  <bruno@clisp.org>
 
        * configure.in: Change version number to 0.11-pre5.

diff --git a/INSTALL b/INSTALL
index f699c51c60a17f902bf4347f96e3bb3ca24f79ff..76099bc44a0a9991110763928583b092c5c967e6 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -146,6 +146,12 @@ use the following options:
 
      env CC="xlc -D_ALL_SOURCE" ./configure
 
+   On GNU/Linux with Intel icc as C/C++ compiler, config.guess guesses
+wrong and, as a consequence, libtool disables the use of shared libraries.
+To correct this, it is recommended to use the following options:
+
+     env CC="icc -D__ELF__" CXX="icc -D__ELF__" ./configure
+
    On BeOS, user installed software goes in /boot/home/config, not
 /usr/local.  It is recommended to use the following options:
 

diff --git a/m4/ChangeLog b/m4/ChangeLog
index c746a884cb0ee69a128f0636583fc4a4c7ef3710..7c73d0653431ce8acf4ba38524b6cdfab5d7625f 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-12  Bruno Haible  <bruno@clisp.org>
+
+       * libtool.m4: Add support for Intel icc.
+
 2002-01-12  Bruno Haible  <bruno@clisp.org>
 
        * lib-prefix.m4 (AC_LIB_PREPARE_PREFIX): Fix shell programming mistake.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 3eb0f63587ca675992de5b9a7d21ce188e48e457..b8442c4ff69bc2e4b86cdb9fe22a0daee0146ff6 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -874,6 +874,19 @@ AC_CACHE_VAL(lt_cv_prog_cc_pic,
       # PIC (with -KPIC) is the default.
       ;;
 
+    linux*)
+      echo '__INTEL_COMPILER' > conftest.$ac_ext
+      if $CC -E conftest.$ac_ext >/dev/null | grep __INTEL_COMPILER >/dev/null
+      then
+        lt_cv_prog_cc_can_build_shared=no
+      else
+        # Intel icc
+        lt_cv_prog_cc_pic='-KPIC'
+        lt_cv_prog_cc_static='-static'
+        lt_cv_prog_cc_wl='-Qoption,ld,'
+      fi
+      ;;
+
     cygwin* | mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).