Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit895f954

Browse files
committed
Update ipv6 comment, move configure test to the right place
1 parent2d5e27c commit895f954

File tree

3 files changed

+83
-83
lines changed

3 files changed

+83
-83
lines changed

‎configure

Lines changed: 75 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -7169,80 +7169,6 @@ fi
71697169
done
71707170
71717171
7172-
# This exports HAVE_IPV6 to both C files and Makefiles
7173-
echo"$as_me:$LINENO: checking for getaddrinfo">&5
7174-
echo$ECHO_N"checking for getaddrinfo...$ECHO_C">&6
7175-
iftest"${ac_cv_func_getaddrinfo+set}" =set;then
7176-
echo$ECHO_N"(cached)$ECHO_C">&6
7177-
else
7178-
cat>conftest.$ac_ext<<_ACEOF
7179-
#line$LINENO "configure"
7180-
#include "confdefs.h"
7181-
/* System header to define __stub macros and hopefully few prototypes,
7182-
which can conflict with char getaddrinfo (); below. */
7183-
#include <assert.h>
7184-
/* Override any gcc2 internal prototype to avoid an error. */
7185-
#ifdef __cplusplus
7186-
extern "C"
7187-
#endif
7188-
/* We use char because int might match the return type of a gcc2
7189-
builtin and then its argument prototype would still apply. */
7190-
char getaddrinfo ();
7191-
char (*f) ();
7192-
7193-
#ifdef F77_DUMMY_MAIN
7194-
# ifdef __cplusplus
7195-
extern "C"
7196-
# endif
7197-
int F77_DUMMY_MAIN() { return 1; }
7198-
#endif
7199-
int
7200-
main ()
7201-
{
7202-
/* The GNU C library defines this for functions which it implements
7203-
to always fail with ENOSYS. Some functions are actually named
7204-
something starting with __ and the normal name is an alias. */
7205-
#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo)
7206-
choke me
7207-
#else
7208-
f = getaddrinfo;
7209-
#endif
7210-
7211-
;
7212-
return 0;
7213-
}
7214-
_ACEOF
7215-
rm -f conftest.$ac_objext conftest$ac_exeext
7216-
if { (evalecho"$as_me:$LINENO:\"$ac_link\"")>&5
7217-
(eval$ac_link)2>&5
7218-
ac_status=$?
7219-
echo"$as_me:$LINENO:\$? =$ac_status">&5
7220-
(exit$ac_status); }&&
7221-
{ ac_try='test -s conftest$ac_exeext'
7222-
{ (evalecho"$as_me:$LINENO:\"$ac_try\"")>&5
7223-
(eval$ac_try)2>&5
7224-
ac_status=$?
7225-
echo"$as_me:$LINENO:\$? =$ac_status">&5
7226-
(exit$ac_status); }; };then
7227-
ac_cv_func_getaddrinfo=yes
7228-
else
7229-
echo"$as_me: failed program was:">&5
7230-
cat conftest.$ac_ext>&5
7231-
ac_cv_func_getaddrinfo=no
7232-
fi
7233-
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
7234-
fi
7235-
echo"$as_me:$LINENO: result:$ac_cv_func_getaddrinfo">&5
7236-
echo"${ECHO_T}$ac_cv_func_getaddrinfo">&6
7237-
iftest$ac_cv_func_getaddrinfo = yes;then
7238-
HAVE_IPV6="yes"; cat>>confdefs.h<<\_ACEOF
7239-
#define HAVE_IPV6 1
7240-
_ACEOF
7241-
7242-
fi
7243-
7244-
7245-
72467172
iftest"$with_readline" = yes;then
72477173
72487174
forac_headerin readline/readline.h
@@ -10036,6 +9962,80 @@ fi
100369962
100379963
100389964
9965+
# This exports HAVE_IPV6 to both C files and Makefiles
9966+
echo"$as_me:$LINENO: checking for getaddrinfo">&5
9967+
echo$ECHO_N"checking for getaddrinfo...$ECHO_C">&6
9968+
iftest"${ac_cv_func_getaddrinfo+set}" =set;then
9969+
echo$ECHO_N"(cached)$ECHO_C">&6
9970+
else
9971+
cat>conftest.$ac_ext<<_ACEOF
9972+
#line$LINENO "configure"
9973+
#include "confdefs.h"
9974+
/* System header to define __stub macros and hopefully few prototypes,
9975+
which can conflict with char getaddrinfo (); below. */
9976+
#include <assert.h>
9977+
/* Override any gcc2 internal prototype to avoid an error. */
9978+
#ifdef __cplusplus
9979+
extern "C"
9980+
#endif
9981+
/* We use char because int might match the return type of a gcc2
9982+
builtin and then its argument prototype would still apply. */
9983+
char getaddrinfo ();
9984+
char (*f) ();
9985+
9986+
#ifdef F77_DUMMY_MAIN
9987+
# ifdef __cplusplus
9988+
extern "C"
9989+
# endif
9990+
int F77_DUMMY_MAIN() { return 1; }
9991+
#endif
9992+
int
9993+
main ()
9994+
{
9995+
/* The GNU C library defines this for functions which it implements
9996+
to always fail with ENOSYS. Some functions are actually named
9997+
something starting with __ and the normal name is an alias. */
9998+
#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo)
9999+
choke me
10000+
#else
10001+
f = getaddrinfo;
10002+
#endif
10003+
10004+
;
10005+
return 0;
10006+
}
10007+
_ACEOF
10008+
rm -f conftest.$ac_objext conftest$ac_exeext
10009+
if { (evalecho"$as_me:$LINENO:\"$ac_link\"")>&5
10010+
(eval$ac_link)2>&5
10011+
ac_status=$?
10012+
echo"$as_me:$LINENO:\$? =$ac_status">&5
10013+
(exit$ac_status); }&&
10014+
{ ac_try='test -s conftest$ac_exeext'
10015+
{ (evalecho"$as_me:$LINENO:\"$ac_try\"")>&5
10016+
(eval$ac_try)2>&5
10017+
ac_status=$?
10018+
echo"$as_me:$LINENO:\$? =$ac_status">&5
10019+
(exit$ac_status); }; };then
10020+
ac_cv_func_getaddrinfo=yes
10021+
else
10022+
echo"$as_me: failed program was:">&5
10023+
cat conftest.$ac_ext>&5
10024+
ac_cv_func_getaddrinfo=no
10025+
fi
10026+
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10027+
fi
10028+
echo"$as_me:$LINENO: result:$ac_cv_func_getaddrinfo">&5
10029+
echo"${ECHO_T}$ac_cv_func_getaddrinfo">&6
10030+
iftest$ac_cv_func_getaddrinfo = yes;then
10031+
HAVE_IPV6="yes"; cat>>confdefs.h<<\_ACEOF
10032+
#define HAVE_IPV6 1
10033+
_ACEOF
10034+
10035+
fi
10036+
10037+
10038+
1003910039
echo"$as_me:$LINENO: checking for PS_STRINGS">&5
1004010040
echo$ECHO_N"checking for PS_STRINGS...$ECHO_C">&6
1004110041
iftest"${pgac_cv_var_PS_STRINGS+set}" =set;then
@@ -16501,8 +16501,8 @@ s,@python_moduledir@,$python_moduledir,;t t
1650116501
s,@python_moduleexecdir@,$python_moduleexecdir,;t t
1650216502
s,@python_includespec@,$python_includespec,;t t
1650316503
s,@python_libspec@,$python_libspec,;t t
16504-
s,@HAVE_IPV6@,$HAVE_IPV6,;t t
1650516504
s,@LIBOBJS@,$LIBOBJS,;t t
16505+
s,@HAVE_IPV6@,$HAVE_IPV6,;t t
1650616506
s,@HPUXMATHLIB@,$HPUXMATHLIB,;t t
1650716507
s,@HAVE_POSIX_SIGNALS@,$HAVE_POSIX_SIGNALS,;t t
1650816508
s,@MSGFMT@,$MSGFMT,;t t

