1diff -rc perl5.005_03.orig/Configure perl5.005_03/Configure 2*** perl5.005_03.orig/Configure Sun Mar 28 17:12:57 1999 3--- perl5.005_03/Configure Sun Sep 17 22:19:16 2000 4*************** 5*** 208,213 **** 6--- 208,214 ---- 7 nm='' 8 nroff='' 9 perl='' 10+ perllibs='' 11 pg='' 12 pmake='' 13 pr='' 14*************** 15*** 11642,11647 **** 16--- 11643,11656 ---- 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*** 12183,12188 **** 33--- 12192,12198 ---- 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.005_03.orig/Makefile.SH perl5.005_03/Makefile.SH 42*** perl5.005_03.orig/Makefile.SH Thu Mar 4 02:35:25 1999 43--- perl5.005_03/Makefile.SH Sun Sep 17 22:21:01 2000 44*************** 45*** 58,67 **** 46 shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp" 47 case "$osvers" in 48 3*) 49! shrpldflags="$shrpldflags -e _nostart $ldflags $libs $cryptlib" 50 ;; 51 *) 52! shrpldflags="$shrpldflags -b noentry $ldflags $libs $cryptlib" 53 ;; 54 esac 55 aixinstdir=`pwd | sed 's/\/UU$//'` 56--- 58,67 ---- 57 shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp" 58 case "$osvers" in 59 3*) 60! shrpldflags="$shrpldflags -e _nostart $ldflags $perllibs $cryptlib" 61 ;; 62 *) 63! shrpldflags="$shrpldflags -b noentry $ldflags $perllibs $cryptlib" 64 ;; 65 esac 66 aixinstdir=`pwd | sed 's/\/UU$//'` 67*************** 68*** 155,161 **** 69 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext) 70 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) 71 72! libs = $libs $cryptlib 73 74 public = perl $suidperl utilities translators 75 76--- 155,161 ---- 77 ext = \$(dynamic_ext) \$(static_ext) \$(nonxs_ext) 78 DYNALOADER = lib/auto/DynaLoader/DynaLoader\$(LIB_EXT) 79 80! libs = $perllibs $cryptlib 81 82 public = perl $suidperl utilities translators 83 84diff -rc perl5.005_03.orig/lib/ExtUtils/Embed.pm perl5.005_03/lib/ExtUtils/Embed.pm 85*** perl5.005_03.orig/lib/ExtUtils/Embed.pm Wed Jan 6 02:17:50 1999 86--- perl5.005_03/lib/ExtUtils/Embed.pm Sun Sep 17 22:19:16 2000 87*************** 88*** 194,200 **** 89 @path = $path ? split(/:/, $path) : @INC; 90 91 push(@potential_libs, @link_args) if scalar @link_args; 92! push(@potential_libs, $Config{libs}) if defined $std; 93 94 push(@mods, static_ext()) if $std; 95 96--- 194,200 ---- 97 @path = $path ? split(/:/, $path) : @INC; 98 99 push(@potential_libs, @link_args) if scalar @link_args; 100! push(@potential_libs, $Config{perllibs}) if defined $std; 101 102 push(@mods, static_ext()) if $std; 103 104diff -rc perl5.005_03.orig/lib/ExtUtils/Liblist.pm perl5.005_03/lib/ExtUtils/Liblist.pm 105*** perl5.005_03.orig/lib/ExtUtils/Liblist.pm Wed Jan 6 02:17:47 1999 106--- perl5.005_03/lib/ExtUtils/Liblist.pm Sun Sep 17 22:19:16 2000 107*************** 108*** 16,33 **** 109 110 sub _unix_os2_ext { 111 my($self,$potential_libs, $verbose) = @_; 112! if ($^O =~ 'os2' and $Config{libs}) { 113 # Dynamic libraries are not transitive, so we may need including 114 # the libraries linked against perl.dll again. 115 116 $potential_libs .= " " if $potential_libs; 117! $potential_libs .= $Config{libs}; 118 } 119 return ("", "", "", "") unless $potential_libs; 120 warn "Potential libraries are '$potential_libs':\n" if $verbose; 121 122 my($so) = $Config{'so'}; 123! my($libs) = $Config{'libs'}; 124 my $Config_libext = $Config{lib_ext} || ".a"; 125 126 127--- 16,33 ---- 128 129 sub _unix_os2_ext { 130 my($self,$potential_libs, $verbose) = @_; 131! if ($^O =~ 'os2' and $Config{perllibs}) { 132 # Dynamic libraries are not transitive, so we may need including 133 # the libraries linked against perl.dll again. 134 135 $potential_libs .= " " if $potential_libs; 136! $potential_libs .= $Config{perllibs}; 137 } 138 return ("", "", "", "") unless $potential_libs; 139 warn "Potential libraries are '$potential_libs':\n" if $verbose; 140 141 my($so) = $Config{'so'}; 142! my($libs) = $Config{'perllibs'}; 143 my $Config_libext = $Config{lib_ext} || ".a"; 144 145 146*************** 147*** 196,202 **** 148 my $BC = 1 if $cc =~ /^bcc/i; 149 my $GC = 1 if $cc =~ /^gcc/i; 150 my $so = $Config{'so'}; 151! my $libs = $Config{'libs'}; 152 my $libpth = $Config{'libpth'}; 153 my $libext = $Config{'lib_ext'} || ".lib"; 154 155--- 196,202 ---- 156 my $BC = 1 if $cc =~ /^bcc/i; 157 my $GC = 1 if $cc =~ /^gcc/i; 158 my $so = $Config{'so'}; 159! my $libs = $Config{'perllibs'}; 160 my $libpth = $Config{'libpth'}; 161 my $libext = $Config{'lib_ext'} || ".lib"; 162 163*************** 164*** 336,342 **** 165 $self->{CCFLAS} || $Config{'ccflags'}; 166 @crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '') 167 . 'PerlShr/Share' ); 168! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libs'}); 169 push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'}); 170 # In general, we pass through the basic libraries from %Config unchanged. 171 # The one exception is that if we're building in the Perl source tree, and 172--- 336,342 ---- 173 $self->{CCFLAS} || $Config{'ccflags'}; 174 @crtls = ( ($dbgqual =~ m-/Debug-i ? $Config{'dbgprefix'} : '') 175 . 'PerlShr/Share' ); 176! push(@crtls, grep { not /\(/ } split /\s+/, $Config{'perllibs'}); 177 push(@crtls, grep { not /\(/ } split /\s+/, $Config{'libc'}); 178 # In general, we pass through the basic libraries from %Config unchanged. 179 # The one exception is that if we're building in the Perl source tree, and 180*************** 181*** 626,632 **** 182 =item * 183 184 If C<$potential_libs> is empty, the return value will be empty. 185! Otherwise, the libraries specified by C<$Config{libs}> (see Config.pm) 186 will be appended to the list of C<$potential_libs>. The libraries 187 will be searched for in the directories specified in C<$potential_libs>, 188 C<$Config{libpth}>, and in C<$Config{installarchlib}/CORE>. 189--- 626,632 ---- 190 =item * 191 192 If C<$potential_libs> is empty, the return value will be empty. 193! Otherwise, the libraries specified by C<$Config{perllibs}> (see Config.pm) 194 will be appended to the list of C<$potential_libs>. The libraries 195 will be searched for in the directories specified in C<$potential_libs>, 196 C<$Config{libpth}>, and in C<$Config{installarchlib}/CORE>. 197*************** 198*** 670,676 **** 199 alphanumeric characters are treated as flags. Unknown flags will be ignored. 200 201 An entry that matches C</:nodefault/i> disables the appending of default 202! libraries found in C<$Config{libs}> (this should be only needed very rarely). 203 204 An entry that matches C</:nosearch/i> disables all searching for 205 the libraries specified after it. Translation of C<-Lfoo> and 206--- 670,676 ---- 207 alphanumeric characters are treated as flags. Unknown flags will be ignored. 208 209 An entry that matches C</:nodefault/i> disables the appending of default 210! libraries found in C<$Config{perllibs}> (this should be only needed very rarely). 211 212 An entry that matches C</:nosearch/i> disables all searching for 213 the libraries specified after it. Translation of C<-Lfoo> and 214*************** 215*** 680,686 **** 216 217 An entry that matches C</:search/i> reenables searching for 218 the libraries specified after it. You can put it at the end to 219! enable searching for default libraries specified by C<$Config{libs}>. 220 221 =item * 222 223--- 680,686 ---- 224 225 An entry that matches C</:search/i> reenables searching for 226 the libraries specified after it. You can put it at the end to 227! enable searching for default libraries specified by C<$Config{perllibs}>. 228 229 =item * 230 231diff -rc perl5.005_03.orig/lib/ExtUtils/MM_Unix.pm perl5.005_03/lib/ExtUtils/MM_Unix.pm 232*** perl5.005_03.orig/lib/ExtUtils/MM_Unix.pm Fri Mar 5 00:34:20 1999 233--- perl5.005_03/lib/ExtUtils/MM_Unix.pm Sun Sep 17 22:19:16 2000 234*************** 235*** 2284,2290 **** 236 MAP_STATIC = ", 237 join(" \\\n\t", reverse sort keys %static), " 238 239! MAP_PRELIBS = $Config::Config{libs} $Config::Config{cryptlib} 240 "; 241 242 if (defined $libperl) { 243--- 2284,2290 ---- 244 MAP_STATIC = ", 245 join(" \\\n\t", reverse sort keys %static), " 246 247! MAP_PRELIBS = $Config::Config{perllibs} $Config::Config{cryptlib} 248 "; 249 250 if (defined $libperl) { 251