X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Configure;h=71b7feb3870e6704be5b0617596225c9b9bfaf79;hb=24b5d5ccc3bc7535f387e48d7e29656751ae98a5;hp=102637e38066b524cf97e6a45db8829985065b81;hpb=90e831dcaea7bb76a1f6fd13b3d99e8db4a40ec1;p=p5sagit%2Fp5-mst-13.2.git diff --git a/Configure b/Configure index 102637e..71b7feb 100755 --- a/Configure +++ b/Configure @@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Thu Mar 21 17:43:57 EET 2002 [metaconfig 3.0 PL70] +# Generated on Tue Apr 9 18:44:25 EET DST 2002 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <&4 <libc.tmp $echo $n ".$c" $grep fprintf libc.tmp > libc.ptf xscan='eval "libc.list"; $echo $n ".$c" >&4' -xrun='eval "libc.list"; echo "done" >&4' +xrun='eval "libc.list"; echo "done." >&4' xxx='[ADTSIW]' if com="$sed -n -e 's/__IO//' -e 's/^.* $xxx *_[_.]*//p' -e 's/^.* $xxx *//p'";\ eval $xscan;\ @@ -8378,6 +8396,12 @@ esac set versiononly eval $setvar +case "$versiononly" in +"$define") inc_version_list='' + inc_version_list_init=0 + ;; +esac + : figure out how to guarantee perl startup case "$startperl" in '') @@ -9066,6 +9090,10 @@ eval $inlibc set alarm d_alarm eval $inlibc +: see if POSIX threads are available +set pthread.h i_pthread +eval $inhdr + : define a fucntion to check prototypes $cat > protochk <> protochk <<'EOSH' @@ -9087,6 +9118,14 @@ while test $# -ge 2; do $define) echo "#include <$2>" >> try.c ;; literal) echo "$2" >> try.c ;; esac + # Extra magic for the benefit of systems that need pthread.h + # to be included early to correctly detect threadsafe functions. + # Such functions must guarantee themselves, though, that the usethreads + # and i_pthread have been defined, before calling protochk. + if test "$usethreads" = "$define" -a "$i_pthread" = "$define" -a "$pthread_h_first" = "$define" -a "$pthread_h_done" = ""; then + echo "#include " >> try.c + pthread_h_done=yes + fi shift 2 done test "$prototype" = "$define" && echo '#define CAN_PROTOTYPE' >> try.c @@ -10000,7 +10039,7 @@ set ctermid_r d_ctermid_r eval $inlibc case "$d_ctermid_r" in "$define") - hdrs="$i_systypes sys/types.h define stdio.h $i_stdio stdio.h" + hdrs="$i_systypes sys/types.h define stdio.h " case "stdio" in time) hdrs="$hdrs $i_systime sys/time.h" @@ -10586,11 +10625,11 @@ case "$d_endhostent_r" in define) case "$endhostent_r_proto" in ''|0) try='int endhostent_r(struct hostent_data*);' - ./protochk "extern $try" $hdrs && endhostent_r_proto=I_S ;; + ./protochk "extern $try" $hdrs && endhostent_r_proto=I_D ;; esac case "$endhostent_r_proto" in ''|0) try='void endhostent_r(struct hostent_data*);' - ./protochk "extern $try" $hdrs && endhostent_r_proto=V_S ;; + ./protochk "extern $try" $hdrs && endhostent_r_proto=V_D ;; esac case "$endhostent_r_proto" in ''|0) d_endhostent_r=undef @@ -10640,11 +10679,11 @@ case "$d_endnetent_r" in define) case "$endnetent_r_proto" in ''|0) try='int endnetent_r(struct netent_data*);' - ./protochk "extern $try" $hdrs && endnetent_r_proto=I_S ;; + ./protochk "extern $try" $hdrs && endnetent_r_proto=I_D ;; esac case "$endnetent_r_proto" in ''|0) try='void endnetent_r(struct netent_data*);' - ./protochk "extern $try" $hdrs && endnetent_r_proto=V_S ;; + ./protochk "extern $try" $hdrs && endnetent_r_proto=V_D ;; esac case "$endnetent_r_proto" in ''|0) d_endnetent_r=undef @@ -10694,11 +10733,11 @@ case "$d_endprotoent_r" in define) case "$endprotoent_r_proto" in ''|0) try='int endprotoent_r(struct protoent_data*);' - ./protochk "extern $try" $hdrs && endprotoent_r_proto=I_S ;; + ./protochk "extern $try" $hdrs && endprotoent_r_proto=I_D ;; esac case "$endprotoent_r_proto" in ''|0) try='void endprotoent_r(struct protoent_data*);' - ./protochk "extern $try" $hdrs && endprotoent_r_proto=V_S ;; + ./protochk "extern $try" $hdrs && endprotoent_r_proto=V_D ;; esac case "$endprotoent_r_proto" in ''|0) d_endprotoent_r=undef @@ -10890,11 +10929,11 @@ case "$d_endservent_r" in define) case "$endservent_r_proto" in ''|0) try='int endservent_r(struct servent_data*);' - ./protochk "extern $try" $hdrs && endservent_r_proto=I_S ;; + ./protochk "extern $try" $hdrs && endservent_r_proto=I_D ;; esac case "$endservent_r_proto" in ''|0) try='void endservent_r(struct servent_data*);' - ./protochk "extern $try" $hdrs && endservent_r_proto=V_S ;; + ./protochk "extern $try" $hdrs && endservent_r_proto=V_D ;; esac case "$endservent_r_proto" in ''|0) d_endservent_r=undef @@ -13791,13 +13830,6 @@ $rm -f try.* try set d_off64_t eval $setvar -: see if POSIX threads are available -set pthread.h i_pthread -eval $inhdr - - - - : how to create joinable pthreads if test "X$usethreads" = "X$define" -a "X$i_pthread" = "X$define"; then echo " " @@ -16175,6 +16207,24 @@ echo " " set d_telldirproto telldir $i_systypes sys/types.h $i_dirent dirent.h eval $hasproto +: see if time exists +echo " " +if test "X$d_time" = X -o X"$timetype" = X; then + if set time val -f d_time; eval $csym; $val; then + echo 'time() found.' >&4 + val="$define" + rp="What is the type returned by time() on this system?" + set time_t timetype long stdio.h sys/types.h + eval $typedef_ask + else + echo 'time() not found, hope that will do.' >&4 + val="$undef" + timetype='int'; + fi + set d_time + eval $setvar +fi + : see if this is a sys/times.h system set sys/times.h i_systimes eval $inhdr @@ -16202,7 +16252,7 @@ set tmpnam_r d_tmpnam_r eval $inlibc case "$d_tmpnam_r" in "$define") - hdrs="$i_systypes sys/types.h define stdio.h $i_stdio stdio.h" + hdrs="$i_systypes sys/types.h define stdio.h " case "stdio" in time) hdrs="$hdrs $i_systime sys/time.h" @@ -18727,24 +18777,6 @@ $rm -f stdioh -: see if time exists -echo " " -if test "X$d_time" = X -o X"$timetype" = X; then - if set time val -f d_time; eval $csym; $val; then - echo 'time() found.' >&4 - val="$define" - rp="What is the type returned by time() on this system?" - set time_t timetype long stdio.h sys/types.h - eval $typedef_ask - else - echo 'time() not found, hope that will do.' >&4 - val="$undef" - timetype='int'; - fi - set d_time - eval $setvar -fi - : see what type uids are declared as in the kernel echo " " echo "Looking for the type for user ids returned by getuid()." @@ -19444,9 +19476,7 @@ eval $find_extensions # Special case: Add in threads/shared since it is not picked up by the # recursive find above (and adding in general recursive finding breaks # SDBM_File/sdbm). A.D. 10/25/2001. -# Encode::XX need explicit mentions for the same reason. -# --jhi 2002-03-04 -known_extensions="$known_extensions threads/shared Encode/CN Encode/JP Encode/KR Encode/TW" +known_extensions="$known_extensions threads/shared" set X $nonxs_extensions shift nonxs_extensions="$*" @@ -19671,6 +19701,16 @@ EOM : Exclude those that are not xs extensions case "$dflt" in '') dflt=none;; + *) case " $dflt " in + *" Encode "*) # Add the subextensions of Encode + cd "$rsrc/ext" + for xxx in `ls Encode/*/Makefile.PL|awk -F/ '{print $2}'`; do + dflt="$dflt Encode/$xxx" + done + cd "$tdir" + ;; + esac + ;; esac rp="What extensions do you wish to include?" . ./myread