diff options
author | Matthias Klose <doko@ubuntu.com> | 2010-05-08 11:01:39 (GMT) |
---|---|---|
committer | Matthias Klose <doko@ubuntu.com> | 2010-05-08 11:01:39 (GMT) |
commit | c511b47fb68ebdb7a83887b2ed957754863a46d7 (patch) | |
tree | e141f2538aa4b42899091d316e50b932b7ebb138 /configure | |
parent | 2f88bfdf9673a5e14669da375b4aad4a29815fa9 (diff) | |
download | cpython-c511b47fb68ebdb7a83887b2ed957754863a46d7.zip cpython-c511b47fb68ebdb7a83887b2ed957754863a46d7.tar.gz cpython-c511b47fb68ebdb7a83887b2ed957754863a46d7.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 | 155 |
1 files changed, 90 insertions, 65 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 80965 . +# From configure.in Revision: 80966 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for python 2.7. # @@ -5611,6 +5611,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" @@ -5652,6 +5653,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" @@ -5675,7 +5677,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 () { @@ -5683,15 +5684,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 @@ -7018,7 +7023,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int main () { -long double x; x = (long double)0.; +long double x; x = (long double)0; ; return 0; } @@ -7297,7 +7302,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 () { @@ -7305,6 +7311,7 @@ pthread_t x; x = *(pthread_t*)0; ; return 0; } + _ACEOF if ac_fn_c_try_compile "$LINENO"; then : have_pthread_t=yes @@ -8048,7 +8055,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 () { @@ -8056,16 +8064,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;; @@ -9045,6 +9058,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 @@ -9065,13 +9079,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 @@ -9083,25 +9101,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 @@ -9276,7 +9300,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 () { @@ -9286,14 +9311,14 @@ FSIORefNum fRef = 0 } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : + ] +else + $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; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -9533,7 +9558,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 @@ -9558,7 +9583,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 @@ -9583,7 +9608,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 @@ -9608,7 +9633,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 @@ -9633,7 +9658,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 @@ -9658,7 +9683,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 @@ -9683,7 +9708,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 @@ -9711,7 +9736,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 @@ -9745,7 +9770,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 @@ -9774,7 +9799,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 @@ -9803,7 +9828,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 @@ -10123,7 +10148,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 @@ -10156,7 +10181,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 @@ -10189,7 +10214,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 @@ -10222,7 +10247,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 @@ -10499,7 +10524,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 @@ -10528,7 +10552,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 @@ -10988,6 +11011,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> @@ -11005,6 +11029,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 @@ -11052,8 +11077,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 () { @@ -11295,11 +11319,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 @@ -11362,7 +11384,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 @@ -11396,6 +11418,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 @@ -11485,19 +11508,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; @@ -11505,34 +11528,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; @@ -11540,17 +11563,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 @@ -12821,6 +12844,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 @@ -12994,6 +13018,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 @@ -13442,7 +13467,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 @@ -13468,7 +13493,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 @@ -13494,7 +13519,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 |