X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=aclocal.m4;h=0dcfd2e021288b25e480037b1e985f532ae9b6d1;hp=9dd7ecf146dfabf44d4eb10947da4aced4525874;hb=0a57cba46779af884cc537d18923dcb6313b9904;hpb=59eec5f21669e81977b5b1fe9bf717cab49cf7fb

diff --git a/aclocal.m4 b/aclocal.m4
index 9dd7ecf..0dcfd2e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -84,15 +84,15 @@ AC_MSG_CHECKING(how to produce PIC code)
 wl=
 
 can_build_shared=yes
-if test "$XEGCC" = yes; then
+if test "$XEGCC" = yes -o "$__ICC" = yes; then
   wl='-Wl,'
 
   case "$xehost_os" in
-  aix3* | aix4* | irix5* | irix6* | osf3* | osf4*)
+  aix[[3-9]]* | irix[[5-9]]* | osf[[3-9]])
     # PIC is the default for these OSes.
     ;;
 
-  aix3* | aix4* | os2*)
+  os2*)
     # We can build DLLs from non-PIC.
     ;;
   amigaos*)
@@ -117,7 +117,7 @@ else
     dll_cflags='+Z'
     ;;
 
-  irix5* | irix6*)
+  irix[[5-9]]*)
     wl='-Wl,'
     # PIC (with -KPIC) is the default.
     ;;
@@ -126,11 +126,16 @@ else
     # We can build DLLs from non-PIC.
     ;;
 
-  osf3* | osf4*)
+  osf[[3-9]]*)
     # All OSF/1 code is PIC.
     wl='-Wl,'
     ;;
 
+  aix[[3-9]]*)
+    # All AIX code is PIC.
+    wl='-Wl,'
+    ;;
+
   sco3.2v5*)
     dll_cflags='-belf -Kpic'
     wl='-Wl,'
@@ -238,12 +243,12 @@ cc_produces_so=no
 xldf=
 xcldf=
 AC_MSG_CHECKING(if C compiler can produce shared libraries)
-if test "$XEGCC" = yes; then
+if test "$XEGCC" = yes -o "$__ICC" = yes; then
   xcldf="-shared"
   xldf="-shared"
 else # Not using GCC
   case "$xehost_os" in
-    aix3* | aix4*)
+    aix[[3-9]]*)
       xldf="-bE:ELLSONAME.exp -H512 -T512 -bhalt:4 -bM:SRE -bnoentry -lc"
       xcldf="${wl}-bE:ELLSONAME.exp ${wl}-H512 ${wl}-T512 ${wl}-bhalt:4 ${wl}-bM:SRE ${wl}-bnoentry ${wl}-lc"
       ;;
@@ -262,7 +267,7 @@ else # Not using GCC
       xcldf="${wl}-b ${wl}+s"
       ;;
 
-    irix5* | irix6* | osf3* | osf4*)
+    irix[[5-9]]* | osf[[3-9]]*)
       xcldf="${wl}-shared"
       xldf="-shared"
       ;;
@@ -308,12 +313,13 @@ if test -z "$LTLD"; then
     # Accept absolute paths.
     /*)
       if test -z "$LTLD"; then
-        case "$ac_prog" in
-          *gcc-lib*) LTLD="$CC"
-                     ;;
-          *)         LTLD="$ac_prog"
-                     ;;
-        esac
+#        case "$ac_prog" in
+#          *gcc-lib*) LTLD="$CC"
+#                     ;;
+#          *)
+         LTLD="$ac_prog"
+#                     ;;
+#        esac
       fi
       ;;
     "")
@@ -415,7 +421,7 @@ else
       dll_ldflags=$xldf
       ;;
 
-    aix4*)
+    aix[[4-9]]*)
       dll_ldflags=$xcldf
       ;;
 
@@ -445,7 +451,7 @@ else
       dll_ldflags=$xldf
       ;;
 
-    irix5* | irix6*)
+    irix[[5-9]]*)
       dll_ld=$LTLD
       dll_ldflags=$xldf
       ;;
@@ -532,11 +538,7 @@ fi
 
 if test -z "$ld_dynamic_link_flags"; then
   case "$xehost_os" in
-  aix3*)
-    ld_dynamic_link_flags=
-    ;;
-
-  aix4*)
+  aix[[3-9]]*)
     ld_dynamic_link_flags=
     ;;
 
@@ -556,7 +558,7 @@ if test -z "$ld_dynamic_link_flags"; then
     ld_dynamic_link_flags="${wl}-E"
     ;;
 
-  irix5* | irix6*)
+  irix[[5-9]]*)
     ld_dynamic_link_flags=
     ;;