From: Paul Marquess <paul.marquess@btinternet.com>
Date: Sat, 14 Oct 2000 13:37:49 +0000 (+0100)
Subject: Needs to be conditional on SunOS 4.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=eedaba540bbd9967b7e1fdfd27b4f76617a87c00;p=p5sagit%2Fp5-mst-13.2.git

Needs to be conditional on SunOS 4.

Subject: [Pach 5.7.0@7229] Removing -ldb from the core build
Message-ID: <000101c035db$8ffb60a0$2614140a@bfs.phone.com>

p4raw-id: //depot/perl@7230
---

diff --git a/Configure b/Configure
index 8daae15..79d3ad9 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 Fri Oct 13 02:10:51 EET DST 2000 [metaconfig 3.0 PL70]
+# Generated on Sat Oct 14 17:18:06 EET DST 2000 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >/tmp/c1$$ <<EOF
@@ -15171,14 +15171,21 @@ extensions="$*"
 
 : Remove libraries needed only for extensions
 : The appropriate ext/Foo/Makefile.PL will add them back in, if necessary.
-case "$usedl" in
-$define|true|[yY]*)
-	set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` 
-	shift
-	perllibs="$*"
-	;;
-*)	perllibs="$libs"
-	;;
+: The exception is SunOS 4.x, which needs them.
+case "${osname}X${osvers}" in
+sunos*X4*)
+    perllibs="$libs"
+    ;;
+*) case "$usedl" in
+    $define|true|[yY]*)
+	    set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` 
+	    shift
+	    perllibs="$*"
+	    ;;
+    *)	perllibs="$libs"
+	    ;;
+    esac
+    ;;
 esac
 
 : Remove build directory name from cppstdin so it can be used from
diff --git a/myconfig.SH b/myconfig.SH
index 1ab8bdc..e80dfb5 100644
--- a/myconfig.SH
+++ b/myconfig.SH
@@ -49,6 +49,7 @@ Summary of my $package (revision $baserev version $PERL_VERSION subversion $PERL
     ld='$ld', ldflags ='$ldflags'
     libpth=$libpth
     libs=$libs
+    perllibs=$perllibs
     libc=$libc, so=$so, useshrplib=$useshrplib, libperl=$libperl
   Dynamic Linking:
     dlsrc=$dlsrc, dlext=$dlext, d_dlsymun=$d_dlsymun, ccdlflags='$ccdlflags'
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 7c21f5f..4c2da90 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -376,6 +376,12 @@ $Config{byteorder} is now computed dynamically (this is more robust
 with "fat binaries" where an executable image contains binaries for
 more than one binary platform.)
 
+=item *
+
+Configure no longer included the DBM libraries (dbm, gdbm, db, ndbm)
+when building the Perl binary. The only exception to this is SunOS 4.x,
+which needs them.
+
 =back
 
 =head1 Selected Bug Fixes