diff options
author | Matthias Klose <doko@ubuntu.com> | 2010-04-25 21:00:44 (GMT) |
---|---|---|
committer | Matthias Klose <doko@ubuntu.com> | 2010-04-25 21:00:44 (GMT) |
commit | b159a5563d86e0292bbd2d78497f486efebf505b (patch) | |
tree | 7f6ec88738d7ad5127e88d233648810966fda8a9 /configure | |
parent | de4ceabfd8b9cf357332e7fa1bfb46c157402efa (diff) | |
download | cpython-b159a5563d86e0292bbd2d78497f486efebf505b.zip cpython-b159a5563d86e0292bbd2d78497f486efebf505b.tar.gz cpython-b159a5563d86e0292bbd2d78497f486efebf505b.tar.bz2 |
configure.in: convert all obsolete AC_TRY_* macros to AC_*_IFELSE,
only whitespace changes in generated configure (diff -uEwB).
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 179 |
1 files changed, 111 insertions, 68 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 80474 . +# From configure.in Revision: 80475 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for python 3.2. # @@ -5289,6 +5289,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main () { @@ -5296,13 +5297,16 @@ int main() { return 0; } ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - CC="$ac_save_cc -fstrict-aliasing" - CFLAGS="$CFLAGS -Werror -Wstrict-aliasing" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + CC="$ac_save_cc -fstrict-aliasing" + CFLAGS="$CFLAGS -Werror -Wstrict-aliasing" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + int main () { @@ -5310,15 +5314,23 @@ void f(int **x) {} int main() { double *x; f((int **) &x); return 0; } ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_no_strict_aliasing=no + + ac_cv_no_strict_aliasing=no + else - ac_cv_no_strict_aliasing=yes + + ac_cv_no_strict_aliasing=yes + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + else - ac_cv_no_strict_aliasing=no + + ac_cv_no_strict_aliasing=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -5510,6 +5522,7 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_cv_opt_olimit_ok=yes else ac_cv_opt_olimit_ok=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CC="$ac_save_cc" @@ -5551,6 +5564,7 @@ if ac_fn_c_try_compile "$LINENO"; then : ac_cv_olimit_ok=yes else ac_cv_olimit_ok=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext CC="$ac_save_cc" @@ -5574,7 +5588,6 @@ $as_echo_n "checking whether gcc supports ParseTuple __format__... " >&6; } /* end confdefs.h. */ void f(char*,...)__attribute((format(PyArg_ParseTuple, 1, 2))); - int main () { @@ -5582,15 +5595,19 @@ main () ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : + $as_echo "#define HAVE_ATTRIBUTE_FORMAT_PARSETUPLE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6256,7 +6273,8 @@ $as_echo "$was_it_defined" >&6; } $as_echo_n "checking for makedev... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <sys/types.h> + + #include <sys/types.h> int main () { @@ -6264,6 +6282,7 @@ main () ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO"; then : ac_cv_has_makedev=yes @@ -7191,7 +7210,8 @@ $as_echo_n "checking for pthread_t... " >&6; } have_pthread_t=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <pthread.h> + + #include <pthread.h> int main () { @@ -7199,6 +7219,7 @@ pthread_t x; x = *(pthread_t*)0; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : have_pthread_t=yes @@ -7893,7 +7914,8 @@ case "$ac_sys_system" in $as_echo_n "checking for genuine AIX C++ extensions support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include "/usr/lpp/xlC/include/load.h" + + #include "/usr/lpp/xlC/include/load.h" int main () { @@ -7901,16 +7923,21 @@ loadAndInit("", 0, "") ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO"; then : + $as_echo "#define AIX_GENUINE_CPLUSPLUS 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext;; @@ -8798,6 +8825,7 @@ $as_echo "yes" >&6; } else if test "$cross_compiling" = yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ipv6=no @@ -8818,13 +8846,17 @@ main() _ACEOF if ac_fn_c_try_run "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ipv6=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } ipv6=no + fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -8836,25 +8868,31 @@ if test "$ipv6" = "yes"; then $as_echo_n "checking if RFC2553 API is available... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <sys/types.h> + + #include <sys/types.h> #include <netinet/in.h> int main () { struct sockaddr_in6 x; -x.sin6_scope_id; + x.sin6_scope_id; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - ipv6=yes + ipv6=yes + else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - ipv6=no + ipv6=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9029,7 +9067,8 @@ fi $as_echo_n "checking for OSX 10.5 SDK or later... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <Carbon/Carbon.h> + + #include <Carbon/Carbon.h> int main () { @@ -9037,14 +9076,18 @@ FSIORefNum fRef = 0 ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : + $as_echo "#define HAVE_OSX105_SDK 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -9283,7 +9326,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_CHROOT 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9308,7 +9351,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_LINK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9333,7 +9376,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_SYMLINK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9358,7 +9401,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_FCHDIR 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9383,7 +9426,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_FSYNC 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9408,7 +9451,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_FDATASYNC 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9433,7 +9476,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_EPOLL 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9461,7 +9504,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_KQUEUE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9495,7 +9538,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_CTERMID_R 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9524,7 +9567,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_FLOCK 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9553,7 +9596,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_GETPAGESIZE 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9873,7 +9916,7 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_HSTRERROR 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9906,7 +9949,7 @@ if ac_fn_c_try_link "$LINENO"; then : $as_echo "#define HAVE_INET_ATON 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9939,7 +9982,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_INET_PTON 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -9972,7 +10015,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_SETGROUPS 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -10249,7 +10292,6 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define GETPGRP_HAVE_ARG 1" >>confdefs.h - fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -10278,7 +10320,6 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define SETPGRP_HAVE_ARG 1" >>confdefs.h - fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -10738,6 +10779,7 @@ $as_echo_n "checking for time.h that defines altzone... " >&6; } if test "${ac_cv_header_time_altzone+set}" = set; then : $as_echo_n "(cached) " >&6 else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <time.h> @@ -10755,6 +10797,7 @@ else ac_cv_header_time_altzone=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time_altzone" >&5 @@ -10802,8 +10845,7 @@ if test "${ac_cv_struct_addrinfo+set}" = set; then : else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - -# include <netdb.h> +#include <netdb.h> int main () { @@ -11045,11 +11087,9 @@ return foo(10); _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - $as_echo "#define HAVE_PROTOTYPES 1" >>confdefs.h - have_prototypes=yes - + have_prototypes=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_prototypes" >&5 @@ -11112,7 +11152,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -11146,6 +11186,7 @@ $as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -11235,19 +11276,19 @@ $as_echo_n "checking gethostbyname_r with 5 args... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <netdb.h> +# include <netdb.h> int main () { - char *name; - struct hostent *he; - char buffer[2048]; - int buflen = 2048; - int h_errnop; + char *name; + struct hostent *he; + char buffer[2048]; + int buflen = 2048; + int h_errnop; - (void) gethostbyname_r(name, he, buffer, buflen, &h_errnop) + (void) gethostbyname_r(name, he, buffer, buflen, &h_errnop) ; return 0; @@ -11255,34 +11296,34 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h + $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h $as_echo "#define HAVE_GETHOSTBYNAME_R_5_ARG 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 3 args" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking gethostbyname_r with 3 args" >&5 $as_echo_n "checking gethostbyname_r with 3 args... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# include <netdb.h> +# include <netdb.h> int main () { - char *name; - struct hostent *he; - struct hostent_data data; + char *name; + struct hostent *he; + struct hostent_data data; - (void) gethostbyname_r(name, he, &data); + (void) gethostbyname_r(name, he, &data); ; return 0; @@ -11290,17 +11331,17 @@ main () _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h + $as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h $as_echo "#define HAVE_GETHOSTBYNAME_R_3_ARG 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -12552,6 +12593,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : have_readline=yes else have_readline=no + fi rm -f conftest.err conftest.$ac_ext if test $have_readline = yes @@ -12725,6 +12767,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : have_readline=yes else have_readline=no + fi rm -f conftest.err conftest.$ac_ext if test $have_readline = yes @@ -13173,7 +13216,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_CURSES_IS_TERM_RESIZED 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -13199,7 +13242,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_CURSES_RESIZE_TERM 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -13225,7 +13268,7 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define HAVE_CURSES_RESIZETERM 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |