Better NetInfo behaviour.

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

diff --git a/hints/aix.sh b/hints/aix.sh
index 41706ac..25e2048 100644 (file)
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -32,13 +32,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 +48,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.
@@ -72,36 +66,37 @@ case "$osvers" in
 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 -DNEED_PTHREAD_INIT $ccflags"
-    cppflags="-DUSE_THREADS -DNEED_PTHREAD_INIT $cppflags"
+if [ "X$usethreads" = "X$define" ]; then
+    ccflags="$ccflags -DNEED_PTHREAD_INIT"
     case "$cc" in
     xlc_r | cc_r)
        ;;
     cc | '') 
-       cc=xlc_r
+       cc=xlc_r # Let us be stricter.
         ;;
     *)
-       case "$cc" in
-       gcc)
-           echo >&4 "You cannot use POSIX threads from GNU cc in AIX."
-           ;;
-       *)
-           echo >&4 "Unknown C compiler."
-           ;;
-       esac
-       echo >&4 "You should use the AIX C compilers called xlc_r or cc_r."
-       echo >&4 "Cannot continue, aborting."
+       cat >&4 <<EOM
+Unknown C compiler '$cc'.
+For pthreads you should use the AIX C compilers xlc_r or cc_r.
+Cannot continue, aborting.
+EOM
        exit 1
        ;;
     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 -lc/'`
 
-    lddlflags=`echo $lddlflags | sed 's/ -lc$/ -lpthreads -lc_r/'`
+    # Add the c_r library to the list of libraries wanted
+    # 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="$*"
 fi