‎configure.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $Header: /cvsroot/pgsql/configure.in,v 1.225 2003/01/0603:18:25 momjian Exp $
2+
dnl $Header: /cvsroot/pgsql/configure.in,v 1.226 2003/01/0605:46:18 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -687,11 +687,6 @@ AC_CHECK_HEADERS(netinet/tcp.h, [], [],
687687
#endif
688688
])
689689

690-
# This exports HAVE_IPV6 to both C files and Makefiles
691-
AC_CHECK_FUNC(getaddrinfo,
692-
[HAVE_IPV6="yes"; AC_DEFINE(HAVE_IPV6, 1, [])], [])
693-
AC_SUBST(HAVE_IPV6)
694-
695690
if test "$with_readline" = yes; then
696691
AC_CHECK_HEADERS(readline/readline.h, [],
697692
[AC_CHECK_HEADERS(readline.h, [],
@@ -791,6 +786,11 @@ AC_CHECK_FUNCS([cbrt fcvt getopt_long getpeereid memmove pstat setproctitle sets
791786

792787
AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
793788

789+
# This exports HAVE_IPV6 to both C files and Makefiles
790+
AC_CHECK_FUNC(getaddrinfo,
791+
[HAVE_IPV6="yes"; AC_DEFINE(HAVE_IPV6, 1, [])], [])
792+
AC_SUBST(HAVE_IPV6)
793+
794794
AC_CACHE_CHECK([for PS_STRINGS], [pgac_cv_var_PS_STRINGS],
795795
[AC_TRY_LINK(
796796
[#include <machine/vmparam.h>

‎src/include/pg_config.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* or in pg_config.h afterwards. Of course, if you edit pg_config.h, then your
99
* changes will be overwritten the next time you run configure.
1010
*
11-
* $Id: pg_config.h.in,v 1.35 2003/01/0603:18:27 momjian Exp $
11+
* $Id: pg_config.h.in,v 1.36 2003/01/0605:46:18 momjian Exp $
1212
*/
1313

1414
#ifndefPG_CONFIG_H
@@ -368,7 +368,7 @@
368368
/* Set to 1 if you have <sys/shm.h> */
369369
#undef HAVE_SYS_SHM_H
370370

371-
/* Set to 1 if you have<netinet/ip6.h> for IPv6 */
371+
/* Set to 1 if you havegetaddrinfo for IPv6 */
372372
#undef HAVE_IPV6
373373

374374
/* Set to 1 if you have <kernel/OS.h> */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp