[inseparable changes from match from perl-5.003_98 to perl-5.003_99]

 CORE PORTABILITY

Subject: NeXT hints update
Date: Thu, 1 May 97 00:28:41 +0200
From: Unknown Contributor <hansm@euronet.nl>
Files: Configure Makefile.SH hints/next_4.sh

    private-msgid: 199704302229.AAA02690@mail.euronet.nl

Subject: Support shared libperl on AIX
Date: Sat, 26 Apr 1997 20:31:37 -0500
From: Eric Bartley <bartley@icd.cc.purdue.edu>
Files: Configure Makefile.SH hints/aix.sh
Msg-ID: 199704270131.UAA51426@icd.cc.purdue.edu

    (applied based on p5p patch as commit 019c9bb5516c92cceeeb4b050fa8075a1359c43c)

9 files changed, 142 insertions, 14 deletions

diff --git a/Changes b/Changes
index 509ec769d3..288a0d7b01 100644
--- a/Changes
+++ b/Changes
@@ -46,6 +46,100 @@ And the Keepers of the Patch Pumpkin:
 
 
 ----------------
+Version 5.003_99
+----------------
+
+"Oops."  Now this _has_ to be the gamma; we're out of numbers.
+
+ CORE LANGUAGE CHANGES
+
+   (no changes)
+
+ CORE PORTABILITY
+
+  Title:  "NeXT hints update"
+   From:  hansm@euronet.nl
+ Msg-ID:  <199704302229.AAA02690@mail.euronet.nl>
+   Date:  Thu, 1 May 97 00:28:41 +0200
+  Files:  Configure Makefile.SH hints/next_4.sh
+
+  Title:  "Support shared libperl on AIX"
+   From:  Eric Bartley <bartley@icd.cc.purdue.edu>
+ Msg-ID:  <199704270131.UAA51426@icd.cc.purdue.edu>
+   Date:  Sat, 26 Apr 1997 20:31:37 -0500
+  Files:  Configure Makefile.SH hints/aix.sh
+
+ OTHER CORE CHANGES
+
+  Title:  "Fix NUL-termination bug in delimcpy()"
+   From:  Chip Salzenberg
+  Files:  util.c
+
+  Title:  "Forget prototype of subroutine after C<undef &subr>"
+   From:  Chip Salzenberg
+  Files:  op.c
+
+  Title:  "Handle tainted values in lists returned from subs, evals"
+   From:  Chip Salzenberg
+  Files:  pp_ctl.c pp_hot.c t/op/taint.t
+
+  Title:  "Fix sysread() on tied handle"
+   From:  Spider Boardman
+ Msg-ID:  <199705010601.CAA04926@Orb.Nashua.NH.US>
+   Date:  Thu, 1 May 1997 02:01:20 -0400
+  Files:  pp_sys.c
+
+  Title:  "Fix OS/2-specific buffer overflow"
+   From:  Ilya Zakharevich
+ Msg-ID:  <199704301920.PAA09681@monk.mps.ohio-state.edu>
+   Date:  Wed, 30 Apr 1997 15:20:01 -0400 (EDT)
+  Files:  os2/os2.c
+
+ BUILD PROCESS
+
+  Title:  "Add new globals to perl.exp"
+   From:  Chip Salzenberg
+  Files:  perl_exp.SH
+
+ LIBRARY AND EXTENSIONS
+
+  Title:  "Refresh DB_File to 1.14"
+   From:  Paul Marquess
+ Msg-ID:  <9704302045.AA05484@claudius.bfsec.bt.co.uk>
+   Date:  Wed, 30 Apr 1997 21:45:09 +0100 (BST)
+  Files:  ext/DB_File/DB_File.pm ext/DB_File/DB_File.xs t/lib/db-btree.t
+          t/lib/db-hash.t t/lib/db-recno.t
+
+ TESTS
+
+  Title:  "Disable op/pipe.t test under Machten"
+   From:  Dominic Dunlop <domo@slipper.ip.lu>
+ Msg-ID:  <v03102801af8e160d3879@[194.51.248.68]>
+   Date:  Thu, 1 May 1997 12:48:26 +0200
+  Files:  t/io/pipe.t
+
+ UTILITIES
+
+  Title:  "typo fixes to installhtml"
+   From:  lvirden@cas.org (Larry W. Virden)
+ Msg-ID:  <199705011114.HAA26968@cas.org>
+   Date:  Thu, 1 May 1997 07:14:31 -0400
+  Files:  installhtml
+
+ DOCUMENTATION
+
+  Title:  "Fix description of av_undef() in perlguts"
+   From:  Gisle Aas
+ Msg-ID:  <199705011042.MAA09897@bergen.sn.no>
+   Date:  Thu, 1 May 1997 12:42:46 +0200
+  Files:  pod/perlguts.pod
+
+  Title:  "Fix typo in perldelta"
+   From:  Chip Salzenberg
+  Files:  pod/perldelta.pod
+
+
+----------------
 Version 5.003_98
 ----------------
 
@@ -69,14 +163,14 @@ Here it is, the second public beta (a.k.a gamma).
   Files:  opcode.pl
 
   Title:  "Reset errno after failed piped close"
-   From:  Roderick Schertler <roderick@argon.org>
+   From:  Roderick Schertler
  Msg-ID:  <28152.862264940@eeyore.ibcinc.com>
    Date:  Mon, 28 Apr 1997 18:02:20 -0400
   Files:  lib/Time/gmtime.pm lib/Time/localtime.pm pod/perlfunc.pod
           t/io/pipe.t util.c
 
   Title:  "Fix warning wrt return value of PerlIO_getname()"
-   From:  Spider Boardman <spider@Orb.Nashua.NH.US>
+   From:  Spider Boardman
  Msg-ID:  <199704300448.AAA24174@Orb.Nashua.NH.US>
    Date:  Wed, 30 Apr 1997 00:48:13 -0400
   Files:  perlio.c
diff --git a/Configure b/Configure
index 0dbe17c8fe..5b2a376a25 100755
--- a/Configure
+++ b/Configure
@@ -85,6 +85,9 @@ done
 PATH=.$p_$PATH
 export PATH
 
+: This should not matter in a script, but apparently it does sometimes
+unset CDPATH
+
 : Sanity checks
 if test ! -t 0; then
 	echo "Say 'sh $me', not 'sh <$me'"
@@ -4726,6 +4729,9 @@ xxx=''
 tmp_shrpenv=''
 if "$useshrplib"; then
     case "$osname" in 
+	aix)
+		# We'll set it in Makefile.SH...
+		;;
 	solaris|netbsd)
 		xxx="-R $shrpdir"
 		;;
diff --git a/Makefile.SH b/Makefile.SH
index db4e759da8..ec99d02e5c 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -24,19 +24,27 @@ case "$d_dosuid" in
 esac
 
 linklibperl='$(LIBPERL)'
+shrpldflags='$(LDDLFLAGS)'
 case "$useshrplib" in
 true)
 	pldlflags="$cccdlflags"
 	# NeXT-4 specific stuff.  Can't we do this in the hint file?
 	case "${osname}${osvers}" in
 	next4*)
-		ld='libtool -dynamic -undefined warning -framework System \
-		-compatibility_version 1 -current_version $(PATCHLEVEL) \
-		-prebind -seg1addr 0x27000000 -install_name $(SHRPDIR)/$@'
+		ld=libtool
+		lddlflags="-dynamic -undefined warning -framework System \
+		-compatibility_version 1 -current_version $patchlevel \
+		-prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@"
 		;;
 	sunos*|freebsd[23]*|netbsd*)
 		linklibperl="-lperl"
 		;;
+	aix*)
+		shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
+		shrpldflags="$shrpldflags -b noentry $ldflags $libs $cryptlib"
+		aixinstdir=`pwd | sed 's/\/UU$//'`
+		linklibperl="-L $archlibexp/CORE -L $aixinstdir -lperl"
+		;;
 	esac
 	;;
 *)	pldlflags=''
@@ -98,6 +106,7 @@ man3ext = $man3ext
 # The following are used to build and install shared libraries for
 # dynamic loading.
 LDDLFLAGS = $lddlflags
+SHRPLDFLAGS = $shrpldflags
 CCDLFLAGS = $ccdlflags
 DLSUFFIX = .$dlext
 PLDLFLAGS = $pldlflags
