diff options
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 224 |
1 files changed, 110 insertions, 114 deletions
diff --git a/configure b/configure index 346c02e3502..1e66c582ad4 100755 --- a/configure +++ b/configure @@ -1481,7 +1481,7 @@ else if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.C | *.o | *.obj) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -8279,173 +8279,169 @@ cat >> confdefs.h <<EOF EOF + # Some platforms predefine the types int8, int16, etc. Only check -# a (hopefully) representative subset. Don't use AC_CHECK_TYPE, which -# doesn't work the way we want to. -echo $ac_n "checking size of int8""... $ac_c" 1>&6 -echo "configure:8287: checking size of int8" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int8'+set}'`\" = set"; then +# a (hopefully) representative subset. + +pgac_type_includes="\ +#include <stdio.h> +#ifdef HAVE_SUPPORTDEFS_H +#include <SupportDefs.h> +#endif" + +echo $ac_n "checking for int8""... $ac_c" 1>&6 +echo "configure:8294: checking for int8" >&5 +if eval "test \"`echo '$''{'pgac_cv_have_int8'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_int8=0 -else cat > conftest.$ac_ext <<EOF -#line 8295 "configure" +#line 8299 "configure" #include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int8)); - exit(0); -} +$pgac_type_includes +int main() { +if ((int8 *) 0) + return 0; +if (sizeof (int8)) + return 0; +; return 0; } EOF -if { (eval echo configure:8306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int8=`cat conftestval` +if { (eval echo configure:8309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + pgac_cv_have_int8=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int8=0 + rm -rf conftest* + pgac_cv_have_int8=no fi -rm -fr conftest* +rm -f conftest* fi -fi -echo "$ac_t""$ac_cv_sizeof_int8" 1>&6 -cat >> confdefs.h <<EOF -#define SIZEOF_INT8 $ac_cv_sizeof_int8 +echo "$ac_t""$pgac_cv_have_int8" 1>&6 +if test "$pgac_cv_have_int8" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_INT8 1 EOF + fi -echo $ac_n "checking size of uint8""... $ac_c" 1>&6 -echo "configure:8326: checking size of uint8" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_uint8'+set}'`\" = set"; then +echo $ac_n "checking for uint8""... $ac_c" 1>&6 +echo "configure:8330: checking for uint8" >&5 +if eval "test \"`echo '$''{'pgac_cv_have_uint8'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_uint8=0 -else cat > conftest.$ac_ext <<EOF -#line 8334 "configure" +#line 8335 "configure" #include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(uint8)); - exit(0); -} +$pgac_type_includes +int main() { +if ((uint8 *) 0) + return 0; +if (sizeof (uint8)) + return 0; +; return 0; } EOF -if { (eval echo configure:8345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_uint8=`cat conftestval` +if { (eval echo configure:8345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + pgac_cv_have_uint8=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_uint8=0 + rm -rf conftest* + pgac_cv_have_uint8=no fi -rm -fr conftest* +rm -f conftest* fi -fi -echo "$ac_t""$ac_cv_sizeof_uint8" 1>&6 -cat >> confdefs.h <<EOF -#define SIZEOF_UINT8 $ac_cv_sizeof_uint8 +echo "$ac_t""$pgac_cv_have_uint8" 1>&6 +if test "$pgac_cv_have_uint8" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_UINT8 1 EOF + fi -echo $ac_n "checking size of int64""... $ac_c" 1>&6 -echo "configure:8365: checking size of int64" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_int64'+set}'`\" = set"; then +echo $ac_n "checking for int64""... $ac_c" 1>&6 +echo "configure:8366: checking for int64" >&5 +if eval "test \"`echo '$''{'pgac_cv_have_int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_int64=0 -else cat > conftest.$ac_ext <<EOF -#line 8373 "configure" +#line 8371 "configure" #include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(int64)); - exit(0); -} +$pgac_type_includes +int main() { +if ((int64 *) 0) + return 0; +if (sizeof (int64)) + return 0; +; return 0; } EOF -if { (eval echo configure:8384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_int64=`cat conftestval` +if { (eval echo configure:8381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + pgac_cv_have_int64=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_int64=0 + rm -rf conftest* + pgac_cv_have_int64=no fi -rm -fr conftest* +rm -f conftest* fi -fi -echo "$ac_t""$ac_cv_sizeof_int64" 1>&6 -cat >> confdefs.h <<EOF -#define SIZEOF_INT64 $ac_cv_sizeof_int64 +echo "$ac_t""$pgac_cv_have_int64" 1>&6 +if test "$pgac_cv_have_int64" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_INT64 1 EOF + fi -echo $ac_n "checking size of uint64""... $ac_c" 1>&6 -echo "configure:8404: checking size of uint64" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_uint64'+set}'`\" = set"; then +echo $ac_n "checking for uint64""... $ac_c" 1>&6 +echo "configure:8402: checking for uint64" >&5 +if eval "test \"`echo '$''{'pgac_cv_have_uint64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test "$cross_compiling" = yes; then - ac_cv_sizeof_uint64=0 -else cat > conftest.$ac_ext <<EOF -#line 8412 "configure" +#line 8407 "configure" #include "confdefs.h" -#include <stdio.h> -main() -{ - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(uint64)); - exit(0); -} +$pgac_type_includes +int main() { +if ((uint64 *) 0) + return 0; +if (sizeof (uint64)) + return 0; +; return 0; } EOF -if { (eval echo configure:8423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_uint64=`cat conftestval` +if { (eval echo configure:8417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + pgac_cv_have_uint64=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_uint64=0 + rm -rf conftest* + pgac_cv_have_uint64=no fi -rm -fr conftest* +rm -f conftest* fi -fi -echo "$ac_t""$ac_cv_sizeof_uint64" 1>&6 -cat >> confdefs.h <<EOF -#define SIZEOF_UINT64 $ac_cv_sizeof_uint64 +echo "$ac_t""$pgac_cv_have_uint64" 1>&6 +if test "$pgac_cv_have_uint64" = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_UINT64 1 EOF + fi + echo $ac_n "checking for POSIX signal interface""... $ac_c" 1>&6 -echo "configure:8444: checking for POSIX signal interface" >&5 +echo "configure:8440: 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 8449 "configure" +#line 8445 "configure" #include "confdefs.h" #include <signal.h> @@ -8456,7 +8452,7 @@ act.sa_flags = SA_RESTART; sigaction(0, &act, &oact); ; return 0; } EOF -if { (eval echo configure:8460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8456: \"$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 @@ -8486,7 +8482,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:8490: checking for $ac_word" >&5 +echo "configure:8486: 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 @@ -8522,7 +8518,7 @@ test -n "$TCLSH" && break done echo $ac_n "checking for tclConfig.sh""... $ac_c" 1>&6 -echo "configure:8526: checking for tclConfig.sh" >&5 +echo "configure:8522: checking for tclConfig.sh" >&5 # Let user override test if test -z "$TCL_CONFIG_SH"; then pgac_test_dirs="$with_tclconfig" @@ -8555,7 +8551,7 @@ fi # Check for Tk configuration script tkConfig.sh if test "$with_tk" = yes; then echo $ac_n "checking for tkConfig.sh""... $ac_c" 1>&6 -echo "configure:8559: checking for tkConfig.sh" >&5 +echo "configure:8555: checking for tkConfig.sh" >&5 # Let user override test if test -z "$TK_CONFIG_SH"; then pgac_test_dirs="$with_tkconfig $with_tclconfig" @@ -8594,7 +8590,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:8598: checking for $ac_word" >&5 +echo "configure:8594: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_NSGMLS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8630,7 +8626,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:8634: checking for $ac_word" >&5 +echo "configure:8630: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_JADE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8661,7 +8657,7 @@ done echo $ac_n "checking for DocBook V3.1""... $ac_c" 1>&6 -echo "configure:8665: checking for DocBook V3.1" >&5 +echo "configure:8661: checking for DocBook V3.1" >&5 if eval "test \"`echo '$''{'pgac_cv_check_docbook'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8694,7 +8690,7 @@ have_docbook=$pgac_cv_check_docbook echo $ac_n "checking for DocBook stylesheets""... $ac_c" 1>&6 -echo "configure:8698: checking for DocBook stylesheets" >&5 +echo "configure:8694: checking for DocBook stylesheets" >&5 if eval "test \"`echo '$''{'pgac_cv_path_stylesheets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8733,7 +8729,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:8737: checking for $ac_word" >&5 +echo "configure:8733: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_SGMLSPL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else |