Jumbo Configure update.

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

diff --git a/hints/aix.sh b/hints/aix.sh
index 10e7603..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"
 
@@ -63,33 +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='-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$define" ]; then
-    ccflags="$ccflags -DNEED_PTHREAD_INIT"
-    case "$cc" in
-    xlc_r | cc_r)
-       ;;
-    cc | '') 
-       cc=xlc_r # Let us be stricter.
-        ;;
-    *)
-       cat >&4 <<EOM
-Unknown C compiler '$cc'.
+# 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
-       ;;
-    esac
+           exit 1
+           ;;
+        esac
+
+        # Add the POSIX threads library and the re-entrant libc.
 
-    # Add the POSIX threads library and the re-entrant libc.
+        lddlflags=`echo $lddlflags | sed 's/ -lc$/ -lpthreads -lc_r -lc/'`
 
-    lddlflags=`echo $lddlflags | sed 's/ -lc$/ -lpthreads -lc_r -lc/'`
-fi
+        # 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