diff options
| -rwxr-xr-x | configure | 150 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 4 |
3 files changed, 83 insertions, 83 deletions
diff --git a/configure b/configure index 425db13d059..6f40aa046e6 100755 --- a/configure +++ b/configure @@ -7169,80 +7169,6 @@ fi done -# This exports HAVE_IPV6 to both C files and Makefiles -echo "$as_me:$LINENO: checking for getaddrinfo" >&5 -echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 -if test "${ac_cv_func_getaddrinfo+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 getaddrinfo (); below. */ -#include <assert.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 getaddrinfo (); -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_getaddrinfo) || defined (__stub___getaddrinfo) -choke me -#else -f = getaddrinfo; -#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_getaddrinfo=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_getaddrinfo=no -fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 -echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 -if test $ac_cv_func_getaddrinfo = yes; then - HAVE_IPV6="yes"; cat >>confdefs.h <<\_ACEOF -#define HAVE_IPV6 1 -_ACEOF - -fi - - - if test "$with_readline" = yes; then for ac_header in readline/readline.h @@ -10036,6 +9962,80 @@ fi +# This exports HAVE_IPV6 to both C files and Makefiles +echo "$as_me:$LINENO: checking for getaddrinfo" >&5 +echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6 +if test "${ac_cv_func_getaddrinfo+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 getaddrinfo (); below. */ +#include <assert.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 getaddrinfo (); +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_getaddrinfo) || defined (__stub___getaddrinfo) +choke me +#else +f = getaddrinfo; +#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_getaddrinfo=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_getaddrinfo=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5 +echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6 +if test $ac_cv_func_getaddrinfo = yes; then + HAVE_IPV6="yes"; cat >>confdefs.h <<\_ACEOF +#define HAVE_IPV6 1 +_ACEOF + +fi + + + echo "$as_me:$LINENO: checking for PS_STRINGS" >&5 echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6 if test "${pgac_cv_var_PS_STRINGS+set}" = set; then @@ -16501,8 +16501,8 @@ s,@python_moduledir@,$python_moduledir,;t t s,@python_moduleexecdir@,$python_moduleexecdir,;t t s,@python_includespec@,$python_includespec,;t t s,@python_libspec@,$python_libspec,;t t -s,@HAVE_IPV6@,$HAVE_IPV6,;t t s,@LIBOBJS@,$LIBOBJS,;t t +s,@HAVE_IPV6@,$HAVE_IPV6,;t t s,@HPUXMATHLIB@,$HPUXMATHLIB,;t t s,@HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t s,@MSGFMT@,$MSGFMT,;t t diff --git a/configure.in b/configure.in index 64cb6844d56..6180a057be8 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Header: /cvsroot/pgsql/configure.in,v 1.225 2003/01/06 03:18:25 momjian Exp $ +dnl $Header: /cvsroot/pgsql/configure.in,v 1.226 2003/01/06 05:46:18 momjian Exp $ dnl dnl Developers, please strive to achieve this order: dnl @@ -687,11 +687,6 @@ AC_CHECK_HEADERS(netinet/tcp.h, [], [], #endif ]) -# This exports HAVE_IPV6 to both C files and Makefiles -AC_CHECK_FUNC(getaddrinfo, - [HAVE_IPV6="yes"; AC_DEFINE(HAVE_IPV6, 1, [])], []) -AC_SUBST(HAVE_IPV6) - if test "$with_readline" = yes; then AC_CHECK_HEADERS(readline/readline.h, [], [AC_CHECK_HEADERS(readline.h, [], @@ -791,6 +786,11 @@ AC_CHECK_FUNCS([cbrt fcvt getopt_long getpeereid memmove pstat setproctitle sets AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>]) +# This exports HAVE_IPV6 to both C files and Makefiles +AC_CHECK_FUNC(getaddrinfo, + [HAVE_IPV6="yes"; AC_DEFINE(HAVE_IPV6, 1, [])], []) +AC_SUBST(HAVE_IPV6) + AC_CACHE_CHECK([for PS_STRINGS], [pgac_cv_var_PS_STRINGS], [AC_TRY_LINK( [#include <machine/vmparam.h> diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 447a6c7a89a..44aca827188 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -8,7 +8,7 @@ * or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your * changes will be overwritten the next time you run configure. * - * $Id: pg_config.h.in,v 1.35 2003/01/06 03:18:27 momjian Exp $ + * $Id: pg_config.h.in,v 1.36 2003/01/06 05:46:18 momjian Exp $ */ #ifndef PG_CONFIG_H @@ -368,7 +368,7 @@ /* Set to 1 if you have <sys/shm.h> */ #undef HAVE_SYS_SHM_H -/* Set to 1 if you have <netinet/ip6.h> for IPv6 */ +/* Set to 1 if you have getaddrinfo for IPv6 */ #undef HAVE_IPV6 /* Set to 1 if you have <kernel/OS.h> */ |