diff options
| -rwxr-xr-x | Configure | 13 | ||||
| -rw-r--r-- | Cross/config.sh-arm-linux | 3 | ||||
| -rw-r--r-- | Cross/config.sh-arm-linux-n770 | 3 | ||||
| -rw-r--r-- | NetWare/config.wc | 3 | ||||
| -rw-r--r-- | Porting/Glossary | 5 | ||||
| -rwxr-xr-x | Porting/bisect-runner.pl | 2 | ||||
| -rw-r--r-- | Porting/config.sh | 3 | ||||
| -rw-r--r-- | configure.com | 3 | ||||
| -rw-r--r-- | hints/amigaos.sh | 2 | ||||
| -rw-r--r-- | plan9/config_sh.sample | 3 | ||||
| -rw-r--r-- | symbian/config.sh | 1 | ||||
| -rw-r--r-- | uconfig.h | 2 | ||||
| -rw-r--r-- | uconfig.sh | 1 | ||||
| -rw-r--r-- | uconfig64.sh | 1 | ||||
| -rw-r--r-- | win32/config.ce | 3 | ||||
| -rw-r--r-- | win32/config.gc | 5 | ||||
| -rw-r--r-- | win32/config.vc | 5 |
17 files changed, 15 insertions, 43 deletions
@@ -887,7 +887,6 @@ i_rpcsvcdbm='' d_dirnamlen='' direntrytype='' i_dirent='' -i_dld='' i_dlfcn='' i_fcntl='' i_float='' @@ -1381,7 +1380,7 @@ libswanted_uselargefiles='' : set usesocks on the Configure command line to enable socks. : List of libraries we want. : If anyone needs extra -lxxx, put those in a hint file. -libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" +libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun" libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" : We probably want to search /usr/shlib before most other libraries. : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. @@ -7810,10 +7809,6 @@ esac esac $rm -f libnames libpath -: see if dld is available -set dld.h i_dld -eval $inhdr - : Check if we are using C++ echo " " echo "Checking for C++..." >&4 @@ -7948,9 +7943,6 @@ $undef|n|false) case "$d_dlopen" in $define) dflt='y' ;; esac - case "$i_dld" in - $define) dflt='y' ;; - esac : Does a dl_xxx.xs file exist for this operating system $test -f $rsrc/$dldir/dl_${osname}.xs && dflt='y' ;; @@ -7967,8 +7959,6 @@ y*) usedl="$define" dflt="$dldir/dl_${osname}.xs" elif $test "$d_dlopen" = "$define" ; then dflt="$dldir/dl_dlopen.xs" - elif $test "$i_dld" = "$define" ; then - dflt="$dldir/dl_dld.xs" else dflt='' fi @@ -23540,7 +23530,6 @@ i_crypt='$i_crypt' i_db='$i_db' i_dbm='$i_dbm' i_dirent='$i_dirent' -i_dld='$i_dld' i_dlfcn='$i_dlfcn' i_fcntl='$i_fcntl' i_float='$i_float' diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux index 75aad20331..fea06f138d 100644 --- a/Cross/config.sh-arm-linux +++ b/Cross/config.sh-arm-linux @@ -646,7 +646,6 @@ i_crypt='define' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='define' i_fcntl='undef' i_float='define' @@ -782,7 +781,7 @@ libsdirs=' /usr/lib' libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' libspath=' /usr/local/lib /lib /usr/lib' -libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' +libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' libswanted_uselargefiles='' line='' lint='' diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770 index 98c3122974..c3b8dafea5 100644 --- a/Cross/config.sh-arm-linux-n770 +++ b/Cross/config.sh-arm-linux-n770 @@ -618,7 +618,6 @@ i_crypt='define' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='define' i_fcntl='undef' i_float='define' @@ -753,7 +752,7 @@ libsdirs=' /usr/lib' libsfiles=' libnsl.so libdl.so libm.so libcrypt.so libutil.so libc.so' libsfound=' /usr/lib/libnsl.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so' libspath=' /usr/local/lib /lib /usr/lib' -libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD' +libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD' libswanted_uselargefiles='' line='' lint='' diff --git a/NetWare/config.wc b/NetWare/config.wc index 3da939a3db..1182d47d11 100644 --- a/NetWare/config.wc +++ b/NetWare/config.wc @@ -628,7 +628,6 @@ i_crypt='undef' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='define' i_fcntl='define' i_float='define' @@ -757,7 +756,7 @@ libsdirs='' libsfiles='' libsfound='' libspath='' -libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' line='line' lint='' lkflags='' diff --git a/Porting/Glossary b/Porting/Glossary index 1f5b8c92b4..17d1511ae5 100644 --- a/Porting/Glossary +++ b/Porting/Glossary @@ -3027,11 +3027,6 @@ i_dirent (i_dirent.U): This variable conditionally defines I_DIRENT, which indicates to the C program that it should include <dirent.h>. -i_dld (i_dld.U): - This variable conditionally defines the I_DLD symbol, which - indicates to the C program that <dld.h> (GNU dynamic loading) - exists and should be included. - i_dlfcn (i_dlfcn.U): This variable conditionally defines the I_DLFCN symbol, which indicates to the C program that <dlfcn.h> exists and should diff --git a/Porting/bisect-runner.pl b/Porting/bisect-runner.pl index b15c7ff061..572c0cc27e 100755 --- a/Porting/bisect-runner.pl +++ b/Porting/bisect-runner.pl @@ -1259,7 +1259,7 @@ unless (extract_from_file('Configure', 'ignore_versioned_solibs')) { my @libs; # This is the current libswanted list from Configure, less the libs removed # by current hints/linux.sh - foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl dld + foreach my $lib (qw(sfio socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD)) { foreach my $dir (@paths) { # Note the wonderful consistency of dot-or-not in the config vars: diff --git a/Porting/config.sh b/Porting/config.sh index e4f6785433..0f35d3da6b 100644 --- a/Porting/config.sh +++ b/Porting/config.sh @@ -663,7 +663,6 @@ i_crypt='define' i_db='define' i_dbm='define' i_dirent='define' -i_dld='undef' i_dlfcn='define' i_fcntl='undef' i_float='define' @@ -800,7 +799,7 @@ libsdirs=' /usr/lib' libsfiles=' libnsl.so libgdbm.so libdb.so libdl.so libm.so libcrypt.so libutil.so libc.so libgdbm_compat.so' libsfound=' /usr/lib/libnsl.so /usr/lib/libgdbm.so /usr/lib/libdb.so /usr/lib/libdl.so /usr/lib/libm.so /usr/lib/libcrypt.so /usr/lib/libutil.so /usr/lib/libc.so /usr/lib/libgdbm_compat.so' libspath=' /usr/local/lib /lib /usr/lib' -libswanted='sfio socket inet nsl nm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' +libswanted='sfio socket inet nsl nm gdbm dbm db malloc dl ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' libswanted_uselargefiles='' line='' lint='' diff --git a/configure.com b/configure.com index 97c36fc6d8..7ef1334ae0 100644 --- a/configure.com +++ b/configure.com @@ -122,7 +122,7 @@ $!: full support for void wanted by default !sfn $!defvoidused=15 !sfn $!: List of libraries we want. !sfn $!libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl' !sfn -$!libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt" !sfn +$!libswanted="$libswanted ld sun m c cposix posix ndir dir crypt" !sfn $!libswanted="$libswanted ucb bsd BSD PW x" !sfn $!: We probably want to search /usr/shlib before most other libraries. !sfn $!: This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. !sfn @@ -6461,7 +6461,6 @@ $ WC "i_crypt='undef'" $ WC "i_db='undef'" $ WC "i_dbm='undef'" $ WC "i_dirent='undef'" ! we roll our own -$ WC "i_dld='undef'" $ WC "i_dlfcn='undef'" $ WC "i_fcntl='" + i_fcntl + "'" $ WC "i_float='define'" diff --git a/hints/amigaos.sh b/hints/amigaos.sh index c5ba6ff591..595b2a3993 100644 --- a/hints/amigaos.sh +++ b/hints/amigaos.sh @@ -22,7 +22,7 @@ xlibpth="$libpth" # This should remove unwanted libraries instead of limiting the set # to just these few. E.g. what about Berkeley DB? -libswanted='gdbm m dld' +libswanted='gdbm m' so=' ' libs='-lm' diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample index 3e64111df7..7984ea370d 100644 --- a/plan9/config_sh.sample +++ b/plan9/config_sh.sample @@ -640,7 +640,6 @@ i_crypt='undef' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='undef' i_fcntl='define' i_float='define' @@ -764,7 +763,7 @@ libsdirs='' libsfiles='' libsfound='' libspath=' /lib' -libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' +libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt sec ucb bsd BSD PW x util' libswanted_uselargefiles='' line='' lint='' diff --git a/symbian/config.sh b/symbian/config.sh index 7f7895719a..0c590431cd 100644 --- a/symbian/config.sh +++ b/symbian/config.sh @@ -567,7 +567,6 @@ i_crypt='undef' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='undef' i_fcntl='define' i_float='undef' @@ -4754,5 +4754,5 @@ /* Generated from: * 3631b2b781d1779dc1855cb35ab72d5176a9eb36a527f74231c7e3f274021182 config_h.SH - * e0e303f4b6a586f3c94ed5c08078b3b837c1cc5683e61b0dd6c6b84cd8c44774 uconfig.sh + * 3dc6c26adfbf4f2e111d90b34d50e317e18555a76a270fbac2899d08a42f2fd1 uconfig.sh * ex: set ro: */ diff --git a/uconfig.sh b/uconfig.sh index 835136261f..374e65d302 100644 --- a/uconfig.sh +++ b/uconfig.sh @@ -553,7 +553,6 @@ i_crypt='undef' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='undef' i_fcntl='undef' i_float='undef' diff --git a/uconfig64.sh b/uconfig64.sh index e8b10fc163..9f706243c2 100644 --- a/uconfig64.sh +++ b/uconfig64.sh @@ -554,7 +554,6 @@ i_crypt='undef' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='undef' i_fcntl='undef' i_float='undef' diff --git a/win32/config.ce b/win32/config.ce index 950c31341b..c3e36789ae 100644 --- a/win32/config.ce +++ b/win32/config.ce @@ -624,7 +624,6 @@ i_crypt='undef' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='define' i_fcntl='define' i_float='define' @@ -749,7 +748,7 @@ libsdirs='' libsfiles='' libsfound='' libspath='' -libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' line='line' lint='' lkflags='' diff --git a/win32/config.gc b/win32/config.gc index dac300e5a1..ca098f33c0 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -636,7 +636,6 @@ i_crypt='undef' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='define' i_fcntl='define' i_float='define' @@ -775,8 +774,8 @@ libsdirs='' libsfiles='' libsfound='' libspath='' -libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' -libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' line='line' lint='' lkflags='' diff --git a/win32/config.vc b/win32/config.vc index 17d68c3d11..829e0b4e32 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -635,7 +635,6 @@ i_crypt='undef' i_db='undef' i_dbm='undef' i_dirent='define' -i_dld='undef' i_dlfcn='define' i_fcntl='define' i_float='define' @@ -774,8 +773,8 @@ libsdirs='' libsfiles='' libsfound='' libspath='' -libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' -libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +libswanted='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' +libswanted_uselargefiles='net socket inet nsl nm ndbm gdbm dbm db malloc dl ld sun m c cposix posix ndir dir crypt ucb bsd BSD PW x' line='line' lint='' lkflags='' |