![[Python logo]](http://www.python.org/images/python-logo.gif){kind=logo}
Project: Python
Revision: 66284
Author: gregory.p.smith
Date: 07 Sep 2008 01:15:58
Changes:Diff:/python/trunk/configure
...... @@ -1,5 +1,5 @@ 1 1 #! /bin/sh 2 # From configure.in Revision: 65652 . 2 # From configure.in Revision: 66283 . 3 3 # Guess values for system-dependent variables and create Makefiles. 4 4 # Generated by GNU Autoconf 2.61 for python 2.6. 5 5 # ...... @@ -2076,7 +2076,7 @@ 2076 2076 # On OpenBSD, select(2) is not available if _XOPEN_SOURCE is defined, 2077 2077 # even though select is a POSIX function. Reported by J. Ribbens. 2078 2078 # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish. 2079 OpenBSD*) 2079 OpenBSD/2.* | OpenBSD/3.[0123456789] | OpenBSD/4.[0123]) 2080 2080 define_xopen_source=no 2081 2081 # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is 2082 2082 # also defined. This can be overridden by defining _BSD_SOURCE ...... @@ -2086,8 +2086,6 @@ 2086 2086 #define _BSD_SOURCE 1 2087 2087 _ACEOF 2088 2088 2089 # OpenBSD's readline library needs the libcurses 2090 READLINE_LIBS="-lcurses" 2091 2089 ;; 2092 2090 # Defining _XOPEN_SOURCE on NetBSD version prior to the introduction of 2093 2091 # _NETBSD_SOURCE disables certain features (eg. setgroups). Reported by ...... @@ -22961,14 +22959,20 @@ 22961 22959 # save the value of LIBS so we don't actually link Python with readline 22962 22960 LIBS_no_readline=$LIBS 22963 22961 22964 { echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 22965 echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6; } 22966 if test "${ac_cv_lib_readline_readline+set}" = set; then 22967 echo $ECHO_N "(cached) $ECHO_C" >&6 22968 else 22969 ac_check_lib_save_LIBS=$LIBS 22970 LIBS="-lreadline $READLINE_LIBS $LIBS" 22971 cat >conftest.$ac_ext <<_ACEOF 22962 # On some systems we need to link readline to a termcap compatible 22963 # library. NOTE: Keep the precedence of listed libraries synchronised 22964 # with setup.py. 22965 py_cv_lib_readline=no 22966 { echo "$as_me:$LINENO: checking how to link readline libs" >&5 22967 echo $ECHO_N "checking how to link readline libs... $ECHO_C" >&6; } 22968 for py_libtermcap in "" ncursesw ncurses curses termcap; do 22969 if test -z "$py_libtermcap"; then 22970 READLINE_LIBS="-lreadline" 22971 else 22972 READLINE_LIBS="-lreadline -l$py_libtermcap" 22973 fi 22974 LIBS="$READLINE_LIBS $LIBS_no_readline" 22975 cat >conftest.$ac_ext <<_ACEOF 22972 22976 /* confdefs.h. */ 22973 22977 _ACEOF 22974 22978 cat confdefs.h >>conftest.$ac_ext ...... @@ -23008,102 +23012,33 @@ 23008 23012 test ! -s conftest.err 23009 23013 } && test -s conftest$ac_exeext && 23010 23014 $as_test_x conftest$ac_exeext; then 23011 ac_cv_lib_readline_readline=yes 23015 py_cv_lib_readline=yes 23012 23016 else 23013 23017 echo "$as_me: failed program was:" >&5 23014 23018 sed 's/^/| /' conftest.$ac_ext >&5 23015 23019 23016 ac_cv_lib_readline_readline=no 23020 23017 23021 fi 23018 23022 23019 23023 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ 23020 23024 conftest$ac_exeext conftest.$ac_ext 23021 LIBS=$ac_check_lib_save_LIBS 23022 fi 23023 { echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 23024 echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6; } 23025 if test $ac_cv_lib_readline_readline = yes; then 23026 cat >>confdefs.h <<_ACEOF 23027 #define HAVE_LIBREADLINE 1 23028 _ACEOF 23029 23030 LIBS="-lreadline $LIBS" 23031 23032 fi 23033 23034 if test "$ac_cv_have_readline_readline" = no 23035 then 23036 23037 { echo "$as_me:$LINENO: checking for readline in -ltermcap" >&5 23038 echo $ECHO_N "checking for readline in -ltermcap... $ECHO_C" >&6; } 23039 if test "${ac_cv_lib_termcap_readline+set}" = set; then 23040 echo $ECHO_N "(cached) $ECHO_C" >&6 23041 else 23042 ac_check_lib_save_LIBS=$LIBS 23043 LIBS="-ltermcap $LIBS" 23044 cat >conftest.$ac_ext <<_ACEOF 23045 /* confdefs.h. */ 23046 _ACEOF 23047 cat confdefs.h >>conftest.$ac_ext 23048 cat >>conftest.$ac_ext <<_ACEOF 23049 /* end confdefs.h. */ 23050 23051 /* Override any GCC internal prototype to avoid an error. 23052 Use char because int might match the return type of a GCC 23053 builtin and then its argument prototype would still apply. */ 23054 #ifdef __cplusplus 23055 extern "C" 23056 #endif 23057 char readline (); 23058 int 23059 main () 23060 { 23061 return readline (); 23062 ; 23063 return 0; 23064 } 23065 _ACEOF 23066 rm -f conftest.$ac_objext conftest$ac_exeext 23067 if { (ac_try="$ac_link" 23068 case "(($ac_try" in 23069 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; 23070 *) ac_try_echo=$ac_try;; 23071 esac 23072 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 23073 (eval "$ac_link") 2>conftest.er1 23074 ac_status=$? 23075 grep -v '^ *+' conftest.er1 >conftest.err 23076 rm -f conftest.er1 23077 cat conftest.err >&5 23078 echo "$as_me:$LINENO: \$? = $ac_status" >&5 23079 (exit $ac_status); } && { 23080 test -z "$ac_c_werror_flag" || 23081 test ! -s conftest.err 23082 } && test -s conftest$ac_exeext && 23083 $as_test_x conftest$ac_exeext; then 23084 ac_cv_lib_termcap_readline=yes 23025 if test $py_cv_lib_readline = yes; then 23026 break 23027 fi 23028 done 23029 # Uncomment this line if you want to use READINE_LIBS in Makefile or scripts 23030 #AC_SUBST([READLINE_LIBS]) 23031 if test $py_cv_lib_readline = !yes; then 23032 { echo "$as_me:$LINENO: result: none" >&5 23033 echo "${ECHO_T}none" >&6; } 23085 23034 else 23086 echo "$as_me: failed program was:" >&5 23087 sed 's/^/| /' conftest.$ac_ext >&5 23088 23089 ac_cv_lib_termcap_readline=no 23090 fi 23035 { echo "$as_me:$LINENO: result: $READLINE_LIBS" >&5 23036 echo "${ECHO_T}$READLINE_LIBS" >&6; } 23091 23037 23092 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ 23093 conftest$ac_exeext conftest.$ac_ext 23094 LIBS=$ac_check_lib_save_LIBS 23095 fi 23096 { echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_readline" >&5 23097 echo "${ECHO_T}$ac_cv_lib_termcap_readline" >&6; } 23098 if test $ac_cv_lib_termcap_readline = yes; then 23099 cat >>confdefs.h <<_ACEOF 23100 #define HAVE_LIBTERMCAP 1 23038 cat >>confdefs.h <<\_ACEOF 23039 #define HAVE_LIBREADLINE 1 23101 23040 _ACEOF 23102 23041 23103 LIBS="-ltermcap $LIBS" 23104 23105 fi 23106 23107 23042 fi 23108 23043 23109 23044 # check for readline 2.1