X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Configure;h=c6c4ff32455cf08bb234af1f8d161db785dd2b2f;hb=f86a8bc58a487e28b31c5d91c65920f4859f3f74;hp=f91462ed7a7f042a2addeb0015846263dd67059d;hpb=abcf653aa463675479f9ed2ac9430790d962b866;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Configure b/Configure index f91462e..c6c4ff3 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 Jun 29 17:44:53 EET DST 2001 [metaconfig 3.0 PL70] +# Generated on Thu Aug 9 16:34:00 EET DST 2001 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <&4 + if test ! -f t/base/lex.t; then + echo "Failed to create the symlinks (t/base/lex.t missing). Aborting." >&4 exit 1 fi cd UU @@ -3516,14 +3531,6 @@ case "$ccname" in '') ccname="$cc" ;; esac -case "$gccversion" in -'') ;; -*) case "$ccflags" in - *-Wall*) ;; - *) ccflags="$ccflags -Wall" ;; - esac - ;; -esac : decide how portable to be. Allow command line overrides. case "$d_portable" in @@ -5576,7 +5583,7 @@ nm_extract="$com" if $test -f /lib/syscalls.exp; then echo " " echo "Also extracting names from /lib/syscalls.exp for good ole AIX..." >&4 - $sed -n 's/^\([^ ]*\)[ ]*syscall[0-9]*$/\1/p' /lib/syscalls.exp >>libc.list + $sed -n 's/^\([^ ]*\)[ ]*syscall[0-9]*[ ]*$/\1/p' /lib/syscalls.exp >>libc.list fi ;; esac @@ -6061,7 +6068,6 @@ prefixit='case "$3" in esac;; esac' - : get the patchlevel echo " " echo "Getting the current patchlevel..." >&4 @@ -6088,11 +6094,15 @@ if $test -r $rsrc/.patch ; then perl_patchlevel=`cat $rsrc/.patch` fi fi +: Define a handy string here to avoid duplication in myconfig.SH and configpm. +version_patchlevel_string="version $patchlevel subversion $subversion" case "$perl_patchlevel" in -0) ;; -'') $echo "(You have $package version $patchlevel subversion $subversion.)" ;; -*) $echo "(You have $package version $patchlevel subversion $subversion patchlevel $perl_patchlevel.)" ;; +0|'') ;; +*) version_patchlevel_string="$version_patchlevel_string patch $perl_patchlevel" ;; esac + +$echo "(You have $package $version_patchlevel_string.)" + case "$osname" in dos|vms) : XXX Should be a Configure test for double-dots in filenames. @@ -6759,6 +6769,58 @@ else installbin="$binexp" fi +echo " " +case "$extras" in +'') dflt='n';; +*) dflt='y';; +esac +cat < ../extras.lst + val="'$extras'" + ;; +esac +set extras +eval $setvar +echo " " + : Find perl5.005 or later. echo "Looking for a previously installed perl5.005 or later... " case "$perl5" in @@ -6991,6 +7053,7 @@ EOM esac ;; *) case "$osname" in + darwin) dflt='none' ;; svr4*|esix*|solaris|nonstopux) dflt='-fPIC' ;; *) dflt='-fpic' ;; esac ;; @@ -7351,8 +7414,9 @@ esac echo " " case "$sysman" in '') - syspath='/usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1' - syspath="$syspath /usr/man/u_man/man1 /usr/share/man/man1" + syspath='/usr/share/man/man1 /usr/man/man1' + syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" + syspath="$syspath /usr/man/u_man/man1" syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" @@ -7384,7 +7448,8 @@ case "$man1dir" in ' ') dflt=none ;; '') - lookpath="$prefixexp/man/man1 $prefixexp/man/l_man/man1" + lookpath="$prefixexp/share/man/man1" + lookpath="$lookpath $prefixexp/man/man1 $prefixexp/man/l_man/man1" lookpath="$lookpath $prefixexp/man/p_man/man1" lookpath="$lookpath $prefixexp/man/u_man/man1" lookpath="$lookpath $prefixexp/man/man.1" @@ -9053,6 +9118,10 @@ eval $inlibc set chsize d_chsize eval $inlibc +: see if class exists +set class d_class +eval $inlibc + hasstruct='varname=$1; struct=$2; shift; shift; while $test $# -ge 2; do case "$1" in @@ -9665,6 +9734,7 @@ case "$o_nonblock" in $cat head.c > try.c $cat >>try.c <<'EOCP' #include +#include int main() { #ifdef O_NONBLOCK printf("O_NONBLOCK\n"); @@ -9706,6 +9776,7 @@ case "$eagain" in #include #include #include +#include #define MY_O_NONBLOCK $o_nonblock #ifndef errno /* XXX need better Configure test */ extern int errno; @@ -9860,10 +9931,12 @@ eval $inlibc echo " " : See if fcntl-based locking works. -$cat >try.c <<'EOCP' +$cat >try.c < #include #include +#include +$signal_t blech(x) int x; { exit(3); } int main() { #if defined(F_SETLK) && defined(F_SETLKW) struct flock flock; @@ -9872,6 +9945,8 @@ int main() { flock.l_type = F_RDLCK; flock.l_whence = SEEK_SET; flock.l_start = flock.l_len = 0; + signal(SIGALRM, blech); + alarm(10); retval = fcntl(fd, F_SETLK, &flock); close(fd); (retval < 0 ? exit(2) : exit(0)); @@ -9891,6 +9966,18 @@ case "$d_fcntl" in else echo "Nope, it didn't work." val="$undef" + case "$?" in + 3) $cat >&4 <try.c <