From: Tom Lane Date: Wed, 17 Aug 2005 20:20:22 +0000 (+0000) Subject: Remove unnecessary configure test for inet_ntop(), per Andrew Dunstan. X-Git-Url: http://waps.l3s.uni-hannover.de/gitweb/?a=commitdiff_plain;h=a04c9c3890430c1227e91513608de8b4b727b869;p=users%2Fbernd%2Fpostgres.git Remove unnecessary configure test for inet_ntop(), per Andrew Dunstan. --- diff --git a/configure b/configure index 7b47820f33..40543101b6 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53 for PostgreSQL 8.0.0. +# Generated by GNU Autoconf 2.53 for PostgreSQL 8.0.3. # # Report bugs to . # @@ -258,8 +258,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='PostgreSQL' PACKAGE_TARNAME='postgresql' -PACKAGE_VERSION='8.0.0' -PACKAGE_STRING='PostgreSQL 8.0.0' +PACKAGE_VERSION='8.0.3' +PACKAGE_STRING='PostgreSQL 8.0.3' PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org' ac_unique_file="src/backend/access/common/heaptuple.c" @@ -773,7 +773,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures PostgreSQL 8.0.0 to adapt to many kinds of systems. +\`configure' configures PostgreSQL 8.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -834,7 +834,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PostgreSQL 8.0.0:";; + short | recursive ) echo "Configuration of PostgreSQL 8.0.3:";; esac cat <<\_ACEOF @@ -955,7 +955,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -PostgreSQL configure 8.0.0 +PostgreSQL configure 8.0.3 generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -972,7 +972,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by PostgreSQL $as_me 8.0.0, which was +It was created by PostgreSQL $as_me 8.0.3, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -6358,7 +6358,8 @@ done fi if test "$with_krb5" = yes ; then - echo "$as_me:$LINENO: checking for library containing com_err" >&5 + if test "$PORTNAME" != "win32"; then + echo "$as_me:$LINENO: checking for library containing com_err" >&5 echo $ECHO_N "checking for library containing com_err... $ECHO_C" >&6 if test "${ac_cv_search_com_err+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6470,7 +6471,7 @@ echo "$as_me: error: could not find function 'com_err' required for Kerberos 5" { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for library containing krb5_encrypt" >&5 + echo "$as_me:$LINENO: checking for library containing krb5_encrypt" >&5 echo $ECHO_N "checking for library containing krb5_encrypt... $ECHO_C" >&6 if test "${ac_cv_search_krb5_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6582,7 +6583,7 @@ echo "$as_me: error: could not find function 'krb5_encrypt' required for Kerbero { (exit 1); exit 1; }; } fi - echo "$as_me:$LINENO: checking for library containing krb5_sendauth" >&5 + echo "$as_me:$LINENO: checking for library containing krb5_sendauth" >&5 echo $ECHO_N "checking for library containing krb5_sendauth... $ECHO_C" >&6 if test "${ac_cv_search_krb5_sendauth+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6694,6 +6695,120 @@ echo "$as_me: error: could not find function 'krb5_sendauth' required for Kerber { (exit 1); exit 1; }; } fi + else + echo "$as_me:$LINENO: checking for library containing com_err" >&5 +echo $ECHO_N "checking for library containing com_err... $ECHO_C" >&6 +if test "${ac_cv_search_com_err+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +ac_cv_search_com_err=no +cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char com_err (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +com_err (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_com_err="none required" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +if test "$ac_cv_search_com_err" = no; then + for ac_lib in 'comerr32 -lkrb5_32'; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char com_err (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +com_err (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_com_err="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_com_err" >&5 +echo "${ECHO_T}$ac_cv_search_com_err" >&6 +if test "$ac_cv_search_com_err" != no; then + test "$ac_cv_search_com_err" = "none required" || LIBS="$ac_cv_search_com_err $LIBS" + +else + { { echo "$as_me:$LINENO: error: could not find function 'com_err' required for Kerberos 5" >&5 +echo "$as_me: error: could not find function 'com_err' required for Kerberos 5" >&2;} + { (exit 1); exit 1; }; } +fi + + fi fi if test "$with_openssl" = yes ; then @@ -11865,79 +11980,12 @@ fi echo "$as_me:$LINENO: result: $ac_cv_type_struct_sockaddr_in6" >&5 echo "${ECHO_T}$ac_cv_type_struct_sockaddr_in6" >&6 if test $ac_cv_type_struct_sockaddr_in6 = yes; then - echo "$as_me:$LINENO: checking for inet_ntop" >&5 -echo $ECHO_N "checking for inet_ntop... $ECHO_C" >&6 -if test "${ac_cv_func_inet_ntop+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char inet_ntop (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char inet_ntop (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_inet_ntop) || defined (__stub___inet_ntop) -choke me -#else -f = inet_ntop; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_inet_ntop=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_inet_ntop=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntop" >&5 -echo "${ECHO_T}$ac_cv_func_inet_ntop" >&6 -if test $ac_cv_func_inet_ntop = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_IPV6 1 _ACEOF - HAVE_IPV6=yes -fi - + HAVE_IPV6=yes fi @@ -19241,7 +19289,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by PostgreSQL $as_me 8.0.0, which was +This file was extended by PostgreSQL $as_me 8.0.3, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19306,7 +19354,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -PostgreSQL config.status 8.0.0 +PostgreSQL config.status 8.0.3 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index cb9a3fa123..a29f7abc8d 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details. dnl m4_pattern_forbid(^PGAC_)dnl to catch undefined macros -AC_INIT([PostgreSQL], [8.0.0], [pgsql-bugs@postgresql.org]) +AC_INIT([PostgreSQL], [8.0.3], [pgsql-bugs@postgresql.org]) AC_PREREQ(2.53) AC_COPYRIGHT([Copyright (c) 1996-2005, PostgreSQL Global Development Group]) @@ -673,12 +673,17 @@ if test "$with_krb4" = yes ; then fi if test "$with_krb5" = yes ; then - AC_SEARCH_LIBS(com_err, [krb5 'krb5 -ldes -lasn1 -lroken' com_err], [], - [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) - AC_SEARCH_LIBS(krb5_encrypt, [krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto], [], - [AC_MSG_ERROR([could not find function 'krb5_encrypt' required for Kerberos 5])]) - AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -ldes -lasn1 -lroken'], [], - [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) + if test "$PORTNAME" != "win32"; then + AC_SEARCH_LIBS(com_err, [krb5 'krb5 -ldes -lasn1 -lroken' com_err], [], + [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) + AC_SEARCH_LIBS(krb5_encrypt, [krb5 'krb5 -ldes -lasn1 -lroken' crypto k5crypto], [], + [AC_MSG_ERROR([could not find function 'krb5_encrypt' required for Kerberos 5])]) + AC_SEARCH_LIBS(krb5_sendauth, [krb5 'krb5 -ldes -lasn1 -lroken'], [], + [AC_MSG_ERROR([could not find function 'krb5_sendauth' required for Kerberos 5])]) + else + AC_SEARCH_LIBS(com_err, 'comerr32 -lkrb5_32', [], + [AC_MSG_ERROR([could not find function 'com_err' required for Kerberos 5])]) + fi fi if test "$with_openssl" = yes ; then @@ -850,10 +855,9 @@ AC_CHECK_DECLS(fdatasync, [], [], [#include ]) HAVE_IPV6=no AC_CHECK_TYPE([struct sockaddr_in6], - [AC_CHECK_FUNC(inet_ntop, - [AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if you have support for IPv6.]) - HAVE_IPV6=yes])], - [], + [AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if you have support for IPv6.]) + HAVE_IPV6=yes], + [], [$ac_includes_default #include ]) AC_SUBST(HAVE_IPV6)