@@ -248,8 +257,16 @@ $(LIBPERL): $& perl$(OBJ_EXT) $(obj)
 	case "$useshrplib" in
 	true)
 		$spitshell >>Makefile <<'!NO!SUBS!'
-	$(LD) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj)
+	$(LD) $(SHRPLDFLAGS) -o $@ perl$(OBJ_EXT) $(obj)
+!NO!SUBS!
+		case "$osname" in
+		aix)
+			$spitshell >>Makefile <<'!NO!SUBS!'
+	mv $@ libperl$(OBJ_EXT)
+	$(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
 !NO!SUBS!
+			;;
+		esac
 		;;
 	*)
 		$spitshell >>Makefile <<'!NO!SUBS!'
diff --git a/hints/aix.sh b/hints/aix.sh
index 6a9e54570a..2c42151ea6 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -17,6 +17,9 @@ alignbytes=8
 
 usemymalloc='n'
 
+so="a"
+dlext="so"
+
 # Make setsockopt work correctly.  See man page.
 # ccflags='-D_BSD=44'
 
diff --git a/hints/next_4.sh b/hints/next_4.sh
index bd6a38734c..651b5e40fc 100644
--- a/hints/next_4.sh
+++ b/hints/next_4.sh
@@ -24,7 +24,7 @@ ld='cc'
 #optimize='-g -O'
 
 #
-# Change the lines below if you do not want to build 'quad-fat'
+# Change the lines below if you do not want to build 'triple-fat'
 # binaries
 #
 archs=`/bin/lipo -info /usr/lib/libm.a | sed 's/^[^:]*:[^:]*: //'`
@@ -33,9 +33,17 @@ do
        mab="$mab -arch $d"
 done
 
-ccflags="$ccflags $mab"
-ccdlflags="$mab"
-# Can we also set ld='libtool -xxx' ?
+#
+# Unfortunately, "cc -E - $mab" doesn't work.  Since that's what
+# Configure will try if we add $mab to $ccflags, we won't.  If you want
+# to build a fat binary, try changing $ccflags and $ccdlflags to look
+# like this when Configure invites you to edit config.h manually:
+#
+#   ccflags="$ccflags $mab"
+#   ccdlflags="$mab"
+#
+# (I wonder: Can we also set ld='libtool -xxx' ?)
+#
 
 useshprlib='true'
 dlext='bundle'
diff --git a/patchlevel.h b/patchlevel.h
index 0824199875..25ab1c65ac 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1,5 +1,5 @@
 #define PATCHLEVEL 3
-#define SUBVERSION 98
+#define SUBVERSION 99
 
 /*
 	local_patches -- list of locally applied less-than-subversion patches.
diff --git a/plan9/buildinfo b/plan9/buildinfo
index 3823659de9..f2d685ce80 100644
--- a/plan9/buildinfo
+++ b/plan9/buildinfo
@@ -1 +1 @@
-p9pvers = 5.003_98
+p9pvers = 5.003_99
diff --git a/vms/config.vms b/vms/config.vms
index 516a5135a2..1d6d131a7e 100644
--- a/vms/config.vms
+++ b/vms/config.vms
@@ -76,7 +76,7 @@
  * when Perl is built.  Please do not change it by hand; make
  * any changes to FndVers.Com instead.
  */
-#define ARCHLIB_EXP "/perl_root/lib/VMS_VAX/5_00398"  /**/
+#define ARCHLIB_EXP "/perl_root/lib/VMS_VAX/5_00399"  /**/
 #define ARCHLIB ARCHLIB_EXP	/*config-skip*/
 
 /* ARCHNAME:
diff --git a/vms/descrip.mms b/vms/descrip.mms
index 1cc936e261..29ee690d9b 100644
--- a/vms/descrip.mms
+++ b/vms/descrip.mms
@@ -65,7 +65,7 @@ OBJVAL = $(MMS$TARGET_NAME)$(O)
 .endif
 
 # Updated by fndvers.com -- do not edit by hand
-PERL_VERSION = 5_00398#
+PERL_VERSION = 5_00399#
 
 
 ARCHDIR =  [.lib.$(ARCH).$(PERL_VERSION)]