X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Flinux.sh;h=61d9fc8e5e0bfbd1c03a6b6473bd1b8f2a991cf0;hb=6137113dfd943e6f896f8b9c1a4df2b7d4e355ae;hp=7dccc1cc0730ab0aea504ac38cc4b14c2860600b;hpb=b965688b0e455884d8849b2b52a7c24c4c9dae12;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/linux.sh b/hints/linux.sh
index 7dccc1c..61d9fc8 100644
--- a/hints/linux.sh
+++ b/hints/linux.sh
@@ -48,7 +48,7 @@ libswanted="$*"
 # If you have glibc, then report the version for ./myconfig bug reporting.
 # (Configure doesn't need to know the specific version since it just uses
 # gcc to load the library for all tests.)
-# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they 
+# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
 # are insufficiently precise to distinguish things like
 # libc-2.0.6 and libc-2.0.7.
 if test -L /lib/libc.so.6; then
@@ -60,26 +60,41 @@ fi
 # function in <sys/stat.h>.
 d_lstat=define
 
-# The system malloc() is about as fast and as frugal as perl's. 
+# malloc wrap works
+case "$usemallocwrap" in
+'') usemallocwrap='define' ;;
+esac
+
+# The system malloc() is about as fast and as frugal as perl's.
 # Since the system malloc() has been the default since at least
 # 5.001, we might as well leave it that way.  --AD  10 Jan 2002
 case "$usemymalloc" in
 '') usemymalloc='n' ;;
 esac
 
+# Check if we're about to use Intel's ICC compiler
+case "`${cc:-cc} -V 2>&1`" in
+*"Intel(R) C++ Compiler"*)
+    # This is needed for Configure's prototype checks to work correctly
+    ccflags="-we147 $ccflags"
+    # If we're using ICC, we usually want the best performance
+    case "$optimize" in
+    '') optimize='-O3' ;;
+    esac
+    ;;
+esac
+
 case "$optimize" in
-'') # If we have modern enough gcc and well-supported enough CPU,
-    # crank up the optimization level.
-    case "`${cc:-gcc} -v 2>&1`" in
-    *"gcc version 2.95"*|*"gcc version 3."*)
-        case "`arch 2>&1`" in
-        i?86|ppc) optimize='-O3' ;;
-        esac
+# use -O2 by default ; -O3 doesn't seem to bring significant benefits with gcc
+'')
+    optimize='-O2'
+    case "`uname -m`" in
+        ppc*)
+            # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy
+	    # with -O2 ; so downgrade to -O1.
+            optimize='-O1'
         ;;
     esac
-    case "$optimize" in
-    '') optimize='-O2' ;;
-    esac
     ;;
 esac
 
@@ -134,8 +149,8 @@ EOM
     #so='none'
 
 	# In addition, on some systems there is a problem with perl and NDBM
-	# which causes AnyDBM and NDBM_File to lock up. This is evidenced 
-	# in the tests as AnyDBM just freezing.  Apparently, this only 
+	# which causes AnyDBM and NDBM_File to lock up. This is evidenced
+	# in the tests as AnyDBM just freezing.  Apparently, this only
 	# happens on a.out systems, so we disable NDBM for all a.out linux
 	# systems.  If someone can suggest a more robust test
 	#  that would be appreciated.
@@ -148,7 +163,7 @@ EOM
 	# just as advertised. Checking into it, I found that the lockup was
 	# during the call to dbm_open. Not *in* dbm_open -- but between the call
 	# to and the jump into.
-	# 
+	#
 	# To make a long story short, making sure that the *.a and *.sa pairs of
 	#   /usr/lib/lib{m,db,gdbm}.{a,sa}
 	# were perfectly in sync took care of it.
@@ -218,13 +233,13 @@ fi
 
 # Shimpei Yamashita <shimpei@socrates.patnet.caltech.edu>
 # Message-Id: <33EF1634.B36B6500@pobox.com>
-# 
+#
 # The DR2 of MkLinux (osname=linux,archname=ppc-linux) may need
 # special flags passed in order for dynamic loading to work.
 # instead of the recommended:
 #
 # ccdlflags='-rdynamic'
-# 
+#
 # it should be:
 # ccdlflags='-Wl,-E'
 #
@@ -235,8 +250,8 @@ fi
 #'osfmach3ppc') ccdlflags='-Wl,-E' ;;
 #esac
 
-case "`uname -r`" in
-sparc-linux)
+case "`uname -m`" in
+sparc*)
 	case "$cccdlflags" in
 	*-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;;
 	*)	 cccdlflags="$cccdlflags -fPIC" ;;
@@ -244,12 +259,29 @@ sparc-linux)
 	;;
 esac
 
-# This script UU/usethreads.cbu will get 'called-back' by Configure 
+# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
+# true libraries. The scripts cause binding against static
+# version of -lgdbm which is a bad idea. So if we have 'nm'
+# make sure it can read the file
+# NI-S 2003/08/07
+if [ -r /usr/lib/libndbm.so  -a  -x /usr/bin/nm ] ; then
+   if /usr/bin/nm /usr/lib/libndbm.so >/dev/null 2>&1 ; then
+    echo 'Your shared -lndbm seems to be a real library.'
+   else
+    echo 'Your shared -lndbm is not a real library.'
+    set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
+    shift
+    libswanted="$*"
+   fi
+fi
+
+
+# This script UU/usethreads.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use threads.
 cat > UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
 $define|true|[yY]*)
-        ccflags="-D_REENTRANT -D_GNU_SOURCE $ccflags"
+        ccflags="-D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS $ccflags"
         set `echo X "$libswanted "| sed -e 's/ c / pthread c /'`
         shift
         libswanted="$*"
@@ -271,7 +303,7 @@ esac
 EOCBU
 
 cat > UU/uselargefiles.cbu <<'EOCBU'
-# This script UU/uselargefiles.cbu will get 'called-back' by Configure 
+# This script UU/uselargefiles.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use large files.
 case "$uselargefiles" in
 ''|$define|true|[yY]*)