From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Mon, 28 Feb 2000 23:39:26 +0000 (+0000)
Subject: More AIX fixes from Steven Hirsch.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bab3591f9fe41314b6f0fcfe82b37895cadc6fc3;p=p5sagit%2Fp5-mst-13.2.git

More AIX fixes from Steven Hirsch.

p4raw-id: //depot/cfgperl@5333
---

diff --git a/Configure b/Configure
index 452b4fb..7792d88 100755
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Mon Feb 28 19:17:18 EET 2000 [metaconfig 3.0 PL70]
+# Generated on Tue Feb 29 01:36:56 EET 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.com)
 
 cat >/tmp/c1$$ <<EOF
@@ -4561,7 +4561,7 @@ case "$use64bitall" in
       	   *) ccflags="$ccflags -DUSE_64_BIT_ALL";;
 	   esac
 	   case "$archname64" in
-	   ''|64) archname64=64all ;;
+	   ''|64int) archname64=64all ;;
 	   esac
 	   ;;
 	esac
diff --git a/ext/DynaLoader/dl_aix.xs b/ext/DynaLoader/dl_aix.xs
index 0a92af7..35242ed 100644
--- a/ext/DynaLoader/dl_aix.xs
+++ b/ext/DynaLoader/dl_aix.xs
@@ -54,11 +54,17 @@
  * of load() and unload() from libC and libC_r need to be used,
  * otherwise statics in the extensions won't get initialized right.
  * -- Stephanie Beals <bealzy@us.ibm.com> */
+
+/* Older AIX C compilers cannot deal with C++ double-slash comments in
+   the ibmcxx and/or xlC includes.  Since we only need a single file,
+   be more fine-grained about what's included <hirschs@btv.ibm.com> */
 #ifdef USE_libC /* The define comes, when it comes, from hints/aix.pl. */
 #   define LOAD   loadAndInit
 #   define UNLOAD terminateAndUnload
-#   ifdef USE_load_h
-#       include <load.h>
+#   if defined(USE_xlC_load_h)
+#       include "/usr/lpp/xlC/include/load.h"
+#   elif defined(USE_ibmcxx_load_h)
+#       include "/usr/ibmcxx/include/load.h"
 #   endif
 #else
 #   define LOAD   load
diff --git a/ext/DynaLoader/hints/aix.pl b/ext/DynaLoader/hints/aix.pl
index 4225979..7dde941 100644
--- a/ext/DynaLoader/hints/aix.pl
+++ b/ext/DynaLoader/hints/aix.pl
@@ -3,8 +3,8 @@ use Config;
 if ($Config{libs} =~ /-lC/ && -f '/lib/libC.a') {
     $self->{CCFLAGS} = $Config{ccflags} . ' -DUSE_libC';
     if (-f '/usr/ibmcxx/include/load.h') {
-	$self->{CCFLAGS} .= ' -I/usr/ibmcxx/include -DUSE_load_h';
+	$self->{CCFLAGS} .= ' -DUSE_ibmcxx_load_h';
     } elsif (-f '/usr/lpp/xlC/include/load.h') {
-	$self->{CCFLAGS} .= ' -I/usr/lpp/xlC/include -DUSE_load_h';
+	$self->{CCFLAGS} .= ' -DUSE_xlC_load_h';
     }
 }
diff --git a/hints/aix.sh b/hints/aix.sh
index a22ca82..5a94820 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -318,7 +318,7 @@ EOM
 	    # from 'trylist', the Configure script will just reset it to 'ar'
 	    # immediately prior to writing config.sh.  This took me hours
 	    # to figure out.
-	    trylist="`echo $trylist | sed -e 's@^ar @@' -e 's@ ar @@g' -e 's@ ar$@@'`"
+	    trylist="`echo $trylist | sed -e 's@^ar @@' -e 's@ ar @ @g' -e 's@ ar$@@'`"
 	    ar="ar -X64"
 	    nm_opt="-X64 $nm_opt"
 	    # Note: Placing the 'lfcflags' variable into the 'ldflags' string