diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2007-05-16 08:33:14 +0300 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2007-05-16 17:36:15 +0000 |
| commit | 7978b0dbd605658ae6a06756d30af746c747a39e (patch) | |
| tree | 341e6cefb3cb806eb79b3cd863dbf568233b8e04 /Configure | |
| parent | ec29429e8a1cf7b63f335cba3a013c7fe6425556 (diff) | |
| download | perl-7978b0dbd605658ae6a06756d30af746c747a39e.tar.gz | |
Configure (and Makefile.SH): remove ODBM_File early if c++ (this time even with the Configure bits)
Message-Id: <200705160233.l4G2XEET143034@kosh.hut.fi>
p4raw-id: //depot/perl@31232
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 64 |
1 files changed, 34 insertions, 30 deletions
@@ -26,7 +26,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Thu May 10 00:08:36 CEST 2007 [metaconfig 3.0 PL70] +# Generated on Wed May 16 19:31:47 CEST 2007 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -21079,6 +21079,12 @@ for xxx in $known_extensions ; do $define$define) avail_ext="$avail_ext $xxx" ;; esac ;; + IPC/SysV|ipc/sysv) + : XXX Do we need a useipcsysv variable here + case "${d_msg}${d_sem}${d_shm}" in + *"${define}"*) avail_ext="$avail_ext $xxx" ;; + esac + ;; NDBM_File|ndbm_fil) case "$i_ndbm" in $define) @@ -21096,24 +21102,28 @@ for xxx in $known_extensions ; do ODBM_File|odbm_fil) case "${i_dbm}${i_rpcsvcdbm}" in *"${define}"*) - case "$osname-$use64bitint" in - hpux-define) - case "$libs" in - *-ldbm*) avail_ext="$avail_ext $xxx" ;; + case "$d_cplusplus" in + define) ;; # delete as a function name will not work + *) case "$osname-$use64bitint" in + hpux-define) + case "$libs" in + *-ldbm*) avail_ext="$avail_ext $xxx" ;; + esac + ;; + *) avail_ext="$avail_ext $xxx" ;; esac ;; - *) avail_ext="$avail_ext $xxx" ;; esac ;; esac ;; - POSIX|posix) - case "$useposix" in + Opcode|opcode) + case "$useopcode" in true|define|y) avail_ext="$avail_ext $xxx" ;; esac ;; - Opcode|opcode) - case "$useopcode" in + POSIX|posix) + case "$useposix" in true|define|y) avail_ext="$avail_ext $xxx" ;; esac ;; @@ -21141,6 +21151,20 @@ for xxx in $known_extensions ; do esac esac ;; + threads|threads/shared) + # threads and threads::shared are special cases. + # To stop people from asking "Perl 5.8.0 was supposed + # to have this new fancy threads implementation but my + # perl doesn't have it" and from people trying to + # (re)install the threads module using CPAN.pm and + # CPAN.pm then offering to reinstall Perl 5.8.0, + # the threads.pm and threads/shared.pm will always be + # there, croaking informatively ("you need to rebuild + # all of Perl with threads, sorry") when threads haven't + # been compiled in. + # --jhi + avail_ext="$avail_ext $xxx" + ;; Win32*) case "$osname" in cygwin) avail_ext="$avail_ext $xxx" ;; @@ -21159,26 +21183,6 @@ for xxx in $known_extensions ; do $define) avail_ext="$avail_ext $xxx" ;; esac ;; - threads|threads/shared) - # threads and threads::shared are special cases. - # To stop people from asking "Perl 5.8.0 was supposed - # to have this new fancy threads implementation but my - # perl doesn't have it" and from people trying to - # (re)install the threads module using CPAN.pm and - # CPAN.pm then offering to reinstall Perl 5.8.0, - # the threads.pm and threads/shared.pm will always be - # there, croaking informatively ("you need to rebuild - # all of Perl with threads, sorry") when threads haven't - # been compiled in. - # --jhi - avail_ext="$avail_ext $xxx" - ;; - IPC/SysV|ipc/sysv) - : XXX Do we need a useipcsysv variable here - case "${d_msg}${d_sem}${d_shm}" in - *"${define}"*) avail_ext="$avail_ext $xxx" ;; - esac - ;; *) avail_ext="$avail_ext $xxx" ;; esac |