Jumbo Configure update.

[p5sagit/p5-mst-13.2.git] / hints / aix.sh

diff --git a/hints/aix.sh b/hints/aix.sh
index 8869a23..727cf93 100644 (file)
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -19,6 +19,10 @@ alignbytes=8
 
 usemymalloc='n'
 
+# Intuiting the existence of system calls under AIX is difficult,
+# at best; the safest technique is to find them empirically.
+usenm='undef'
+
 so="a"
 dlext="so"
 
@@ -32,13 +36,13 @@ esac
 
 case "$osvers" in
 3*) d_fchmod=undef
-    ccflags='-D_ALL_SOURCE'
+    ccflags="$ccflags -D_ALL_SOURCE"
     ;;
 *)  # These hints at least work for 4.x, possibly other systems too.
-    ccflags='-D_ALL_SOURCE -D_ANSI_C_SOURCE -D_POSIX_SOURCE'
+    ccflags="$ccflags -D_ALL_SOURCE -D_ANSI_C_SOURCE -D_POSIX_SOURCE"
     case "$cc" in
      *gcc*) ;;
-     *) ccflags="-qmaxmem=8192  $ccflags" ;;
+     *) ccflags="$ccflags -qmaxmem=8192" ;;
     esac
     nm_opt='-B'
     ;;
@@ -48,12 +52,6 @@ esac
 d_setregid='undef'
 d_setreuid='undef'
 
-# The optimizer in 4.1.1 apparently generates bad code for scope.c.
-# Configure doesn't offer an easy way to propagate extra variables
-# only for certain cases, so the following contortion is required:
-# This is probably not needed in 5.002 and later.
-# scope_cflags='case "$osvers" in 4.1*) optimize=" ";; esac'
-
 # Changes for dynamic linking by Wayne Scott <wscott@ichips.intel.com>
 #
 # Tell perl which symbols to export for dynamic linking.
@@ -69,39 +67,48 @@ esac
 #                           symbol: boot_$(EXP)  can it be auto-generated?
 case "$osvers" in
 3*) 
-lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).exp -e _nostart -lc'
+    lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).exp -e _nostart -lc'
     ;;
 *) 
-lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).exp -b noentry -lc'
-
-;;
+    lddlflags='-bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).exp -b noentry -lc'
+    ;;
 esac
 
-if [ "X$usethreads" != "X" ]; then
-    ccflags="-DUSE_THREADS $ccflags"
-    cppflags="-DUSE_THREADS $cppflags"
-    case "$cc" in
-    xlc_r)
-       ;;
-    cc | '') 
-       cc=xlc_r
-        ;;
-    *)
-       case "$cc" in
-       gcc)
-           echo >&4 "You cannot use POSIX threads from GNU cc in AIX."
+# 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="$ccflags -DNEED_PTHREAD_INIT"
+        case "$cc" in
+        xlc_r | cc_r) ;;
+        cc) 
+           echo >&4 "Switching cc to xlc_r because of POSIX threads."
+           cc=xlc_r
+            ;;
+        '') 
+           cc=xlc_r
+            ;;
+        *)
+           cat >&4 <<EOM
+For pthreads you should use the AIX C compilers xlc_r or cc_r.
+(now your compiler was '$cc')
+Cannot continue, aborting.
+EOM
+           exit 1
            ;;
-       *)
-           echo >&4 "Unknown C compiler."
-           ;;
-       esac
-       echo >&4 "You should use the AIX C compiler called xlc_r."
-       echo >&4 "Cannot continue, aborting."
-       exit 1
-       ;;
-    esac
+        esac
 
-    # Add the POSIX threads library and use the re-entrant libc.
+        # Add the POSIX threads library and the re-entrant libc.
 
-    lddlflags=`echo $lddlflags | sed 's/ -lc$/ -lpthreads -lc_r/'`
-fi
+        lddlflags=`echo $lddlflags | sed 's/ -lc$/ -lpthreads -lc_r -lc/'`
+
+        # Add the c_r library to the list of wanted libraries.
+        # Make sure the c_r library is before the c library or
+        # make will fail.
+        set `echo X "$libswanted "| sed -e 's/ c / c_r c /'`
+        shift
+        libswanted="$*"
+       ;;
+esac
+EOCBU