long long and long double thingies from #4804; regen Configure.
p4raw-id: //depot/metaconfig@4805
and installed. I have submitted these for inclusion in the
regular dist distribution.
+installdirs/
+ These are units to handle perl's installation directories and
+ related issues.
+
modified/
These are modified versions of the standard units. Also included in
this directory are new units that are clearly derived from existing
units. I have submitted these for inclusion in the regular dist
distribution.
+nullified/
+ These are null units that replace units in the standard
+ distribution. Typically they are there because some part of the
+ perl source accidentally uses a symbol that metaconfig means we
+ want the corresponding unit.
+
perl/
These are specific to perl. Some are heavily derived from
original dist units, and are marked as such. Others are original.
?RCS: Revision 3.0.1.1 1994/10/29 16:12:51 ram
?RCS: patch36: created by ADO
?RCS:
-?MAKE:d_Gconvert: Compile cat Inlibc rm _o
+?MAKE:d_Gconvert: Compile cat Inlibc rm _o uselongdouble d_qgcvt
?MAKE: -pick add $@ %<
?S:d_Gconvert:
?S: This variable holds what Gconvert is defined as to convert
#define Gconvert(x,n,t,b) gcvt((x),(n),(b))
char *myname = "gcvt";
#endif
+#ifdef TRY_qgcvt
+#define Gconvert(x,n,t,b) qgcvt((x),(n),(b))
+char *myname = "qgcvt";
+#endif
#ifdef TRY_sprintf
#define Gconvert(x,n,t,b) sprintf((b),"%.*g",(n),(x))
char *myname = "sprintf";
*) xxx_list='gconvert gcvt sprintf' ;;
esac
+ case "$uselongdouble$d_qgcvt" in
+ definedefine) xxx_list="`echo $xxx_list|sed s/gcvt/qgcvt/`" ;;
+ esac
+
for xxx_convert in $xxx_list; do
- echo "Trying $xxx_convert"
+ echo "Trying $xxx_convert..."
$rm -f try try$_o
set try -DTRY_$xxx_convert
if eval $compile; then
case "$xxx_convert" in
gconvert) d_Gconvert='gconvert((x),(n),(t),(b))' ;;
gcvt) d_Gconvert='gcvt((x),(n),(b))' ;;
+ qgcvt) d_Gconvert='qgcvt((x),(n),(b))' ;;
*) d_Gconvert='sprintf((b),"%.*g",(n),(x))' ;;
esac
fi
--- /dev/null
+
+From Raphael_Manfredi@grenoble.hp.com Thu Feb 12 09:37:34 1998
+Date: Thu, 12 Feb 98 10:37:17 +0100
+From: Raphael Manfredi <Raphael_Manfredi@grenoble.hp.com>
+To: Andy Dougherty <doughera@newton.phys.lafayette.edu>
+Subject: Unofficial patch over dist-3.0PL70
+
+Index: mcon/U/Extractall.U
+*** /tmp/RCSAa22428 Thu Feb 12 10:33:08 1998
+--- mcon/U/Extractall.U Fri Mar 7 15:07:56 1997
+***************
+*** 17,23 ****
+ ?X:
+ ?MAKE:Extractall: Extract Options rsrc
+ ?MAKE: -pick wipe $@ %<
+- ?T:config
+ : extract files and exit if asked to do so
+ case "$extractsh" in
+ true)
+--- 17,22 ----
+***************
+*** 28,44 ****
+ *) exec 1>&4;;
+ esac
+ case "$config_sh" in
+! '') config_sh='config.sh'; config="$rsrc/config.sh";;
+! /*) config="$config_sh";;
+! *) config="$rsrc/$config_sh";;
+ esac
+ echo " "
+ echo "Fetching answers from $config_sh..."
+! . $config
+ test "$override" && . ./optdef.sh
+ echo " "
+ ?X: extract has to be run from the top directory, not within UU.
+- cd ..
+ . UU/extract
+ rm -rf UU
+ echo "Done."
+--- 27,41 ----
+ *) exec 1>&4;;
+ esac
+ case "$config_sh" in
+! '') config_sh='config.sh';;
+ esac
+ echo " "
+ echo "Fetching answers from $config_sh..."
+! cd ..
+! . $config_sh
+ test "$override" && . ./optdef.sh
+ echo " "
+ ?X: extract has to be run from the top directory, not within UU.
+ . UU/extract
+ rm -rf UU
+ echo "Done."
+
+Index: mcon/U/Head.U
+*** /tmp/RCSAa22431 Thu Feb 12 10:33:10 1998
+--- mcon/U/Head.U Tue May 13 09:15:46 1997
+***************
+*** 194,200 ****
+ case "$inksh/$needksh" in
+ /[a-z]*)
+ ?X: Unset ENV to avoid any ~/.kshrc that could alias cd or whatever...
+! unset ENV
+ changesh=true
+ reason="$needksh"
+ ;;
+--- 194,200 ----
+ case "$inksh/$needksh" in
+ /[a-z]*)
+ ?X: Unset ENV to avoid any ~/.kshrc that could alias cd or whatever...
+! ENV=''
+ changesh=true
+ reason="$needksh"
+ ;;
+***************
+*** 235,240 ****
+ test -d UU || mkdir UU
+ ?X: Use ./* to avoid any confirmation prompts from enhanced shells -- WED
+ ?X: Unset CDPATH to avoid surprised when using cd under some shells
+! unset CDPATH
+ cd UU && rm -f ./*
+
+--- 235,240 ----
+ test -d UU || mkdir UU
+ ?X: Use ./* to avoid any confirmation prompts from enhanced shells -- WED
+ ?X: Unset CDPATH to avoid surprised when using cd under some shells
+! CDPATH=''
+ cd UU && rm -f ./*
+
+
+Index: mcon/U/Oldconfig.U
+*** /tmp/RCSAa22434 Thu Feb 12 10:33:11 1998
+--- mcon/U/Oldconfig.U Fri Mar 7 15:07:33 1997
+***************
+*** 363,373 ****
+ *) if test -f /etc/systemid; then
+ osname=sco
+ set `echo $3 | $sed 's/\./ /g'` $4
+! if $test -f sco_$1_$2_$3.sh; then
+ osvers=$1.$2.$3
+! elif $test -f sco_$1_$2.sh; then
+ osvers=$1.$2
+! elif $test -f sco_$1.sh; then
+ osvers=$1
+ fi
+ else
+--- 363,373 ----
+ *) if test -f /etc/systemid; then
+ osname=sco
+ set `echo $3 | $sed 's/\./ /g'` $4
+! if $test -f $src/hints/sco_$1_$2_$3.sh; then
+ osvers=$1.$2.$3
+! elif $test -f $src/hints/sco_$1_$2.sh; then
+ osvers=$1.$2
+! elif $test -f $src/hints/sco_$1.sh; then
+ osvers=$1
+ fi
+ else
+
+Index: mcon/U/Signal.U
+*** /tmp/RCSAa22437 Thu Feb 12 10:33:11 1998
+--- mcon/U/Signal.U Mon Sep 29 13:05:31 1997
+***************
+*** 165,171 ****
+ $cat >signal_cmd <<EOS
+ $startsh
+ $test -s signal.lst && exit 0
+! if $cc $ccflags signal.c -o signal $ldflags >/dev/null 2>&1; then
+ ./signal | $sort -n +1 | $uniq | $awk -f signal.awk >signal.lst
+ else
+ echo "(I can't seem be able to compile the test program -- Guessing)"
+--- 165,171 ----
+ $cat >signal_cmd <<EOS
+ $startsh
+ $test -s signal.lst && exit 0
+! if $cc $ccflags $ldflags -o signal signal.c >/dev/null 2>&1; then
+ ./signal | $sort -n +1 | $uniq | $awk -f signal.awk >signal.lst
+ else
+ echo "(I can't seem be able to compile the test program -- Guessing)"
+
+Index: mcon/U/alignbytes.U
+*** /tmp/RCSAa22440 Thu Feb 12 10:33:12 1998
+--- mcon/U/alignbytes.U Mon Mar 3 14:25:43 1997
+***************
+*** 45,51 ****
+ dflt=`./try`
+ else
+ dflt='8'
+! echo"(I can't seem to compile the test program...)"
+ fi
+ ;;
+ *) dflt="$alignbytes"
+--- 45,51 ----
+ dflt=`./try`
+ else
+ dflt='8'
+! echo "(I can't seem to compile the test program...)"
+ fi
+ ;;
+ *) dflt="$alignbytes"
+
+Index: mcon/U/bitpbyte.U
+*** /tmp/RCSAa22443 Thu Feb 12 10:33:12 1998
+--- mcon/U/bitpbyte.U Mon Sep 29 13:06:25 1997
+***************
+*** 50,56 ****
+ printf("%d\n", BITSPERBYTE);
+ }
+ EOCP
+! if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='8'
+--- 50,56 ----
+ printf("%d\n", BITSPERBYTE);
+ }
+ EOCP
+! if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='8'
+
+Index: mcon/U/byteorder.U
+*** /tmp/RCSAa22446 Thu Feb 12 10:33:13 1998
+--- mcon/U/byteorder.U Mon Sep 29 13:06:33 1997
+***************
+*** 61,67 ****
+ }
+ EOCP
+ xxx_prompt=y
+! if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
+ dflt=`./try`
+ case "$dflt" in
+ [1-4][1-4][1-4][1-4]|12345678|87654321)
+--- 61,67 ----
+ }
+ EOCP
+ xxx_prompt=y
+! if $cc $ccflags -o try try.c >/dev/null 2>&1 && ./try > /dev/null; then
+ dflt=`./try`
+ case "$dflt" in
+ [1-4][1-4][1-4][1-4]|12345678|87654321)
+
+Index: mcon/U/ccflags.U
+*** /tmp/RCSAa22449 Thu Feb 12 10:33:14 1998
+--- mcon/U/ccflags.U Mon Sep 29 13:07:28 1997
+***************
+*** 86,92 ****
+ ?INIT:
+ : determine optimize, if desired, or use for debug flag also
+ case "$optimize" in
+! ' ') dflt='none';;
+ '') dflt='-O';;
+ *) dflt="$optimize";;
+ esac
+--- 86,92 ----
+ ?INIT:
+ : determine optimize, if desired, or use for debug flag also
+ case "$optimize" in
+! ' '|$undef) dflt='none';;
+ '') dflt='-O';;
+ *) dflt="$optimize";;
+ esac
+***************
+*** 335,341 ****
+ echo " "
+ echo "Checking your choice of C compiler and flags for coherency..." >&4
+ ?X: Strip extra blanks in case some of the following variables are empty
+! set X $cc $optimize $ccflags $ldflags try.c -o try
+ shift
+ $cat >try.msg <<EOM
+ I've tried to compile and run a simple program with:
+--- 335,341 ----
+ echo " "
+ echo "Checking your choice of C compiler and flags for coherency..." >&4
+ ?X: Strip extra blanks in case some of the following variables are empty
+! set X $cc $optimize $ccflags $ldflags -o try try.c
+ shift
+ $cat >try.msg <<EOM
+ I've tried to compile and run a simple program with:
+***************
+*** 355,361 ****
+ ?X: We need to try the resulting executable, because cc might yield a 0 status
+ ?X: even when ld failed, in which case the executable will not run properly,
+ ?X: if its x bit is set at all...
+! if sh -c "$cc $optimize $ccflags try.c -o try $ldflags" >>try.msg 2>&1; then
+ if sh -c './try' >>try.msg 2>&1; then
+ dflt=n
+ else
+--- 355,361 ----
+ ?X: We need to try the resulting executable, because cc might yield a 0 status
+ ?X: even when ld failed, in which case the executable will not run properly,
+ ?X: if its x bit is set at all...
+! if sh -c "$cc $optimize $ccflags $ldflags -o try try.c" >>try.msg 2>&1; then
+ if sh -c './try' >>try.msg 2>&1; then
+ dflt=n
+ else
+***************
+*** 370,376 ****
+ fi
+ case "$dflt" in
+ y)
+! $cat try.msg
+ ?X: using -K will prevent default aborting--maybe they're cross compiling?
+ case "$knowitall" in
+ '')
+--- 370,376 ----
+ fi
+ case "$dflt" in
+ y)
+! $cat try.msg >&4
+ ?X: using -K will prevent default aborting--maybe they're cross compiling?
+ case "$knowitall" in
+ '')
+
+Index: mcon/U/cf_who.U
+*** /tmp/RCSAa22452 Thu Feb 12 10:33:14 1998
+--- mcon/U/cf_who.U Tue Aug 19 16:34:29 1997
+***************
+*** 27,32 ****
+--- 27,34 ----
+ ?S: questions. This is used to tag both config.sh and config_h.SH.
+ ?S:.
+ : who configured the system
++ ?X: Ensure English date -- Jarkko Hietaniemi
++ LC_ALL=C; export LC_ALL
+ cf_time=`$date 2>&1`
+ ?X:
+ ?X: Leave a white space between first two '(' for ksh. The sub-shell is needed
+
+Index: mcon/U/charsize.U
+*** /tmp/RCSAa22455 Thu Feb 12 10:33:15 1998
+--- mcon/U/charsize.U Mon Sep 29 13:07:51 1997
+***************
+*** 34,40 ****
+ printf("%d\n", sizeof(char));
+ }
+ EOCP
+! if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='1'
+--- 34,40 ----
+ printf("%d\n", sizeof(char));
+ }
+ EOCP
+! if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='1'
+
+Index: mcon/U/d_NOFILE.U
+*** /tmp/RCSAa22458 Thu Feb 12 10:33:15 1998
+--- mcon/U/d_NOFILE.U Mon Sep 29 13:09:18 1997
+***************
+*** 58,64 ****
+ }
+ EOCP
+ nofile=''
+! if $cc $ccflags nofile.c -o nofile $libs >/dev/null 2>&1; then
+ nofile=`./nofile 2>/dev/null`
+ fi
+ if $test "$nofile"; then
+--- 58,64 ----
+ }
+ EOCP
+ nofile=''
+! if $cc $ccflags -o nofile nofile.c $libs >/dev/null 2>&1; then
+ nofile=`./nofile 2>/dev/null`
+ fi
+ if $test "$nofile"; then
+***************
+*** 92,99 ****
+ exit(0);
+ }
+ EOCP
+! if $cc $ccflags -DGETPARAM_H nofile.c -o nofile $libs >/dev/null 2>&1 \
+! || $cc $ccflags nofile.c -o nofile $libs >/dev/null 2>&1 ; then
+ set `./nofile`
+ d_gettblsz=$1
+ d_ulimit4=$2
+--- 92,99 ----
+ exit(0);
+ }
+ EOCP
+! if $cc $ccflags -DGETPARAM_H -o nofile nofile.c $libs >/dev/null 2>&1 \
+! || $cc $ccflags -o nofile nofile.c $libs >/dev/null 2>&1 ; then
+ set `./nofile`
+ d_gettblsz=$1
+ d_ulimit4=$2
+***************
+*** 163,170 ****
+ exit(0);
+ }
+ EOCP
+! if $cc $ccflags -DGETPARAM_H nofile.c -o nofile $libs >/dev/null 2>&1 \
+! || $cc $ccflags nofile.c -o nofile $libs >/dev/null 2>&1 ; then
+ nofile=`./nofile 2>/dev/null`
+ fi
+ if $test "$nofile"; then
+--- 163,170 ----
+ exit(0);
+ }
+ EOCP
+! if $cc $ccflags -DGETPARAM_H -o nofile nofile.c $libs >/dev/null 2>&1 \
+! || $cc $ccflags -o nofile nofile.c $libs >/dev/null 2>&1 ; then
+ nofile=`./nofile 2>/dev/null`
+ fi
+ if $test "$nofile"; then
+
+Index: mcon/U/d_PORTAR.U
+*** /tmp/RCSAa22461 Thu Feb 12 10:33:15 1998
+--- mcon/U/d_PORTAR.U Mon Sep 29 13:09:39 1997
+***************
+*** 45,52 ****
+ #endif
+ exit(0);}
+ EOCP
+! if $cc portar.c -o portar >/dev/null 2>&1 || \
+! $cc -DPORTAR=1 portar.c -o portar >/dev/null 2>&1 ; then
+ case "`./portar`" in
+ D)
+ val="$define"
+--- 45,52 ----
+ #endif
+ exit(0);}
+ EOCP
+! if $cc -o portar portar.c >/dev/null 2>&1 || \
+! $cc -DPORTAR=1 -o portar portar.c >/dev/null 2>&1 ; then
+ case "`./portar`" in
+ D)
+ val="$define"
+
+Index: mcon/U/d_SHM_MAC.U
+*** /tmp/RCSAa22464 Thu Feb 12 10:33:16 1998
+--- mcon/U/d_SHM_MAC.U Mon Sep 29 13:09:57 1997
+***************
+*** 99,107 ****
+ echo "Trying $D_sys_immu $D_sys_param $D_sys_sysmacros $D_sys_seg"
+ ;;
+ esac
+! if $cc shm_mac.c $ccflags \
+ $D_sys_immu $D_sys_param $D_sys_sysmacros $D_sys_seg \
+! -o shm_mac >/dev/null 2>&1 ; then
+ set X $D_sys_immu $D_sys_param $D_sys_sysmacros $D_sys_seg
+ shift
+ flags="$*"
+--- 99,107 ----
+ echo "Trying $D_sys_immu $D_sys_param $D_sys_sysmacros $D_sys_seg"
+ ;;
+ esac
+! if $cc $ccflags \
+ $D_sys_immu $D_sys_param $D_sys_sysmacros $D_sys_seg \
+! -o shm_mac shm_mac.c >/dev/null 2>&1 ; then
+ set X $D_sys_immu $D_sys_param $D_sys_sysmacros $D_sys_seg
+ shift
+ flags="$*"
+
+Index: mcon/U/d_access.U
+*** /tmp/RCSAa22467 Thu Feb 12 10:33:16 1998
+--- mcon/U/d_access.U Mon Sep 29 13:10:19 1997
+***************
+*** 47,62 ****
+ EOCP
+ : check sys/file.h first, no particular reason here
+ if $test `./findhdr sys/file.h` && \
+! $cc $cppflags -DI_SYS_FILE access.c -o access >/dev/null 2>&1 ; then
+ h_sysfile=true;
+ echo "<sys/file.h> defines the *_OK access constants." >&4
+ elif $test `./findhdr fcntl.h` && \
+! $cc $cppflags -DI_FCNTL access.c -o access >/dev/null 2>&1 ; then
+ h_fcntl=true;
+ echo "<fcntl.h> defines the *_OK access constants." >&4
+ @if I_UNISTD
+ elif $test `./findhdr unistd.h` && \
+! $cc $cppflags -DI_UNISTD access.c -o access >/dev/null 2>&1 ; then
+ echo "<unistd.h> defines the *_OK access constants." >&4
+ @end
+ else
+--- 47,62 ----
+ EOCP
+ : check sys/file.h first, no particular reason here
+ if $test `./findhdr sys/file.h` && \
+! $cc $cppflags -DI_SYS_FILE -o access access.c >/dev/null 2>&1 ; then
+ h_sysfile=true;
+ echo "<sys/file.h> defines the *_OK access constants." >&4
+ elif $test `./findhdr fcntl.h` && \
+! $cc $cppflags -DI_FCNTL -o access access.c >/dev/null 2>&1 ; then
+ h_fcntl=true;
+ echo "<fcntl.h> defines the *_OK access constants." >&4
+ @if I_UNISTD
+ elif $test `./findhdr unistd.h` && \
+! $cc $cppflags -DI_UNISTD -o access access.c >/dev/null 2>&1 ; then
+ echo "<unistd.h> defines the *_OK access constants." >&4
+ @end
+ else
+
+Index: mcon/U/d_attribut.U
+No differences encountered
+
+Index: mcon/U/d_bsdjmp.U
+*** /tmp/RCSAa22473 Thu Feb 12 10:33:17 1998
+--- mcon/U/d_bsdjmp.U Mon Sep 29 13:10:47 1997
+***************
+*** 46,52 ****
+ exit(1);
+ }
+ EOP
+! if $cc set.c -o set $libs >/dev/null 2>&1; then
+ if ./set >/dev/null 2>&1; then
+ echo "Good! You have BSD _setjmp and _longjmp routines." >&4
+ val="$define"
+--- 46,52 ----
+ exit(1);
+ }
+ EOP
+! if $cc -o set set.c $libs >/dev/null 2>&1; then
+ if ./set >/dev/null 2>&1; then
+ echo "Good! You have BSD _setjmp and _longjmp routines." >&4
+ val="$define"
+
+Index: mcon/U/d_casti32.U
+*** /tmp/RCSAa22476 Thu Feb 12 10:33:17 1998
+--- mcon/U/d_casti32.U Mon Sep 29 13:10:57 1997
+***************
+*** 59,65 ****
+ exit(result);
+ }
+ EOCP
+! if $cc -o try $ccflags try.c >/dev/null 2>&1; then
+ ./try
+ yyy=$?
+ else
+--- 59,65 ----
+ exit(result);
+ }
+ EOCP
+! if $cc $ccflags -o try try.c >/dev/null 2>&1; then
+ ./try
+ yyy=$?
+ else
+
+Index: mcon/U/d_castneg.U
+*** /tmp/RCSAa22479 Thu Feb 12 10:33:18 1998
+--- mcon/U/d_castneg.U Mon Sep 29 13:11:03 1997
+***************
+*** 115,121 ****
+
+ }
+ EOCP
+! if $cc -o try $ccflags try.c >/dev/null 2>&1; then
+ ./try
+ castflags=$?
+ else
+--- 115,121 ----
+
+ }
+ EOCP
+! if $cc $ccflags -o try try.c >/dev/null 2>&1; then
+ ./try
+ castflags=$?
+ else
+
+Index: mcon/U/d_charsprf.U
+*** /tmp/RCSAa22482 Thu Feb 12 10:33:18 1998
+--- mcon/U/d_charsprf.U Mon Sep 29 13:11:25 1997
+***************
+*** 32,38 ****
+ exit((unsigned long)sprintf(buf,"%s","foo") > 10L);
+ }
+ EOF
+! if $cc ucbsprf.c -o ucbsprf >/dev/null 2>&1 && ./ucbsprf; then
+ echo "Your sprintf() returns (int)." >&4
+ val="$undef"
+ else
+--- 32,38 ----
+ exit((unsigned long)sprintf(buf,"%s","foo") > 10L);
+ }
+ EOF
+! if $cc -o ucbsprf ucbsprf.c >/dev/null 2>&1 && ./ucbsprf; then
+ echo "Your sprintf() returns (int)." >&4
+ val="$undef"
+ else
+
+Index: mcon/U/d_eofpipe.U
+*** /tmp/RCSAa22485 Thu Feb 12 10:33:19 1998
+--- mcon/U/d_eofpipe.U Mon Sep 29 13:11:59 1997
+***************
+*** 52,58 ****
+ exit(1);
+ }
+ EOP
+! if $cc $ccflags pipe.c -o pipe $libs >/dev/null 2>&1; then
+ ?X: Use a script to avoid the possible 'alarm call' message
+ echo "./pipe || exit 1" > mpipe
+ chmod +x mpipe
+--- 52,58 ----
+ exit(1);
+ }
+ EOP
+! if $cc $ccflags -o pipe pipe.c $libs >/dev/null 2>&1; then
+ ?X: Use a script to avoid the possible 'alarm call' message
+ echo "./pipe || exit 1" > mpipe
+ chmod +x mpipe
+
+Index: mcon/U/d_fd_set.U
+*** /tmp/RCSAa22488 Thu Feb 12 10:33:19 1998
+--- mcon/U/d_fd_set.U Mon Sep 29 13:12:18 1997
+***************
+*** 90,96 ****
+ #endif
+ }
+ EOCP
+! if $cc $ccflags -DTRYBITS fd_set.c -o fd_set >fd_set.out 2>&1 ; then
+ d_fds_bits="$define"
+ d_fd_set="$define"
+ echo "Well, your system knows about the normal fd_set typedef..." >&4
+--- 90,96 ----
+ #endif
+ }
+ EOCP
+! if $cc $ccflags -DTRYBITS -o fd_set fd_set.c >fd_set.out 2>&1 ; then
+ d_fds_bits="$define"
+ d_fd_set="$define"
+ echo "Well, your system knows about the normal fd_set typedef..." >&4
+***************
+*** 107,113 ****
+ $cat <<'EOM'
+ Hmm, your compiler has some difficulty with fd_set. Checking further...
+ EOM
+! if $cc $ccflags fd_set.c -o fd_set >fd_set.out 2>&1 ; then
+ d_fds_bits="$undef"
+ d_fd_set="$define"
+ echo "Well, your system has some sort of fd_set available..." >&4
+--- 107,113 ----
+ $cat <<'EOM'
+ Hmm, your compiler has some difficulty with fd_set. Checking further...
+ EOM
+! if $cc $ccflags -o fd_set fd_set.c >fd_set.out 2>&1 ; then
+ d_fds_bits="$undef"
+ d_fd_set="$define"
+ echo "Well, your system has some sort of fd_set available..." >&4
+
+Index: mcon/U/d_getpagsz.U
+*** /tmp/RCSAa22491 Thu Feb 12 10:33:20 1998
+--- mcon/U/d_getpagsz.U Mon Sep 29 13:12:48 1997
+***************
+*** 57,63 ****
+ dflt='4096'
+ case "$d_getpagsz" in
+ "$define")
+! if $cc $ccflags page.c -o page $libs >/dev/null 2>&1; then
+ dflt=`./page`
+ guess=''
+ else
+--- 57,63 ----
+ dflt='4096'
+ case "$d_getpagsz" in
+ "$define")
+! if $cc $ccflags -o page page.c $libs >/dev/null 2>&1; then
+ dflt=`./page`
+ guess=''
+ else
+***************
+*** 65,71 ****
+ fi
+ ;;
+ *)
+! if $cc $ccflags page.c -o page $libs -lPW >/dev/null 2>&1; then
+ dflt=`./page`
+ guess=''
+ echo "(For your eyes only: I used the getpagesize() from -lPW.)"
+--- 65,71 ----
+ fi
+ ;;
+ *)
+! if $cc $ccflags -o page page.c $libs -lPW >/dev/null 2>&1; then
+ dflt=`./page`
+ guess=''
+ echo "(For your eyes only: I used the getpagesize() from -lPW.)"
+***************
+*** 78,84 ****
+ printf("%d\n", PAGESIZE);
+ }
+ EOP
+! if $cc $ccflags page.c -o page $libs >/dev/null 2>&1; then
+ dflt=`./page`
+ guess=''
+ echo "(Using value of PAGESIZE found in <sys/param.h>.)"
+--- 78,84 ----
+ printf("%d\n", PAGESIZE);
+ }
+ EOP
+! if $cc $ccflags -o page page.c $libs >/dev/null 2>&1; then
+ dflt=`./page`
+ guess=''
+ echo "(Using value of PAGESIZE found in <sys/param.h>.)"
+
+Index: mcon/U/d_keepsig.U
+*** /tmp/RCSAa22494 Thu Feb 12 10:33:20 1998
+--- mcon/U/d_keepsig.U Mon Sep 29 13:13:17 1997
+***************
+*** 47,53 ****
+ printf("abc\n");
+ }
+ EOCP
+! if $cc -o try $ccflags try.c >/dev/null 2>&1; then
+ ?X: On AIX a single ./try will not work (with ksh)
+ ?X: Backquotes required on Linux and SGI (prevents "ambiguous output redirect")
+ ?X: (reported by Xavier LeVourch <xavierl@eiffel.com>)
+--- 47,53 ----
+ printf("abc\n");
+ }
+ EOCP
+! if $cc $ccflags -o try try.c >/dev/null 2>&1; then
+ ?X: On AIX a single ./try will not work (with ksh)
+ ?X: Backquotes required on Linux and SGI (prevents "ambiguous output redirect")
+ ?X: (reported by Xavier LeVourch <xavierl@eiffel.com>)
+
+Index: mcon/U/d_msem.U
+
+Index: mcon/U/d_nolnbuf.U
+*** /tmp/RCSAa22498 Thu Feb 12 10:33:21 1998
+--- mcon/U/d_nolnbuf.U Mon Sep 29 13:13:31 1997
+***************
+*** 41,47 ****
+ putchar('\n');
+ }
+ EOT
+! $cc blurfl.c -o blurfl >/dev/null 2>&1;
+ $rm -f blurfl.c
+ $cat >&4 <<'EOM'
+ Checking for buffering of stdout to terminal.
+--- 41,47 ----
+ putchar('\n');
+ }
+ EOT
+! $cc -o blurfl blurfl.c >/dev/null 2>&1;
+ $rm -f blurfl.c
+ $cat >&4 <<'EOM'
+ Checking for buffering of stdout to terminal.
+
+Index: mcon/U/d_open3.U
+*** /tmp/RCSAa22501 Thu Feb 12 10:33:21 1998
+--- mcon/U/d_open3.U Mon Sep 29 13:13:48 1997
+***************
+*** 53,59 ****
+ EOCP
+ : check sys/file.h first to get FREAD on Sun
+ if $test `./findhdr sys/file.h` && \
+! $cc $cppflags "-DI_SYS_FILE" open3.c -o open3 >/dev/null 2>&1 ; then
+ h_sysfile=true;
+ echo "<sys/file.h> defines the O_* constants..." >&4
+ if ./open3; then
+--- 53,59 ----
+ EOCP
+ : check sys/file.h first to get FREAD on Sun
+ if $test `./findhdr sys/file.h` && \
+! $cc $cppflags "-DI_SYS_FILE" -o open3 open3.c >/dev/null 2>&1 ; then
+ h_sysfile=true;
+ echo "<sys/file.h> defines the O_* constants..." >&4
+ if ./open3; then
+***************
+*** 64,70 ****
+ val="$undef"
+ fi
+ elif $test `./findhdr fcntl.h` && \
+! $cc "-DI_FCNTL" open3.c -o open3 >/dev/null 2>&1 ; then
+ h_fcntl=true;
+ echo "<fcntl.h> defines the O_* constants..." >&4
+ if ./open3; then
+--- 64,70 ----
+ val="$undef"
+ fi
+ elif $test `./findhdr fcntl.h` && \
+! $cc "-DI_FCNTL" -o open3 open3.c >/dev/null 2>&1 ; then
+ h_fcntl=true;
+ echo "<fcntl.h> defines the O_* constants..." >&4
+ if ./open3; then
+
+Index: mcon/U/d_pidcheck.U
+*** /tmp/RCSAa22504 Thu Feb 12 10:33:22 1998
+--- mcon/U/d_pidcheck.U Mon Sep 29 13:13:57 1997
+***************
+*** 50,56 ****
+ exit(status0 == status9);
+ }
+ EOCP
+! if $cc try.c -o try >/dev/null 2>&1 ; then
+ if ./try >/dev/null 2>&1 ; then
+ echo "Yes, it does marvels."
+ d_pidcheck="$undef"
+--- 50,56 ----
+ exit(status0 == status9);
+ }
+ EOCP
+! if $cc -o try try.c >/dev/null 2>&1 ; then
+ if ./try >/dev/null 2>&1 ; then
+ echo "Yes, it does marvels."
+ d_pidcheck="$undef"
+
+Index: mcon/U/d_safebcpy.U
+*** /tmp/RCSAa22507 Thu Feb 12 10:33:22 1998
+--- mcon/U/d_safebcpy.U Mon Sep 29 13:14:09 1997
+***************
+*** 93,100 ****
+ exit(0);
+ }
+ EOCP
+! if $cc $optimize $ccflags $ldflags foo.c \
+! -o safebcpy $libs >/dev/null 2>&1; then
+ if ./safebcpy 2>/dev/null; then
+ echo "Yes, it can."
+ val="$define"
+--- 93,100 ----
+ exit(0);
+ }
+ EOCP
+! if $cc $optimize $ccflags $ldflags \
+! -o safebcpy foo.c $libs >/dev/null 2>&1; then
+ if ./safebcpy 2>/dev/null; then
+ echo "Yes, it can."
+ val="$define"
+
+Index: mcon/U/d_safemcpy.U
+*** /tmp/RCSAa22510 Thu Feb 12 10:33:23 1998
+--- mcon/U/d_safemcpy.U Mon Sep 29 13:14:20 1997
+***************
+*** 96,103 ****
+ exit(0);
+ }
+ EOCP
+! if $cc $optimize $ccflags $ldflags foo.c \
+! -o safemcpy $libs >/dev/null 2>&1; then
+ if ./safemcpy 2>/dev/null; then
+ echo "Yes, it can."
+ val="$define"
+--- 96,103 ----
+ exit(0);
+ }
+ EOCP
+! if $cc $optimize $ccflags $ldflags \
+! -o safemcpy foo.c $libs >/dev/null 2>&1; then
+ if ./safemcpy 2>/dev/null; then
+ echo "Yes, it can."
+ val="$define"
+
+Index: mcon/U/d_sanemcmp.U
+*** /tmp/RCSAa22513 Thu Feb 12 10:33:23 1998
+--- mcon/U/d_sanemcmp.U Mon Sep 29 13:14:28 1997
+***************
+*** 63,70 ****
+ exit(0);
+ }
+ EOCP
+! if $cc $optimize $ccflags $ldflags foo.c \
+! -o sanemcmp $libs >/dev/null 2>&1; then
+ if ./sanemcmp 2>/dev/null; then
+ echo "Yes, it can."
+ val="$define"
+--- 63,70 ----
+ exit(0);
+ }
+ EOCP
+! if $cc $optimize $ccflags $ldflags \
+! -o sanemcmp foo.c $libs >/dev/null 2>&1; then
+ if ./sanemcmp 2>/dev/null; then
+ echo "Yes, it can."
+ val="$define"
+
+Index: mcon/U/d_scannl.U
+*** /tmp/RCSAa22516 Thu Feb 12 10:33:24 1998
+--- mcon/U/d_scannl.U Mon Sep 29 13:14:36 1997
+***************
+*** 48,54 ****
+ exit(0);
+ }
+ EOCP
+! if $cc -o try $ccflags try.c >/dev/null 2>&1; then
+ if ./try <<'EOD'
+ 2
+ 3
+--- 48,54 ----
+ exit(0);
+ }
+ EOCP
+! if $cc $ccflags -o try try.c >/dev/null 2>&1; then
+ if ./try <<'EOD'
+ 2
+ 3
+
+Index: mcon/U/d_vprintf.U
+*** /tmp/RCSAa22519 Thu Feb 12 10:33:24 1998
+--- mcon/U/d_vprintf.U Mon Sep 29 13:15:27 1997
+***************
+*** 54,60 ****
+ exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
+ }
+ EOF
+! if $cc $ccflags vprintf.c -o vprintf >/dev/null 2>&1 && ./vprintf; then
+ echo "Your vsprintf() returns (int)." >&4
+ val2="$undef"
+ else
+--- 54,60 ----
+ exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
+ }
+ EOF
+! if $cc $ccflags -o vprintf vprintf.c >/dev/null 2>&1 && ./vprintf; then
+ echo "Your vsprintf() returns (int)." >&4
+ val2="$undef"
+ else
+
+Index: mcon/U/d_wifstat.U
+*** /tmp/RCSAa22522 Thu Feb 12 10:33:24 1998
+--- mcon/U/d_wifstat.U Mon Sep 29 13:15:37 1997
+***************
+*** 65,71 ****
+ }
+ EOCP
+ d_wifstat="$undef"
+! if $cc $ccflags $ldflags foo.c -o foo $libs >/dev/null 2>&1; then
+ if ./foo >/dev/null; then
+ echo "Great! Looks like we can use the WIFxxx macros." >&4
+ d_wifstat="$define"
+--- 65,71 ----
+ }
+ EOCP
+ d_wifstat="$undef"
+! if $cc $ccflags $ldflags -o foo foo.c $libs >/dev/null 2>&1; then
+ if ./foo >/dev/null; then
+ echo "Great! Looks like we can use the WIFxxx macros." >&4
+ d_wifstat="$define"
+
+Index: mcon/U/doublesize.U
+*** /tmp/RCSAa22525 Thu Feb 12 10:33:25 1998
+--- mcon/U/doublesize.U Mon Sep 29 13:15:45 1997
+***************
+*** 34,40 ****
+ printf("%d\n", sizeof(double));
+ }
+ EOCP
+! if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='8'
+--- 34,40 ----
+ printf("%d\n", sizeof(double));
+ }
+ EOCP
+! if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='8'
+
+Index: mcon/U/floatsize.U
+*** /tmp/RCSAa22528 Thu Feb 12 10:33:25 1998
+--- mcon/U/floatsize.U Mon Sep 29 13:16:01 1997
+***************
+*** 34,40 ****
+ printf("%d\n", sizeof(float));
+ }
+ EOCP
+! if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='4'
+--- 34,40 ----
+ printf("%d\n", sizeof(float));
+ }
+ EOCP
+! if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='4'
+
+Index: mcon/U/fpu.U
+*** /tmp/RCSAa22531 Thu Feb 12 10:33:25 1998
+--- mcon/U/fpu.U Mon Sep 29 13:16:11 1997
+***************
+*** 22,28 ****
+ $cat>fpa.c << GOOP
+ main(){return(1);}
+ GOOP
+! $cc -ffpa fpa.c -o fpa
+ fpa > fpa.out 2>&1
+ if $test ! -s fpa.out; then
+ dflt='y'
+--- 22,28 ----
+ $cat>fpa.c << GOOP
+ main(){return(1);}
+ GOOP
+! $cc -ffpa -o fpa fpa.c
+ fpa > fpa.out 2>&1
+ if $test ! -s fpa.out; then
+ dflt='y'
+
+Index: mcon/U/i_time.U
+*** /tmp/RCSAa22534 Thu Feb 12 10:33:26 1998
+--- mcon/U/i_time.U Mon Sep 29 13:16:37 1997
+***************
+*** 112,118 ****
+ '') $echo $n ".$c"
+ if $cc $ccflags \
+ $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \
+! try.c -o try >/dev/null 2>&1 ; then
+ set X $i_time $i_systime $i_systimek $sysselect $s_timeval
+ shift
+ flags="$*"
+--- 112,118 ----
+ '') $echo $n ".$c"
+ if $cc $ccflags \
+ $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \
+! -o try try.c >/dev/null 2>&1 ; then
+ set X $i_time $i_systime $i_systimek $sysselect $s_timeval
+ shift
+ flags="$*"
+
+Index: mcon/U/install.U
+*** /tmp/RCSAa22537 Thu Feb 12 10:33:26 1998
+--- mcon/U/install.U Mon Sep 29 13:16:53 1997
+***************
+*** 53,59 ****
+ exit(0);
+ }
+ EOC
+! if $cc try.c -o try >/dev/null 2>&1; then
+ cp try try.ns
+ strip try >/dev/null 2>&1
+ else
+--- 53,59 ----
+ exit(0);
+ }
+ EOC
+! if $cc -o try try.c >/dev/null 2>&1; then
+ cp try try.ns
+ strip try >/dev/null 2>&1
+ else
+
+Index: mcon/U/mkdep.U
+*** /tmp/RCSAa22540 Thu Feb 12 10:33:27 1998
+--- mcon/U/mkdep.U Mon Mar 17 14:45:52 1997
+***************
+*** 61,67 ****
+ '')
+ ;;
+ *)
+! if test -x "$mkdep" &&
+ $mkdep dep.c >dep.out 2>/dev/null &&
+ $contains "dep$_o:.*dep\.h" dep.out >/dev/null 2>&1
+ then
+--- 61,67 ----
+ '')
+ ;;
+ *)
+! if test -f "$mkdep" &&
+ $mkdep dep.c >dep.out 2>/dev/null &&
+ $contains "dep$_o:.*dep\.h" dep.out >/dev/null 2>&1
+ then
+
+Index: mcon/U/nblock_io.U
+*** /tmp/RCSAa22543 Thu Feb 12 10:33:27 1998
+--- mcon/U/nblock_io.U Mon Sep 29 13:17:30 1997
+***************
+*** 103,109 ****
+ exit(0);
+ }
+ EOCP
+! if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then
+ o_nonblock=`./try`
+ case "$o_nonblock" in
+ '') echo "I can't figure it out, assuming O_NONBLOCK will do.";;
+--- 103,109 ----
+ exit(0);
+ }
+ EOCP
+! if $cc $ccflags $ldflags -o try try.c >/dev/null 2>&1; then
+ o_nonblock=`./try`
+ case "$o_nonblock" in
+ '') echo "I can't figure it out, assuming O_NONBLOCK will do.";;
+***************
+*** 181,187 ****
+ exit(0); /* Bye bye, thank you for playing! */
+ }
+ EOCP
+! if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then
+ ?X: Use script to avoid the possible 'alarm call' message
+ echo "$startsh" >mtry
+ echo "./try >try.out 2>try.ret 3>try.err || exit 4" >>mtry
+--- 181,187 ----
+ exit(0); /* Bye bye, thank you for playing! */
+ }
+ EOCP
+! if $cc $ccflags $ldflags -o try try.c >/dev/null 2>&1; then
+ ?X: Use script to avoid the possible 'alarm call' message
+ echo "$startsh" >mtry
+ echo "./try >try.out 2>try.ret 3>try.err || exit 4" >>mtry
+
+Index: mcon/U/patchlevel.U
+*** /tmp/RCSAa22546 Thu Feb 12 10:33:28 1998
+--- mcon/U/patchlevel.U Tue May 20 10:17:36 1997
+***************
+*** 19,25 ****
+ echo " "
+ echo "Getting the current patchlevel..." >&4
+ if $test -r $rsrc/patchlevel.h;then
+! patchlevel=`awk '/PATCHLEVEL/ {print $3}' < $rsrc/patchlevel.h`
+ else
+ patchlevel=0
+ fi
+--- 19,27 ----
+ echo " "
+ echo "Getting the current patchlevel..." >&4
+ if $test -r $rsrc/patchlevel.h;then
+! patchlevel=`awk \
+! '/^#[ ]*define[ ][ ]*PATCHLEVEL/ {print $3}' \
+! < $rsrc/patchlevel.h`
+ else
+ patchlevel=0
+ fi
+
+Index: mcon/U/ptrsize.U
+*** /tmp/RCSAa22549 Thu Feb 12 10:33:28 1998
+--- mcon/U/ptrsize.U Mon Sep 29 13:18:02 1997
+***************
+*** 34,40 ****
+ printf("%d\n", sizeof(char *));
+ }
+ EOCP
+! if $cc $ccflags try.c -o try >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='4'
+--- 34,40 ----
+ printf("%d\n", sizeof(char *));
+ }
+ EOCP
+! if $cc $ccflags -o try try.c >/dev/null 2>&1 ; then
+ dflt=`./try`
+ else
+ dflt='4'
+
+Index: mcon/U/randbits.U
+*** /tmp/RCSAa22552 Thu Feb 12 10:33:28 1998
+--- mcon/U/randbits.U Mon Sep 29 13:18:10 1997
+***************
+*** 59,65 ****
+ printf("%d\n",i);
+ }
+ EOCP
+! if $cc try.c -o try >/dev/null 2>&1 ; then
+ dflt=`try`
+ else
+ dflt='?'
+--- 59,65 ----
+ printf("%d\n",i);
+ }
+ EOCP
+! if $cc -o try try.c >/dev/null 2>&1 ; then
+ dflt=`try`
+ else
+ dflt='?'
+
+Index: mcon/U/randfunc.U
+*** /tmp/RCSAa22555 Thu Feb 12 10:33:29 1998
+--- mcon/U/randfunc.U Mon Sep 29 13:18:16 1997
+***************
+*** 117,123 ****
+ printf("%d\n",i);
+ }
+ EOCP
+! if $cc try.c -o try >/dev/null 2>&1 ; then
+ dflt=`try`
+ else
+ dflt='?'
+--- 117,123 ----
+ printf("%d\n",i);
+ }
+ EOCP
+! if $cc -o try try.c >/dev/null 2>&1 ; then
+ dflt=`try`
+ else
+ dflt='?'
+
+Index: mcon/U/sockopt.U
+*** /tmp/RCSAa22558 Thu Feb 12 10:33:29 1998
+--- mcon/U/sockopt.U Mon Sep 29 13:18:39 1997
+***************
+*** 47,53 ****
+ exit(0);
+ }
+ EOP
+! if $cc $ccflags $sockethdr socket.c -o socket $libs \
+ $socketlib >/dev/null 2>&1; then
+ ./socket >/dev/null 2>&1
+ case $? in
+--- 47,53 ----
+ exit(0);
+ }
+ EOP
+! if $cc $ccflags $sockethdr -o socket socket.c $libs \
+ $socketlib >/dev/null 2>&1; then
+ ./socket >/dev/null 2>&1
+ case $? in
+
+Index: mcon/U/src.U
+*** /tmp/RCSAa22561 Thu Feb 12 10:33:29 1998
+--- mcon/U/src.U Fri Mar 7 15:08:15 1997
+***************
+*** 9,15 ****
+ ?RCS: Revision 3.0.1.1 1997/02/28 16:23:54 ram
+ ?RCS: patch61: created
+ ?RCS:
+! ?MAKE:src +rsrc: Options Myread package contains
+ ?MAKE: -pick add $@ %<
+ ?Y:TOP
+ ?S:src (srcdir):
+--- 9,15 ----
+ ?RCS: Revision 3.0.1.1 1997/02/28 16:23:54 ram
+ ?RCS: patch61: created
+ ?RCS:
+! ?MAKE:src +rsrc: Options package contains
+ ?MAKE: -pick add $@ %<
+ ?Y:TOP
+ ?S:src (srcdir):
+***************
+*** 18,39 ****
+ ?S: find the sources remotely.
+ ?S:.
+ ?S:rsrc (relsrcdir):
+! ?S: This variable holds the relative path to the package source.
+! ?S: The contents are correct for the configuration environment,
+! ?S: i.e. there is an extra .. either appended or prepended.
+ ?S: Configure units should use this, not the src variable.
+ ?S:.
+ ?LINT:change package
+ : Find the path to the source tree
+ case "$src" in
+! '') src=`echo $0 | sed -e 's%/[^/][^/]*$%%'`;;
+ esac
+ case "$src" in
+! '')
+! src=.
+! rsrc=..
+ ;;
+! /*) rsrc="$src/..";;
+ *) rsrc="../$src";;
+ esac
+ ?X:
+--- 18,41 ----
+ ?S: find the sources remotely.
+ ?S:.
+ ?S:rsrc (relsrcdir):
+! ?S: This variable holds a potentially relative path to the package
+! ?S: source. The contents are correct for the configuration environment,
+! ?S: i.e. there might be an extra .. prepended to get out of the UU dir.
+ ?S: Configure units should use this, not the src variable.
+ ?S:.
+ ?LINT:change package
+ : Find the path to the source tree
+ case "$src" in
+! '') case "$0" in
+! */*) src=`echo $0 | sed -e 's%/[^/][^/]*$%%'`;;
+! *) src='.';;
+! esac;;
+ esac
+ case "$src" in
+! '') src=/
+! rsrc=/
+ ;;
+! /*) rsrc="$src";;
+ *) rsrc="../$src";;
+ esac
+ ?X:
+***************
+*** 46,52 ****
+ ?X: If it matches, we know we found the right source tree. -- RAM, 15/03/96
+ ?X:
+ if test -f $rsrc/Configure && \
+! $contains "^package=$package" $rsrc/Configure >/dev/null 2>&1
+ then
+ : found it, so we are ok.
+ else
+--- 48,54 ----
+ ?X: If it matches, we know we found the right source tree. -- RAM, 15/03/96
+ ?X:
+ if test -f $rsrc/Configure && \
+! $contains "^package=$package$" $rsrc/Configure >/dev/null 2>&1
+ then
+ : found it, so we are ok.
+ else
+***************
+*** 55,61 ****
+ rsrc=''
+ for src in . .. ../.. ../../.. ../../../..; do
+ if test -f ../$src/Configure && \
+! $contains "^package=$package" ../$src/Configure >/dev/null 2>&1
+ then
+ rsrc=../$src
+ break
+--- 57,63 ----
+ rsrc=''
+ for src in . .. ../.. ../../.. ../../../..; do
+ if test -f ../$src/Configure && \
+! $contains "^package=$package$" ../$src/Configure >/dev/null 2>&1
+ then
+ rsrc=../$src
+ break
+***************
+*** 64,91 ****
+ fi
+ case "$rsrc" in
+ '')
+! ?X: It's too early to use Getfile.U (would stack too much units before this)
+! echo " "
+! dflt=
+! rp="Directory where sources for $package are located?"
+! . ./myread
+! src="$ans"
+! rsrc="$src"
+! if test -f $rsrc/Configure && \
+! $contains "^package=$package" $rsrc/Configure >/dev/null 2>&1
+! then
+! echo "Ok, I've found them under $src"
+! else
+! echo "Sorry, I can't seem to be able to locate $package sources." >&4
+! exit 1
+! fi
+ ;;
+ ?X: Don't echo anything if the sources are in . -- they should know already ;-)
+ ?X: In that case, rsrc is ../. since we lookup from within UU
+! ../.) ;;
+ *)
+ echo " "
+! echo "Sources for $package found in $src" >&4
+ ;;
+ esac
+
+--- 66,85 ----
+ fi
+ case "$rsrc" in
+ '')
+! cat <<EOM >&4
+!
+! Sorry, I can't seem to locate the source dir for $package. Please start
+! Configure with an explicit path -- i.e. /some/path/Configure.
+!
+! EOM
+! exit 1
+ ;;
+ ?X: Don't echo anything if the sources are in . -- they should know already ;-)
+ ?X: In that case, rsrc is ../. since we lookup from within UU
+! ../.) rsrc='..';;
+ *)
+ echo " "
+! echo "Sources for $package found in \"$src\"." >&4
+ ;;
+ esac
+
+
+Index: mcon/U/sunscanf.U
+*** /tmp/RCSAa22564 Thu Feb 12 10:33:30 1998
+--- mcon/U/sunscanf.U Mon Sep 29 13:18:52 1997
+***************
+*** 31,37 ****
+ printf("%d\n", value == 4.5);
+ }
+ EOCP
+! if $cc $ccflags scanf.c -o scanf >/dev/null 2>&1 ; then
+ if $test `scanf` = 0; then
+ echo "Hmm.. seems your not running the USG flavor.."
+ val="$undef"
+--- 31,37 ----
+ printf("%d\n", value == 4.5);
+ }
+ EOCP
+! if $cc $ccflags -o scanf scanf.c >/dev/null 2>&1 ; then
+ if $test `scanf` = 0; then
+ echo "Hmm.. seems your not running the USG flavor.."
+ val="$undef"
+
+Index: mcon/U/usenm.U
+*** /tmp/RCSAa22567 Thu Feb 12 10:33:30 1998
+--- mcon/U/usenm.U Fri Mar 7 15:07:34 1997
+***************
+*** 11,17 ****
+ ?RCS: Baseline for dist 3.0 netwide release.
+ ?RCS:
+ ?MAKE:usenm runnm nm_opt nm_so_opt: cat test Myread Oldconfig myuname grep \
+! d_gnulibc
+ ?MAKE: -pick add $@ %<
+ ?S:usenm:
+ ?S: This variable contains 'true' or 'false' depending whether the
+--- 11,17 ----
+ ?RCS: Baseline for dist 3.0 netwide release.
+ ?RCS:
+ ?MAKE:usenm runnm nm_opt nm_so_opt: cat test Myread Oldconfig myuname grep \
+! d_gnulibc egrep rsrc
+ ?MAKE: -pick add $@ %<
+ ?S:usenm:
+ ?S: This variable contains 'true' or 'false' depending whether the
+***************
+*** 45,51 ****
+ dflt=n
+ ;;
+ *)
+! dflt=`egrep 'inlibc|csym' ../Configure | wc -l 2>/dev/null`
+ if $test $dflt -gt 20; then
+ dflt=y
+ else
+--- 45,51 ----
+ dflt=n
+ ;;
+ *)
+! dflt=`$egrep 'inlibc|csym' $rsrc/Configure | wc -l 2>/dev/null`
+ if $test $dflt -gt 20; then
+ dflt=y
+ else
+
+Index: mcon/man/mconfig.SH
+*** /tmp/RCSAa22570 Thu Feb 12 10:33:38 1998
+--- mcon/man/mconfig.SH Mon Mar 17 14:48:30 1997
+***************
+*** 366,371 ****
+--- 366,374 ----
+ .IP *
+ Always use echo " " (with a space) because of Eunice systems.
+ .IP *
++ Only use \fBtest\fR with \-r, \-w, \-f or \-d since those are the only
++ portable switches. In particular, avoid "test -x".
++ .IP *
+ Use only programs that came with V7, so that you know everyone has them.
+ .IP *
+ Use \$\&contains when you want to grep conditionally, since not all
+
+*** end of unofficial patch ***
--- /dev/null
+This patch goes on top of the dist-3.0@70. It fixes two problems:
+
+1. The new _a, _o, and _exe suffixes need to be marked as
+"Exceptions" since they are not lower-case symbols, but we still want
+them in config.sh.
+
+2. The pattern /configure\b/ for &mani_remove was too aggressive. In
+the perl distribution, I have a file "configure.gnu", (which matches
+the pattern) but I don't have a plain file "configure" (due to
+case-insensitive file-system issues). This version looks for
+/configure\s/, assuming there will be a comment on the same line
+as the filename in MANIFEST. Perhaps we should just drop the test. I
+don't know.
+
+ Andy Dougherty doughera@lafcol.lafayette.edu
+ Dept. of Physics
+ Lafayette College, Easton PA 18042
+
+Index: dist-3.0@70-andy/mcon/mconfig.SH
+Prereq: 3.0.1.5
+--- dist-3.0@70/mcon/mconfig.SH Fri Feb 28 11:59:05 1997
++++ dist-3.0@70-andy/mcon/mconfig.SH Tue Apr 14 14:48:41 1998
+@@ -121,7 +121,8 @@
+ $MANI = 'MANIFEST'; # For manifake
+ }
+
+-# Record the exceptions -- all symbols but these are lower case
++# Record the exceptions -- almost all symbols but these are lower case
++# We also use three symbols from Unix.U for default file suffixes.
+ sub init_except {
+ $Except{'Mcc'}++;
+ $Except{'Author'}++;
+@@ -134,6 +135,9 @@
+ $Except{'Revision'}++;
+ $Except{'Source'}++;
+ $Except{'State'}++;
++ $Except{'_a'}++;
++ $Except{'_o'}++;
++ $Except{'_exe'}++;
+ }
+
+ # Print out metaconfig's usage and exits
+Index: dist-3.0@70-andy/mcon/pl/cosmetic.pl
+Prereq: 3.0.1.3
+--- dist-3.0@70/mcon/pl/cosmetic.pl Fri Feb 28 11:59:14 1997
++++ dist-3.0@70-andy/mcon/pl/cosmetic.pl Tue Apr 14 14:20:49 1998
+@@ -61,9 +61,9 @@
+ if ($opt_G) { # Want a GNU-like configure wrapper
+ &add_configure;
+ &mani_add('configure', 'GNU configure-like wrapper', $spaces)
+- if !/^configure\b/ && -f 'configure';
++ if !/^configure\s/ && -f 'configure';
+ } else {
+- &mani_remove('configure') if /^configure\b/ && !-f 'configure';
++ &mani_remove('configure') if /^configure\s/ && !-f 'configure';
+ }
+
+ $* = 0;
+
+
+End of patch.
--- /dev/null
+This patch goes on top of the dist-3.0@70 patches a and b.
+It changes the main() function in C programs in various units to
+explicitly be entered as int main(). I gather this helps make
+some C++ compilers happier.
+
+This is done as a dist patch rather than privatizing all the relevant
+units because the patch is trivial and this is easier.
+
+ Andy Dougherty doughera@lafayette.edu
+ Dept. of Physics
+ Lafayette College, Easton PA 18042
+
+
+diff -r -u U.old/abortsig.U U/abortsig.U
+--- U.old/abortsig.U Tue Apr 14 15:10:09 1998
++++ U/abortsig.U Tue Dec 14 16:10:33 1999
+@@ -40,7 +40,7 @@
+ '') $cat >abort.c <<EOP
+ #include <signal.h>
+ caught() { exit(0); }
+-main()
++int main()
+ {
+ #ifdef $signal
+ signal($signal, caught);
+diff -r -u U.old/alignbytes.U U/alignbytes.U
+--- U.old/alignbytes.U Tue Apr 14 15:10:09 1998
++++ U/alignbytes.U Tue Dec 14 16:10:36 1999
+@@ -42,7 +42,7 @@
+ char foo;
+ double bar;
+ } try;
+-main()
++int main()
+ {
+ printf("%d\n", (char *)&try.bar - (char *)&try.foo);
+ }
+diff -r -u U.old/bitpbyte.U U/bitpbyte.U
+--- U.old/bitpbyte.U Tue Apr 14 15:10:09 1998
++++ U/bitpbyte.U Tue Dec 14 16:10:38 1999
+@@ -51,7 +51,7 @@
+ #define BITSPERBYTE 8
+ #endif
+ #endif
+-main()
++int main()
+ {
+ printf("%d\n", BITSPERBYTE);
+ }
+diff -r -u U.old/byteorder.U U/byteorder.U
+--- U.old/byteorder.U Tue Apr 14 15:10:09 1998
++++ U/byteorder.U Tue Dec 14 16:10:40 1999
+@@ -48,7 +48,7 @@
+ EOM
+ $cat >try.c <<'EOCP'
+ #include <stdio.h>
+-main()
++int main()
+ {
+ int i;
+ union {
+diff -r -u U.old/ccflags.U U/ccflags.U
+--- U.old/ccflags.U Tue Apr 14 15:10:09 1998
++++ U/ccflags.U Tue Dec 14 16:10:42 1999
+@@ -354,7 +354,7 @@
+ EOM
+ $cat > try.c <<'EOF'
+ #include <stdio.h>
+-main() { exit(0); }
++int main() { exit(0); }
+ EOF
+ dflt=y
+ ?X: Use "sh -c" to avoid error messages tagged with leading "Configure:".
+diff -r -u U.old/charorder.U U/charorder.U
+--- U.old/charorder.U Tue Apr 14 15:10:09 1998
++++ U/charorder.U Tue Dec 14 16:10:44 1999
+@@ -52,7 +52,7 @@
+ $cat >byteorder.c <<'EOCP'
+ #include <stdio.h>
+
+-main(argc, argv)
++int main(argc, argv)
+ int argc;
+ char *argv[]; {
+ int i;
+diff -r -u U.old/charsize.U U/charsize.U
+--- U.old/charsize.U Tue Apr 14 15:10:09 1998
++++ U/charsize.U Tue Dec 14 16:10:46 1999
+@@ -35,7 +35,7 @@
+ echo "Checking to see how big your characters are..." >&4
+ $cat >try.c <<'EOCP'
+ #include <stdio.h>
+-main()
++int main()
+ {
+ printf("%d\n", sizeof(char));
+ }
+diff -r -u U.old/d_NOFILE.U U/d_NOFILE.U
+--- U.old/d_NOFILE.U Tue Apr 14 15:10:09 1998
++++ U/d_NOFILE.U Tue Dec 14 16:10:49 1999
+@@ -58,7 +58,7 @@
+ @if VAL_NOFILE || nofile
+ $cat >nofile.c <<'EOCP'
+ #include <stdio.h>
+-main()
++int main()
+ {
+ printf("%d\n", getdtablesize());
+ }
+diff -r -u U.old/d_PORTAR.U U/d_PORTAR.U
+--- U.old/d_PORTAR.U Tue Apr 14 15:10:09 1998
++++ U/d_PORTAR.U Tue Dec 14 16:10:52 1999
+@@ -37,7 +37,7 @@
+ echo 'Checking to see if we need to define PORTAR for portable archives...' >&4
+ $cat >portar.c <<'EOCP'
+ #include <ar.h>
+-main() {
++int main() {
+ char *arfmag = ARFMAG;
+ int sarmag = SARMAG;
+ struct ar_hdr arh;
+diff -r -u U.old/d_SHM_MAC.U U/d_SHM_MAC.U
+--- U.old/d_SHM_MAC.U Tue Apr 14 15:10:09 1998
++++ U/d_SHM_MAC.U Tue Dec 14 16:10:54 1999
+@@ -86,7 +86,7 @@
+ #include <sys/seg.h>
+ #endif
+
+-main() {
++int main() {
+ int foo = SHMLBA ;
+ }
+ EOCP
+diff -r -u U.old/d_access.U U/d_access.U
+--- U.old/d_access.U Tue Apr 14 15:10:09 1998
++++ U/d_access.U Tue Dec 14 16:10:56 1999
+@@ -47,7 +47,7 @@
+ #ifdef I_UNISTD
+ #include <unistd.h>
+ #endif
+-main() {
++int main() {
+ exit(R_OK);
+ }
+ EOCP
+diff -r -u U.old/d_bsdjmp.U U/d_bsdjmp.U
+--- U.old/d_bsdjmp.U Tue Apr 14 15:10:09 1998
++++ U/d_bsdjmp.U Tue Dec 14 16:10:59 1999
+@@ -43,7 +43,7 @@
+ #include <setjmp.h>
+ jmp_buf env;
+ int set = 1;
+-main()
++int main()
+ {
+ if (_setjmp(env))
+ exit(set);
+diff -r -u U.old/d_casti32.U U/d_casti32.U
+--- U.old/d_casti32.U Tue Apr 14 15:10:09 1998
++++ U/d_casti32.U Tue Dec 14 16:11:01 1999
+@@ -49,7 +49,7 @@
+ #include <sys/types.h>
+ #include <signal.h>
+ $signal_t blech() { exit(3); }
+-main()
++int main()
+ {
+ $xxx i32;
+ double f;
+diff -r -u U.old/d_castneg.U U/d_castneg.U
+--- U.old/d_castneg.U Tue Apr 14 15:10:09 1998
++++ U/d_castneg.U Tue Dec 14 16:11:04 1999
+@@ -64,7 +64,7 @@
+ unsigned long dummy_long(p) unsigned long p; { return p; }
+ unsigned int dummy_int(p) unsigned int p; { return p; }
+ unsigned short dummy_short(p) unsigned short p; { return p; }
+-main()
++int main()
+ {
+ double f = -123.;
+ unsigned long along;
+diff -r -u U.old/d_charsprf.U U/d_charsprf.U
+--- U.old/d_charsprf.U Tue Apr 14 15:10:09 1998
++++ U/d_charsprf.U Tue Dec 14 16:11:06 1999
+@@ -31,7 +31,7 @@
+ : see if sprintf is declared as int or pointer to char
+ echo " "
+ $cat >ucbsprf.c <<'EOF'
+-main()
++int main()
+ {
+ int sprintf();
+ char buf[10];
+diff -r -u U.old/d_ckeypad.U U/d_ckeypad.U
+--- U.old/d_ckeypad.U Tue Apr 14 15:10:10 1998
++++ U/d_ckeypad.U Tue Dec 14 16:11:08 1999
+@@ -36,7 +36,7 @@
+ echo "Checking the curses library ($termlib) for the keypad() function..." >&4
+ $cat >c_keypad.c <<'EOCP'
+ #include <curses.h>
+-main() {
++int main() {
+ keypad(stdscr, TRUE);
+ exit(0);
+ }
+diff -r -u U.old/d_const.U U/d_const.U
+--- U.old/d_const.U Tue Apr 14 15:10:10 1998
++++ U/d_const.U Tue Dec 14 16:11:11 1999
+@@ -46,7 +46,7 @@
+ ?X: handle typedefs properly if they're declared const. To guard
+ ?X: against this, boost up the test by using an explicit typedef...
+ typedef struct spug { int drokk; } spug;
+-main()
++int main()
+ {
+ const char *foo;
+ const spug y;
+diff -r -u U.old/d_eofpipe.U U/d_eofpipe.U
+--- U.old/d_eofpipe.U Tue Apr 14 15:10:10 1998
++++ U/d_eofpipe.U Tue Dec 14 16:11:13 1999
+@@ -36,7 +36,7 @@
+ '')
+ echo "Let's see if your pipes return EOF to select() upon closing..." >&4
+ $cat >pipe.c <<'EOP'
+-main()
++int main()
+ {
+ int pd[2];
+ int mask;
+diff -r -u U.old/d_fd_set.U U/d_fd_set.U
+--- U.old/d_fd_set.U Tue Apr 14 15:10:10 1998
++++ U/d_fd_set.U Tue Dec 14 16:11:15 1999
+@@ -82,7 +82,7 @@
+ #ifdef I_SYS_SELECT
+ #include <sys/select.h>
+ #endif
+-main() {
++int main() {
+ fd_set fds;
+
+ #ifdef TRYBITS
+diff -r -u U.old/d_getpagsz.U U/d_getpagsz.U
+--- U.old/d_getpagsz.U Tue Apr 14 15:10:10 1998
++++ U/d_getpagsz.U Tue Dec 14 16:11:24 1999
+@@ -54,7 +54,7 @@
+ '')
+ $cat >page.c <<EOP
+ extern int getpagesize();
+-main()
++int main()
+ {
+ printf("%d\n", getpagesize());
+ }
+diff -r -u U.old/d_getpgrp.U U/d_getpgrp.U
+--- U.old/d_getpgrp.U Tue Apr 14 15:10:10 1998
++++ U/d_getpgrp.U Tue Dec 14 16:11:27 1999
+@@ -54,7 +54,7 @@
+ #ifdef I_UNISTD
+ # include <unistd.h>
+ #endif
+-main()
++int main()
+ {
+ if (getuid() == 0) {
+ printf("(I see you are running Configure as super-user...)\n");
+diff -r -u U.old/d_isascii.U U/d_isascii.U
+--- U.old/d_isascii.U Tue Apr 14 15:10:10 1998
++++ U/d_isascii.U Tue Dec 14 16:11:35 1999
+@@ -36,7 +36,7 @@
+ $cat >isascii.c <<'EOCP'
+ #include <stdio.h>
+ #include <ctype.h>
+-main() {
++int main() {
+ int c = 'A';
+ if (isascii(c))
+ exit(0);
+diff -r -u U.old/d_keepsig.U U/d_keepsig.U
+--- U.old/d_keepsig.U Tue Apr 14 15:10:10 1998
++++ U/d_keepsig.U Tue Dec 14 16:11:37 1999
+@@ -45,7 +45,7 @@
+ $cat >try.c <<'EOCP'
+ foo() {}
+
+-main()
++int main()
+ {
+ signal(2, foo);
+ kill(getpid(), 2);
+diff -r -u U.old/d_nolnbuf.U U/d_nolnbuf.U
+--- U.old/d_nolnbuf.U Tue Apr 14 15:10:11 1998
++++ U/d_nolnbuf.U Tue Dec 14 16:11:39 1999
+@@ -36,7 +36,7 @@
+ '')
+ $cat <<'EOT' >blurfl.c
+ #include <stdio.h>
+-main()
++int main()
+ {
+ int i;
+
+diff -r -u U.old/d_open3.U U/d_open3.U
+--- U.old/d_open3.U Tue Apr 14 15:10:11 1998
++++ U/d_open3.U Tue Dec 14 16:11:41 1999
+@@ -48,7 +48,7 @@
+ #ifdef I_SYS_FILE
+ #include <sys/file.h>
+ #endif
+-main() {
++int main() {
+ if(O_RDONLY);
+ #ifdef O_TRUNC
+ exit(0);
+diff -r -u U.old/d_pidcheck.U U/d_pidcheck.U
+--- U.old/d_pidcheck.U Tue Apr 14 15:10:11 1998
++++ U/d_pidcheck.U Tue Dec 14 16:11:43 1999
+@@ -42,7 +42,7 @@
+ *)
+ echo "Checking to see if kill(pid, 0) works..." >&4
+ $cat >try.c <<'EOCP'
+-main()
++int main()
+ {
+ int pid, status0, status9;
+
+diff -r -u U.old/d_safebcpy.U U/d_safebcpy.U
+--- U.old/d_safebcpy.U Tue Apr 14 15:10:11 1998
++++ U/d_safebcpy.U Tue Dec 14 16:11:46 1999
+@@ -72,7 +72,7 @@
+ #ifdef I_UNISTD
+ # include <unistd.h> /* Needed for NetBSD */
+ #endif
+-main()
++int main()
+ {
+ char buf[128], abc[128];
+ char *b;
+diff -r -u U.old/d_safemcpy.U U/d_safemcpy.U
+--- U.old/d_safemcpy.U Tue Apr 14 15:10:11 1998
++++ U/d_safemcpy.U Tue Dec 14 16:11:49 1999
+@@ -75,7 +75,7 @@
+ #ifdef I_UNISTD
+ # include <unistd.h> /* Needed for NetBSD */
+ #endif
+-main()
++int main()
+ {
+ char buf[128], abc[128];
+ char *b;
+diff -r -u U.old/d_sanemcmp.U U/d_sanemcmp.U
+--- U.old/d_sanemcmp.U Tue Apr 14 15:10:11 1998
++++ U/d_sanemcmp.U Tue Dec 14 16:11:51 1999
+@@ -60,7 +60,7 @@
+ #ifdef I_UNISTD
+ # include <unistd.h> /* Needed for NetBSD */
+ #endif
+-main()
++int main()
+ {
+ char a = -1;
+ char b = 0;
+diff -r -u U.old/d_scannl.U U/d_scannl.U
+--- U.old/d_scannl.U Tue Apr 14 15:10:11 1998
++++ U/d_scannl.U Tue Dec 14 16:11:53 1999
+@@ -45,7 +45,7 @@
+ ?X: to the string given as argument to scanf().
+ echo 'Let'"'"'s see if scanf() handles "\\n" correctly...' >&4
+ $cat >try.c <<'EOCP'
+-main()
++int main()
+ {
+ int i = 0, j = 0;
+ scanf("%d\n%d", &i, &j);
+diff -r -u U.old/d_setpgrp.U U/d_setpgrp.U
+--- U.old/d_setpgrp.U Tue Apr 14 15:10:11 1998
++++ U/d_setpgrp.U Tue Dec 14 16:11:56 1999
+@@ -65,7 +65,7 @@
+ #ifdef I_UNISTD
+ # include <unistd.h>
+ #endif
+-main()
++int main()
+ {
+ if (getuid() == 0) {
+ printf("(I see you are running Configure as super-user...)\n");
+diff -r -u U.old/d_sgndchr.U U/d_sgndchr.U
+--- U.old/d_sgndchr.U Tue Apr 14 15:10:11 1998
++++ U/d_sgndchr.U Tue Dec 14 16:11:58 1999
+@@ -37,7 +37,7 @@
+ echo " "
+ echo "Checking to see if your C compiler can do signed chars..." >&4
+ $cat >try.c <<'EOCP'
+-main()
++int main()
+ {
+ char c = 0;
+
+diff -r -u U.old/d_sigaction.U U/d_sigaction.U
+--- U.old/d_sigaction.U Tue Apr 14 15:10:11 1998
++++ U/d_sigaction.U Tue Dec 14 16:12:01 1999
+@@ -45,7 +45,7 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <signal.h>
+-main()
++int main()
+ {
+ struct sigaction act, oact;
+ }
+diff -r -u U.old/d_sigsetjmp.U U/d_sigsetjmp.U
+--- U.old/d_sigsetjmp.U Tue Apr 14 15:10:12 1998
++++ U/d_sigsetjmp.U Tue Dec 14 16:12:03 1999
+@@ -67,7 +67,7 @@
+ #include <setjmp.h>
+ sigjmp_buf env;
+ int set = 1;
+-main()
++int main()
+ {
+ if (sigsetjmp(env,1))
+ exit(set);
+diff -r -u U.old/d_stdstdio.U U/d_stdstdio.U
+--- U.old/d_stdstdio.U Tue Apr 14 15:10:12 1998
++++ U/d_stdstdio.U Tue Dec 14 16:12:05 1999
+@@ -196,7 +196,7 @@
+ #include <stdio.h>
+ #define FILE_ptr(fp) $stdio_ptr
+ #define FILE_cnt(fp) $stdio_cnt
+-main() {
++int main() {
+ FILE *fp = fopen("try.c", "r");
+ char c = getc(fp);
+ if (
+diff -r -u U.old/d_strctcpy.U U/d_strctcpy.U
+--- U.old/d_strctcpy.U Tue Apr 14 15:10:12 1998
++++ U/d_strctcpy.U Tue Dec 14 16:12:07 1999
+@@ -31,7 +31,7 @@
+ echo " "
+ echo "Checking to see if your C compiler can copy structs..." >&4
+ $cat >try.c <<'EOCP'
+-main()
++int main()
+ {
+ struct blurfl {
+ int dyick;
+diff -r -u U.old/d_volatile.U U/d_volatile.U
+--- U.old/d_volatile.U Tue Apr 14 15:10:12 1998
++++ U/d_volatile.U Tue Dec 14 16:12:10 1999
+@@ -41,7 +41,7 @@
+ echo " "
+ echo 'Checking to see if your C compiler knows about "volatile"...' >&4
+ $cat >try.c <<'EOCP'
+-main()
++int main()
+ {
+ ?X:
+ ?X: The following seven lines added by Bill Campbell <billc@sierra.com>
+diff -r -u U.old/d_vprintf.U U/d_vprintf.U
+--- U.old/d_vprintf.U Tue Apr 14 15:10:12 1998
++++ U/d_vprintf.U Tue Dec 14 16:12:12 1999
+@@ -48,7 +48,7 @@
+ $cat >vprintf.c <<'EOF'
+ #include <varargs.h>
+
+-main() { xxx("foo"); }
++int main() { xxx("foo"); }
+
+ xxx(va_alist)
+ va_dcl
+diff -r -u U.old/d_wifstat.U U/d_wifstat.U
+--- U.old/d_wifstat.U Tue Apr 14 15:10:12 1998
++++ U/d_wifstat.U Tue Dec 14 16:12:15 1999
+@@ -56,7 +56,7 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+
+-main()
++int main()
+ {
+ $type status;
+ int e = 0;
+diff -r -u U.old/doublesize.U U/doublesize.U
+--- U.old/doublesize.U Tue Apr 14 15:10:12 1998
++++ U/doublesize.U Tue Dec 14 16:12:17 1999
+@@ -35,7 +35,7 @@
+ echo "Checking to see how big your double precision numbers are..." >&4
+ $cat >try.c <<'EOCP'
+ #include <stdio.h>
+-main()
++int main()
+ {
+ printf("%d\n", sizeof(double));
+ }
+diff -r -u U.old/errnolist.U U/errnolist.U
+--- U.old/errnolist.U Tue Apr 14 15:10:14 1998
++++ U/errnolist.U Tue Dec 14 16:12:20 1999
+@@ -81,7 +81,7 @@
+ EOM
+ $cat >errnolist.c <<'EOCP'
+ extern char *sys_errnolist[];
+-main() {
++int main() {
+ char *p0 = sys_errnolist[0];
+ char *p1 = sys_errnolist[1];
+
+diff -r -u U.old/floatsize.U U/floatsize.U
+--- U.old/floatsize.U Tue Apr 14 15:10:14 1998
++++ U/floatsize.U Tue Dec 14 16:12:22 1999
+@@ -35,7 +35,7 @@
+ echo "Checking to see how big your floating point numbers are..." >&4
+ $cat >try.c <<'EOCP'
+ #include <stdio.h>
+-main()
++int main()
+ {
+ printf("%d\n", sizeof(float));
+ }
+diff -r -u U.old/i_db.U U/i_db.U
+--- U.old/i_db.U Tue Apr 14 15:10:14 1998
++++ U/i_db.U Tue Dec 14 16:12:24 1999
+@@ -79,7 +79,7 @@
+ {
+ }
+ HASHINFO info;
+-main()
++int main()
+ {
+ info.hash = hash_cb;
+ }
+diff -r -u U.old/i_sysioctl.U U/i_sysioctl.U
+--- U.old/i_sysioctl.U Tue Apr 14 15:10:15 1998
++++ U/i_sysioctl.U Tue Dec 14 16:12:27 1999
+@@ -177,7 +177,7 @@
+ #include <sys/types.h> /* Just in case */
+ #include <$xxx>
+
+-main()
++int main()
+ {
+ #ifdef TIOCNOTTY
+ exit(0);
+diff -r -u U.old/i_time.U U/i_time.U
+--- U.old/i_time.U Tue Apr 14 15:10:15 1998
++++ U/i_time.U Tue Dec 14 16:12:30 1999
+@@ -73,7 +73,7 @@
+ #ifdef I_SYSSELECT
+ #include <sys/select.h>
+ #endif
+-main()
++int main()
+ {
+ struct tm foo;
+ #ifdef S_TIMEVAL
+diff -r -u U.old/install.U U/install.U
+--- U.old/install.U Tue Apr 14 15:10:15 1998
++++ U/install.U Tue Dec 14 16:12:32 1999
+@@ -53,7 +53,7 @@
+ done
+ done
+ $cat >try.c <<EOC
+-main()
++int main()
+ {
+ printf("OK\n");
+ exit(0);
+diff -r -u U.old/intsize.U U/intsize.U
+--- U.old/intsize.U Tue Apr 14 15:10:15 1998
++++ U/intsize.U Tue Dec 14 16:12:34 1999
+@@ -59,7 +59,7 @@
+ echo "Checking to see how big your integers are..." >&4
+ $cat >intsize.c <<'EOCP'
+ #include <stdio.h>
+-main()
++int main()
+ {
+ @if INTSIZE || intsize
+ printf("intsize=%d;\n", sizeof(int));
+diff -r -u U.old/models.U U/models.U
+--- U.old/models.U Tue Apr 14 15:10:15 1998
++++ U/models.U Tue Dec 14 16:12:37 1999
+@@ -63,7 +63,7 @@
+ ?X: We may not use Cppsym or we get a circular dependency through cc.
+ ?X: But this should work regardless of which cc we eventually use.
+ $cat >pdp11.c <<'EOP'
+-main() {
++int main() {
+ #ifdef pdp11
+ exit(0);
+ #else
+diff -r -u U.old/nblock_io.U U/nblock_io.U
+--- U.old/nblock_io.U Tue Apr 14 15:10:15 1998
++++ U/nblock_io.U Tue Dec 14 16:12:39 1999
+@@ -91,7 +91,7 @@
+ '')
+ $cat head.c > try.c
+ $cat >>try.c <<'EOCP'
+-main() {
++int main() {
+ #ifdef O_NONBLOCK
+ printf("O_NONBLOCK\n");
+ exit(0);
+diff -r -u U.old/nlist_pfx.U U/nlist_pfx.U
+--- U.old/nlist_pfx.U Tue Apr 14 15:10:15 1998
++++ U/nlist_pfx.U Tue Dec 14 16:12:41 1999
+@@ -46,7 +46,7 @@
+ #include <stdio.h>
+ #include <nlist.h>
+
+-main(argc, argv)
++int main(argc, argv)
+ int argc;
+ char **argv;
+ {
+diff -r -u U.old/orderlib.U U/orderlib.U
+--- U.old/orderlib.U Tue Apr 14 15:10:15 1998
++++ U/orderlib.U Tue Dec 14 16:12:43 1999
+@@ -50,7 +50,7 @@
+ echo 'int bar1() { return bar2(); }' > bar1.c
+ echo 'int bar2() { return 2; }' > bar2.c
+ $cat > foo.c <<'EOP'
+-main() { printf("%d\n", bar1()); exit(0); }
++int main() { printf("%d\n", bar1()); exit(0); }
+ EOP
+ $cc $ccflags -c bar1.c >/dev/null 2>&1
+ $cc $ccflags -c bar2.c >/dev/null 2>&1
+diff -r -u U.old/prototype.U U/prototype.U
+--- U.old/prototype.U Tue Apr 14 15:10:16 1998
++++ U/prototype.U Tue Dec 14 16:12:45 1999
+@@ -102,7 +102,7 @@
+ echo " "
+ echo "Checking out function prototypes..." >&4
+ $cat >prototype.c <<'EOCP'
+-main(int argc, char *argv[]) {
++int main(int argc, char *argv[]) {
+ exit(0);}
+ EOCP
+ if $cc $ccflags -c prototype.c >prototype.out 2>&1 ; then
+diff -r -u U.old/ptrsize.U U/ptrsize.U
+--- U.old/ptrsize.U Tue Apr 14 15:10:16 1998
++++ U/ptrsize.U Tue Dec 14 16:12:48 1999
+@@ -35,7 +35,7 @@
+ echo "Checking to see how big your pointers are..." >&4
+ $cat >try.c <<'EOCP'
+ #include <stdio.h>
+-main()
++int main()
+ {
+ printf("%d\n", sizeof(char *));
+ }
+diff -r -u U.old/randbits.U U/randbits.U
+--- U.old/randbits.U Tue Apr 14 15:10:16 1998
++++ U/randbits.U Tue Dec 14 16:12:50 1999
+@@ -50,7 +50,7 @@
+ #endif
+ EOCP
+ $cat >>try.c <<'EOCP'
+-main()
++int main()
+ {
+ register int i;
+ register unsigned long tmp;
+diff -r -u U.old/randfunc.U U/randfunc.U
+--- U.old/randfunc.U Tue Apr 14 15:10:16 1998
++++ U/randfunc.U Tue Dec 14 16:12:52 1999
+@@ -107,7 +107,7 @@
+ echo "Checking to see how many bits your $randfunc() function produces..." >&4
+ $cat >try.c <<EOCP
+ #include <stdio.h>
+-main()
++int main()
+ {
+ register int i;
+ register unsigned long tmp;
+diff -r -u U.old/sbrksmart.U U/sbrksmart.U
+--- U.old/sbrksmart.U Tue Apr 14 15:10:16 1998
++++ U/sbrksmart.U Tue Dec 14 16:12:55 1999
+@@ -39,7 +39,7 @@
+ $cat > sbrk.c <<'EOC'
+ #define INC 256 /* Small enough to be less than a page size */
+
+-main()
++int main()
+ {
+ char *obrk = (char *) sbrk(0);
+ char *nbrk;
+diff -r -u U.old/selecttype.U U/selecttype.U
+--- U.old/selecttype.U Tue Apr 14 15:10:16 1998
++++ U/selecttype.U Tue Dec 14 16:13:02 1999
+@@ -78,7 +78,7 @@
+ #ifdef I_SYS_SELECT
+ #include <sys/select.h>
+ #endif
+-main()
++int main()
+ {
+ int width;
+ Select_fd_set_t readfds;
+diff -r -u U.old/sockopt.U U/sockopt.U
+--- U.old/sockopt.U Tue Apr 14 15:10:16 1998
++++ U/sockopt.U Tue Dec 14 16:13:04 1999
+@@ -43,7 +43,7 @@
+ #include <netinet/in.h>
+ #include <netdb.h>
+
+-main()
++int main()
+ {
+ int s = socket(AF_INET, SOCK_STREAM, 0);
+ if (s == -1)
+diff -r -u U.old/ssizetype.U U/ssizetype.U
+--- U.old/ssizetype.U Tue Apr 14 15:10:16 1998
++++ U/ssizetype.U Tue Dec 14 16:13:07 1999
+@@ -51,7 +51,7 @@
+ #include <sys/types.h>
+ #define Size_t $sizetype
+ #define SSize_t $dflt
+-main()
++int main()
+ {
+ if (sizeof(Size_t) == sizeof(SSize_t))
+ printf("$dflt\n");
+diff -r -u U.old/sunscanf.U U/sunscanf.U
+--- U.old/sunscanf.U Tue Apr 14 15:10:16 1998
++++ U/sunscanf.U Tue Dec 14 16:13:09 1999
+@@ -29,7 +29,7 @@
+ echo " "
+ echo "Checking to see what flavor of scanf you have..." >&4
+ $cat >scanf.c <<'EOCP'
+-main()
++int main()
+ {
+ float value;
+
+diff -r -u U.old/voidflags.U U/voidflags.U
+--- U.old/voidflags.U Tue Apr 14 15:10:16 1998
++++ U/voidflags.U Tue Dec 14 16:13:11 1999
+@@ -95,7 +95,7 @@
+ #endif
+ exit(0);
+ }
+-main() { sub(); }
++int main() { sub(); }
+ EOCP
+ ?X: This unit used to use cc -S in those tests to try to speed up things, but
+ ?X: unfortunately, AIX 3.2 does not support this option.
--- /dev/null
+?RCS: $Id: inc_version_list.U,v $
+?RCS:
+?RCS: Copyright (c) 2000 Andy Dougherty
+?RCS:
+?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: as specified in the README file that comes with the distribution.
+?RCS: You may reuse parts of this distribution only within the terms of
+?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: of the source tree for dist 3.0.
+?RCS:
+?RCS: $Log: inc_version_list.U,v $
+?RCS:
+?MAKE:inc_version_list : cat sed Getfile perl version api_versionstring \
+ rm Myread archname prefix sitelib
+?MAKE: -pick add $@ %<
+?Y:TOP
+?S:inc_version_list:
+?S: This variable specifies the list of subdirectories in over
+?S: which perl.c:incpush() and lib/lib.pm will automatically
+?S: search when adding directories to @INC. This is only useful
+?S: if you have a perl library directory tree structured like the
+?S: default one. See INSTALL for how this works. The versioned
+?S: site_perl directory was introduced in 5.005, so that is the
+?S: lowest possible value.
+?S:
+?S: This list includes architecture-dependent directories back to
+?S: version $api_versionstring (e.g. 5.5.640) and
+?S: architecture-independent directories all the way back to
+?S: 5.005.
+?S:.
+?C:PERL_INC_VERSION_LIST:
+?C: This variable specifies the list of subdirectories in over
+?C: which perl.c:incpush() and lib/lib.pm will automatically
+?C: search when adding directories to @INC, in a format suitable
+?C: for a C initialization string. See the inc_version_list entry
+?C: in Porting/Glossary for more details.
+?C:.
+?H:#define PERL_INC_VERSION_LIST $inc_version_list /**/
+?H:.
+?T: stem d
+: Determine list of previous versions to include in @INC
+$cat > getverlist <<EOPL
+#!$perl -w
+use File::Basename;
+\$api_versionstring = "$api_versionstring";
+\$version = "$version";
+\$sitelib = "$sitelib";
+\$archname = "$archname";
+EOPL
+ $cat >> getverlist <<'EOPL'
+# Can't have leading @ because metaconfig interprets it as a command!
+;@inc_version_list=();
+$stem=dirname($sitelib);
+# Redo to do opendir/readdir?
+if (-d $stem) {
+ chdir($stem);
+ ;@candidates = glob("5.*");
+}
+else {
+ ;@candidates = ();
+}
+
+foreach $d (@candidates) {
+ if ($d lt $version) {
+ if ($d ge $api_versionstring) {
+ unshift(@inc_version_list, "$d/$archname", $d);
+ }
+ elsif ($d ge "5.005") {
+ unshift(@inc_version_list, $d);
+ }
+ }
+ else {
+ # Skip newer version. I.e. don't look in
+ # 5.7.0 if we're installing 5.6.1.
+ }
+}
+
+if (@inc_version_list) {
+ print '"';
+ print join('", "', @inc_version_list);
+ print '"';
+}
+else {
+ # Blank space to preserve value for next Configure run.
+ print " ";
+}
+EOPL
+chmod +x getverlist
+case "$inc_version_list" in
+'') if test -x $perl; then
+ dflt=`$perl getverlist`
+ else
+ dflt=''
+ fi
+ ;;
+*) dflt="$inc_version_list" ;;
+esac
+$cat <<'EOM'
+
+In order to ease the process of upgrading, this version of perl
+can be configured to use modules built and installed with earlier
+versions of perl that were installed under $prefix. Specify here
+the list of earlier versions that this version of perl should check.
+If Configure detected no earlier versions of perl installed under
+$prefix, then the list will be empty.
+
+The default should almost always be sensible, so if you're not sure,
+just accept the default.
+EOM
+
+rp='list of earlier versions to include in @INC?'
+. ./myread
+inc_version_list="$ans"
+$rm -f getverlist
+
?RCS: patch61: created
?RCS:
?MAKE:sitearch sitearchexp installsitearch: cat sed Getfile \
- Oldconfig Prefixit archname apiversion installprefix \
+ Oldconfig Prefixit archname installprefix \
prefix sitelib test
?MAKE: -pick add $@ %<
?Y:TOP
?H:.
?T:tdflt
: determine where site specific architecture-dependent libraries go.
-: sitelib default is /usr/local/lib/perl5/site_perl/
-: sitearch default is /usr/local/lib/perl5/site_perl/$apiversion/$archname
+: sitelib default is /usr/local/lib/perl5/site_perl/$version
+: sitearch default is /usr/local/lib/perl5/site_perl/$version/$archname
: sitelib may have an optional trailing /share.
tdflt=`echo $sitelib | $sed 's,/share$,,'`
-tdflt="$tdflt/$apiversion/$archname"
+tdflt="$tdflt/$archname"
set sitearch sitearch none
eval $prefixit
case "$sitearch" in
?RCS:
?MAKE:sitelib sitelibexp installsitelib: cat Getfile \
Oldconfig Prefixit package installprefix prefix \
- test sed installstyle siteprefix
+ version test sed installstyle siteprefix
?MAKE: -pick add $@ %<
?Y:TOP
?S:sitelib:
?H:.
?T:prog
: determine where site specific libraries go.
-: Usual default is /usr/local/lib/perl5/site_perl
+: Usual default is /usr/local/lib/perl5/site_perl/$version
: The default "style" setting is made in installstyle.U
: XXX No longer works with Prefixit stuff.
?X: remove any trailing -3.0 or other version identification
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
case "$installstyle" in
-*lib/perl5*) dflt=$siteprefix/lib/site_$prog ;;
-*) dflt=$siteprefix/lib/site_$prog ;;
+*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
+*) dflt=$siteprefix/lib/site_$prog/$version ;;
esac
$cat <<EOM
?RCS:
?RCS:
?MAKE:d_vendorarch vendorarch vendorarchexp installvendorarch: sed Getfile \
- Oldconfig Prefixit test apiversion archname vendorlib \
+ Oldconfig Prefixit test archname vendorlib \
vendorprefix prefix installprefix
?MAKE: -pick add $@ %<
?Y:TOP
;;
*) d_vendorarch="$define"
: determine where vendor-supplied architecture-dependent libraries go.
- : vendorlib default is /usr/local/lib/perl5/vendor_perl/
- : vendorarch default is /usr/local/lib/perl5/vendor_perl/$apiversion/$archname
+ : vendorlib default is /usr/local/lib/perl5/vendor_perl/$version
+ : vendorarch default is /usr/local/lib/perl5/vendor_perl/$version/$archname
: vendorlib may have an optional trailing /share.
tdflt=`echo $vendorlib | $sed 's,/share$,,'`
- tdflt="$tdflt/$apiversion/$archname"
+ tdflt="$tdflt/$archname"
case "$vendorarch" in
'') dflt="$tdflt" ;;
*) dflt="$vendorarch" ;;
?RCS:
?MAKE:d_vendorlib vendorlib vendorlibexp installvendorlib: Getfile \
Oldconfig Prefixit test package vendorprefix prefix sed \
- installstyle installprefix
+ installstyle installprefix version
?MAKE: -pick add $@ %<
?Y:TOP
?S:vendorlib:
;;
*) d_vendorlib="$define"
: determine where vendor-supplied modules go.
- : Usual default is /usr/local/lib/perl5/vendor_perl
+ : Usual default is /usr/local/lib/perl5/vendor_perl/$version
?X: remove any trailing -3.0 or other version identification
prog=`echo $package | $sed 's/-*[0-9.]*$//'`
case "$installstyle" in
- *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog ;;
- *) dflt=$vendorprefix/lib/vendor_$prog ;;
+ *lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
+ *) dflt=$vendorprefix/lib/vendor_$prog/$version ;;
esac
fn=d~+
rp='Pathname for the vendor-supplied library files?'
?S: The list is a space-separated list of symbol=value tokens.
?S:.
?S:cppccsymbols:
-?S: The variable contains the symbols defined by the C compiler when
+?S: The variable contains the symbols defined by the C compiler
?S: when it calls cpp. The symbols defined by the cc alone or cpp
?S: alone are not in this list, see ccsymbols and cppsymbols.
?S: The list is a space-separated list of symbol=value tokens.
osvers="$2.$3"
fi
fi
- $test -f /sys/posix.dll &&
- $test -f /usr/bin/what &&
- set X `/usr/bin/what /sys/posix.dll` &&
- $test "$3" = UWIN &&
- osname=uwin &&
- osvers="$5"
+
+ $test -f /sys/posix.dll &&
+ $test -f /usr/bin/what &&
+ set X `/usr/bin/what /sys/posix.dll` &&
+ $test "$3" = UWIN &&
+ osname=uwin &&
+ osvers="$5"
+
?X: If we have uname, we already computed a suitable uname -a output, correctly
?X: formatted for Xenix, and it lies in $myuname.
if $test -f $uname; then
*) osvers=$tmp;;
esac
;;
+ bsd386) osname=bsd386
+ osvers=`$uname -r`
+ ;;
+ cygwin*) osname=cygwin
+ osvers="$3"
+ ;;
*dc.osx) osname=dcosx
osvers="$3"
;;
*) osname=newsos ;;
esac
;;
- bsd386) osname=bsd386
- osvers=`$uname -r`
+ next*) osname=next ;;
+ POSIX-BC | posix-bc ) osname=posix-bc
+ osvers="$3"
;;
- POSIX-BC | posix-bc ) osname=posix-bc
- osvers="$3"
- ;;
powerux | power_ux | powermax_os | powermaxos | \
powerunix | power_unix) osname=powerux
osvers="$3"
;;
- next*) osname=next ;;
+ qnx) osname=qnx
+ osvers="$4"
+ ;;
solaris) osname=solaris
case "$3" in
5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
uts) osname=uts
osvers="$3"
;;
- qnx) osname=qnx
- osvers="$4"
- ;;
$2) case "$osname" in
*isc*) ;;
*freebsd*) ;;
: Remove SIGSTKSIZE used by Linux.
: Remove SIGSTKSZ used by Posix.
: Remove SIGTYP void lines used by OS2.
-xxx=`echo '#include <signal.h>' |
+: Some cpps, like os390, dont give the file name anywhere
+if [ "X$fieldn" = X ]; then
+ : Just make some guesses. We check them later.
+ xxx='/usr/include/signal.h /usr/include/sys/signal.h'
+else
+ xxx=`echo '#include <signal.h>' |
$cppstdin $cppminus $cppflags 2>/dev/null |
$grep '^[ ]*#.*include' |
$awk "{print \\$$fieldn}" | $sed 's!"!!g' | $sort | $uniq`
+fi
: Check this list of files to be sure we have parsed the cpp output ok.
: This will also avoid potentially non-existent files, such
: as ../foo/bar.h
print substr($3, 4, 20)
}' $xxxfiles`
: Append some common names just in case the awk scan failed.
-xxx="$xxx ABRT ALRM BUS CHLD CLD CONT DIL EMT FPE HUP ILL INT IO IOT KILL"
-xxx="$xxx LOST PHONE PIPE POLL PROF PWR QUIT SEGV STKFLT STOP SYS TERM TRAP"
-xxx="$xxx TSTP TTIN TTOU URG USR1 USR2 USR3 USR4 VTALRM"
-xxx="$xxx WINCH WIND WINDOW XCPU XFSZ"
+xxx="$xxx ABRT ALRM BUS CANCEL CHLD CLD CONT DIL EMT FPE"
+xxx="$xxx FREEZE HUP ILL INT IO IOT KILL LOST LWP PHONE"
+xxx="$xxx PIPE POLL PROF PWR QUIT RTMAX RTMIN SEGV STKFLT STOP"
+xxx="$xxx SYS TERM THAW TRAP TSTP TTIN TTOU URG USR1 USR2"
+xxx="$xxx USR3 USR4 VTALRM WAITING WINCH WIND WINDOW XCPU XFSZ"
+
: generate a few handy files for later
$cat > signal.c <<'EOCP'
#include <sys/types.h>
--- /dev/null
+?RCS: $Id: myhostname.U,v 3.0.1.3 1997/02/28 16:15:55 ram Exp $
+?RCS:
+?RCS: Copyright (c) 1991-1993, Raphael Manfredi
+?RCS:
+?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: as specified in the README file that comes with the distribution.
+?RCS: You may reuse parts of this distribution only within the terms of
+?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: of the source tree for dist 3.0.
+?RCS:
+?RCS: $Log: myhostname.U,v $
+?RCS: Revision 3.0.1.3 1997/02/28 16:15:55 ram
+?RCS: patch61: improved hostname lookup by using ypmatch when NIS is used
+?RCS:
+?RCS: Revision 3.0.1.2 1994/10/29 16:25:43 ram
+?RCS: patch36: call ./xenix explicitely instead of relying on PATH
+?RCS: patch36: now uses new Tr unit to convert to/from lowercase
+?RCS:
+?RCS: Revision 3.0.1.1 1994/06/20 07:06:20 ram
+?RCS: patch30: now a little more clever for domain name guessing
+?RCS:
+?RCS: Revision 3.0 1993/08/18 12:09:18 ram
+?RCS: Baseline for dist 3.0 netwide release.
+?RCS:
+?MAKE:myhostname phostname mydomain: contains sed test Myread Oldconfig \
+ Guess Loc awk echo sort uniq +usrinc rm hostcat Tr
+?MAKE: -pick add $@ %<
+?S:myhostname (hostname):
+?S: This variable contains the eventual value of the MYHOSTNAME symbol,
+?S: which is the name of the host the program is going to run on.
+?S: The domain is not kept with hostname, but must be gotten from mydomain.
+?S: The dot comes with mydomain, and need not be supplied by the program.
+?S:.
+?S:mydomain:
+?S: This variable contains the eventual value of the MYDOMAIN symbol,
+?S: which is the domain of the host the program is going to run on.
+?S: The domain must be appended to myhostname to form a complete host name.
+?S: The dot comes with mydomain, and need not be supplied by the program.
+?S:.
+?S:phostname:
+?S: This variable contains the eventual value of the PHOSTNAME symbol,
+?S: which is a command that can be fed to popen() to get the host name.
+?S: The program should probably not presume that the domain is or isn't
+?S: there already.
+?S:.
+?C:MYHOSTNAME (HOSTNAME):
+?C: This symbol contains name of the host the program is going to run on.
+?C: The domain is not kept with hostname, but must be gotten from MYDOMAIN.
+?C: The dot comes with MYDOMAIN, and need not be supplied by the program.
+?C: If gethostname() or uname() exist, MYHOSTNAME may be ignored. If MYDOMAIN
+?C: is not used, MYHOSTNAME will hold the name derived from PHOSTNAME.
+?C:.
+?C:MYDOMAIN:
+?C: This symbol contains the domain of the host the program is going to
+?C: run on. The domain must be appended to HOSTNAME to form a complete
+?C: host name. The dot comes with MYDOMAIN, and need not be supplied by
+?C: the program. If the host name is derived from PHOSTNAME, the domain
+?C: may or may not already be there, and the program should check.
+?C:.
+?H:#define MYHOSTNAME "$myhostname" /**/
+?H:#define MYDOMAIN "$mydomain" /**/
+?H:.
+?T:cont i tans tmp_re
+: now get the host name
+echo " "
+echo "Figuring out host name..." >&4
+case "$myhostname" in
+'') cont=true
+ echo 'Maybe "hostname" will work...'
+ if tans=`sh -c hostname 2>&1` ; then
+ myhostname=$tans
+ phostname=hostname
+ cont=''
+ fi
+ ;;
+*) cont='';;
+esac
+if $test "$cont"; then
+ if ./xenix; then
+ echo 'Oh, dear. Maybe "/etc/systemid" is the key...'
+ if tans=`cat /etc/systemid 2>&1` ; then
+ myhostname=$tans
+ phostname='cat /etc/systemid'
+ echo "Whadyaknow. Xenix always was a bit strange..."
+ cont=''
+ fi
+ elif $test -r /etc/systemid; then
+ echo "(What is a non-Xenix system doing with /etc/systemid?)"
+ fi
+fi
+if $test "$cont"; then
+ echo 'No, maybe "uuname -l" will work...'
+ if tans=`sh -c 'uuname -l' 2>&1` ; then
+ myhostname=$tans
+ phostname='uuname -l'
+ else
+ echo 'Strange. Maybe "uname -n" will work...'
+ if tans=`sh -c 'uname -n' 2>&1` ; then
+ myhostname=$tans
+ phostname='uname -n'
+ else
+ echo 'Oh well, maybe I can mine it out of whoami.h...'
+ if tans=`sh -c $contains' sysname $usrinc/whoami.h' 2>&1` ; then
+ myhostname=`echo "$tans" | $sed 's/^.*"\(.*\)"/\1/'`
+ phostname="sed -n -e '"'/sysname/s/^.*\"\\(.*\\)\"/\1/{'"' -e p -e q -e '}' <$usrinc/whoami.h"
+ else
+ case "$myhostname" in
+ '') echo "Does this machine have an identity crisis or something?"
+ phostname='';;
+ *)
+ echo "Well, you said $myhostname before..."
+ phostname='echo $myhostname';;
+ esac
+ fi
+ fi
+ fi
+fi
+: you do not want to know about this
+set $myhostname
+myhostname=$1
+
+: verify guess
+if $test "$myhostname" ; then
+ dflt=y
+ rp='Your host name appears to be "'$myhostname'".'" Right?"
+ . ./myread
+ case "$ans" in
+ y*) ;;
+ *) myhostname='';;
+ esac
+fi
+
+: bad guess or no guess
+while $test "X$myhostname" = X ; do
+ dflt=''
+ rp="Please type the (one word) name of your host:"
+ . ./myread
+ myhostname="$ans"
+done
+
+: translate upper to lower if necessary
+case "$myhostname" in
+*[A-Z]*)
+ echo "(Normalizing case in your host name)"
+ myhostname=`echo $myhostname | ./tr '[A-Z]' '[a-z]'`
+ ;;
+esac
+
+?X: Do not ask for domain name if this is not used later on. In that
+?X: case, the hostname may keep its domain name, but it doesn't matter.
+@if MYDOMAIN || mydomain
+case "$myhostname" in
+*.*)
+ dflt=`expr "X$myhostname" : "X[^.]*\(\..*\)"`
+ myhostname=`expr "X$myhostname" : "X\([^.]*\)\."`
+ echo "(Trimming domain name from host name--host name is now $myhostname)"
+ ;;
+*) case "$mydomain" in
+ '')
+?X:
+?X: There is currently no way to say we do not want hostcat if mydomain is not
+?X: used. One way to achieve that would be to put that code in a mydomain.U
+?X: unit. However, we want to stick the sanity checks right after the domain
+?X: name computation, or if none is done, right after the hostname computation.
+?X:
+ {
+?X: If we use NIS, try ypmatch.
+ test "X$hostcat" = "Xypcat hosts" &&
+ ypmatch "$myhostname" hosts 2>/dev/null |\
+ $sed -e 's/[ ]*#.*//; s/$/ /' > hosts && \
+ $test -s hosts
+ } || {
+?X: Extract only the relevant hosts, reducing file size,
+?X: remove comments, insert trailing space for later use.
+?X: Test to be sure we *have* a hostcat command. os390 doesn't.
+ test "X$hostcat" != "X" &&
+ $hostcat | $sed -n -e "s/[ ]*#.*//; s/\$/ /
+ /[ ]$myhostname[ . ]/p" > hosts
+ }
+ tmp_re="[ . ]"
+ $test x`$awk "/[0-9].*[ ]$myhostname$tmp_re/ { sum++ }
+ END { print sum }" hosts` = x1 || tmp_re="[ ]"
+ dflt=.`$awk "/[0-9].*[ ]$myhostname$tmp_re/ {for(i=2; i<=NF;i++) print \\\$i}" \
+ hosts | $sort | $uniq | \
+ $sed -n -e "s/$myhostname\.\([-a-zA-Z0-9_.]\)/\1/p"`
+ case `$echo X$dflt` in
+ X*\ *) echo "(Several hosts in /etc/hosts matched hostname)"
+ dflt=.
+ ;;
+ X.) echo "(You do not have fully-qualified names in /etc/hosts)"
+ ;;
+ esac
+ case "$dflt" in
+ .)
+ tans=`./loc resolv.conf X /etc /usr/etc`
+ if $test -f "$tans"; then
+ echo "(Attempting domain name extraction from $tans)"
+?X: Look for either a search or a domain directive.
+ dflt=.`$sed -n -e 's/ / /g' \
+ -e 's/^search *\([^ ]*\).*/\1/p' $tans \
+ | ./tr '[A-Z]' '[a-z]' 2>/dev/null`
+ case "$dflt" in
+ .) dflt=.`$sed -n -e 's/ / /g' \
+ -e 's/^domain *\([^ ]*\).*/\1/p' $tans \
+ | ./tr '[A-Z]' '[a-z]' 2>/dev/null`
+ ;;
+ esac
+ fi
+ ;;
+ esac
+ case "$dflt" in
+ .) echo "(No help from resolv.conf either -- attempting clever guess)"
+ dflt=.`sh -c domainname 2>/dev/null`
+ case "$dflt" in
+ '') dflt='.';;
+ .nis.*|.yp.*|.main.*) dflt=`echo $dflt | $sed -e 's/^\.[^.]*//'`;;
+ esac
+ ;;
+ esac
+ case "$dflt" in
+ .) echo "(Lost all hope -- silly guess then)"
+ dflt='.uucp'
+ ;;
+ esac
+ $rm -f hosts
+ ;;
+ *) dflt="$mydomain";;
+ esac;;
+esac
+echo " "
+rp="What is your domain name?"
+. ./myread
+tans="$ans"
+case "$ans" in
+'') ;;
+.*) ;;
+*) tans=".$tans";;
+esac
+mydomain="$tans"
+
+: translate upper to lower if necessary
+case "$mydomain" in
+*[A-Z]*)
+ echo "(Normalizing case in your domain name)"
+ mydomain=`echo $mydomain | ./tr '[A-Z]' '[a-z]'`
+ ;;
+esac
+
+@end
+: a little sanity check here
+case "$phostname" in
+'') ;;
+*)
+ case `$phostname | ./tr '[A-Z]' '[a-z]'` in
+ $myhostname$mydomain|$myhostname) ;;
+ *)
+ case "$phostname" in
+ sed*)
+ echo "(That doesn't agree with your whoami.h file, by the way.)"
+ ;;
+ *)
+ echo "(That doesn't agree with your $phostname command, by the way.)"
+ ;;
+ esac
+ ;;
+ esac
+ ;;
+esac
+
--- /dev/null
+?RCS: $Id: nis.U,v 3.0.1.3 1997/02/28 16:17:38 ram Exp $
+?RCS:
+?RCS: Copyright (c) 1991-1993, Raphael Manfredi
+?RCS:
+?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: as specified in the README file that comes with the distribution.
+?RCS: You may reuse parts of this distribution only within the terms of
+?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: of the source tree for dist 3.0.
+?RCS:
+?RCS: $Log: nis.U,v $
+?RCS: Revision 3.0.1.3 1997/02/28 16:17:38 ram
+?RCS: patch61: ensure suitable defaults for hostcat and friends
+?RCS:
+?RCS: Revision 3.0.1.2 1995/03/21 08:48:34 ram
+?RCS: patch52: continued fix for NeXT NIS/NetInfo handling
+?RCS:
+?RCS: Revision 3.0.1.1 1995/02/15 14:16:23 ram
+?RCS: patch51: now correctly handles NeXT using NIS rather than NetInfo
+?RCS:
+?RCS: Revision 3.0 1993/08/18 12:09:24 ram
+?RCS: Baseline for dist 3.0 netwide release.
+?RCS:
+?MAKE:passcat groupcat hostcat: Myread Oldconfig test contains
+?MAKE: -pick add $@ %<
+?S:passcat:
+?S: This variable contains a command that produces the text of the
+?S: /etc/passwd file. This is normally "cat /etc/passwd", but can be
+?S: "ypcat passwd" when NIS is used.
+?S: On some systems, such as os390, there may be no equivalent
+?S: command, in which case this variable is unset.
+?S:.
+?S:groupcat:
+?S: This variable contains a command that produces the text of the
+?S: /etc/group file. This is normally "cat /etc/group", but can be
+?S: "ypcat group" when NIS is used.
+?S: On some systems, such as os390, there may be no equivalent
+?S: command, in which case this variable is unset.
+?S:.
+?S:hostcat:
+?S: This variable contains a command that produces the text of the
+?S: /etc/hosts file. This is normally "cat /etc/hosts", but can be
+?S: "ypcat hosts" when NIS is used.
+?S: On some systems, such as os390, there may be no equivalent
+?S: command, in which case this variable is unset.
+?S:.
+: see if we have to deal with yellow pages, now NIS.
+?X: NeXT gives us some fun here, as always, by having both NIS (former YP)
+?X: and NetInfo. But since it has both, it's ok to put the test inside the if.
+?X: Contributed by Thomas Neumann <tom@smart.bo.open.de>.
+if $test -d /usr/etc/yp || $test -d /etc/yp; then
+ if $test -f /usr/etc/nibindd; then
+ echo " "
+ echo "I'm fairly confident you're on a NeXT."
+@if passcat || groupcat
+ echo " "
+ rp='Do you get the passwd file via NetInfo?'
+ dflt=y
+ case "$passcat" in
+ nidump*) ;;
+ '') ;;
+ *) dflt=n;;
+ esac
+ . ./myread
+ case "$ans" in
+ y*) passcat='nidump passwd .'
+@if groupcat
+ echo "(Assuming /etc/group is also distributed.)"
+ groupcat='nidump group .'
+@end
+ ;;
+ *) echo "You told me, so don't blame me."
+ case "$passcat" in
+ nidump*) passcat=''
+@if groupcat
+ groupcat='';;
+@end
+ esac
+@if groupcat
+ echo "(Assuming /etc/group is handled the same way.)"
+@end
+ ;;
+ esac
+@end
+@if hostcat
+ echo " "
+ rp='Do you get the hosts file via NetInfo?'
+ dflt=y
+ case "$hostcat" in
+ nidump*) ;;
+ '') ;;
+ *) dflt=n;;
+ esac
+ . ./myread
+ case "$ans" in
+ y*) hostcat='nidump hosts .';;
+ *) case "$hostcat" in
+ nidump*) hostcat='';;
+ esac
+ ;;
+ esac
+@end
+ fi
+@if passcat || groupcat
+ case "$passcat" in
+ nidump*) ;;
+ *)
+ case "$passcat" in
+ *ypcat*) dflt=y;;
+ '') if $contains '^\+' /etc/passwd >/dev/null 2>&1; then
+ dflt=y
+ else
+ dflt=n
+ fi;;
+ *) dflt=n;;
+ esac
+ echo " "
+ rp='Are you getting the passwd file via yellow pages?'
+ . ./myread
+ case "$ans" in
+ y*) passcat='ypcat passwd'
+@if groupcat
+ echo "(Assuming /etc/group is also distributed.)"
+ groupcat='ypcat group'
+@end
+ ;;
+ *) passcat='cat /etc/passwd'
+@if groupcat
+ echo "(Assuming /etc/group is also local.)"
+ groupcat='cat /etc/group'
+@end
+ ;;
+ esac
+ ;;
+ esac
+@end
+@if hostcat
+ case "$hostcat" in
+ nidump*) ;;
+ *)
+ case "$hostcat" in
+ *ypcat*) dflt=y;;
+ '') if $contains '^\+' /etc/passwd >/dev/null 2>&1; then
+ dflt=y
+ else
+ dflt=n
+ fi;;
+ *) dflt=n;;
+ esac
+ echo " "
+ rp='Are you getting the hosts file via yellow pages?'
+ . ./myread
+ case "$ans" in
+ y*) hostcat='ypcat hosts';;
+ *) hostcat='cat /etc/hosts';;
+ esac
+ ;;
+ esac
+@end
+fi
+?X: Ensure suitable default -- Manoj Srivastava
+case "$hostcat" in
+'') test -f /etc/hosts && hostcat='cat /etc/hosts';;
+esac
+case "$groupcat" in
+'') test -f /etc/group && groupcat='cat /etc/group';;
+esac
+case "$passcat" in
+'') test -f /etc/passwd && passcat='cat /etc/passwd';;
+esac
+
--- /dev/null
+?RCS: $Id: fpu.U,v 3.0 1993/08/18 12:08:10 ram Exp $
+?RCS:
+?RCS: Copyright (c) 1991-1993, Raphael Manfredi
+?RCS:
+?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: as specified in the README file that comes with the distribution.
+?RCS: You may reuse parts of this distribution only within the terms of
+?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: of the source tree for dist 3.0.
+?RCS:
+?RCS: $Log: fpu.U,v $
+?RCS: Revision 3.0 1993/08/18 12:08:10 ram
+?RCS: Baseline for dist 3.0 netwide release.
+?RCS:
+?LINT: empty
+?X:?MAKE:fpu: test cat cc Myread
+?X:?MAKE: -pick add $@ %<
+?X:?S:fpu (fpunit):
+?X:?S: Set to be the compile flag for the local floating point unit.
+?X:?S:.
+?X:?C:FPU (FPUNIT):
+?X:?C: String containing the flags for the local floating point unit.
+?X:?C:.
+?X:?H:#define FPU "$fpu" /**/
+?X:?H:.
+?X:: see what floating point compile flags should be used.
+?X:fpu=''
+?X:if $test -r /dev/fpa; then
+?X: $cat>fpa.c << GOOP
+?X: main(){return(1);}
+?X:GOOP
+?X: $cc -ffpa -o fpa fpa.c
+?X: fpa > fpa.out 2>&1
+?X: if $test ! -s fpa.out; then
+?X: dflt='y'
+?X: $cat <<'EOM'
+?X:
+?X:You seem to have a sun fpa... I can compile the code to use the fpa but it will
+?X:mean that the code can ONLY run on a machine with a fpa...
+?X:
+?X:EOM
+?X: rp="Should I compile for fpa?"
+?X: . ./myread
+?X: if $test $ans = "n"; then
+?X: fpu=''
+?X: else
+?X: fpu='-ffpa'
+?X: fi
+?X: else
+?X: $cat <<'EOM'
+?X:
+?X:You have the fpa device but I can't seem to use it. Maybe you should talk to
+?X:your sysadmin about this. For now, I am not going to compile it in.
+?X:
+?X:EOM
+?X: fi
+?X:fi
+?X:if $test "$fpu" = ''; then
+?X: if $test -r /usr/etc/mc68881version; then
+?X: dflt='y'
+?X: $cat <<'EOM'
+?X:
+?X:There also seems to be the pieces for a 68881. If I compile this in, it will
+?X:work on almost all Sun 3's except for a few Sun-3/50s without a 68881...
+?X:
+?X:EOM
+?X: rp="Should I compile for a 68881?"
+?X: . ./myread
+?X: if $test $ans = "y"; then
+?X: fpu='-f68881'
+?X: fi
+?X: fi
+?X:fi
+?X:
--- /dev/null
+?RCS: $Id: lib.U,v 3.0.1.3 1995/09/25 09:16:47 ram Exp $
+?RCS:
+?RCS: Copyright (c) 1991-1993, Raphael Manfredi
+?RCS:
+?RCS: You may redistribute only under the terms of the Artistic Licence,
+?RCS: as specified in the README file that comes with the distribution.
+?RCS: You may reuse parts of this distribution only within the terms of
+?RCS: that same Artistic Licence; a copy of which may be found at the root
+?RCS: of the source tree for dist 3.0.
+?RCS:
+?RCS: $Log: lib.U,v $
+?RCS: Revision 3.0.1.3 1995/09/25 09:16:47 ram
+?RCS: patch59: unit is now forced to the top of Configure, if possible
+?RCS:
+?RCS: Revision 3.0.1.2 1995/01/30 14:38:08 ram
+?RCS: patch49: can now handle installation prefix changes (from WED)
+?RCS:
+?RCS: Revision 3.0.1.1 1994/08/29 16:27:40 ram
+?RCS: patch32: now uses installation prefix to set the default
+?RCS:
+?RCS: Revision 3.0 1993/08/18 12:08:56 ram
+?RCS: Baseline for dist 3.0 netwide release.
+?RCS:
+?LINT: empty
+?X:?MAKE:lib libexp: Getfile Loc Oldconfig Prefixit Prefixup prefixexp
+?X:?MAKE: -pick add $@ %<
+?X:?Y:TOP
+?X:?S:lib:
+?X:?S: This variable holds the name of the directory in which the user wants
+?X:?S: to put public library files for the package in question. It is most
+?X:?S: often a local directory such as /usr/local/lib. Programs using this
+?X:?S: variable must be prepared to deal with filename expansion.
+?X:?S:.
+?X:?S:libexp:
+?X:?S: This variable is the same as the lib variable, but is filename expanded
+?X:?S: at configuration time, for convenient use in your makefiles.
+?X:?S:.
+?X:: determine where public libraries go
+?X:set lib lib
+?X:eval $prefixit
+?X:case "$lib" in
+?X:'')
+?X: dflt=`./loc . "." $prefixexp/lib /usr/local/lib /usr/lib /lib`
+?X: set dflt
+?X: eval $prefixup
+?X: ;;
+?X:*) dflt="$lib";;
+?X:esac
+?X:echo " "
+?X:fn=d~
+?X:rp='Where do you want to put the public libraries?'
+?X:. ./getfile
+?X:lib="$ans"
+?X:libexp="$ansexp"
+
: see if qgcvt exists
set qgcvt d_qgcvt
eval $inlibc
+
: see if strtold exists
set strtold d_strtold
eval $inlibc
+
: see if strtoll exists
set strtoll d_strtoll
eval $inlibc
+
: see if strtoq exists
set strtoq d_strtoq
eval $inlibc
+
?RCS: You may distribute under the terms of either the GNU General Public
?RCS: License or the Artistic License, as specified in the README file.
?RCS:
-?MAKE:d_strtouq: Inlibc
+?MAKE:d_strtoull: Inlibc
?MAKE: -pick add $@ %<
-?S:d_strtouq:
-?S: This variable conditionally defines the HAS_STRTOUQ symbol, which
-?S: indicates to the C program that the strtouq() routine is available.
+?S:d_strtoull:
+?S: This variable conditionally defines the HAS_STRTOULL symbol, which
+?S: indicates to the C program that the strtoull() routine is available.
?S:.
-?C:HAS_STRTOUQ:
-?C: This symbol, if defined, indicates that the strtouq routine is
+?C:HAS_STRTOULL:
+?C: This symbol, if defined, indicates that the strtoull routine is
?C: available to convert strings to unsigned long longs.
?C:.
-?H:#$d_strtouq HAS_STRTOUQ /**/
+?H:#$d_strtoull HAS_STRTOULL /**/
?H:.
-?LINT:set d_strtouq
-: see if strtouq exists
-set strtouq d_strtouq
+?LINT:set d_strtoull
+: see if strtoull exists
+set strtoull d_strtoull
eval $inlibc
+
: see if strtouq exists
set strtouq d_strtouq
eval $inlibc
+
?MAKE: -pick add $@ %<
?Y:BOTTOM
?S:usedl:
-?S: This variable indicates if the the system supports dynamic
+?S: This variable indicates if the system supports dynamic
?S: loading of some sort. See also dlsrc and dlobj.
?S:.
?S:ld:
}
EOCP
set try
- if eval $compile && ./try; then
+ if eval $compile_ok && ./try; then
echo 'Looks OK.' >&4
else
echo "I can't use Berkeley DB with your <db.h>. I'll disable Berkeley DB." >&4
?MAKE:libperl useshrplib shrpenv ldlibpthname: \
Myread Oldconfig archlibexp awk cat libc \
_a osname osvers so patchlevel subversion usedl ld \
- ccdlflags installarchlib
+ version lib_ext ccdlflags installarchlib
?MAKE: -pick wipe $@ %<
?S:libperl:
?S: The perl executable is obtained by linking perlmain.c with
;;
*) case "$useshrplib" in
'') case "$osname" in
- svr4*|dgux|dynixptx|esix|powerux|beos)
+ svr4*|dgux|dynixptx|esix|powerux|beos|cygwin*)
dflt=y
also='Building a shared libperl is required for dynamic loading to work on your system.'
;;
linux*) # ld won't link with a bare -lperl otherwise.
dflt=libperl.$so
;;
+ cygwin*) # include version
+ dflt=`echo libperl$version | sed -e 's/\./_/g'`$lib_ext
+ ;;
*) # Try to guess based on whether libc has major.minor.
case "$libc" in
*libc.$so.[0-9]*.[0-9]*) dflt=$majmin ;;
?RCS: $Id: patchlevel.U,v 3.0.1.1 1997/02/28 16:18:41 ram Exp $
?RCS:
?RCS: Copyright (c) 1991-1993, Raphael Manfredi
-?RCS:
+?RCS:
?RCS: This file is included with or a derivative work of a file included
?RCS: with the metaconfig program of Raphael Manfredi's "dist" distribution.
?RCS: In accordance with clause 7 of dist's modified Artistic License:
?RCS: Revision 3.0 1993/08/18 12:09:31 ram
?RCS: Baseline for dist 3.0 netwide release.
?RCS:
-?MAKE:patchlevel version subversion apiversion: \
- package baserev test rsrc echo n c awk
+?MAKE:patchlevel subversion version api_revision api_version \
+ api_subversion api_versionstring: package baserev test rsrc \
+ echo n c awk osname
?MAKE: -pick add $@ %<
?S:patchlevel:
?S: The patchlevel level of this package.
?S: The value of patchlevel comes from the patchlevel.h file.
+?S: In a version number such as 5.6.1, this is the "6".
+?S: In patchlevel.h, this is referred to as the "PERL_VERSION".
?S:.
?S:subversion:
?S: The subversion level of this package.
?S: The value of subversion comes from the patchlevel.h file.
+?S: In a version number such as 5.6.1, this is the "1".
?S: This is unique to perl.
?S:.
?S:version:
-?S: The full version number of this package. This combines
-?S: baserev, patchlevel, and subversion to get the full
-?S: version number, including any possible subversions. Care
-?S: is taken to use the C locale in order to get something
-?S: like 5.004 instead of 5,004. This is unique to perl.
+?S: The full version number of this package, such as 5.6.1 (or 5_6_1).
+?S: This combines baserev, patchlevel, and subversion to get the
+?S: full version number, including any possible subversions.
+?S: This is suitable for use as a directory name, and hence is
+?S: filesystem dependent.
+?S:.
+?S:api_revision:
+?S: The three variables, api_revision, api_version, and
+?S: api_subversion, specify the version of the oldest perl binary
+?S: compatible with the present perl. In a full version string
+?S: such as '5.6.1', api_revision is the '5'.
+?S: Prior to 5.5.640, the format was a floating point number,
+?S: like 5.00563.
+?S:
+?S: perl.c:incpush() and lib/lib.pm will automatically search in
+?S: $sitelib/.. for older directories back to the limit specified
+?S: by these api_ variables. This is only useful if you have a
+?S: perl library directory tree structured like the default one.
+?S: See INSTALL for how this works. The versioned site_perl
+?S: directory was introduced in 5.005, so that is the lowest
+?S: possible value. The version list appropriate for the current
+?S: system is determined in inc_version_list.U.
+?S:
+?S: XXX To do: Since compatibility can depend on compile time
+?S: options (such as bincompat, longlong, etc.) it should
+?S: (perhaps) be set by Configure, but currently it isn't.
+?S: Currently, we read a hard-wired value from patchlevel.h.
+?S: Perhaps what we ought to do is take the hard-wired value from
+?S: patchlevel.h but then modify it if the current Configure
+?S: options warrant. patchlevel.h then would use an #ifdef guard.
+?S:.
+?S:api_version:
+?S: The three variables, api_revision, api_version, and
+?S: api_subversion, specify the version of the oldest perl binary
+?S: compatible with the present perl. In a full version string
+?S: such as '5.6.1', api_version is the '6'. See api_revision for
+?S: full details. As a special case, 5.5.0 is rendered in the
+?S: old-style as 5.005. (In the 5.005_0x maintenance series,
+?S: this was the only versioned directory in $sitelib.)
+?S:.
+?S:api_subversion:
+?S: The three variables, api_revision, api_version, and
+?S: api_subversion, specify the version of the oldest perl binary
+?S: compatible with the present perl. In a full version string
+?S: such as '5.6.1', api_subversion is the '1'. See api_revision for
+?S: full details.
?S:.
-?S:apiversion:
-?S: MakeMaker will install add-on modules in a directory with the
-?S: PERL_APIVERSION version number. The value is set manually in
-?S: patchlevel.h. Normally, for maintenance releases, this is
-?S: just something like 5.005 or 5.6 or 5.7. That is, it does not
-?S: include the subversion number and does not change across
-?S: maintenance releases. This is so that add-on extensions can
-?S: be shared across maintenance versions. It is unclear how this
-?S: ought to work for developer versions. If a release breaks
-?S: binary compatibility, this number should be increased.
+?S:api_versionstring:
+?S: This variable combines api_revision, api_version, and
+?S: api_subversion in a format such as 5.6.1 (or 5_6_1) suitable
+?S: for use as a directory name. This is filesystem dependent.
?S:.
+
?LINT:extern LC_ALL
?LINT:change LC_ALL
?LINT:extern LANGUAGE
if $test -r $rsrc/patchlevel.h;then
patchlevel=`awk '/define[ ]+PERL_VERSION/ {print $3}' $rsrc/patchlevel.h`
subversion=`awk '/define[ ]+PERL_SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
- apiversion=`awk '/define[ ]+PERL_APIVERSION/ {print $3}' $rsrc/patchlevel.h`
+ api_revision=`awk '/define[ ]+PERL_API_REVISION/ {print $3}' $rsrc/patchlevel.h`
+ api_version=`awk '/define[ ]+PERL_API_VERSION/ {print $3}' $rsrc/patchlevel.h`
+ api_subversion=`awk '/define[ ]+PERL_API_SUBVERSION/ {print $3}' $rsrc/patchlevel.h`
else
patchlevel=0
subversion=0
- apiversion=0
+ api_revision=0
+ api_version=0
+ api_subversion=0
fi
$echo $n "(You have $package" $c
case "$package" in
$echo $n " patchlevel $patchlevel" $c
test 0 -eq "$subversion" || $echo $n " subversion $subversion" $c
echo ".)"
-
-if test 0 -eq "$subversion"; then
- version=`LC_ALL=C; export LC_ALL; \
- echo $baserev $patchlevel | \
- $awk '{ printf "%.3f\n", $1 + $2/1000.0 }'`
-else
- version=`LC_ALL=C; export LC_ALL; \
- echo $baserev $patchlevel $subversion | \
- $awk '{ printf "%.5f\n", $1 + $2/1000.0 + $3/100000.0 }'`
+case "$osname" in
+dos|cygwin|vms|win32)
+ : XXX Should be a Configure test for double-dots in filenames.
+ version=`echo $baserev $patchlevel $subversion | \
+ $awk '{ printf "%d_%d_%d\n", $1, $2, $3 }'`
+ api_versionstring=`echo $api_revision $api_version $api_subversion | \
+ $awk '{ printf "%d_%d_%d\n", $1, $2, $3 }'`
+ ;;
+*)
+ version=`echo $baserev $patchlevel $subversion | \
+ $awk '{ printf "%d.%d.%d\n", $1, $2, $3 }'`
+ api_versionstring=`echo $api_revision $api_version $api_subversion | \
+ $awk '{ printf "%d.%d.%d\n", $1, $2, $3 }'`
+ ;;
+esac
+: Special case the 5.005_xx maintenance series, which used 5.005
+: without any subversion label as a subdirectory in $sitelib
+if test "${api_revision}${api_version}${api_subversion}" = "550"; then
+ api_versionstring='5.005'
fi
?RCS: You may distribute under the terms of either the GNU General Public
?RCS: License or the Artistic License, as specified in the README file.
?RCS:
-?MAKE:usemultiplicity: Myread Oldconfig Setvar
+?MAKE:usemultiplicity: useithreads Myread Oldconfig Setvar
?MAKE: -pick add $@ %<
?Y:TOP
?S:usemultiplicity:
cat <<EOM
Perl can be built so that multiple Perl interpreters can coexist
-within the same Perl executable. To do so, Configure must be run with
--Dusemultiplicity.
-
-Normally you do not need this and you should answer no.
+within the same Perl executable.
+EOM
+case "$useithreads" in
+$define)
+ cat <<EOM
+This multiple interpreter support is required for interpreter-based threads.
EOM
-case "$usemultiplicity" in
-$define|true|[yY]*) dflt='y';;
-*) dflt='n';;
-esac
-rp='Build Perl for multiplicity?'
-. ./myread
-case "$ans" in
-y|Y) val="$define" ;;
-*) val="$undef" ;;
+ val="$define"
+ ;;
+*)
+ echo 'Normally you do not need this and you should answer no.'
+ case "$usemultiplicity" in
+ $define|true|[yY]*) dflt='y';;
+ *) dflt='n';;
+ esac
+ rp='Build Perl for multiplicity?'
+ . ./myread
+ case "$ans" in
+ y|Y) val="$define" ;;
+ *) val="$undef" ;;
+ esac
+ ;;
esac
set usemultiplicity
-eval $setvar
+eval $setvar
?RCS: $Id: usethreads.U,v $
?RCS:
-?RCS: Copyright (c) 1998 Andy Dougherty
+?RCS: Copyright (c) 1998-2000 Andy Dougherty
?RCS:
?RCS: You may distribute under the terms of either the GNU General Public
?RCS: License or the Artistic License, as specified in the README file.
?RCS:
?RCS: $Log: usethreads.U,v $
?RCS:
-?MAKE:usethreads d_oldpthreads: Myread Oldconfig Setvar test cat
+?MAKE:usethreads useithreads use5005threads d_oldpthreads: \
+ Myread Oldconfig Setvar test cat
?MAKE: -pick add $@ %<
?Y:TOP
?S:usethreads:
?S: This variable conditionally defines the USE_THREADS symbol,
?S: and indicates that Perl should be built to use threads.
?S:.
+?S:useithreads:
+?S: This variable conditionally defines the USE_ITHREADS symbol,
+?S: and indicates that Perl should be built to use the interpreter-based
+?S: threading implementation.
+?S:.
+?S:use5005threads:
+?S: This variable conditionally defines the USE_5005THREADS symbol,
+?S: and indicates that Perl should be built to use the 5.005-based
+?S: threading implementation.
+?S:.
?X: I'm putting old_pthreads in this unit because it might eventually
?X: be part of an automatic determination to see if we can use threads
?X: at all.
?S: draft POSIX threads API. This is only potentially meaningful if
?S: usethreads is set.
?S:.
+?C:USE_ITHREADS:
+?C: This symbol, if defined, indicates that Perl should be built to
+?C: use the interpreter-based threading implementation.
+?C:.
+?C:USE_5005THREADS:
+?C: This symbol, if defined, indicates that Perl should be built to
+?C: use the 5.005-based threading implementation.
+?C:.
?C:USE_THREADS:
?C: This symbol, if defined, indicates that Perl should
-?C: be built to use threads.
+?C: be built to use threads. At present, it is a synonym for
+?C: USE_5005THREADS, but eventually the source ought to be changed
+?C: to use this to mean _any_ threading implementation.
?C:.
?C:OLD_PTHREADS_API:
?C: This symbol, if defined, indicates that Perl should
?C: be built to use the old draft POSIX threads API.
?C:.
-?H:?%<:#ifndef USE_TTHREADS
-?H:?%<:#$usethreads USE_THREADS /**/
+?H:#$use5005threads USE_5005THREADS /**/
+?H:#$useithreads USE_ITHREADS /**/
+?H:?%<:#if defined(USE_5005THREADS) && !defined(USE_ITHREADS)
+?H:?%<:#define USE_THREADS /* until src is revised*/
?H:?%<:#endif
?H:#$d_oldpthreads OLD_PTHREADS_API /**/
?H:.
-?LINT:set usethreads d_oldpthreads
+?LINT:set usethreads useithreads use5005threads d_oldpthreads
?INIT:: set usethreads on the Configure command line to enable threads.
?F:!usethreads.cbu
?X: We should really have some explanatory text here, and some
rp='Build a threading Perl?'
. ./myread
case "$ans" in
-y|Y) val="$define" ;;
+y|Y) val="$define" ;;
*) val="$undef" ;;
esac
set usethreads
-eval $setvar
+eval $setvar
+
+case "$usethreads" in
+$define)
+ $cat <<EOM
+
+As of 5.5.640, Perl has two different internal threading implementations,
+the 5.005 version (5005threads) and an interpreter-based version
+(ithreads) that has one interpreter per thread. Both are very
+experimental. This arrangement exists to help developers work out
+which one is better.
+EOM
+ : Default to ithreads unless overridden on command line or with
+ : old config.sh
+ dflt='y'
+ case "$use5005threads" in
+ $define|true|[yY]*) dflt='n';;
+ esac
+ case "$useithreads" in
+ $undef|false|[nN]*) dflt='n';;
+ esac
+ rp='Use interpreter-based ithreads?'
+ . ./myread
+ case "$ans" in
+ y|Y) val="$define" ;;
+ *) val="$undef" ;;
+ esac
+ set useithreads
+ eval $setvar
+ : Now set use5005threads to the opposite value.
+ case "$useithreads" in
+ $define) val="$undef" ;;
+ *) val="$define" ;;
+ esac
+ set use5005threads
+ eval $setvar
+ ;;
+*)
+ useithreads="$undef"
+ use5005threads="$undef"
+ ;;
+esac
?X: Check out what kind of threads api we have
case "$d_oldpthreads" in
?X: In general, -lpthread needs to come before -lc but after other
?X: libraries such as -lgdbm and such like. We assume here that -lc
-?X: is present in libswanted. If that fails to be true in, then this
+?X: is present in libswanted. If that fails to be true, then this
?X: can be changed to add pthread to the very end of libswanted.
case "$usethreads" in
Assuming POSIX threads, then.)
EOM
fi
- ;;
+ ;;
esac
https://perl5.git.perl.org / metaconfig.git / commitdiff