-*** Configure.orig Thu Oct 19 07:48:18 1995
---- Configure Wed Nov 01 20:14:32 1995
-***************
-*** 561,566 ****
---- 561,575 ----
- defvoidused=''
- voidflags=''
- CONFIG=''
-+ archobjs=''
-+ firstmakefile='makefile'
-+ obj_ext='.o'
-+ obj_ext_regexp='\.o'
-+ lib_ext='.a'
-+ exe_ext=
-+ ar='ar'
-+ plibext=
-+ path_sep=$p_
-
- define='define'
- undef='undef'
-***************
-*** 1363,1369 ****
- say=offhand
- for file in $trylist; do
- xxx=`./loc $file $file $pth`
-! eval $file=$xxx
- eval _$file=$xxx
- case "$xxx" in
- /*)
---- 1370,1378 ----
- say=offhand
- for file in $trylist; do
- xxx=`./loc $file $file $pth`
-! if test "X$file" != "X$xxx" ; then
-! eval $file=$xxx
-! fi
- eval _$file=$xxx
- case "$xxx" in
- /*)
-***************
-*** 2156,2162 ****
- exit(0);
- }
- EOM
-! if $cc -o gccvers gccvers.c >/dev/null 2>&1; then
- gccversion=`./gccvers`
- case "$gccversion" in
- '') echo "You are not using GNU cc." ;;
---- 2165,2171 ----
- exit(0);
- }
- EOM
-! if $cc -o gccvers gccvers.c $ldflags >/dev/null 2>&1; then
- gccversion=`./gccvers`
- case "$gccversion" in
- '') echo "You are not using GNU cc." ;;
-***************
-*** 3851,3856 ****
---- 3860,3871 ----
- *"-l$thislib "*);;
- *) dflt="$dflt -l$thislib";;
- esac
-+ elif xxx=`./loc $thislib.lib X $libpth`; $test -f "$xxx"; then
-+ echo "Found -l$thislib."
-+ case " $dflt " in
-+ *"-l$thislib "*);;
-+ *) dflt="$dflt -l$thislib";;
-+ esac
- else
- echo "No -l$thislib."
- fi
-***************
-*** 3964,3975 ****
- :
- elif try=`./loc lib$thislib.$so X $libpth`; $test -f "$try"; then
- :
-! elif try=`./loc lib$thislib.a X $libpth`; $test -f "$try"; then
- :
- elif try=`./loc lib$thislib X $libpth`; $test -f "$try"; then
- :
- elif try=`./loc $thislib X $libpth`; $test -f "$try"; then
- :
- elif try=`./loc Slib$thislib.a X $xlibpth`; $test -f "$try"; then
- :
- else
---- 3979,3992 ----
- :
- elif try=`./loc lib$thislib.$so X $libpth`; $test -f "$try"; then
- :
-! elif try=`./loc lib$thislib$lib_ext X $libpth`; $test -f "$try"; then
- :
- elif try=`./loc lib$thislib X $libpth`; $test -f "$try"; then
- :
- elif try=`./loc $thislib X $libpth`; $test -f "$try"; then
- :
-+ elif try=`./loc $thislib$lib_ext X $libpth`; $test -f "$try"; then
-+ :
- elif try=`./loc Slib$thislib.a X $xlibpth`; $test -f "$try"; then
- :
- else
-***************
-*** 4018,4028 ****
- fi
- elif $test -r "$libc" || (test -h "$libc") >/dev/null 2>&1; then
- echo "Your C library seems to be in $libc, as you said before."
-! elif $test -r $incpath/usr/lib/libc.a; then
-! libc=$incpath/usr/lib/libc.a;
- echo "Your C library seems to be in $libc. That's fine."
-! elif $test -r /lib/libc.a; then
-! libc=/lib/libc.a;
- echo "Your C library seems to be in $libc. You're normal."
- else
- if tans=`./loc libc.a blurfl/dyick $libpth`; $test -r "$tans"; then
---- 4035,4045 ----
- fi
- elif $test -r "$libc" || (test -h "$libc") >/dev/null 2>&1; then
- echo "Your C library seems to be in $libc, as you said before."
-! elif $test -r $incpath/usr/lib/libc$lib_ext; then
-! libc=$incpath/usr/lib/libc$lib_ext;
- echo "Your C library seems to be in $libc. That's fine."
-! elif $test -r /lib/libc$lib_ext; then
-! libc=/lib/libc$lib_ext;
- echo "Your C library seems to be in $libc. You're normal."
- else
- if tans=`./loc libc.a blurfl/dyick $libpth`; $test -r "$tans"; then
-***************
-*** 4135,4140 ****
---- 4152,4161 ----
- eval $xscan;\
- $contains '^fprintf$' libc.list >/dev/null 2>&1; then
- eval $xrun
-+ elif com="$sed -n -e 's/^[-0-9a-f ]*_\(.*\)=.*/\1/p'";\
-+ eval $xscan;\
-+ $contains '^fprintf$' libc.list >/dev/null 2>&1; then
-+ eval $xrun
- else
- nm -p $* 2>/dev/null >libc.tmp
- $grep fprintf libc.tmp > libc.ptf
-***************
-*** 4145,4167 ****
- eval $xrun
- else
- echo " "
-! echo "nm didn't seem to work right. Trying ar instead..." >&4
- com=''
-! if ar t $libc > libc.tmp; then
- for thisname in $libnames; do
-! ar t $thisname >>libc.tmp
- done
-! $sed -e 's/\.o$//' < libc.tmp > libc.list
- echo "Ok." >&4
- else
-! echo "ar didn't seem to work right." >&4
- echo "Maybe this is a Cray...trying bld instead..." >&4
- if bld t $libc | $sed -e 's/.*\///' -e 's/\.o:.*$//' > libc.list
- then
- for thisname in $libnames; do
- bld t $libnames | \
- $sed -e 's/.*\///' -e 's/\.o:.*$//' >>libc.list
-! ar t $thisname >>libc.tmp
- done
- echo "Ok." >&4
- else
---- 4166,4189 ----
- eval $xrun
- else
- echo " "
-! echo "nm didn't seem to work right. Trying $ar instead..." >&4
- com=''
-! if test "X$osname" = "Xos2"; then ar_opt=tv ; else ar_opt=t ;fi
-! if $ar $ar_opt $libc > libc.tmp; then
- for thisname in $libnames; do
-! $ar $ar_opt $thisname >>libc.tmp
- done
-! $sed -e 's/\.o$//' -e 's/^ \+//' < libc.tmp | grep -v "^IMPORT#" > libc.list
- echo "Ok." >&4
- else
-! echo "$ar didn't seem to work right." >&4
- echo "Maybe this is a Cray...trying bld instead..." >&4
- if bld t $libc | $sed -e 's/.*\///' -e 's/\.o:.*$//' > libc.list
- then
- for thisname in $libnames; do
- bld t $libnames | \
- $sed -e 's/.*\///' -e 's/\.o:.*$//' >>libc.list
-! $ar t $thisname >>libc.tmp
- done
- echo "Ok." >&4
- else
-***************
-*** 4507,4513 ****
- exit(0);
- }
- EOCP
-! if $cc $ccflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
- intsize=`./try`
- echo "Your integers are $intsize bytes long."
- else
---- 4529,4535 ----
- exit(0);
- }
- EOCP
-! if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1 && ./try > /dev/null; then
- intsize=`./try`
- echo "Your integers are $intsize bytes long."
- else
-***************
-*** 4587,4593 ****
- exit(result);
- }
- EOCP
-! if $cc -o try $ccflags try.c >/dev/null 2>&1; then
- ./try
- yyy=$?
- else
---- 4609,4615 ----
- exit(result);
- }
- EOCP
-! if $cc -o try $ccflags try.c $ldflags >/dev/null 2>&1; then
- ./try
- yyy=$?
- else
-***************
-*** 4668,4674 ****
-
- }
- EOCP
-! if $cc -o try $ccflags try.c >/dev/null 2>&1; then
- ./try
- castflags=$?
- else
---- 4690,4696 ----
-
- }
- EOCP
-! if $cc -o try $ccflags try.c $ldflags >/dev/null 2>&1; then
- ./try
- castflags=$?
- else
-***************
-*** 4707,4713 ****
- 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
---- 4729,4735 ----
- exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
- }
- EOF
-! if $cc $ccflags vprintf.c $ldflags -o vprintf >/dev/null 2>&1 && ./vprintf; then
- echo "Your vsprintf() returns (int)." >&4
- val2="$undef"
- else
-***************
-*** 4777,4783 ****
- cryptlib=-lcrypt
- fi
- if $test -z "$cryptlib"; then
-! cryptlib=`./loc libcrypt.a "" $libpth`
- else
- cryptlib=-lcrypt
- fi
---- 4799,4805 ----
- cryptlib=-lcrypt
- fi
- if $test -z "$cryptlib"; then
-! cryptlib=`./loc libcrypt$lib_ext "" $libpth`
- else
- cryptlib=-lcrypt
- fi
-***************
-*** 5284,5290 ****
- }
- EOM
- if $cc $ccflags $cccdlflags -c dyna.c > /dev/null 2>&1 &&
-! $ld $lddlflags -o dyna.$dlext dyna.o > /dev/null 2>&1 &&
- $cc $ccflags $ldflags $cccdlflags $ccdlflags fred.c -o fred $libs > /dev/null 2>&1; then
- xxx=`./fred`
- case $xxx in
---- 5306,5312 ----
- }
- EOM
- if $cc $ccflags $cccdlflags -c dyna.c > /dev/null 2>&1 &&
-! $ld $lddlflags -o dyna.$dlext dyna$obj_ext > /dev/null 2>&1 &&
- $cc $ccflags $ldflags $cccdlflags $ccdlflags fred.c -o fred $libs > /dev/null 2>&1; then
- xxx=`./fred`
- case $xxx in
-***************
-*** 5441,5447 ****
- 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
---- 5463,5469 ----
- EOCP
- : check sys/file.h first to get FREAD on Sun
- if $test `./findhdr sys/file.h` && \
-! $cc $cppflags $ldflags "-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
-***************
-*** 5452,5458 ****
- 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
---- 5474,5480 ----
- val="$undef"
- fi
- elif $test `./findhdr fcntl.h` && \
-! $cc "-DI_FCNTL" $ldflags open3.c -o open3 >/dev/null 2>&1 ; then
- h_fcntl=true;
- echo "<fcntl.h> defines the O_* constants..." >&4
- if ./open3; then
-***************
-*** 5931,5937 ****
- y*|true)
- usemymalloc='y'
- mallocsrc='malloc.c'
-! mallocobj='malloc.o'
- d_mymalloc="$define"
- case "$libs" in
- *-lmalloc*)
---- 5953,5959 ----
- y*|true)
- usemymalloc='y'
- mallocsrc='malloc.c'
-! mallocobj="malloc$obj_ext"
- d_mymalloc="$define"
- case "$libs" in
- *-lmalloc*)
-***************
-*** 6366,6375 ****
- : we will have to assume that it supports the 4.2 BSD interface
- d_oldsock="$undef"
- else
-! echo "You don't have Berkeley networking in libc.a..." >&4
-! if test -f /usr/lib/libnet.a; then
-! ( (nm $nm_opt /usr/lib/libnet.a | eval $nm_extract) || \
-! ar t /usr/lib/libnet.a) 2>/dev/null >> libc.list
- if $contains socket libc.list >/dev/null 2>&1; then
- echo "...but the Wollongong group seems to have hacked it in." >&4
- socketlib="-lnet"
---- 6388,6397 ----
- : we will have to assume that it supports the 4.2 BSD interface
- d_oldsock="$undef"
- else
-! echo "You don't have Berkeley networking in libc$lib_ext..." >&4
-! if test -f /usr/lib/libnet$lib_ext; then
-! ( (nm $nm_opt /usr/lib/libnet$lib_ext | eval $nm_extract) || \
-! $ar t /usr/lib/libnet$lib_ext) 2>/dev/null >> libc.list
- if $contains socket libc.list >/dev/null 2>&1; then
- echo "...but the Wollongong group seems to have hacked it in." >&4
- socketlib="-lnet"
-***************
-*** 6382,6388 ****
- d_oldsock="$define"
- fi
- else
-! echo "or even in libnet.a, which is peculiar." >&4
- d_socket="$undef"
- d_oldsock="$undef"
- fi
---- 6404,6410 ----
- d_oldsock="$define"
- fi
- else
-! echo "or even in libnet$lib_ext, which is peculiar." >&4
- d_socket="$undef"
- d_oldsock="$undef"
- fi
-***************
-*** 6905,6911 ****
- printf("%d\n", (char *)&try.bar - (char *)&try.foo);
- }
- EOCP
-! if $cc $ccflags try.c -o try >/dev/null 2>&1; then
- dflt=`./try`
- else
- dflt='8'
---- 6927,6933 ----
- printf("%d\n", (char *)&try.bar - (char *)&try.foo);
- }
- EOCP
-! if $cc $ccflags $ldflags try.c -o try >/dev/null 2>&1; then
- dflt=`./try`
- else
- dflt='8'
-***************
-*** 6953,6959 ****
- }
- 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)
---- 6975,6981 ----
- }
- EOCP
- xxx_prompt=y
-! if $cc $ccflags $ldflags 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)
-***************
-*** 7531,7537 ****
- printf("%d\n",i);
- }
- EOCP
-! if $cc try.c -o try >/dev/null 2>&1 ; then
- dflt=`try`
- else
- dflt='?'
---- 7553,7559 ----
- printf("%d\n",i);
- }
- EOCP
-! if $cc $ldflags try.c -o try >/dev/null 2>&1 ; then
- dflt=`try`
- else
- dflt='?'
-***************
-*** 7558,7575 ****
- $cc $ccflags -c bar1.c >/dev/null 2>&1
- $cc $ccflags -c bar2.c >/dev/null 2>&1
- $cc $ccflags -c foo.c >/dev/null 2>&1
-! ar rc bar.a bar2.o bar1.o >/dev/null 2>&1
-! if $cc $ccflags $ldflags -o foobar foo.o bar.a $libs > /dev/null 2>&1 &&
- ./foobar >/dev/null 2>&1; then
-! echo "ar appears to generate random libraries itself."
- orderlib=false
- ranlib=":"
-! elif ar ts bar.a >/dev/null 2>&1 &&
-! $cc $ccflags $ldflags -o foobar foo.o bar.a $libs > /dev/null 2>&1 &&
- ./foobar >/dev/null 2>&1; then
- echo "a table of contents needs to be added with 'ar ts'."
- orderlib=false
-! ranlib="ar ts"
- else
- case "$ranlib" in
- :) ranlib='';;
---- 7580,7597 ----
- $cc $ccflags -c bar1.c >/dev/null 2>&1
- $cc $ccflags -c bar2.c >/dev/null 2>&1
- $cc $ccflags -c foo.c >/dev/null 2>&1
-! $ar rc bar$lib_ext bar2$obj_ext bar1$obj_ext >/dev/null 2>&1
-! if $cc $ccflags $ldflags -o foobar foo$obj_ext bar$lib_ext $libs > /dev/null 2>&1 &&
- ./foobar >/dev/null 2>&1; then
-! echo "$ar appears to generate random libraries itself."
- orderlib=false
- ranlib=":"
-! elif $ar ts bar$lib_ext >/dev/null 2>&1 &&
-! $cc $ccflags $ldflags -o foobar foo$obj_ext bar$lib_ext $libs > /dev/null 2>&1 &&
- ./foobar >/dev/null 2>&1; then
- echo "a table of contents needs to be added with 'ar ts'."
- orderlib=false
-! ranlib="$ar ts"
- else
- case "$ranlib" in
- :) ranlib='';;
-***************
-*** 7641,7647 ****
- '') $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="$*"
---- 7663,7669 ----
- '') $echo $n ".$c"
- if $cc $ccflags \
- $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \
-! try.c -o try $ldflags >/dev/null 2>&1 ; then
- set X $i_time $i_systime $i_systimek $sysselect $s_timeval
- shift
- flags="$*"
-***************
-*** 7710,7716 ****
- #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
---- 7732,7738 ----
- #endif
- }
- EOCP
-! if $cc $ccflags $ldflags -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
-***************
-*** 7727,7733 ****
- $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
---- 7749,7755 ----
- $cat <<'EOM'
- Hmm, your compiler has some difficulty with fd_set. Checking further...
- EOM
-! if $cc $ccflags $ldflags 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
-***************
-*** 8353,8359 ****
- else
- echo "false"
- fi
-! $rm -f varargs.o
- EOP
- chmod +x varargs
-
---- 8375,8381 ----
- else
- echo "false"
- fi
-! $rm -f varargs$obj_ext
- EOP
- chmod +x varargs
-
-***************
-*** 8496,8506 ****
- echo " "
- echo "Stripping down executable paths..." >&4
- for file in $loclist $trylist; do
-! eval $file="\$file"
- done
- ;;
- esac
-
- : create config.sh file
- echo " "
- echo "Creating config.sh..." >&4
---- 8518,8531 ----
- echo " "
- echo "Stripping down executable paths..." >&4
- for file in $loclist $trylist; do
-! if test X$file != Xln -o X$osname != Xos2; then eval $file="\$file"; fi
- done
- ;;
- esac
-
-+ # Setup libraries for linking miniperl (if not set already)
-+ : ${cldlibs="$libs $cryptlib"}
-+
- : create config.sh file
- echo " "
- echo "Creating config.sh..." >&4
-***************
-*** 8556,8561 ****
---- 8581,8587 ----
- chmod='$chmod'
- chown='$chown'
- clocktype='$clocktype'
-+ cldlibs='$cldlibs'
- comm='$comm'
- compress='$compress'
- contains='$contains'
-***************
-*** 8752,8757 ****
---- 8778,8784 ----
- expr='$expr'
- extensions='$extensions'
- find='$find'
-+ firstmakefile='$firstmakefile'
- flex='$flex'
- fpostype='$fpostype'
- freetype='$freetype'
-***************
-*** 8962,8967 ****
---- 8989,9002 ----
- voidflags='$voidflags'
- xlibpth='$xlibpth'
- zcat='$zcat'
-+ archobjs='$archobjs'
-+ obj_ext='$obj_ext'
-+ obj_ext_regexp='$obj_ext_regexp'
-+ lib_ext='$lib_ext'
-+ exe_ext='$exe_ext'
-+ ar='$ar'
-+ plibext='$plibext'
-+ path_sep='$path_sep'
- EOT
-
- : add special variables
https://perl5.git.perl.org / perl5.git / blobdiff