diff options
| -rwxr-xr-x | configure | 878 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | src/GNUmakefile.in | 89 | ||||
| -rw-r--r-- | src/backend/Makefile | 324 | ||||
| -rw-r--r-- | src/backend/catalog/Makefile | 90 | ||||
| -rw-r--r-- | src/backend/catalog/genbki.sh (renamed from src/backend/catalog/genbki.sh.in) | 135 | ||||
| -rw-r--r-- | src/backend/port/hpux/fixade.h | 67 | ||||
| -rw-r--r-- | src/backend/utils/Gen_fmgrtab.sh | 7 | ||||
| -rw-r--r-- | src/bin/initdb/Makefile | 8 | ||||
| -rw-r--r-- | src/bin/initdb/initdb.sh | 266 | ||||
| -rw-r--r-- | src/include/Makefile | 55 | ||||
| -rw-r--r-- | src/include/c.h | 8 | ||||
| -rwxr-xr-x | src/test/regress/run_check.sh | 4 |
13 files changed, 851 insertions, 1086 deletions
@@ -758,7 +758,7 @@ if test ! -f "src/template/$TEMPLATE"; then echo "" echo "Available Templates (select one using --with-template):" echo "" - ls template + ls src/template echo "" exit fi @@ -2373,7 +2373,7 @@ INSTALL_SHLIB="\${INSTALL} $INSTL_SHLIB_OPTS" -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -2621,117 +2621,12 @@ else echo "$ac_t""no" 1>&6 fi -# Extract the first word of "split", so it can be a program name with args. -set dummy split; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2628: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_split'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$split" in - /*) - ac_cv_path_split="$split" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_split="$split" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_split="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -split="$ac_cv_path_split" -if test -n "$split"; then - echo "$ac_t""$split" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "etags", so it can be a program name with args. -set dummy etags; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2663: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_etags'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$etags" in - /*) - ac_cv_path_etags="$etags" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_etags="$etags" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_etags="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -etags="$ac_cv_path_etags" -if test -n "$etags"; then - echo "$ac_t""$etags" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -# Extract the first word of "xargs", so it can be a program name with args. -set dummy xargs; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2698: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_xargs'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$xargs" in - /*) - ac_cv_path_xargs="$xargs" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_xargs="$xargs" # Let the user override the test with a dos path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_xargs="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -xargs="$ac_cv_path_xargs" -if test -n "$xargs"; then - echo "$ac_t""$xargs" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - for ac_prog in gzcat zcat do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2630: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GZCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2772,7 +2667,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2776: checking for $ac_word" >&5 +echo "configure:2671: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2806,7 +2701,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2810: checking for $ac_word" >&5 +echo "configure:2705: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2840,7 +2735,7 @@ test -n "$YACC" || YACC="yacc" echo $ac_n "checking for main in -lz""... $ac_c" 1>&6 -echo "configure:2844: checking for main in -lz" >&5 +echo "configure:2739: checking for main in -lz" >&5 ac_lib_var=`echo z'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2848,14 +2743,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 2852 "configure" +#line 2747 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2883,7 +2778,7 @@ else fi echo $ac_n "checking for main in -lsfio""... $ac_c" 1>&6 -echo "configure:2887: checking for main in -lsfio" >&5 +echo "configure:2782: checking for main in -lsfio" >&5 ac_lib_var=`echo sfio'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2891,14 +2786,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsfio $LIBS" cat > conftest.$ac_ext <<EOF -#line 2895 "configure" +#line 2790 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2926,7 +2821,7 @@ else fi echo $ac_n "checking for main in -lncurses""... $ac_c" 1>&6 -echo "configure:2930: checking for main in -lncurses" >&5 +echo "configure:2825: checking for main in -lncurses" >&5 ac_lib_var=`echo ncurses'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2934,14 +2829,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 2938 "configure" +#line 2833 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2967,7 +2862,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6 -echo "configure:2971: checking for main in -lcurses" >&5 +echo "configure:2866: checking for main in -lcurses" >&5 ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2975,14 +2870,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <<EOF -#line 2979 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:2986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3012,7 +2907,7 @@ fi fi echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6 -echo "configure:3016: checking for main in -ltermcap" >&5 +echo "configure:2911: checking for main in -ltermcap" >&5 ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3020,14 +2915,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <<EOF -#line 3024 "configure" +#line 2919 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3055,7 +2950,7 @@ else fi echo $ac_n "checking for main in -lreadline""... $ac_c" 1>&6 -echo "configure:3059: checking for main in -lreadline" >&5 +echo "configure:2954: checking for main in -lreadline" >&5 ac_lib_var=`echo readline'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3063,14 +2958,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <<EOF -#line 3067 "configure" +#line 2962 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3098,7 +2993,7 @@ else fi echo $ac_n "checking for using_history in -lreadline""... $ac_c" 1>&6 -echo "configure:3102: checking for using_history in -lreadline" >&5 +echo "configure:2997: checking for using_history in -lreadline" >&5 ac_lib_var=`echo readline'_'using_history | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3106,7 +3001,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <<EOF -#line 3110 "configure" +#line 3005 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3117,7 +3012,7 @@ int main() { using_history() ; return 0; } EOF -if { (eval echo configure:3121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3139,7 +3034,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lhistory""... $ac_c" 1>&6 -echo "configure:3143: checking for main in -lhistory" >&5 +echo "configure:3038: checking for main in -lhistory" >&5 ac_lib_var=`echo history'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3147,14 +3042,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lhistory $LIBS" cat > conftest.$ac_ext <<EOF -#line 3151 "configure" +#line 3046 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3187,7 +3082,7 @@ fi if test "$PORTNAME" != "aix" -a "$PORTNAME" != "alpha" then echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6 -echo "configure:3191: checking for main in -lbsd" >&5 +echo "configure:3086: checking for main in -lbsd" >&5 ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3195,14 +3090,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <<EOF -#line 3199 "configure" +#line 3094 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3231,7 +3126,7 @@ fi fi echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:3235: checking for setproctitle in -lutil" >&5 +echo "configure:3130: checking for setproctitle in -lutil" >&5 ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3239,7 +3134,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <<EOF -#line 3243 "configure" +#line 3138 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3250,7 +3145,7 @@ int main() { setproctitle() ; return 0; } EOF -if { (eval echo configure:3254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3278,7 +3173,7 @@ else fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:3282: checking for main in -lm" >&5 +echo "configure:3177: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3286,14 +3181,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 3290 "configure" +#line 3185 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3321,7 +3216,7 @@ else fi echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:3325: checking for main in -ldl" >&5 +echo "configure:3220: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3329,14 +3224,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3333 "configure" +#line 3228 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3364,7 +3259,7 @@ else fi echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:3368: checking for main in -lsocket" >&5 +echo "configure:3263: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3372,14 +3267,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 3376 "configure" +#line 3271 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3407,7 +3302,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:3411: checking for main in -lnsl" >&5 +echo "configure:3306: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3415,14 +3310,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3419 "configure" +#line 3314 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3450,7 +3345,7 @@ else fi echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6 -echo "configure:3454: checking for main in -lipc" >&5 +echo "configure:3349: checking for main in -lipc" >&5 ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3458,14 +3353,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3462 "configure" +#line 3357 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3493,7 +3388,7 @@ else fi echo $ac_n "checking for main in -lIPC""... $ac_c" 1>&6 -echo "configure:3497: checking for main in -lIPC" >&5 +echo "configure:3392: checking for main in -lIPC" >&5 ac_lib_var=`echo IPC'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3501,14 +3396,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lIPC $LIBS" cat > conftest.$ac_ext <<EOF -#line 3505 "configure" +#line 3400 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3536,7 +3431,7 @@ else fi echo $ac_n "checking for main in -llc""... $ac_c" 1>&6 -echo "configure:3540: checking for main in -llc" >&5 +echo "configure:3435: checking for main in -llc" >&5 ac_lib_var=`echo lc'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3544,14 +3439,14 @@ else ac_save_LIBS="$LIBS" LIBS="-llc $LIBS" cat > conftest.$ac_ext <<EOF -#line 3548 "configure" +#line 3443 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3579,7 +3474,7 @@ else fi echo $ac_n "checking for main in -ldld""... $ac_c" 1>&6 -echo "configure:3583: checking for main in -ldld" >&5 +echo "configure:3478: checking for main in -ldld" >&5 ac_lib_var=`echo dld'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3587,14 +3482,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldld $LIBS" cat > conftest.$ac_ext <<EOF -#line 3591 "configure" +#line 3486 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3622,7 +3517,7 @@ else fi echo $ac_n "checking for main in -lln""... $ac_c" 1>&6 -echo "configure:3626: checking for main in -lln" >&5 +echo "configure:3521: checking for main in -lln" >&5 ac_lib_var=`echo ln'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3630,14 +3525,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lln $LIBS" cat > conftest.$ac_ext <<EOF -#line 3634 "configure" +#line 3529 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3665,7 +3560,7 @@ else fi echo $ac_n "checking for main in -lld""... $ac_c" 1>&6 -echo "configure:3669: checking for main in -lld" >&5 +echo "configure:3564: checking for main in -lld" >&5 ac_lib_var=`echo ld'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3673,14 +3568,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lld $LIBS" cat > conftest.$ac_ext <<EOF -#line 3677 "configure" +#line 3572 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3708,7 +3603,7 @@ else fi echo $ac_n "checking for main in -lcompat""... $ac_c" 1>&6 -echo "configure:3712: checking for main in -lcompat" >&5 +echo "configure:3607: checking for main in -lcompat" >&5 ac_lib_var=`echo compat'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3716,14 +3611,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <<EOF -#line 3720 "configure" +#line 3615 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3751,7 +3646,7 @@ else fi echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6 -echo "configure:3755: checking for main in -lBSD" >&5 +echo "configure:3650: checking for main in -lBSD" >&5 ac_lib_var=`echo BSD'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3759,14 +3654,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lBSD $LIBS" cat > conftest.$ac_ext <<EOF -#line 3763 "configure" +#line 3658 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3794,7 +3689,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:3798: checking for main in -lgen" >&5 +echo "configure:3693: checking for main in -lgen" >&5 ac_lib_var=`echo gen'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3802,14 +3697,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <<EOF -#line 3806 "configure" +#line 3701 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3837,7 +3732,7 @@ else fi echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6 -echo "configure:3841: checking for main in -lPW" >&5 +echo "configure:3736: checking for main in -lPW" >&5 ac_lib_var=`echo PW'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3845,14 +3740,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lPW $LIBS" cat > conftest.$ac_ext <<EOF -#line 3849 "configure" +#line 3744 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:3856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3881,14 +3776,14 @@ fi echo $ac_n "checking for library containing crypt""... $ac_c" 1>&6 -echo "configure:3885: checking for library containing crypt" >&5 +echo "configure:3780: checking for library containing crypt" >&5 if eval "test \"`echo '$''{'ac_cv_search_crypt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_crypt="no" cat > conftest.$ac_ext <<EOF -#line 3892 "configure" +#line 3787 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3899,7 +3794,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:3903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_crypt="none required" else @@ -3910,7 +3805,7 @@ rm -f conftest* test "$ac_cv_search_crypt" = "no" && for i in crypt; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 3914 "configure" +#line 3809 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3921,7 +3816,7 @@ int main() { crypt() ; return 0; } EOF -if { (eval echo configure:3925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_crypt="-l$i" break @@ -3943,12 +3838,12 @@ else : fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3947: checking for ANSI C header files" >&5 +echo "configure:3842: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3952 "configure" +#line 3847 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -3956,7 +3851,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3973,7 +3868,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3977 "configure" +#line 3872 "configure" #include "confdefs.h" #include <string.h> EOF @@ -3991,7 +3886,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 3995 "configure" +#line 3890 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -4012,7 +3907,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 4016 "configure" +#line 3911 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4023,7 +3918,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4047,12 +3942,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:4051: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3946: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4056 "configure" +#line 3951 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -4068,7 +3963,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:4072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -4092,17 +3987,17 @@ for ac_hdr in arpa/inet.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4096: checking for $ac_hdr" >&5 +echo "configure:3991: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4101 "configure" +#line 3996 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4106: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4132,17 +4027,17 @@ for ac_hdr in crypt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4136: checking for $ac_hdr" >&5 +echo "configure:4031: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4141 "configure" +#line 4036 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4172,17 +4067,17 @@ for ac_hdr in dld.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4176: checking for $ac_hdr" >&5 +echo "configure:4071: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4181 "configure" +#line 4076 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4212,17 +4107,17 @@ for ac_hdr in endian.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4216: checking for $ac_hdr" >&5 +echo "configure:4111: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4221 "configure" +#line 4116 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4252,17 +4147,17 @@ for ac_hdr in float.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4256: checking for $ac_hdr" >&5 +echo "configure:4151: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4261 "configure" +#line 4156 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4292,17 +4187,17 @@ for ac_hdr in fp_class.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4296: checking for $ac_hdr" >&5 +echo "configure:4191: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4301 "configure" +#line 4196 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4332,17 +4227,17 @@ for ac_hdr in getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4336: checking for $ac_hdr" >&5 +echo "configure:4231: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4341 "configure" +#line 4236 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4372,17 +4267,17 @@ for ac_hdr in history.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4376: checking for $ac_hdr" >&5 +echo "configure:4271: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4381 "configure" +#line 4276 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4412,17 +4307,17 @@ for ac_hdr in ieeefp.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4416: checking for $ac_hdr" >&5 +echo "configure:4311: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4421 "configure" +#line 4316 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4452,17 +4347,17 @@ for ac_hdr in limits.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4456: checking for $ac_hdr" >&5 +echo "configure:4351: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4461 "configure" +#line 4356 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4492,17 +4387,17 @@ for ac_hdr in netdb.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4496: checking for $ac_hdr" >&5 +echo "configure:4391: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4501 "configure" +#line 4396 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4506: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4532,17 +4427,17 @@ for ac_hdr in netinet/in.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4536: checking for $ac_hdr" >&5 +echo "configure:4431: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4541 "configure" +#line 4436 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4572,17 +4467,17 @@ for ac_hdr in readline.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4576: checking for $ac_hdr" >&5 +echo "configure:4471: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4581 "configure" +#line 4476 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4481: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4612,17 +4507,17 @@ for ac_hdr in readline/history.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4616: checking for $ac_hdr" >&5 +echo "configure:4511: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4621 "configure" +#line 4516 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4652,17 +4547,17 @@ for ac_hdr in readline/readline.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4656: checking for $ac_hdr" >&5 +echo "configure:4551: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4661 "configure" +#line 4556 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4692,17 +4587,17 @@ for ac_hdr in sys/select.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4696: checking for $ac_hdr" >&5 +echo "configure:4591: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4701 "configure" +#line 4596 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4732,17 +4627,17 @@ for ac_hdr in termios.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4736: checking for $ac_hdr" >&5 +echo "configure:4631: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4741 "configure" +#line 4636 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4641: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4772,17 +4667,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4776: checking for $ac_hdr" >&5 +echo "configure:4671: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4781 "configure" +#line 4676 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4812,17 +4707,17 @@ for ac_hdr in values.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4816: checking for $ac_hdr" >&5 +echo "configure:4711: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4821 "configure" +#line 4716 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4852,17 +4747,17 @@ for ac_hdr in sys/exec.h sys/pstat.h machine/vmparam.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4856: checking for $ac_hdr" >&5 +echo "configure:4751: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4861 "configure" +#line 4756 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4892,17 +4787,17 @@ for ac_hdr in sys/types.h sys/socket.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4896: checking for $ac_hdr" >&5 +echo "configure:4791: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4901 "configure" +#line 4796 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4932,17 +4827,17 @@ for ac_hdr in sys/param.h pwd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4936: checking for $ac_hdr" >&5 +echo "configure:4831: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4941 "configure" +#line 4836 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4971,12 +4866,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4975: checking for working const" >&5 +echo "configure:4870: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4980 "configure" +#line 4875 "configure" #include "confdefs.h" int main() { @@ -5025,7 +4920,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5046,21 +4941,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:5050: checking for inline" >&5 +echo "configure:4945: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 5057 "configure" +#line 4952 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:5064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -5088,12 +4983,12 @@ esac echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:5092: checking for preprocessor stringizing operator" >&5 +echo "configure:4987: checking for preprocessor stringizing operator" >&5 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5097 "configure" +#line 4992 "configure" #include "confdefs.h" #define x(y) #y @@ -5123,12 +5018,12 @@ fi echo "$ac_t""${ac_cv_c_stringize}" 1>&6 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5127: checking for uid_t in sys/types.h" >&5 +echo "configure:5022: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5132 "configure" +#line 5027 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -5157,12 +5052,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:5161: checking for mode_t" >&5 +echo "configure:5056: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5166 "configure" +#line 5061 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5190,12 +5085,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5194: checking for off_t" >&5 +echo "configure:5089: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5199 "configure" +#line 5094 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5223,12 +5118,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5227: checking for size_t" >&5 +echo "configure:5122: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5232 "configure" +#line 5127 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5256,12 +5151,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5260: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5155: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5265 "configure" +#line 5160 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -5269,7 +5164,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5290,12 +5185,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:5294: checking for tm_zone in struct tm" >&5 +echo "configure:5189: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5299 "configure" +#line 5194 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -5303,7 +5198,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:5307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -5323,12 +5218,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:5327: checking for tzname" >&5 +echo "configure:5222: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5332 "configure" +#line 5227 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -5338,7 +5233,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:5342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -5360,19 +5255,19 @@ EOF fi echo $ac_n "checking for signed types""... $ac_c" 1>&6 -echo "configure:5364: checking for signed types" >&5 +echo "configure:5259: checking for signed types" >&5 if eval "test \"`echo '$''{'pgac_cv_c_signed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5369 "configure" +#line 5264 "configure" #include "confdefs.h" int main() { signed char c; signed short s; signed int i; ; return 0; } EOF -if { (eval echo configure:5376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_signed=yes else @@ -5392,19 +5287,19 @@ EOF fi echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:5396: checking for volatile" >&5 +echo "configure:5291: checking for volatile" >&5 if eval "test \"`echo '$''{'pgac_cv_c_volatile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5401 "configure" +#line 5296 "configure" #include "confdefs.h" int main() { extern volatile int i; ; return 0; } EOF -if { (eval echo configure:5408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_c_volatile=yes else @@ -5424,7 +5319,7 @@ EOF fi echo $ac_n "checking types of arguments for accept()""... $ac_c" 1>&6 -echo "configure:5428: checking types of arguments for accept()" >&5 +echo "configure:5323: checking types of arguments for accept()" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept_arg1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5438,7 +5333,7 @@ else for ac_cv_func_accept_arg2 in 'struct sockaddr *' 'void *'; do for ac_cv_func_accept_arg3 in 'socklen_t' 'size_t' 'unsigned int' 'int'; do cat > conftest.$ac_ext <<EOF -#line 5442 "configure" +#line 5337 "configure" #include "confdefs.h" #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -5451,7 +5346,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no ; break 3 else @@ -5492,19 +5387,19 @@ EOF echo $ac_n "checking for int timezone""... $ac_c" 1>&6 -echo "configure:5496: checking for int timezone" >&5 +echo "configure:5391: checking for int timezone" >&5 if eval "test \"`echo '$''{'pgac_cv_var_int_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5501 "configure" +#line 5396 "configure" #include "confdefs.h" #include <time.h> int main() { int res = timezone / 60; ; return 0; } EOF -if { (eval echo configure:5508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_var_int_timezone=yes else @@ -5524,12 +5419,12 @@ EOF fi echo $ac_n "checking whether gettimeofday takes only one argument""... $ac_c" 1>&6 -echo "configure:5528: checking whether gettimeofday takes only one argument" >&5 +echo "configure:5423: checking whether gettimeofday takes only one argument" >&5 if eval "test \"`echo '$''{'pgac_cv_func_gettimeofday_1arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5533 "configure" +#line 5428 "configure" #include "confdefs.h" #include <sys/time.h> int main() { @@ -5538,7 +5433,7 @@ struct timezone *tzp; gettimeofday(tp,tzp); ; return 0; } EOF -if { (eval echo configure:5542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_func_gettimeofday_1arg=no else @@ -5558,12 +5453,12 @@ EOF fi echo $ac_n "checking for union semun""... $ac_c" 1>&6 -echo "configure:5562: checking for union semun" >&5 +echo "configure:5457: checking for union semun" >&5 if eval "test \"`echo '$''{'pgac_cv_union_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5567 "configure" +#line 5462 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/ipc.h> @@ -5572,7 +5467,7 @@ int main() { union semun semun; ; return 0; } EOF -if { (eval echo configure:5576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* pgac_cv_union_semun=yes else @@ -5594,9 +5489,9 @@ fi echo $ac_n "checking for fcntl(F_SETLK)""... $ac_c" 1>&6 -echo "configure:5598: checking for fcntl(F_SETLK)" >&5 +echo "configure:5493: checking for fcntl(F_SETLK)" >&5 cat > conftest.$ac_ext <<EOF -#line 5600 "configure" +#line 5495 "configure" #include "confdefs.h" #include <stdio.h> #include <fcntl.h> @@ -5607,7 +5502,7 @@ struct flock lck; fcntl(0, F_SETLK, &lck); ; return 0; } EOF -if { (eval echo configure:5611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FCNTL_SETLK 1 @@ -5622,7 +5517,7 @@ fi rm -f conftest* echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:5626: checking for 8-bit clean memcmp" >&5 +echo "configure:5521: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5630,7 +5525,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 5634 "configure" +#line 5529 "configure" #include "confdefs.h" main() @@ -5640,7 +5535,7 @@ main() } EOF -if { (eval echo configure:5644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -5658,12 +5553,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:5662: checking return type of signal handlers" >&5 +echo "configure:5557: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5667 "configure" +#line 5562 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -5680,7 +5575,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:5684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -5699,12 +5594,12 @@ EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:5703: checking for vprintf" >&5 +echo "configure:5598: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5708 "configure" +#line 5603 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vprintf(); below. */ @@ -5727,7 +5622,7 @@ vprintf(); ; return 0; } EOF -if { (eval echo configure:5731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -5751,12 +5646,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:5755: checking for _doprnt" >&5 +echo "configure:5650: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5760 "configure" +#line 5655 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char _doprnt(); below. */ @@ -5779,7 +5674,7 @@ _doprnt(); ; return 0; } EOF -if { (eval echo configure:5783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -5806,12 +5701,12 @@ fi for ac_func in memmove sysconf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5810: checking for $ac_func" >&5 +echo "configure:5705: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5815 "configure" +#line 5710 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5834,7 +5729,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5861,12 +5756,12 @@ done for ac_func in sigprocmask waitpid setsid fcvt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5865: checking for $ac_func" >&5 +echo "configure:5760: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5870 "configure" +#line 5765 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5889,7 +5784,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5916,12 +5811,12 @@ done for ac_func in setproctitle pstat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5920: checking for $ac_func" >&5 +echo "configure:5815: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5925 "configure" +#line 5820 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5944,7 +5839,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5970,9 +5865,9 @@ done echo $ac_n "checking for PS_STRINGS""... $ac_c" 1>&6 -echo "configure:5974: checking for PS_STRINGS" >&5 +echo "configure:5869: checking for PS_STRINGS" >&5 cat > conftest.$ac_ext <<EOF -#line 5976 "configure" +#line 5871 "configure" #include "confdefs.h" #ifdef HAVE_MACHINE_VMPARAM_H # include <machine/vmparam.h> @@ -5985,7 +5880,7 @@ PS_STRINGS->ps_nargvstr = 1; PS_STRINGS->ps_argvstr = "foo"; ; return 0; } EOF -if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF #define HAVE_PS_STRINGS 1 @@ -6002,12 +5897,12 @@ rm -f conftest* for ac_func in fpclass fp_class fp_class_d class do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6006: checking for $ac_func" >&5 +echo "configure:5901: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6011 "configure" +#line 5906 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6030,7 +5925,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6056,12 +5951,12 @@ done SNPRINTF='' echo $ac_n "checking for snprintf""... $ac_c" 1>&6 -echo "configure:6060: checking for snprintf" >&5 +echo "configure:5955: checking for snprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_snprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6065 "configure" +#line 5960 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char snprintf(); below. */ @@ -6084,7 +5979,7 @@ snprintf(); ; return 0; } EOF -if { (eval echo configure:6088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_snprintf=yes" else @@ -6108,12 +6003,12 @@ SNPRINTF='snprintf.o' fi echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:6112: checking for vsnprintf" >&5 +echo "configure:6007: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6117 "configure" +#line 6012 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -6136,7 +6031,7 @@ vsnprintf(); ; return 0; } EOF -if { (eval echo configure:6140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -6161,7 +6056,7 @@ fi cat > conftest.$ac_ext <<EOF -#line 6165 "configure" +#line 6060 "configure" #include "confdefs.h" #include <stdio.h> EOF @@ -6176,7 +6071,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 6180 "configure" +#line 6075 "configure" #include "confdefs.h" #include <stdio.h> EOF @@ -6191,19 +6086,19 @@ fi rm -f conftest* echo $ac_n "checking for isinf""... $ac_c" 1>&6 -echo "configure:6195: checking for isinf" >&5 +echo "configure:6090: checking for isinf" >&5 if eval "test \"`echo '$''{'ac_cv_func_or_macro_isinf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6200 "configure" +#line 6095 "configure" #include "confdefs.h" #include <math.h> int main() { double x = 0.0; int res = isinf(x); ; return 0; } EOF -if { (eval echo configure:6207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_or_macro_isinf=yes else @@ -6228,12 +6123,12 @@ else fi echo $ac_n "checking for getrusage""... $ac_c" 1>&6 -echo "configure:6232: checking for getrusage" >&5 +echo "configure:6127: checking for getrusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_getrusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6237 "configure" +#line 6132 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getrusage(); below. */ @@ -6256,7 +6151,7 @@ getrusage(); ; return 0; } EOF -if { (eval echo configure:6260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getrusage=yes" else @@ -6281,12 +6176,12 @@ fi echo $ac_n "checking for srandom""... $ac_c" 1>&6 -echo "configure:6285: checking for srandom" >&5 +echo "configure:6180: checking for srandom" >&5 if eval "test \"`echo '$''{'ac_cv_func_srandom'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6290 "configure" +#line 6185 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char srandom(); below. */ @@ -6309,7 +6204,7 @@ srandom(); ; return 0; } EOF -if { (eval echo configure:6313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_srandom=yes" else @@ -6334,12 +6229,12 @@ fi echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -echo "configure:6338: checking for gethostname" >&5 +echo "configure:6233: checking for gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6343 "configure" +#line 6238 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostname(); below. */ @@ -6362,7 +6257,7 @@ gethostname(); ; return 0; } EOF -if { (eval echo configure:6366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else @@ -6387,12 +6282,12 @@ fi echo $ac_n "checking for random""... $ac_c" 1>&6 -echo "configure:6391: checking for random" >&5 +echo "configure:6286: checking for random" >&5 if eval "test \"`echo '$''{'ac_cv_func_random'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6396 "configure" +#line 6291 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char random(); below. */ @@ -6415,7 +6310,7 @@ random(); ; return 0; } EOF -if { (eval echo configure:6419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_random=yes" else @@ -6440,12 +6335,12 @@ fi echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 -echo "configure:6444: checking for inet_aton" >&5 +echo "configure:6339: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6449 "configure" +#line 6344 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char inet_aton(); below. */ @@ -6468,7 +6363,7 @@ inet_aton(); ; return 0; } EOF -if { (eval echo configure:6472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else @@ -6493,12 +6388,12 @@ fi echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:6497: checking for strerror" >&5 +echo "configure:6392: checking for strerror" >&5 if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6502 "configure" +#line 6397 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strerror(); below. */ @@ -6521,7 +6416,7 @@ strerror(); ; return 0; } EOF -if { (eval echo configure:6525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strerror=yes" else @@ -6547,12 +6442,12 @@ fi echo $ac_n "checking for strdup""... $ac_c" 1>&6 -echo "configure:6551: checking for strdup" >&5 +echo "configure:6446: checking for strdup" >&5 if eval "test \"`echo '$''{'ac_cv_func_strdup'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6556 "configure" +#line 6451 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strdup(); below. */ @@ -6575,7 +6470,7 @@ strdup(); ; return 0; } EOF -if { (eval echo configure:6579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strdup=yes" else @@ -6600,12 +6495,12 @@ fi echo $ac_n "checking for strtol""... $ac_c" 1>&6 -echo "configure:6604: checking for strtol" >&5 +echo "configure:6499: checking for strtol" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtol'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6609 "configure" +#line 6504 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtol(); below. */ @@ -6628,7 +6523,7 @@ strtol(); ; return 0; } EOF -if { (eval echo configure:6632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtol=yes" else @@ -6653,12 +6548,12 @@ fi echo $ac_n "checking for strtoul""... $ac_c" 1>&6 -echo "configure:6657: checking for strtoul" >&5 +echo "configure:6552: checking for strtoul" >&5 if eval "test \"`echo '$''{'ac_cv_func_strtoul'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6662 "configure" +#line 6557 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strtoul(); below. */ @@ -6681,7 +6576,7 @@ strtoul(); ; return 0; } EOF -if { (eval echo configure:6685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strtoul=yes" else @@ -6706,12 +6601,12 @@ fi echo $ac_n "checking for strcasecmp""... $ac_c" 1>&6 -echo "configure:6710: checking for strcasecmp" >&5 +echo "configure:6605: checking for strcasecmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_strcasecmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6715 "configure" +#line 6610 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strcasecmp(); below. */ @@ -6734,7 +6629,7 @@ strcasecmp(); ; return 0; } EOF -if { (eval echo configure:6738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strcasecmp=yes" else @@ -6759,12 +6654,12 @@ fi echo $ac_n "checking for cbrt""... $ac_c" 1>&6 -echo "configure:6763: checking for cbrt" >&5 +echo "configure:6658: checking for cbrt" >&5 if eval "test \"`echo '$''{'ac_cv_func_cbrt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6768 "configure" +#line 6663 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char cbrt(); below. */ @@ -6787,7 +6682,7 @@ cbrt(); ; return 0; } EOF -if { (eval echo configure:6791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_cbrt=yes" else @@ -6808,7 +6703,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for cbrt in -lm""... $ac_c" 1>&6 -echo "configure:6812: checking for cbrt in -lm" >&5 +echo "configure:6707: checking for cbrt in -lm" >&5 ac_lib_var=`echo m'_'cbrt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6816,7 +6711,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 6820 "configure" +#line 6715 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6827,7 +6722,7 @@ int main() { cbrt() ; return 0; } EOF -if { (eval echo configure:6831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6865,12 +6760,12 @@ esac echo $ac_n "checking for rint""... $ac_c" 1>&6 -echo "configure:6869: checking for rint" >&5 +echo "configure:6764: checking for rint" >&5 if eval "test \"`echo '$''{'ac_cv_func_rint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6874 "configure" +#line 6769 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char rint(); below. */ @@ -6893,7 +6788,7 @@ rint(); ; return 0; } EOF -if { (eval echo configure:6897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_rint=yes" else @@ -6914,7 +6809,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for rint in -lm""... $ac_c" 1>&6 -echo "configure:6918: checking for rint in -lm" >&5 +echo "configure:6813: checking for rint in -lm" >&5 ac_lib_var=`echo m'_'rint | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6922,7 +6817,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $HPUXMATHLIB $LIBS" cat > conftest.$ac_ext <<EOF -#line 6926 "configure" +#line 6821 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6933,7 +6828,7 @@ int main() { rint() ; return 0; } EOF -if { (eval echo configure:6937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6960,7 +6855,7 @@ fi cat > conftest.$ac_ext <<EOF -#line 6964 "configure" +#line 6859 "configure" #include "confdefs.h" #include <readline.h> EOF @@ -6974,7 +6869,7 @@ EOF else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 6978 "configure" +#line 6873 "configure" #include "confdefs.h" #include <readline/readline.h> EOF @@ -6996,12 +6891,12 @@ rm -f conftest* for ac_func in filename_completion_function do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7000: checking for $ac_func" >&5 +echo "configure:6895: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7005 "configure" +#line 6900 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7024,7 +6919,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7043,7 +6938,7 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then #define $ac_tr_func 1 EOF cat > conftest.$ac_ext <<EOF -#line 7047 "configure" +#line 6942 "configure" #include "confdefs.h" #include <readline.h> EOF @@ -7057,7 +6952,7 @@ EOF else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 7061 "configure" +#line 6956 "configure" #include "confdefs.h" #include <readline/readline.h> EOF @@ -7086,12 +6981,12 @@ done for ac_func in getopt_long do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7090: checking for $ac_func" >&5 +echo "configure:6985: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7095 "configure" +#line 6990 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7114,7 +7009,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7140,16 +7035,16 @@ done echo $ac_n "checking for finite""... $ac_c" 1>&6 -echo "configure:7144: checking for finite" >&5 +echo "configure:7039: checking for finite" >&5 cat > conftest.$ac_ext <<EOF -#line 7146 "configure" +#line 7041 "configure" #include "confdefs.h" #include <math.h> int main() { int dummy=finite(1.0); ; return 0; } EOF -if { (eval echo configure:7153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FINITE 1 @@ -7164,16 +7059,16 @@ fi rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:7168: checking for sigsetjmp" >&5 +echo "configure:7063: checking for sigsetjmp" >&5 cat > conftest.$ac_ext <<EOF -#line 7170 "configure" +#line 7065 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf x; sigsetjmp(x, 1); ; return 0; } EOF -if { (eval echo configure:7177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_SIGSETJMP 1 @@ -7192,12 +7087,12 @@ if test "${enable_syslog+set}" = set; then enableval="$enable_syslog" case $enableval in y|ye|yes) echo $ac_n "checking for syslog""... $ac_c" 1>&6 -echo "configure:7196: checking for syslog" >&5 +echo "configure:7091: checking for syslog" >&5 if eval "test \"`echo '$''{'ac_cv_func_syslog'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7201 "configure" +#line 7096 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char syslog(); below. */ @@ -7220,7 +7115,7 @@ syslog(); ; return 0; } EOF -if { (eval echo configure:7224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_syslog=yes" else @@ -7251,7 +7146,7 @@ fi echo $ac_n "checking whether long int is 64 bits""... $ac_c" 1>&6 -echo "configure:7255: checking whether long int is 64 bits" >&5 +echo "configure:7150: checking whether long int is 64 bits" >&5 if eval "test \"`echo '$''{'pgac_cv_type_long_int_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7260,7 +7155,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 7264 "configure" +#line 7159 "configure" #include "confdefs.h" typedef long int int64; @@ -7289,7 +7184,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:7293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_type_long_int_64=yes else @@ -7316,7 +7211,7 @@ fi if test x"$HAVE_LONG_INT_64" = x"no" ; then echo $ac_n "checking whether long long int is 64 bits""... $ac_c" 1>&6 -echo "configure:7320: checking whether long long int is 64 bits" >&5 +echo "configure:7215: checking whether long long int is 64 bits" >&5 if eval "test \"`echo '$''{'pgac_cv_type_long_long_int_64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7325,7 +7220,7 @@ else echo "configure: warning: 64 bit arithmetic disabled when cross-compiling" 1>&2 else cat > conftest.$ac_ext <<EOF -#line 7329 "configure" +#line 7224 "configure" #include "confdefs.h" typedef long long int int64; @@ -7354,7 +7249,7 @@ main() { exit(! does_int64_work()); } EOF -if { (eval echo configure:7358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_type_long_long_int_64=yes else @@ -7385,7 +7280,7 @@ fi if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then if [ x$SNPRINTF = x ] ; then echo $ac_n "checking whether snprintf handles 'long long int' as %lld""... $ac_c" 1>&6 -echo "configure:7389: checking whether snprintf handles 'long long int' as %lld" >&5 +echo "configure:7284: checking whether snprintf handles 'long long int' as %lld" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 # Force usage of our own snprintf, since we cannot test foreign snprintf @@ -7394,7 +7289,7 @@ echo "configure:7389: checking whether snprintf handles 'long long int' as %lld" else cat > conftest.$ac_ext <<EOF -#line 7398 "configure" +#line 7293 "configure" #include "confdefs.h" #include <stdio.h> typedef long long int int64; @@ -7421,7 +7316,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 INT64_FORMAT='"%lld"' @@ -7432,7 +7327,7 @@ else rm -fr conftest* echo "$ac_t""no" 1>&6 echo $ac_n "checking whether snprintf handles 'long long int' as %qd""... $ac_c" 1>&6 -echo "configure:7436: checking whether snprintf handles 'long long int' as %qd" >&5 +echo "configure:7331: checking whether snprintf handles 'long long int' as %qd" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""assuming not on target machine" 1>&6 # Force usage of our own snprintf, since we cannot test foreign snprintf @@ -7441,7 +7336,7 @@ echo "configure:7436: checking whether snprintf handles 'long long int' as %qd" else cat > conftest.$ac_ext <<EOF -#line 7445 "configure" +#line 7340 "configure" #include "confdefs.h" #include <stdio.h> typedef long long int int64; @@ -7468,7 +7363,7 @@ main() { exit(! does_int64_snprintf_work()); } EOF -if { (eval echo configure:7472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 INT64_FORMAT='"%qd"' @@ -7507,7 +7402,7 @@ EOF echo $ac_n "checking alignment of short""... $ac_c" 1>&6 -echo "configure:7511: checking alignment of short" >&5 +echo "configure:7406: checking alignment of short" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7515,7 +7410,7 @@ else pgac_cv_alignof_short='sizeof(short)' else cat > conftest.$ac_ext <<EOF -#line 7519 "configure" +#line 7414 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; short field; } mystruct; @@ -7527,7 +7422,7 @@ main() exit(0); } EOF -if { (eval echo configure:7531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_short=`cat conftestval` else @@ -7547,7 +7442,7 @@ EOF echo $ac_n "checking alignment of int""... $ac_c" 1>&6 -echo "configure:7551: checking alignment of int" >&5 +echo "configure:7446: checking alignment of int" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7555,7 +7450,7 @@ else pgac_cv_alignof_int='sizeof(int)' else cat > conftest.$ac_ext <<EOF -#line 7559 "configure" +#line 7454 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; int field; } mystruct; @@ -7567,7 +7462,7 @@ main() exit(0); } EOF -if { (eval echo configure:7571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_int=`cat conftestval` else @@ -7587,7 +7482,7 @@ EOF echo $ac_n "checking alignment of long""... $ac_c" 1>&6 -echo "configure:7591: checking alignment of long" >&5 +echo "configure:7486: checking alignment of long" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7595,7 +7490,7 @@ else pgac_cv_alignof_long='sizeof(long)' else cat > conftest.$ac_ext <<EOF -#line 7599 "configure" +#line 7494 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; long field; } mystruct; @@ -7607,7 +7502,7 @@ main() exit(0); } EOF -if { (eval echo configure:7611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_long=`cat conftestval` else @@ -7628,7 +7523,7 @@ EOF if [ x"$HAVE_LONG_LONG_INT_64" = xyes ] ; then echo $ac_n "checking alignment of long long int""... $ac_c" 1>&6 -echo "configure:7632: checking alignment of long long int" >&5 +echo "configure:7527: checking alignment of long long int" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_long_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7636,7 +7531,7 @@ else pgac_cv_alignof_long_long_int='sizeof(long long int)' else cat > conftest.$ac_ext <<EOF -#line 7640 "configure" +#line 7535 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; long long int field; } mystruct; @@ -7648,7 +7543,7 @@ main() exit(0); } EOF -if { (eval echo configure:7652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_long_long_int=`cat conftestval` else @@ -7669,7 +7564,7 @@ EOF fi echo $ac_n "checking alignment of double""... $ac_c" 1>&6 -echo "configure:7673: checking alignment of double" >&5 +echo "configure:7568: checking alignment of double" >&5 if eval "test \"`echo '$''{'pgac_cv_alignof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7677,7 +7572,7 @@ else pgac_cv_alignof_double='sizeof(double)' else cat > conftest.$ac_ext <<EOF -#line 7681 "configure" +#line 7576 "configure" #include "confdefs.h" #include <stdio.h> struct { char filler; double field; } mystruct; @@ -7689,7 +7584,7 @@ main() exit(0); } EOF -if { (eval echo configure:7693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pgac_cv_alignof_double=`cat conftestval` else @@ -7727,12 +7622,12 @@ EOF echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:7731: checking for POSIX signal interface" >&5 +echo "configure:7626: checking for POSIX signal interface" >&5 if eval "test \"`echo '$''{'pgac_cv_func_posix_signals'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7736 "configure" +#line 7631 "configure" #include "confdefs.h" #include <signal.h> @@ -7743,7 +7638,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:7747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* pgac_cv_func_posix_signals=yes else @@ -7772,7 +7667,7 @@ then # Extract the first word of "tclsh", so it can be a program name with args. set dummy tclsh; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7776: checking for $ac_word" >&5 +echo "configure:7671: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7809,7 +7704,7 @@ fi # Extract the first word of "tcl", so it can be a program name with args. set dummy tcl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7813: checking for $ac_word" >&5 +echo "configure:7708: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7852,7 +7747,7 @@ fi if test "$USE_TCL" = true then echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:7856: checking for tclConfig.sh" >&5 +echo "configure:7751: checking for tclConfig.sh" >&5 TCL_CONFIG_SH= library_dirs= if test -z "$TCL_DIRS" @@ -7881,7 +7776,7 @@ USE_TK=$USE_TCL # If TCL is disabled, disable TK if test "$USE_TK" = true then echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 -echo "configure:7885: checking for tkConfig.sh" >&5 +echo "configure:7780: checking for tkConfig.sh" >&5 TK_CONFIG_SH= # library_dirs are set in the check for TCL for dir in $library_dirs @@ -7903,7 +7798,7 @@ echo "configure:7885: checking for tkConfig.sh" >&5 # Extract the first word of "wish", so it can be a program name with args. set dummy wish; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7907: checking for $ac_word" >&5 +echo "configure:7802: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7953,7 +7848,7 @@ if test "$USE_X" = true; then # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:7957: checking for X" >&5 +echo "configure:7852: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -8015,12 +7910,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 8019 "configure" +#line 7914 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8089,14 +7984,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 8093 "configure" +#line 7988 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:8100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -8202,17 +8097,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:8206: checking whether -R must be followed by a space" >&5 +echo "configure:8101: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 8209 "configure" +#line 8104 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:8216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -8228,14 +8123,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 8232 "configure" +#line 8127 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:8239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -8267,7 +8162,7 @@ rm -f conftest* # libraries were built with DECnet support. And [email protected] says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:8271: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:8166: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8275,7 +8170,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 8279 "configure" +#line 8174 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8286,7 +8181,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:8290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8308,7 +8203,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:8312: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:8207: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8316,7 +8211,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 8320 "configure" +#line 8215 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8327,7 +8222,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:8331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8356,12 +8251,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to [email protected]. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:8360: checking for gethostbyname" >&5 +echo "configure:8255: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8365 "configure" +#line 8260 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -8384,7 +8279,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:8388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -8405,7 +8300,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:8409: checking for gethostbyname in -lnsl" >&5 +echo "configure:8304: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8413,7 +8308,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 8417 "configure" +#line 8312 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8424,7 +8319,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:8428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8454,12 +8349,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:8458: checking for connect" >&5 +echo "configure:8353: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8463 "configure" +#line 8358 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -8482,7 +8377,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:8486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -8503,7 +8398,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:8507: checking for connect in -lsocket" >&5 +echo "configure:8402: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8511,7 +8406,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 8515 "configure" +#line 8410 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8522,7 +8417,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:8526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8546,12 +8441,12 @@ fi # [email protected] says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:8550: checking for remove" >&5 +echo "configure:8445: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8555 "configure" +#line 8450 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -8574,7 +8469,7 @@ remove(); ; return 0; } EOF -if { (eval echo configure:8578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -8595,7 +8490,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:8599: checking for remove in -lposix" >&5 +echo "configure:8494: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8603,7 +8498,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 8607 "configure" +#line 8502 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8614,7 +8509,7 @@ int main() { remove() ; return 0; } EOF -if { (eval echo configure:8618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8638,12 +8533,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:8642: checking for shmat" >&5 +echo "configure:8537: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8647 "configure" +#line 8542 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -8666,7 +8561,7 @@ shmat(); ; return 0; } EOF -if { (eval echo configure:8670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -8687,7 +8582,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:8691: checking for shmat in -lipc" >&5 +echo "configure:8586: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8695,7 +8590,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 8699 "configure" +#line 8594 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8706,7 +8601,7 @@ int main() { shmat() ; return 0; } EOF -if { (eval echo configure:8710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8739,7 +8634,7 @@ fi # libraries we check for below, so use a different variable. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:8743: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:8638: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8747,7 +8642,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 8751 "configure" +#line 8646 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8758,7 +8653,7 @@ int main() { IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:8762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8791,7 +8686,7 @@ fi X11_LIBS="" echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:8795: checking for XOpenDisplay in -lX11" >&5 +echo "configure:8690: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8799,7 +8694,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 ${X_PRE_LIBS} $LIBS" cat > conftest.$ac_ext <<EOF -#line 8803 "configure" +#line 8698 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8810,7 +8705,7 @@ int main() { XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:8814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8955,7 +8850,6 @@ trap 'rm -fr `echo "GNUmakefile src/GNUmakefile src/Makefile.global src/backend/port/Makefile - src/backend/catalog/genbki.sh src/test/regress/GNUmakefile src/include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -9045,9 +8939,6 @@ s%@LN_S@%$LN_S%g s%@RANLIB@%$RANLIB%g s%@find@%$find%g s%@tar@%$tar%g -s%@split@%$split%g -s%@etags@%$etags%g -s%@xargs@%$xargs%g s%@GZCAT@%$GZCAT%g s%@PERL@%$PERL%g s%@YACC@%$YACC%g @@ -9124,7 +9015,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile src/GNUmakefile src/Makefile.global src/backend/port/Makefile - src/backend/catalog/genbki.sh src/test/regress/GNUmakefile "} EOF diff --git a/configure.in b/configure.in index 4c937ad856..468f94dda4 100644 --- a/configure.in +++ b/configure.in @@ -133,7 +133,7 @@ if test ! -f "src/template/$TEMPLATE"; then echo "" echo "Available Templates (select one using --with-template):" echo "" - ls template + ls src/template echo "" exit fi @@ -680,9 +680,6 @@ AC_PROG_LN_S AC_PROG_RANLIB AC_PATH_PROG(find, find) AC_PATH_PROG(tar, tar) -AC_PATH_PROG(split, split) -AC_PATH_PROG(etags, etags) -AC_PATH_PROG(xargs, xargs) AC_PATH_PROGS(GZCAT, gzcat zcat, gzcat) AC_CHECK_PROGS(PERL, perl,) AC_PROG_YACC @@ -1203,6 +1200,5 @@ AC_OUTPUT( src/GNUmakefile src/Makefile.global src/backend/port/Makefile - src/backend/catalog/genbki.sh src/test/regress/GNUmakefile ) diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in index a251608701..83d69dd406 100644 --- a/src/GNUmakefile.in +++ b/src/GNUmakefile.in @@ -1,90 +1,41 @@ #------------------------------------------------------------------------- # -# Makefile.inc-- -# Build and install postgres. +# Makefile for src # # Copyright (c) 1994, Regents of the University of California # -# -# IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.56 2000/07/02 15:20:41 petere Exp $ +# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.57 2000/07/06 21:33:12 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR= . +subdir = src +top_builddir = .. include Makefile.global -FIND = @find@ - -# assuming gnu tar and split here -TAR = @tar@ -SPLIT = @split@ - -ETAGS = @etags@ -XARGS = @xargs@ -all: - $(MAKE) -C backend all - $(MAKE) -C interfaces all - $(MAKE) -C bin all - $(MAKE) -C pl all - -install: installdirs - $(MAKE) -C backend install - $(MAKE) -C interfaces install - $(MAKE) -C bin install - $(MAKE) -C pl install - -installdirs: - ../config/mkinstalldirs $(BINDIR) $(LIBDIR) $(INCLUDEDIR) +all install installdirs uninstall dep depend: + $(MAKE) -C backend $@ + $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ clean: - $(MAKE) -C utils clean - $(MAKE) -C backend clean - $(MAKE) -C interfaces clean - $(MAKE) -C bin clean - $(MAKE) -C pl clean + $(MAKE) -C backend $@ + $(MAKE) -C include $@ + $(MAKE) -C interfaces $@ + $(MAKE) -C bin $@ + $(MAKE) -C pl $@ + $(MAKE) -C utils $@ $(MAKE) -C test clean - $(MAKE) -C ../contrib/spi clean -# Not all subdirectories have a make distclean target yet distclean maintainer-clean: - -$(MAKE) -C utils clean - -$(MAKE) -C backend clean - rm -f backend/port/Makefile backend/catalog/genbki.sh \ - backend/port/tas.s backend/port/dynloader.c + -$(MAKE) -C utils $@ + -$(MAKE) -C backend $@ + -$(MAKE) -C include $@ -$(MAKE) -C interfaces $@ -$(MAKE) -C bin $@ -$(MAKE) -C pl $@ -$(MAKE) -C test clean rm -f test/regress/GNUmakefile - -$(MAKE) -C ../contrib/spi clean - rm -f Makefile.port \ - include/config.h include/dynloader.h \ - include/os.h include/version.h \ - Makefile.global \ - GNUmakefile - -.DEFAULT: - $(MAKE) -C utils $@ - $(MAKE) -C backend $@ - $(MAKE) -C interfaces $@ - $(MAKE) -C bin $@ - $(MAKE) -C pl $@ - -TAGS: - rm -f TAGS; \ - for i in backend interfaces/libpq bin; do \ - $(FIND) $$i -name '*.[chyl]' -print | $(XARGS) $(ETAGS) -a ; \ - done - -# target to generate a backup tar file and split files that can be -# saved to 1.44M floppy -BACKUP: - rm -f BACKUP.filelist BACKUP.tgz; \ - $(FIND) . -not -path '*obj/*' -not -path '*data/*' -type f -print > BACKUP.filelist; \ - $(TAR) --files-from BACKUP.filelist -c -z -v -f BACKUP.tgz - $(SPLIT) --bytes=1400k BACKUP.tgz pgBACKUP. - -.PHONY: TAGS -.PHONY: BACKUP + rm -f Makefile.port Makefile.global GNUmakefile diff --git a/src/backend/Makefile b/src/backend/Makefile index 5c3a520fbd..5394aa0d45 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -1,47 +1,18 @@ #------------------------------------------------------------------------- # -# Makefile-- -# Makefile for the postgres backend (and the postmaster) +# Makefile for the postgres backend # # Copyright (c) 1994, Regents of the University of California # -# Functional notes: -# -# Parallel make: -# -# This make file is set up so that you can do a parallel make (with -# the --jobs option of make) and make multiple subdirectories at -# once. -# -# However, the subdirectory make files are not so careful. -# Normally, the --jobs option would get passed down to those -# subdirectory makes, like any other make option, and they would -# fail. But there's a trick: Put a value (max number of -# processes) on the --jobs option, e.g. --jobs=4. Now, due to a -# special feature of make, the --jobs option will not get passed -# to the subdirectory makes. (make does this because if you only -# want 4 tasks running, then splitting the subdirectory makes into -# multiple tasks would violate your wishes). -# -# -# -# Implementation notes: -# -# We don't use $(LD) for linking. We use $(CC) instead. This is because -# the $(CC) program apparently can do linking too, and it has certain -# things like default options and search paths for libraries set up for -# it that the more primitive $(LD) doesn't have. -# -# -# IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.57 2000/07/02 15:20:44 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.58 2000/07/06 21:33:14 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = .. -include $(SRCDIR)/Makefile.global +subdir = src/backend +top_builddir = ../.. +include ../Makefile.global -DIRS = access bootstrap catalog commands executor lib libpq \ +DIRS := access bootstrap catalog commands executor lib libpq \ main parser nodes optimizer port postmaster regex rewrite \ storage tcop utils @@ -49,221 +20,165 @@ ifdef TIOGA DIRS += tioga endif -OBJS = $(DIRS:%=%/SUBSYS.o) +OBJS := $(DIRS:%=%/SUBSYS.o) ifeq ($(PORTNAME), qnx4) -# This file crashes qnx4's wlink and is therefore not in bootstrap/SUBSYS.o -# on that platform. (Wotta hack ... is it still necessary?) +# This file crashes qnx4's wlink and is therefore not in +# bootstrap/SUBSYS.o on that platform. (Wotta hack ... is it still +# necessary?) OBJS+= bootstrap/bootstrap.o endif -ifeq ($(MAKE_DLL), true) -DLLOBJS= $(OBJS) -DLLLIBS= -L/usr/local/lib -lcygipc -lcrypt -lcygwin -lkernel32 -postgres.def: $(DLLOBJS) - $(DLLTOOL) --export-all --output-def $@ $(DLLOBJS) +########################################################################## -libpostgres.a: $(DLLOBJS) $(SRCDIR)/utils/dllinit.o postgres.def - $(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@ -endif +all: postgres $(POSTGRES_IMP) -all: prebuildheaders postgres $(POSTGRES_IMP) +# Note that this is bogus. The desired effect is to build these +# commonly used headers before doing much else. However, nothing says +# that make is required to update these dependencies in any particular +# order, it just happens to do that. Parallel make is broken though. ifneq ($(PORTNAME), win) -postgres: $(OBJS) - $(CC) $(CFLAGS) -o postgres $(OBJS) $(LDFLAGS) +postgres: $(top_srcdir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h $(OBJS) + $(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -else +else # win -postgres: $(DLLOBJS) $(SRCDIR)/utils/dllinit.o postgres.def libpostgres.a +# No points for style here. How about encapsulating some of these +# commands into variables? +postgres: $(top_srcdir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h \ + $(DLLOBJS) $(top_builddir)/src/utils/dllinit.o postgres.def libpostgres.a dlltool --dllname $@$(X) --output-exp [email protected] --def postgres.def gcc -g -o $@$(X) -Wl,--base-file,[email protected] [email protected] $(DLLOBJS) $(DLLLIBS) dlltool --dllname $@$(X) --base-file [email protected] --output-exp [email protected] --def postgres.def gcc -g -o $@$(X) [email protected] $(DLLOBJS) $(DLLLIBS) -endif +endif # win + +# Parallel make trickery $(OBJS): $(DIRS:%=%.dir) +.PHONY: $(DIRS:%=%.dir) $(DIRS:%=%.dir): - $(MAKE) -C $(subst .dir,,$@) all + $(MAKE) -C $(subst .dir,,$@) all -$(SRCDIR)/utils/dllinit.o: $(SRCDIR)/utils/dllinit.c - $(MAKE) -C $(SRCDIR)/utils dllinit.o + +ifeq ($(MAKE_DLL), true) +DLLOBJS := $(OBJS) +DLLLIBS := -L/usr/local/lib -lcygipc -lcrypt -lcygwin -lkernel32 + +postgres.def: $(DLLOBJS) + $(DLLTOOL) --export-all --output-def $@ $(DLLOBJS) + +libpostgres.a: $(DLLOBJS) $(top_builddir)/src/utils/dllinit.o postgres.def + $(DLLTOOL) --dllname postgres.exe --def postgres.def --output-lib $@ +endif # MAKE_DLL + + +$(top_builddir)/src/utils/dllinit.o: $(top_srcdir)/src/utils/dllinit.c + $(MAKE) -C $(top_builddir)/src/utils dllinit.o # The postgres.o target is needed by the rule in Makefile.global that # creates the exports file when MAKE_EXPORTS = true. postgres.o: $(OBJS) - $(CC) $(LDREL) $(LDOUT) postgres.o $(OBJS) $(LDFLAGS) + $(CC) $(LDREL) $(LDOUT) $@ $^ $(LDFLAGS) -# These header files should be up-to-date before we do much else... -.PHONY: prebuildheaders -prebuildheaders: $(SRCDIR)/include/parser/parse.h \ - $(SRCDIR)/include/utils/fmgroids.h +# The following targets are specified in make commands that appear in +# the make files in our subdirectories. Note that it's important we +# match the dependencies shown in the subdirectory makefiles! -############################################################################ -# The following targets are specified in make commands that appear in the -# make files in our subdirectories. Note that it's important we match the -# dependencies shown in the subdirectory makefiles! +$(srcdir)/parser/parse.h: parser/gram.y + $(MAKE) -C parser parse.h -$(SRCDIR)/include/parser/parse.h: parser/parse.h - cp parser/parse.h $(SRCDIR)/include/parser +utils/fmgroids.h: utils/Gen_fmgrtab.sh $(top_srcdir)/src/include/catalog/pg_proc.h + $(MAKE) -C utils fmgroids.h -parser/parse.h: parser/gram.y - $(MAKE) -C parser parse.h +# Make symlinks for these headers in the include directory. That way +# we can cut down on the -I options. Also, a symlink is automatically +# up to date when we update the base file. -$(SRCDIR)/include/utils/fmgroids.h: utils/fmgroids.h - cp utils/fmgroids.h $(SRCDIR)/include/utils +$(top_builddir)/src/include/parser/parse.h: $(srcdir)/parser/parse.h + cd $(dir $@) && rm -f $(notdir $@) && \ + $(LN_S) ../../../$(subdir)/parser/parse.h . -utils/fmgroids.h: utils/Gen_fmgrtab.sh $(SRCDIR)/include/catalog/pg_proc.h - $(MAKE) -C utils fmgroids.h +$(top_builddir)/src/include/utils/fmgroids.h: utils/fmgroids.h + cd $(dir $@) && rm -f $(notdir $@) && \ + $(LN_S) ../../../$(subdir)/utils/fmgroids.h . -############################################################################# -clean: - rm -f postgres$(X) $(POSTGRES_IMP) \ - $(SRCDIR)/include/parser/parse.h \ - $(SRCDIR)/include/utils/fmgroids.h + +########################################################################## + +install: all installdirs + $(INSTALL_PROGRAM) postgres$(X) $(bindir)/postgres$(X) + @rm -f $(bindir)/postmaster + ln -s postgres$(X) $(bindir)/postmaster +ifeq ($(MAKE_EXPORTS), true) + $(INSTALL_DATA) $(POSTGRES_IMP) $(libdir)/$(POSTGRES_IMP) +endif ifeq ($(PORTNAME), win) ifeq ($(MAKE_DLL), true) - rm -f postgres.dll postgres.def libpostgres.a + $(INSTALL_DATA) libpostgres.a $(libdir)/libpostgres.a endif endif - for i in $(DIRS); do $(MAKE) -C $$i clean; done + $(MAKE) -C catalog install-bki + $(INSTALL_DATA) libpq/pg_hba.conf.sample $(datadir)/pg_hba.conf.sample + $(INSTALL_DATA) libpq/pg_ident.conf.sample $(datadir)/pg_ident.conf.sample + $(INSTALL_DATA) utils/misc/postgresql.conf.sample $(datadir)/postgresql.conf.sample -depend dep: prebuildheaders - for i in $(DIRS); do $(MAKE) -C $$i $@; done +installdirs: + $(mkinstalldirs) $(bindir) $(libdir) $(datadir) -.DEFAULT: - for i in $(DIRS); do $(MAKE) -C $$i $@; done -############################################################################# -# -# Installation. -# -# Install the backend program (postgres) to the binary directory and -# make a link as "postmaster". Install the bki files, templates, and sample -# files to the library directory. Install exported headers to the include -# directory (these headers are the minimal ones needed to build loadable -# backend extensions). -# -# (History: Before Release 2, make install generated a bki.source file -# and then used build parameters to convert it to a bki file, then installed -# that bki file in the /files subdirectory of the default data directory. -# Initdb then used the bki file to generate the database catalog classes. -# That had to change because (1) there can be more than one database system, -# and (2) the parameters of a database system should be set at initdb time, -# not at postgres build time. - -.PHONY: install install-bin install-templates install-headers - -install: $(LIBDIR) $(BINDIR) $(HEADERDIR) $(TEMPLATEDIR) \ - postgres $(POSTGRES_IMP) \ - install-bin install-templates install-headers - -install-bin: $(BINDIR) postgres$(X) $(POSTGRES_IMP) - $(INSTALL) $(INSTL_EXE_OPTS) postgres$(X) $(BINDIR)/postgres$(X) - @rm -f $(BINDIR)/postmaster - ln -s postgres$(X) $(BINDIR)/postmaster +########################################################################## + +uninstall: + rm -f $(bindir)/postgres$(X) $(bindir)/postmaster ifeq ($(MAKE_EXPORTS), true) - $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP) + rm -f $(libdir)/$(POSTGRES_IMP) endif ifeq ($(PORTNAME), win) ifeq ($(MAKE_DLL), true) -# $(INSTALL) $(INSTLOPTS) postgres.dll $(BINDIR)/postgres.dll - $(INSTALL) $(INSTLOPTS) libpostgres.a $(LIBDIR)/libpostgres.a + rm -f $(libdir)/libpostgres.a endif endif + $(MAKE) -C catalog uninstall-bki + rm -f $(datadir)/pg_hba.conf.sample \ + $(datadir)/pg_ident.conf.sample \ + $(datadir)/postgresql.conf.sample -install-templates: $(TEMPLATEDIR) \ - libpq/pg_hba.conf.sample libpq/pg_ident.conf.sample \ - utils/misc/postgresql.conf.sample - $(MAKE) -C catalog install-bki-templates - $(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \ - $(TEMPLATEDIR)/pg_hba.conf.sample - $(INSTALL) $(INSTLOPTS) libpq/pg_ident.conf.sample \ - $(TEMPLATEDIR)/pg_ident.conf.sample - $(INSTALL) $(INSTLOPTS) utils/misc/postgresql.conf.sample \ - $(TEMPLATEDIR)/postgresql.conf.sample - -install-headers: prebuildheaders $(SRCDIR)/include/config.h - -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi - -@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi - -@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \ - then mkdir $(HEADERDIR)/port/$(PORTNAME); fi - -@if [ ! -d $(HEADERDIR)/lib ]; \ - then mkdir $(HEADERDIR)/lib; fi - -@if [ ! -d $(HEADERDIR)/libpq ]; \ - then mkdir $(HEADERDIR)/libpq; fi - -@if [ ! -d $(HEADERDIR)/utils ]; \ - then mkdir $(HEADERDIR)/utils; fi - -@if [ ! -d $(HEADERDIR)/access ]; \ - then mkdir $(HEADERDIR)/access; fi - -@if [ ! -d $(HEADERDIR)/executor ]; \ - then mkdir $(HEADERDIR)/executor; fi - -@if [ ! -d $(HEADERDIR)/commands ]; \ - then mkdir $(HEADERDIR)/commands; fi - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/os.h \ - $(HEADERDIR)/os.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/config.h \ - $(HEADERDIR)/config.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/c.h \ - $(HEADERDIR)/c.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres.h \ - $(HEADERDIR)/postgres.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres_ext.h \ - $(HEADERDIR)/postgres_ext.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/fmgr.h \ - $(HEADERDIR)/fmgr.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/pqcomm.h \ - $(HEADERDIR)/libpq/pqcomm.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/libpq-fs.h \ - $(HEADERDIR)/libpq/libpq-fs.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/lib/dllist.h \ - $(HEADERDIR)/lib/dllist.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/geo_decls.h \ - $(HEADERDIR)/utils/geo_decls.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \ - $(HEADERDIR)/utils/elog.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/fmgroids.h \ - $(HEADERDIR)/utils/fmgroids.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \ - $(HEADERDIR)/utils/palloc.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/attnum.h \ - $(HEADERDIR)/access/attnum.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/spi.h \ - $(HEADERDIR)/executor/spi.h - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/commands/trigger.h \ - $(HEADERDIR)/commands/trigger.h -ifeq ($(PORTNAME), hpux) -# is this still necessary? - $(INSTALL) $(INSTLOPTS) $(SRCDIR)/backend/port/hpux/fixade.h \ - $(HEADERDIR)/port/hpux/fixade.h -endif - -$(BINDIR): - mkdir $@ -$(LIBDIR): - mkdir $@ +########################################################################## -$(HEADERDIR): - mkdir $@ - -# TEMPLATEDIR is commonly the same as LIBDIR, but it might be different. -# We don't want duplicate rules if they are the same. -ifneq ($(TEMPLATEDIR),$(LIBDIR)) +clean: + rm -f postgres$(X) $(POSTGRES_IMP) \ + $(top_srcdir)/src/include/parser/parse.h \ + $(top_builddir)/src/include/utils/fmgroids.h +ifeq ($(PORTNAME), win) +ifeq ($(MAKE_DLL), true) + rm -f postgres.dll postgres.def libpostgres.a +endif +endif + for i in $(DIRS); do $(MAKE) -C $$i clean; done -$(TEMPLATEDIR): - mkdir $@ +distclean: clean + rm -f port/Makefile port/tas.s port/dynloader.c -endif +maintainer-clean: distclean + rm -f $(srcdir)/bootstrap/bootparse.c \ + $(srcdir)/bootstrap/bootscanner.c \ + $(srcdir)/bootstrap/bootstrap_tokens.h \ + $(srcdir)/parser/gram.c \ + $(srcdir)/parser/scan.c \ + $(srcdir)/parser/parse.h \ + $(srcdir)/utils/misc/guc-file.c -############################################################################# +########################################################################## # # Support for code development. # @@ -273,21 +188,8 @@ endif quick: $(OBJS) $(CC) -o postgres $(OBJS) $(LDFLAGS) -# -# Build the file, "./ID", used by the "gid" (grep-for-identifier) tool -# -IDFILE= ID -.PHONY: $(IDFILE) -$(IDFILE): - ./makeID +depend dep: $(top_srcdir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h + for i in $(DIRS); do $(MAKE) -C $$i $@; done -# -# Special rule to generate cpp'd version of a .c file. This is -# especially useful given all the hellish macro processing going on. -# The cpp'd version has a .C suffix. To create foo.C from foo.c, just -# type -# make foo.C -# -%.cpp: %.c - $(CC) -E $(CPPFLAGS) $(<:.C=.c) | cat -s | cb | tr -s '\012*' '\012' \ - > $(@F) +.DEFAULT: + for i in $(DIRS); do $(MAKE) -C $$i $@; done diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile index 4cf81c91da..2368851c97 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -1,74 +1,68 @@ #------------------------------------------------------------------------- # -# Makefile-- -# Makefile for catalog +# Makefile for catalog # -# IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.22 2000/06/05 07:16:13 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.23 2000/07/06 21:33:22 petere Exp $ # #------------------------------------------------------------------------- -SRCDIR = ../.. -include $(SRCDIR)/Makefile.global +subdir = src/backend/catalog +top_builddir = ../../.. +include ../../Makefile.global OBJS = catalog.o heap.o index.o indexing.o aclchk.o \ pg_aggregate.o pg_operator.o pg_proc.o pg_type.o -BKIFILES = global1.bki.source local1_template1.bki.source \ - global1.description local1_template1.description +BKIFILES = global.bki template1.bki global.description template1.description all: SUBSYS.o $(BKIFILES) SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -GENBKI= ./genbki.sh - -GLOBALBKI_SRCS= $(addprefix $(SRCDIR)/include/catalog/, \ - pg_database.h pg_variable.h pg_shadow.h \ - pg_group.h pg_log.h \ - ) - -LOCALBKI_SRCS= $(addprefix $(SRCDIR)/include/catalog/, \ - pg_proc.h pg_type.h pg_attribute.h pg_class.h \ - pg_inherits.h pg_index.h pg_statistic.h \ - pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \ - pg_language.h \ - pg_aggregate.h pg_ipl.h pg_inheritproc.h \ - pg_rewrite.h pg_listener.h pg_description.h indexing.h \ - ) - -global1.bki.source: $(GENBKI) $(GLOBALBKI_SRCS) \ - $(addprefix $(SRCDIR)/include/catalog/, indexing.h) -ifneq ($(PORTNAME), win) - sh $(SHOPTS) $(GENBKI) $(BKIOPTS) $(GLOBALBKI_SRCS) > $@ 2>global1.description -else - $(GENBKI) $(BKIOPTS) $(GLOBALBKI_SRCS) > $@ 2>global1.description -endif -local1_template1.bki.source: $(GENBKI) $(LOCALBKI_SRCS) -ifneq ($(PORTNAME), win) - sh $(SHOPTS) $(GENBKI) $(BKIOPTS) $(LOCALBKI_SRCS) > $@ 2>local1_template1.description -else - $(GENBKI) $(BKIOPTS) $(LOCALBKI_SRCS) > $@ 2>local1_template1.description -endif +GLOBAL_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\ + pg_database.h pg_variable.h pg_shadow.h pg_group.h pg_log.h \ + ) -install-bki-templates: $(BKIFILES) - $(INSTALL) $(INSTLOPTS) global1.bki.source \ - $(TEMPLATEDIR)/global1.bki.source - $(INSTALL) $(INSTLOPTS) global1.description \ - $(TEMPLATEDIR)/global1.description - $(INSTALL) $(INSTLOPTS) local1_template1.bki.source \ - $(TEMPLATEDIR)/local1_template1.bki.source - $(INSTALL) $(INSTLOPTS) local1_template1.description \ - $(TEMPLATEDIR)/local1_template1.description +TEMPLATE1_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\ + pg_proc.h pg_type.h pg_attribute.h pg_class.h \ + pg_inherits.h pg_index.h pg_statistic.h \ + pg_operator.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \ + pg_language.h \ + pg_aggregate.h pg_ipl.h pg_inheritproc.h \ + pg_rewrite.h pg_listener.h pg_description.h indexing.h \ + ) + + +global.bki global.description: genbki.sh $(GLOBAL_BKI_SRCS) $(top_srcdir)/src/include/catalog/indexing.h + CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o global -I$(top_srcdir)/src/include $(GLOBAL_BKI_SRCS) + +template1.bki template1.description: genbki.sh $(TEMPLATE1_BKI_SRCS) + CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $< $(BKIOPTS) -o template1 -I$(top_srcdir)/src/include $(TEMPLATE1_BKI_SRCS) + +.PHONY: install-bki +install-bki: $(BKIFILES) installdirs + $(INSTALL_DATA) global.bki $(datadir)/global.bki + $(INSTALL_DATA) global.description $(datadir)/global.description + $(INSTALL_DATA) template1.bki $(datadir)/template1.bki + $(INSTALL_DATA) template1.description $(datadir)/template1.description + +installdirs: + $(mkinstalldirs) $(datadir) + +.PHONY: uninstall-bki +uninstall-bki: + rm -f $(addprefix $(datadir)/, $(BKIFILES)) -depend dep: - $(CC) -MM $(CFLAGS) *.c >depend clean: rm -f SUBSYS.o $(OBJS) $(BKIFILES) + +depend dep: + $(CC) -MM $(CFLAGS) *.c >depend + ifeq (depend,$(wildcard depend)) include depend endif diff --git a/src/backend/catalog/genbki.sh.in b/src/backend/catalog/genbki.sh index 58ddcd54a0..188521524f 100644 --- a/src/backend/catalog/genbki.sh.in +++ b/src/backend/catalog/genbki.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#! /bin/sh #------------------------------------------------------------------------- # # genbki.sh-- @@ -10,7 +10,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.5 2000/01/11 04:02:28 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh,v 1.15 2000/07/06 21:33:22 petere Exp $ # # NOTES # non-essential whitespace is removed from the generated file. @@ -18,45 +18,105 @@ # end can be changed into another awk script or something smarter.. # #------------------------------------------------------------------------- -trap "rm -f /tmp/genbki.tmp /tmp/genbkitmp.c" 0 1 2 3 15 -# make sure it is empty ->/tmp/genbki.tmp +: ${AWK='awk'} +: ${CPP='cc -E'} -if [ $? != 0 ] -then - echo `basename $0`: Bad option - exit 1 -fi +CMDNAME=`basename $0` -BKIOPTS='' +BKIOPTS= +INCLUDE_DIR= +OUTPUT_PREFIX= +INFILES= -for opt in $* +# +# Process command line switches. +# +while [ $# -gt 0 ] do - case $opt in - -D) BKIOPTS="$BKIOPTS -D$2"; shift; shift;; - -D*) BKIOPTS="$BKIOPTS $1";shift;; - --) shift; break;; + case $1 in + -D) + BKIOPTS="$BKIOPTS -D$2" + shift;; + -D*) + BKIOPTS="$BKIOPTS $1" + ;; + -I) + INCLUDE_DIR="$2" + shift;; + -I*) + INCLUDE_DIR=`echo $1 | sed s/^-I//` + ;; + -o) + OUTPUT_PREFIX="$2" + shift;; + -o*) + OUTPUT_PREFIX=`echo $1 | sed s/^-o//` + ;; + --help) + echo "$CMDNAME generates system catalog bootstrapping files." + echo + echo "Usage:" + echo " $CMDNAME [ -D define [...] ] [ -I dir ] [ -o prefix ]" + echo + echo "Options:" + echo " -I path to postgres_ext.h and config.h files" + echo " -o prefix of output files" + echo + echo "The environment variables CPP and AWK determine which C" + echo "preprocessor and Awk program to use. The defaults are" + echo "\`cc -E' and \`awk'." + echo + echo "Report bugs to <[email protected]>." + exit 0 + ;; + -*) + echo "$CMDNAME: invalid option: $1" + exit 1 + ;; + *) + INFILES="$INFILES $1" + ;; esac -done - -# ---------------- -# collect nodefiles -# ---------------- -SYSFILES='' -x=1 -numargs=$# -while test $x -le $numargs ; do - SYSFILES="$SYSFILES $1" - x=`expr $x + 1` shift done +if [ x"$INFILES" = x"" ] ; then + echo "$CMDNAME: no input files" 1>&2 + exit 1 +fi + +if [ x"$OUTPUT_PREFIX" = x"" ] ; then + echo "$CMDNAME: no output prefix specified" 1>&2 + exit 1 +fi + +if [ x"$INCLUDE_DIR" = x"" ] ; then + echo "$CMDNAME: path to include directory unknown" 1>&2 + exit 1 +fi + + +if [ x"$TMPDIR" = x"" ] ; then + TMPDIR=/tmp +fi + + +TMPFILE="$TMPDIR/genbkitmp.c" + +trap "rm -f $TMPFILE" 0 1 2 3 15 + + +# clear output files +> ${OUTPUT_PREFIX}.bki +> ${OUTPUT_PREFIX}.description + + # Get NAMEDATALEN from postgres_ext.h -NAMEDATALEN=`grep '#define[ ]*NAMEDATALEN' ../../include/postgres_ext.h | awk '{ print $3 }'` +NAMEDATALEN=`grep '#define[ ]*NAMEDATALEN' $INCLUDE_DIR/postgres_ext.h | awk '{ print $3 }'` # Get INDEX_MAX_KEYS from config.h (who needs consistency?) -INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' ../../include/config.h | awk '{ print $3 }'` +INDEXMAXKEYS=`grep '#define[ ]*INDEX_MAX_KEYS' $INCLUDE_DIR/config.h | awk '{ print $3 }'` # NOTE: we assume here that FUNC_MAX_ARGS has the same value as INDEX_MAX_KEYS, # and don't read it separately from config.h. This is OK because both of them @@ -73,7 +133,7 @@ INDEXMAXKEYS4=`expr $INDEXMAXKEYS '*' 4` # also, change NameData to name. -- jolly 8/21/95. # put multi-line start/end comments on a separate line # -cat $SYSFILES | \ +cat $INFILES | \ sed -e 's;/\*.*\*/;;g' \ -e 's;/\*;\ /*\ @@ -96,7 +156,7 @@ sed -e "s/;[ ]*$//g" \ -e "s/FUNC_MAX_ARGS\*2/$INDEXMAXKEYS2/g" \ -e "s/FUNC_MAX_ARGS\*4/$INDEXMAXKEYS4/g" \ -e "s/FUNC_MAX_ARGS/$INDEXMAXKEYS/g" \ -| awk ' +| $AWK ' # ---------------- # now use awk to process remaining .h file.. # @@ -161,7 +221,7 @@ raw == 1 { print; next; } { data = substr($0, 8, length($0) - 9); if (data != "") - printf "%d %s\n", oid, data >> "/tmp/genbki.tmp"; + printf "%d %s\n", oid, data >>descriptionfile; } next; } @@ -289,16 +349,11 @@ END { reln_open = 0; } } -' >/tmp/genbkitmp.c +' "descriptionfile=${OUTPUT_PREFIX}.description" > $TMPFILE || exit -@CPP@ $BKIOPTS /tmp/genbkitmp.c | \ +$CPP $BKIOPTS $TMPFILE | \ sed -e '/^[ ]*$/d' \ - -e 's/[ ][ ]*/ /g' || exit 1 + -e 's/[ ][ ]*/ /g' > ${OUTPUT_PREFIX}.bki || exit -# send pg_description file contents to standard error -cat /tmp/genbki.tmp 1>&2 -# ---------------- -# all done -# ---------------- exit 0 diff --git a/src/backend/port/hpux/fixade.h b/src/backend/port/hpux/fixade.h deleted file mode 100644 index 727abe908a..0000000000 --- a/src/backend/port/hpux/fixade.h +++ /dev/null @@ -1,67 +0,0 @@ -/*------------------------------------------------------------------------- - * - * fixade.h - * compiler tricks to make things work while POSTGRES does non-native - * dereferences on PA-RISC. - * - * - * Portions Copyright (c) 1996-2000, PostgreSQL, Inc - * Portions Copyright (c) 1994, Regents of the University of California - * - * $Id: fixade.h,v 1.8 2000/01/26 05:56:46 momjian Exp $ - * - * NOTES - * This must be included in EVERY source file. - * - *------------------------------------------------------------------------- - */ -#ifndef FIXADE_H -#define FIXADE_H - -#if !defined(NOFIXADE) - -#if defined(HP_S500_ALIGN) -/* ---------------- - * This cheesy hack turns ON unaligned-access fixup on H-P PA-RISC; - * the resulting object files contain code that explicitly handles - * realignment on reference, so it slows memory access down by a - * considerable factor. It must be used in conjunction with the +u - * flag to cc. The #pragma is included in c.h to be safe since EVERY - * source file that performs unaligned access must contain the #pragma. - * ---------------- - */ -#pragma HP_ALIGN HPUX_NATURAL_S500 - -#if defined(BROKEN_STRUCT_INIT) -/* ---------------- - * This is so bogus. The HP-UX 9.01 compiler has totally broken - * struct initialization code. It actually length-checks ALL - * array initializations within structs against the FIRST one that - * it sees (when #pragma HP_ALIGN HPUX_NATURAL_S500 is defined).. - * we have to throw in this unused structure before struct varlena - * is defined. - * - * XXX guess you don't need the #pragma anymore after all :-) - * since no one looks at this except me i think i'll just leave - * this here for now.. - * ---------------- - */ -struct HP_WAY_BOGUS -{ - char hpwb_bogus[8191 + 1]; -}; -struct HP_TOO_BOGUS -{ - int hptb_bogus[8191 + 1]; -}; - -#endif /* BROKEN_STRUCT_INIT */ -#endif /* HP_S500_ALIGN */ - -#if defined(WEAK_C_OPTIMIZER) -#pragma OPT_LEVEL 1 -#endif /* WEAK_C_OPTIMIZER */ - -#endif /* !NOFIXADE */ - -#endif /* FIXADE_H */ diff --git a/src/backend/utils/Gen_fmgrtab.sh b/src/backend/utils/Gen_fmgrtab.sh index 12b3626426..b532e0f338 100644 --- a/src/backend/utils/Gen_fmgrtab.sh +++ b/src/backend/utils/Gen_fmgrtab.sh @@ -9,7 +9,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.15 2000/07/01 21:16:44 petere Exp $ +# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.16 2000/07/06 21:33:30 petere Exp $ # #------------------------------------------------------------------------- @@ -33,10 +33,10 @@ do case $1 in -D) BKIOPTS="$BKIOPTS -D$2" - ;; + shift;; -D*) BKIOPTS="$BKIOPTS $1" - shift;; + ;; --noclean) noclean=t ;; @@ -60,6 +60,7 @@ do ;; *) INFILE=$1 + ;; esac shift done diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index 850deb86b8..2da162e272 100644 --- a/src/bin/initdb/Makefile +++ b/src/bin/initdb/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.19 2000/07/02 15:21:00 petere Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.20 2000/07/06 21:33:38 petere Exp $ # #------------------------------------------------------------------------- @@ -15,7 +15,11 @@ include ../../Makefile.global all: initdb initdb: initdb.sh ../../Makefile.global - sed -e 's/__MULTIBYTE__/$(MULTIBYTE)/g' -e 's/__VERSION__/$(VERSION)/g' < $< > $@ + sed -e 's/__MULTIBYTE__/$(MULTIBYTE)/g' \ + -e 's/__VERSION__/$(VERSION)/g' \ + -e 's:__bindir__:$(bindir):g' \ + -e 's:__datadir__:$(datadir):g' \ + < $< > $@ install: all installdirs $(INSTALL_SCRIPT) initdb $(bindir)/initdb diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh index ad12edaa9f..8fbc8c6826 100644 --- a/src/bin/initdb/initdb.sh +++ b/src/bin/initdb/initdb.sh @@ -1,40 +1,42 @@ -#!/bin/sh +#! /bin/sh #------------------------------------------------------------------------- # -# initdb.sh-- -# Create (initialize) a Postgres database system. -# -# A database system is a collection of Postgres databases all managed -# by the same postmaster. +# initdb creates (initializes) a Postgres database cluster (site, +# instance, installation, whatever). A database cluster is a +# collection of Postgres databases all managed by the same postmaster. # -# To create the database system, we create the directory that contains -# all its data, create the files that hold the global classes, create -# a few other control files for it, and create one database: the -# template database. +# To create the database cluster, we create the directory that contains +# all its data, create the files that hold the global tables, create +# a few other control files for it, and create one database: the +# template database. # -# The template database is an ordinary Postgres database. Its data -# never changes, though. It exists to make it easy for Postgres to -# create other databases -- it just copies. +# The template database is an ordinary Postgres database. Its data +# never changes, though. It exists to make it easy for Postgres to +# create other databases -- it just copies. # -# Optionally, we can skip creating the database system and just create -# (or replace) the template database. +# Optionally, we can skip creating the complete database cluster and +# just create (or replace) the template database. # -# To create all those classes, we run the postgres (backend) program and -# feed it data from bki files that are in the Postgres library directory. +# To create all those things, we run the postgres (backend) program and +# feed it data from the bki files that were installed. # -# Copyright (c) 1994, Regents of the University of California # +# Copyright (c) 1994, Regents of the University of California # -# IDENTIFICATION -# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.100 2000/07/05 19:51:03 wieck Exp $ +# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.101 2000/07/06 21:33:38 petere Exp $ # #------------------------------------------------------------------------- + +########################################################################## +# +# INITIALIZATION + exit_nicely(){ stty echo > /dev/null 2>&1 echo echo "$CMDNAME failed." - if [ "$noclean" -eq 0 ]; then + if [ "$noclean" != yes ]; then echo "Removing $PGDATA." rm -rf "$PGDATA" || echo "Failed." echo "Removing temp file $TEMPFILE." @@ -48,6 +50,15 @@ exit_nicely(){ CMDNAME=`basename $0` +# Placed here during build +VERSION=__VERSION__ +bindir='__bindir__' +# Note that "datadir" is not the directory we're initializing, it's +# merely how Autoconf names PREFIX/share. +datadir='__datadir__' +# as set by configure --enable-multibyte[=XXX]. +MULTIBYTE=__MULTIBYTE__ + if [ "$TMPDIR" ]; then TEMPFILE="$TMPDIR/initdb.$$" else @@ -87,6 +98,10 @@ else done fi +if [ x"$PGPATH" = x"" ] ; then + PGPATH=$bindir +fi + # Check if needed programs actually exist in path for prog in postgres pg_id do @@ -117,24 +132,26 @@ then exit 1 fi -# Replaced at build time -VERSION=__VERSION__ + short_version=`echo $VERSION | sed -e 's!^\([0-9][0-9]*\.[0-9][0-9]*\).*!\1!'` if [ x"$short_version" = x"" ] ; then echo "$CMDNAME: bug: version number is out of format" exit 1 fi + +########################################################################## +# +# COMMAND LINE OPTIONS + # 0 is the default (non-)encoding MULTIBYTEID=0 -# This is placed here by configure --enable-multibyte[=XXX]. -MULTIBYTE=__MULTIBYTE__ # Set defaults: -debug=0 -noclean=0 -template_only=0 -show_setting=0 +debug= +noclean= +template_only= +show_setting= # Note: There is a single compelling reason that the name of the database # superuser be the same as the Unix user owning the server process: @@ -156,18 +173,18 @@ do exit 0 ;; --debug|-d) - debug=1 + debug=yes echo "Running with debug mode on." ;; --show|-s) - show_setting=1 + show_setting=yes ;; --noclean|-n) - noclean=1 + noclean=yes echo "Running with noclean mode on. Mistakes will not be cleaned up." ;; --template|-t) - template_only=1 + template_only=yes echo "Updating template1 database only." ;; # The sysid of the database superuser. Can be freely changed. @@ -196,16 +213,13 @@ do -D*) PGDATA=`echo $1 | sed 's/^-D//'` ;; -# The directory where the database templates are stored (traditionally in -# $prefix/lib). This is now autodetected for the most common layouts. - --pglib|-L) - PGLIB="$2" +# The directory where the database templates are stored. Normally +# they are in PREFIX/share and this option should be unnecessary. + -L) + datadir="$2" shift;; - --pglib=*) - PGLIB=`echo $1 | sed 's/^--pglib=//'` - ;; -L*) - PGLIB=`echo $1 | sed 's/^-L//'` + datadir=`echo $1 | sed 's/^-L//'` ;; # The encoding of the template1 database. Defaults to what you chose # at configure time. (see above) @@ -231,27 +245,26 @@ do done if [ "$usage" ]; then - echo "initdb initialized a PostgreSQL database." - echo - echo "Usage:" - echo " $CMDNAME [options] datadir" - echo - echo "Options:" - echo " [-D, --pgdata] <datadir> Location for this database" - echo " -W, --pwprompt Prompt for a password for the new superuser's" - if [ -n "$MULTIBYTE" ] - then - echo " -E, --encoding <encoding> Set the default multibyte encoding for new databases" - fi - echo " -i, --sysid <sysid> Database sysid for the superuser" - echo "Less commonly used options: " - echo " -L, --pglib <libdir> Where to find the input files" - echo " -t, --template Re-initialize template database only" - echo " -d, --debug Generate lots of debugging output" - echo " -n, --noclean Do not clean up after errors" - echo - echo "Report bugs to <[email protected]>." - exit 0 + echo "$CMDNAME initialized a PostgreSQL database cluster." + echo + echo "Usage:" + echo " $CMDNAME [options] datadir" + echo + echo "Options:" + echo " [-D, --pgdata] <datadir> Location for this database cluster" + echo " -W, --pwprompt Prompt for a password for the new superuser" + if [ -n "$MULTIBYTE" ] ; then + echo " -E, --encoding <encoding> Set the default multibyte encoding for new databases" + fi + echo " -i, --sysid <sysid> Database sysid for the superuser" + echo "Less commonly used options: " + echo " -L <directory> Where to find the input files" + echo " -t, --template Re-initialize template database only" + echo " -d, --debug Generate lots of debugging output" + echo " -n, --noclean Do not clean up after errors" + echo + echo "Report bugs to <[email protected]>." + exit 0 fi #------------------------------------------------------------------------- @@ -284,7 +297,7 @@ fi if [ -z "$PGDATA" ] then echo "$CMDNAME: You must identify where the the data for this database" - echo "system will reside. Do this with either a --pgdata invocation" + echo "system will reside. Do this with either a -D invocation" echo "option or a PGDATA environment variable." echo exit 1 @@ -305,76 +318,40 @@ fi # Find the input files #------------------------------------------------------------------------- -if [ -z "$PGLIB" ] -then - for dir in "$PGPATH/../lib" "$PGPATH/../lib/pgsql" - do - if [ -f "$dir/global1.bki.source" ] - then - PGLIB="$dir" - break - fi - done -fi - -if [ -z "$PGLIB" ] -then - echo "$CMDNAME: Could not find the \"lib\" directory, that contains" - echo "the files needed by initdb. Please specify it with the" - echo "--pglib option." - exit 1 -fi +TEMPLATE1_BKI="$datadir"/template1.bki +GLOBAL_BKI="$datadir"/global.bki +TEMPLATE1_DESCR="$datadir"/template1.description +GLOBAL_DESCR="$datadir"/global.description -TEMPLATE="$PGLIB"/local1_template1.bki.source -GLOBAL="$PGLIB"/global1.bki.source -PG_HBA_SAMPLE="$PGLIB"/pg_hba.conf.sample -POSTGRESQL_CONF_SAMPLE="$PGLIB"/postgresql.conf.sample +PG_HBA_SAMPLE="$datadir"/pg_hba.conf.sample +POSTGRESQL_CONF_SAMPLE="$datadir"/postgresql.conf.sample -TEMPLATE_DESCR="$PGLIB"/local1_template1.description -GLOBAL_DESCR="$PGLIB"/global1.description - -if [ "$show_setting" -eq 1 ] +if [ "$show_setting" = yes ] || [ "$debug" = yes ] then - echo - echo "The initdb setting:" - echo - echo " DATADIR: $PGDATA" - echo " PGLIB: $PGLIB" - echo " PGPATH: $PGPATH" - echo " TEMPFILE: $TEMPFILE" - echo " MULTIBYTE: $MULTIBYTE" - echo " MULTIBYTEID: $MULTIBYTEID" - echo " SUPERUSERNAME: $POSTGRES_SUPERUSERNAME" - echo " SUPERUSERID: $POSTGRES_SUPERUSERID" - echo " TEMPLATE: $TEMPLATE" - echo " GLOBAL: $GLOBAL" - echo " PG_HBA_SAMPLE: $PG_HBA_SAMPLE" - echo " POSTGRESQL_CONF_SAMPLE: $POSTGRESQL_CONF_SAMPLE" - echo " TEMPLATE_DESCR: $TEMPLATE_DESCR" - echo " GLOBAL_DESCR: $GLOBAL_DESCR" - echo - exit 0 + echo + echo "Initdb variables:" + for var in PGDATA datadir PGPATH TEMPFILE MULTIBYTE MULTIBYTEID \ + POSTGRES_SUPERUSERNAME POSTGRES_SUPERUSERID TEMPLATE1_BKI GLOBAL_BKI \ + TEMPLATE1_DESCR GLOBAL_DESCR POSTGRESQL_CONF_SAMPLE PG_HBA_SAMPLE ; do + eval "echo ' '$var=\$$var" + done +fi + +if [ "$show_setting" = yes ] ; then + exit 0 fi -for PREREQ_FILE in "$TEMPLATE" "$GLOBAL" "$PG_HBA_SAMPLE" +for PREREQ_FILE in "$TEMPLATE1_BKI" "$GLOBAL_BKI" "$PG_HBA_SAMPLE" do - if [ ! -f "$PREREQ_FILE" ] - then + if [ ! -f "$PREREQ_FILE" ] ; then echo "$CMDNAME does not find the file '$PREREQ_FILE'." echo "This means you have a corrupted installation or identified the" - echo "wrong directory with the --pglib invocation option." + echo "wrong directory with the -L invocation option." exit 1 fi done -[ "$debug" -ne 0 ] && echo "$CMDNAME: Using $TEMPLATE as input to create the template database." - -if [ "$template_only" -eq 0 ] -then - [ "$debug" -ne 0 ] && echo "$CMDNAME: Using $GLOBAL as input to create the global classes." - [ "$debug" -ne 0 ] && echo "$CMDNAME: Using $PG_HBA_SAMPLE as default authentication control file." -fi trap 'echo "Caught signal." ; exit_nicely' 1 2 3 15 @@ -383,16 +360,17 @@ echo "This database system will be initialized with username \"$POSTGRES_SUPERUS echo "This user will own all the data files and must also own the server process." echo -# ----------------------------------------------------------------------- -# Create the data directory if necessary -# ----------------------------------------------------------------------- + +########################################################################## +# +# CREATE DATABASE DIRECTORY # umask must disallow access to group, other for files and dirs umask 077 if [ -f "$PGDATA"/PG_VERSION ] then - if [ "$template_only" -eq 0 ] + if [ "$template_only" != yes ] then echo "$CMDNAME: The file $PGDATA/PG_VERSION already exists." echo "This probably means initdb has already been run and the" @@ -430,14 +408,15 @@ else fi fi -#---------------------------------------------------------------------------- -# Create the template1 database -#---------------------------------------------------------------------------- + +########################################################################## +# +# CREATE TEMPLATE1 DATABASE rm -rf "$PGDATA"/base/template1 || exit_nicely mkdir "$PGDATA"/base/template1 || exit_nicely -if [ "$debug" -eq 1 ] +if [ "$debug" = yes ] then BACKEND_TALK_ARG="-d" else @@ -448,25 +427,26 @@ BACKENDARGS="-boot -C -F -D$PGDATA $BACKEND_TALK_ARG" FIRSTRUN="-boot -x -C -F -D$PGDATA $BACKEND_TALK_ARG" echo "Creating template database in $PGDATA/base/template1" -[ "$debug" -ne 0 ] && echo "Running: $PGPATH/postgres $FIRSTRUN template1" +[ "$debug" = yes ] && echo "Running: $PGPATH/postgres $FIRSTRUN template1" -cat "$TEMPLATE" \ +cat "$TEMPLATE1_BKI" \ | sed -e "s/PGUID/$POSTGRES_SUPERUSERID/g" \ | "$PGPATH"/postgres $FIRSTRUN template1 \ || exit_nicely echo $short_version > "$PGDATA"/base/template1/PG_VERSION || exit_nicely -#---------------------------------------------------------------------------- -# Create the global classes, if requested. -#---------------------------------------------------------------------------- -if [ "$template_only" -eq 0 ] +########################################################################## +# +# CREATE GLOBAL TABLES + +if [ "$template_only" != yes ] then echo "Creating global relations in $PGDATA/global" - [ "$debug" -ne 0 ] && echo "Running: $PGPATH/postgres $BACKENDARGS template1" + [ "$debug" = yes ] && echo "Running: $PGPATH/postgres $BACKENDARGS template1" - cat "$GLOBAL" \ + cat "$GLOBAL_BKI" \ | sed -e "s/POSTGRES/$POSTGRES_SUPERUSERNAME/g" \ -e "s/PGUID/$POSTGRES_SUPERUSERID/g" \ | "$PGPATH"/postgres $BACKENDARGS template1 \ @@ -485,7 +465,7 @@ then #echo "show" >> "$TEMPFILE" echo "close pg_database" >> "$TEMPFILE" - [ "$debug" -ne 0 ] && echo "Running: $PGPATH/postgres $BACKENDARGS template1 < $TEMPFILE" + [ "$debug" = yes ] && echo "Running: $PGPATH/postgres $BACKENDARGS template1 < $TEMPFILE" "$PGPATH"/postgres $BACKENDARGS template1 < "$TEMPFILE" # Gotta remove that temp file before exiting on error. @@ -494,6 +474,11 @@ then [ "$retval" -ne 0 ] && exit_nicely fi + +########################################################################## +# +# CREATE VIEWS and other things + echo PGSQL_OPT="-o /dev/null -O -F -D$PGDATA" @@ -607,7 +592,7 @@ echo "CREATE VIEW pg_indexes AS \ echo "Loading pg_description." echo "COPY pg_description FROM STDIN" > $TEMPFILE -cat "$TEMPLATE_DESCR" >> $TEMPFILE +cat "$TEMPLATE1_DESCR" >> $TEMPFILE cat "$GLOBAL_DESCR" >> $TEMPFILE cat $TEMPFILE \ @@ -618,6 +603,11 @@ echo "Vacuuming database." echo "VACUUM ANALYZE" \ | "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely + +########################################################################## +# +# FINISHED + echo echo "Success. You can now start the database server using:" echo "" diff --git a/src/include/Makefile b/src/include/Makefile new file mode 100644 index 0000000000..d36e8bc7f9 --- /dev/null +++ b/src/include/Makefile @@ -0,0 +1,55 @@ +#------------------------------------------------------------------------- +# +# Makefile for src/include +# +# Install exported headers to the include directory (these headers are +# the minimal ones needed to build loadable backend extensions). +# +# $Header: /cvsroot/pgsql/src/include/Makefile,v 1.1 2000/07/06 21:33:44 petere Exp $ +# +#------------------------------------------------------------------------- + +subdir = src/include +top_builddir = ../.. +include ../Makefile.global + + +HEADERS := os.h config.h c.h postgres.h postgres_ext.h fmgr.h \ + libpq/pqcomm.h libpq/libpq-fs.h lib/dllist.h \ + utils/geo_decls.h utils/elog.h utils/fmgroids.h utils/palloc.h \ + access/attnum.h executor/spi.h commands/trigger.h + + +all: $(HEADERS) + + +# These rules are necessary in case someone installs the include tree +# before building the backend tree. Very messy. +utils/fmgroids.h: $(top_builddir)/src/backend/utils/fmgroids.h + cd utils && rm -f fmgroids.h && $(LN_S) ../$(top_builddir)/src/backend/utils/fmgroids.h . + +# This file is built in the backend tree, but we need to keep track of +# the dependencies here. +$(top_builddir)/src/backend/utils/fmgroids.h: $(top_srcdir)/src/backend/utils/Gen_fmgrtab.sh catalog/pg_proc.h + $(MAKE) -C $(dir $@) fmgroids.h + + +install: all installdirs + @for i in $(HEADERS); do \ + echo "$(INSTALL_DATA) $(srcdir)/$$i $(includedir)/$$i"; \ + $(INSTALL_DATA) $(srcdir)/$$i $(includedir)/$$i; \ + done + +# Automatically pick out the needed subdirectories for the include +# tree. +installdirs: + $(mkinstalldirs) $(addprefix $(includedir)/, $(sort $(dir $(HEADERS)))) + +uninstall: + rm -f $(addprefix $(includedir)/, $(HEADERS)) + +clean: + rm -f utils/fmgroids.h parser/parse.h + +distclean maintainer-clean: clean + rm -f config.h dynloader.h os.h diff --git a/src/include/c.h b/src/include/c.h index 36caac611f..65ff45aa92 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: c.h,v 1.74 2000/06/08 22:37:35 momjian Exp $ + * $Id: c.h,v 1.75 2000/07/06 21:33:44 petere Exp $ * *------------------------------------------------------------------------- */ @@ -904,12 +904,6 @@ extern char *vararg_format(const char *fmt,...); #define PG_BINARY_W "w" #endif -#ifdef FIXADE -#if defined(hpux) -#include "port/hpux/fixade.h" /* for unaligned access fixup */ -#endif /* hpux */ -#endif - #if defined(sun) && defined(__sparc__) && !defined(__SVR4) #define memmove(d, s, l) bcopy(s, d, l) #include <unistd.h> diff --git a/src/test/regress/run_check.sh b/src/test/regress/run_check.sh index 2f33fdcdf7..d057d35264 100755 --- a/src/test/regress/run_check.sh +++ b/src/test/regress/run_check.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.20 2000/06/20 16:40:19 petere Exp $ +# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.21 2000/07/06 21:33:45 petere Exp $ # ---------- # Check call syntax @@ -187,7 +187,7 @@ export PATH # Run initdb to initialize a database system in ./tmp_check # ---------- echo "=============== Initializing check database instance ================" -initdb -L $LIBDIR -D $PGDATA --noclean >$LOGDIR/initdb.log 2>&1 +initdb -D $PGDATA --noclean >$LOGDIR/initdb.log 2>&1 if [ $? -ne 0 ] then |