From: Jarkko Hietaniemi Date: Fri, 2 Apr 1999 13:13:39 +0000 (+0000) Subject: Configure regen. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2000072cab81cd89af2f9e1974fc40b8ae0aecc8;p=p5sagit%2Fp5-mst-13.2.git Configure regen. Add llseek + offset_t probing. Change CONFIG to CONFIGDOTSH. 'unset foo' is unportable, use foo=''. p4raw-id: //depot/cfgperl@3201 --- diff --git a/Configure b/Configure index 58ce766..ce5658f 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 Thu Mar 25 00:17:22 EET 1999 [metaconfig 3.0 PL70] +# Generated on Fri Apr 2 15:40:35 EET DST 1999 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.com) cat >/tmp/c1$$ <extract <<'EOS' -CONFIG=true +CONFIGDOTSH=true echo "Doing variable substitutions on .SH files..." if test -f $src/MANIFEST; then set x `awk '{print $1}' <$src/MANIFEST | grep '\.SH$'` @@ -2095,7 +2097,7 @@ EOM osvers=2 fi fi - unset tmp + tmp='' ;; pc*) if test -n "$DJGPP"; then @@ -6862,7 +6864,7 @@ while $test $# -ge 2; do shift 2; done > try.c; echo "int main () { struct $struct foo; foo.$field = 0; }" >> try.c; -if eval $cc $optimize $ccflags -c try.c >/dev/null 2>&1; then +if $cc $optimize $ccflags -c try.c >/dev/null 2>&1; then val="$define"; else val="$undef"; @@ -7228,6 +7230,10 @@ if $test X"$use64bits" = X"$define"; then set lockf64 d_lockf64 eval $inlibc + : see if llseek exists + set llseek d_llseek + eval $inlibc + : see if lseek64 exists set lseek64 d_lseek64 eval $inlibc @@ -7269,6 +7275,7 @@ if $test X"$use64bits" = X"$define"; then echo $n "Checking to see if your system supports off64_t...$c" >&4 $cat >try.c < +#include off64_t foo() { off64_t x; x = 7; return x; }' EOCP if $cc $optimize $ccflags -c try.c >/dev/null 2>&1; then @@ -7279,7 +7286,26 @@ EOCP echo " Nope, it doesn't." >&4 fi $rm -f try.* - set d_off64t + set d_off64_t + eval $setvar + + : check for offset_t + echo " " + echo $n "Checking to see if your system supports offset_t...$c" >&4 + $cat >try.c < +#include +offset_t foo() { offset_t x; x = 7; return x; }' +EOCP + if $cc $optimize $ccflags -c try.c >/dev/null 2>&1; then + val="$define" + echo " Yup, it does." >&4 + else + val="$undef" + echo " Nope, it doesn't." >&4 + fi + $rm -f try.* + set d_offset_t eval $setvar : check for ino64_t @@ -7304,7 +7330,7 @@ EOCP else echo " Nope, it doesn't." >&4 fi - set d_ino64t + set d_ino64_t eval $setvar : check for struct flock64 @@ -7339,7 +7365,7 @@ EOCP else val="$undef" - for xxx in d_fstat64 d_ftruncate64 d_lockf64 d_lseek64 d_lstat64 d_open64 d_opendir64 d_readdir64 d_seekdir64 d_stat64 d_telldir64 d_truncate64 d_off64t d_ino64t d_flock64_s d_dirent64_s + for xxx in d_fstat64 d_ftruncate64 d_lockf64 d_lseek64 d_lstat64 d_open64 d_opendir64 d_readdir64 d_seekdir64 d_stat64 d_telldir64 d_truncate64 d_off64_t d_offset_t d_ino64_t d_flock64_s d_dirent64_s do set $xxx eval $setvar @@ -11986,7 +12012,7 @@ do done $rm -f try.c EOS -unset postprocess_cc_v +postprocess_cc_v='' chmod +x ccsym $eunicefix ccsym ./ccsym > ccsym1.raw @@ -12756,13 +12782,14 @@ d_hasmntopt='$d_hasmntopt' d_htonl='$d_htonl' d_index='$d_index' d_inetaton='$d_inetaton' -d_ino64t='$d_ino64t' +d_ino64_t='$d_ino64_t' d_int64t='$d_int64t' d_iovec_s='$d_iovec_s' d_isascii='$d_isascii' d_killpg='$d_killpg' d_lchown='$d_lchown' d_link='$d_link' +d_llseek='$d_llseek' d_locconv='$d_locconv' d_lockf64='$d_lockf64' d_lockf='$d_lockf' @@ -12800,7 +12827,8 @@ d_munmap='$d_munmap' d_mymalloc='$d_mymalloc' d_nextkey64='$d_nextkey64' d_nice='$d_nice' -d_off64t='$d_off64t' +d_off64_t='$d_off64_t' +d_offset_t='$d_offset_t' d_old_pthread_create_joinable='$d_old_pthread_create_joinable' d_oldpthreads='$d_oldpthreads' d_oldsock='$d_oldsock' @@ -13240,7 +13268,7 @@ $test -f UU/cmdline.opt && $cat UU/cmdline.opt >> config.sh : add special variables $test -f $src/patchlevel.h && \ awk '/^#define[ ]+PERL_/ {printf "%s=%s\n",$2,$3}' $src/patchlevel.h >>config.sh -echo "CONFIG=true" >>config.sh +echo "CONFIGDOTSH=true" >>config.sh : propagate old symbols if $test -f UU/config.sh; then diff --git a/Makefile.SH b/Makefile.SH index 22f70ae..15758eb 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -1,5 +1,5 @@ #! /bin/sh -case $CONFIG in +case $CONFIGDOTSH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/Policy_sh.SH b/Policy_sh.SH index 52a2c57..3008843 100644 --- a/Policy_sh.SH +++ b/Policy_sh.SH @@ -1,4 +1,4 @@ -case $CONFIG in +case $CONFIGDOTSH in '') . ./config.sh ;; esac echo "Extracting Policy.sh (with variable substitutions)" diff --git a/cflags.SH b/cflags.SH index 8a1ba82..75de568 100755 --- a/cflags.SH +++ b/cflags.SH @@ -1,4 +1,4 @@ -case $CONFIG in +case $CONFIGDOTSH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; @@ -28,7 +28,7 @@ $startsh : In the following dollars and backticks do not need the extra backslash. $spitshell >>cflags <<'!NO!SUBS!' -case $CONFIG in +case $CONFIGDOTSH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/config_h.SH b/config_h.SH index d42a4e6..f933c78 100644 --- a/config_h.SH +++ b/config_h.SH @@ -2335,7 +2335,7 @@ sed <config.h -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un- #$d_stat64 HAS_STAT64 /**/ #$d_telldir64 HAS_TELLDIR64 /**/ #$d_truncate64 HAS_TRUNCATE64 /**/ -#$d_off64t HAS_OFF64_T /**/ +#$d_off64_t HAS_OFF64_T /**/ #$d_dirent64_s HAS_STRUCT_DIRENT64 /**/ /* PRIVLIB: diff --git a/configpm b/configpm index 9cf8103..4c9eb12 100755 --- a/configpm +++ b/configpm @@ -44,10 +44,10 @@ $in_v = 0; while (<>) { next if m:^#!/bin/sh:; - # Catch CONFIG=true and PERL_VERSION=n line from Configure. + # Catch CONFIGDOTSH=true and PERL_VERSION=n line from Configure. s/^(\w+)=(true|\d+)\s*$/$1='$2'\n/; my ($k,$v) = ($1,$2); - # grandfather PATCHLEVEL and SUBVERSION + # grandfather PATCHLEVEL and SUBVERSION and CONFIG if ($k) { if ($k eq 'PERL_VERSION') { push @v_others, "PATCHLEVEL='$v'\n"; @@ -55,6 +55,9 @@ while (<>) { elsif ($k eq 'PERL_SUBVERSION') { push @v_others, "SUBVERSION='$v'\n"; } + elsif ($k eq 'CONFIGDOTSH') { + push @v_others, "CONFIG='$v'\n"; + } } # We can delimit things in config.sh with either ' or ". unless ($in_v or m/^(\w+)=(['"])(.*\n)/){ @@ -411,11 +414,11 @@ require $config_pm; import Config; die "$0: $config_pm not valid" - unless $Config{'CONFIG'} eq 'true'; + unless $Config{'CONFIGDOTSH'} eq 'true'; die "$0: error processing $config_pm" if defined($Config{'an impossible name'}) - or $Config{'CONFIG'} ne 'true' # test cache + or $Config{'CONFIGDOTSH'} ne 'true' # test cache ; die "$0: error processing $config_pm" diff --git a/makeaperl.SH b/makeaperl.SH index 16b7435..45812ba 100644 --- a/makeaperl.SH +++ b/makeaperl.SH @@ -1,4 +1,4 @@ -case $CONFIG in +case $CONFIGDOTSH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/makedepend.SH b/makedepend.SH index 0f32da3..ba90d72 100755 --- a/makedepend.SH +++ b/makedepend.SH @@ -1,5 +1,5 @@ #! /bin/sh -case $CONFIG in +case $CONFIGDOTSH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; @@ -37,7 +37,7 @@ esac export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh \$0; kill \$\$) -case $CONFIG in +case $CONFIGDOTSH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/makedir.SH b/makedir.SH index 09908ed..d1650e7 100755 --- a/makedir.SH +++ b/makedir.SH @@ -1,4 +1,4 @@ -case $CONFIG in +case $CONFIGDOTSH in '') if test ! -f config.sh; then ln ../config.sh . || \ diff --git a/myconfig.SH b/myconfig.SH index dd2b914..83de2fa 100644 --- a/myconfig.SH +++ b/myconfig.SH @@ -1,4 +1,4 @@ -case $CONFIG in +case $CONFIGDOTSH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/perl_exp.SH b/perl_exp.SH index 6bf0d7c..5a15ed4 100644 --- a/perl_exp.SH +++ b/perl_exp.SH @@ -24,7 +24,7 @@ # The file is then given to the system loader (cc/xlc command line) # as -bE:export.file. -case $CONFIG in +case $CONFIGDOTSH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; diff --git a/writemain.SH b/writemain.SH index 025d954..b191975 100644 --- a/writemain.SH +++ b/writemain.SH @@ -1,4 +1,4 @@ -case $CONFIG in +case $CONFIGDOTSH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..;