1diff -rc perl5.004_02.orig/Configure perl5.004_02/Configure 2*** perl5.004_02.orig/Configure Thu Aug 7 15:08:44 1997 3--- perl5.004_02/Configure Sun Nov 12 22:06:24 2000 4*************** 5*** 188,193 **** 6--- 188,194 ---- 7 mv='' 8 nroff='' 9 perl='' 10+ perllibs='' 11 pg='' 12 pmake='' 13 pr='' 14*************** 15*** 9911,9916 **** 16--- 9912,9925 ---- 17 shift 18 extensions="$*" 19 20+ : Remove libraries needed only for extensions 21+ : The appropriate ext/Foo/Makefile.PL will add them back in, if 22+ : necessary. 23+ set X `echo " $libs " | 24+ sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` 25+ shift 26+ perllibs="$*" 27+ 28 : Remove build directory name from cppstdin so it can be used from 29 : either the present location or the final installed location. 30 echo " " 31*************** 32*** 10379,10384 **** 33--- 10388,10394 ---- 34 patchlevel='$patchlevel' 35 path_sep='$path_sep' 36 perl='$perl' 37+ perllibs='$perllibs' 38 perladmin='$perladmin' 39 perlpath='$perlpath' 40 pg='$pg' 41diff -rc perl5.004_02.orig/Makefile.SH perl5.004_02/Makefile.SH 42*** perl5.004_02.orig/Makefile.SH Thu Aug 7 13:10:53 1997 43--- perl5.004_02/Makefile.SH Sun Nov 12 22:06:24 2000 44*************** 45*** 126,132 **** 46 ext = \$(dynamic_ext) \$(static_ext) 47 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) 48 49! libs = $libs $cryptlib 50 51 public = perl $suidperl utilities translators 52 53--- 126,132 ---- 54 ext = \$(dynamic_ext) \$(static_ext) 55 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) 56 57! libs = $perllibs $cryptlib 58 59 public = perl $suidperl utilities translators 60 61diff -rc perl5.004_02.orig/lib/ExtUtils/Embed.pm perl5.004_02/lib/ExtUtils/Embed.pm 62*** perl5.004_02.orig/lib/ExtUtils/Embed.pm Fri Aug 1 15:08:44 1997 63--- perl5.004_02/lib/ExtUtils/Embed.pm Sun Nov 12 22:06:24 2000 64*************** 65*** 178,184 **** 66 @path = $path ? split(/:/, $path) : @INC; 67 68 push(@potential_libs, @link_args) if scalar @link_args; 69! push(@potential_libs, $Config{libs}) if defined $std; 70 71 push(@mods, static_ext()) if $std; 72 73--- 178,184 ---- 74 @path = $path ? split(/:/, $path) : @INC; 75 76 push(@potential_libs, @link_args) if scalar @link_args; 77! push(@potential_libs, $Config{perllibs}) if defined $std; 78 79 push(@mods, static_ext()) if $std; 80 81diff -rc perl5.004_02.orig/lib/ExtUtils/Liblist.pm perl5.004_02/lib/ExtUtils/Liblist.pm 82*** perl5.004_02.orig/lib/ExtUtils/Liblist.pm Fri Aug 1 19:36:58 1997 83--- perl5.004_02/lib/ExtUtils/Liblist.pm Sun Nov 12 22:06:24 2000 84*************** 85*** 16,33 **** 86 87 sub _unix_os2_ext { 88 my($self,$potential_libs, $verbose) = @_; 89! if ($^O =~ 'os2' and $Config{libs}) { 90 # Dynamic libraries are not transitive, so we may need including 91 # the libraries linked against perl.dll again. 92 93 $potential_libs .= " " if $potential_libs; 94! $potential_libs .= $Config{libs}; 95 } 96 return ("", "", "", "") unless $potential_libs; 97 print STDOUT "Potential libraries are '$potential_libs':\n" if $verbose; 98 99 my($so) = $Config{'so'}; 100! my($libs) = $Config{'libs'}; 101 my $Config_libext = $Config{lib_ext} || ".a"; 102 103 104--- 16,33 ---- 105 106 sub _unix_os2_ext { 107 my($self,$potential_libs, $verbose) = @_; 108! if ($^O =~ 'os2' and $Config{perllibs}) { 109 # Dynamic libraries are not transitive, so we may need including 110 # the libraries linked against perl.dll again. 111 112 $potential_libs .= " " if $potential_libs; 113! $potential_libs .= $Config{perllibs}; 114 } 115 return ("", "", "", "") unless $potential_libs; 116 print STDOUT "Potential libraries are '$potential_libs':\n" if $verbose; 117 118 my($so) = $Config{'so'}; 119! my($libs) = $Config{'perllibs'}; 120 my $Config_libext = $Config{lib_ext} || ".a"; 121 122 123*************** 124*** 186,196 **** 125 my($self, $potential_libs, $verbose) = @_; 126 127 # If user did not supply a list, we punt. 128! # (caller should probably use the list in $Config{libs}) 129 return ("", "", "", "") unless $potential_libs; 130 131 my($so) = $Config{'so'}; 132! my($libs) = $Config{'libs'}; 133 my($libpth) = $Config{'libpth'}; 134 my($libext) = $Config{'lib_ext'} || ".lib"; 135 136--- 186,196 ---- 137 my($self, $potential_libs, $verbose) = @_; 138 139 # If user did not supply a list, we punt. 140! # (caller should probably use the list in $Config{perllibs}) 141 return ("", "", "", "") unless $potential_libs; 142 143 my($so) = $Config{'so'}; 144! my($libs) = $Config{'perllibs'}; 145 my($libpth) = $Config{'libpth'}; 146 my($libext) = $Config{'lib_ext'} || ".lib"; 147 148*************** 149*** 540,546 **** 150 =item * 151 152 If C<$potential_libs> is empty, the return value will be empty. 153! Otherwise, the libraries specified by C<$Config{libs}> (see Config.pm) 154 will be appended to the list of C<$potential_libs>. The libraries 155 will be searched for in the directories specified in C<$potential_libs> 156 as well as in C<$Config{libpth}>. For each library that is found, a 157--- 540,546 ---- 158 =item * 159 160 If C<$potential_libs> is empty, the return value will be empty. 161! Otherwise, the libraries specified by C<$Config{perllibs}> (see Config.pm) 162 will be appended to the list of C<$potential_libs>. The libraries 163 will be searched for in the directories specified in C<$potential_libs> 164 as well as in C<$Config{libpth}>. For each library that is found, a 165diff -rc perl5.004_02.orig/lib/ExtUtils/MM_Unix.pm perl5.004_02/lib/ExtUtils/MM_Unix.pm 166*** perl5.004_02.orig/lib/ExtUtils/MM_Unix.pm Tue Aug 5 14:28:08 1997 167--- perl5.004_02/lib/ExtUtils/MM_Unix.pm Sun Nov 12 22:06:25 2000 168*************** 169*** 2224,2230 **** 170 MAP_STATIC = ", 171 join(" \\\n\t", reverse sort keys %static), " 172 173! MAP_PRELIBS = $Config::Config{libs} $Config::Config{cryptlib} 174 "; 175 176 if (defined $libperl) { 177--- 2224,2230 ---- 178 MAP_STATIC = ", 179 join(" \\\n\t", reverse sort keys %static), " 180 181! MAP_PRELIBS = $Config::Config{perllibs} $Config::Config{cryptlib} 182 "; 183 184 if (defined $libperl) { 185diff -rc perl5.004_02.orig/myconfig perl5.004_02/myconfig 186*** perl5.004_02.orig/myconfig Sat Dec 21 01:13:20 1996 187--- perl5.004_02/myconfig Sun Nov 12 22:06:25 2000 188*************** 189*** 35,41 **** 190 Linker and Libraries: 191 ld='$ld', ldflags ='$ldflags' 192 libpth=$libpth 193! libs=$libs 194 libc=$libc, so=$so 195 useshrplib=$useshrplib, libperl=$libperl 196 Dynamic Linking: 197--- 35,41 ---- 198 Linker and Libraries: 199 ld='$ld', ldflags ='$ldflags' 200 libpth=$libpth 201! libs=$perllibs 202 libc=$libc, so=$so 203 useshrplib=$useshrplib, libperl=$libperl 204 Dynamic Linking: 205diff -rc perl5.004_02.orig/patchlevel.h perl5.004_02/patchlevel.h 206*** perl5.004_02.orig/patchlevel.h Fri Aug 1 15:07:34 1997 207--- perl5.004_02/patchlevel.h Sun Nov 12 22:06:25 2000 208*************** 209*** 38,43 **** 210--- 38,44 ---- 211 */ 212 static char *local_patches[] = { 213 NULL 214+ ,"NODB-1.0 - remove -ldb from core perl binary." 215 ,NULL 216 }; 217 218