Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8f623be

Browse files
committed
Remove useless symbol from Makefile.global.
I added HAVE_IPV6 to Makefile.global way back in commit 7703e55 so that we could transmit its value to the shell-script version of initdb. Since initdb was rewritten in C, it's been finding that out from pg_config.h instead, so this is useless. Keeping it here just wastes configure and make cycles, plus it's a potential two-sources-of-truth problem.
1 parent 9e12fb0 commit 8f623be

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

configure

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,6 @@ PG_CRC32C_OBJS
650650
CFLAGS_ARMV8_CRC32C
651651
CFLAGS_SSE42
652652
have_win32_dbghelp
653-
HAVE_IPV6
654653
LIBOBJS
655654
UUID_LIBS
656655
LDAP_LIBS_BE
@@ -15347,19 +15346,16 @@ cat >>confdefs.h <<_ACEOF
1534715346
_ACEOF
1534815347

1534915348

15350-
HAVE_IPV6=no
1535115349
ac_fn_c_check_type "$LINENO" "struct sockaddr_in6" "ac_cv_type_struct_sockaddr_in6" "$ac_includes_default
1535215350
#include <netinet/in.h>
1535315351
"
1535415352
if test "x$ac_cv_type_struct_sockaddr_in6" = xyes; then :
1535515353

1535615354
$as_echo "#define HAVE_IPV6 1" >>confdefs.h
1535715355

15358-
HAVE_IPV6=yes
1535915356
fi
1536015357

1536115358

15362-
1536315359
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
1536415360
$as_echo_n "checking for PS_STRINGS... " >&6; }
1536515361
if ${pgac_cv_var_PS_STRINGS+:} false; then :

configure.in

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1652,14 +1652,11 @@ AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
16521652

16531653
AC_CHECK_DECLS([RTLD_GLOBAL, RTLD_NOW], [], [], [#include <dlfcn.h>])
16541654

1655-
HAVE_IPV6=no
16561655
AC_CHECK_TYPE([struct sockaddr_in6],
1657-
[AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if you have support for IPv6.])
1658-
HAVE_IPV6=yes],
1656+
[AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if you have support for IPv6.])],
16591657
[],
16601658
[$ac_includes_default
16611659
#include <netinet/in.h>])
1662-
AC_SUBST(HAVE_IPV6)
16631660

16641661
AC_CACHE_CHECK([for PS_STRINGS], [pgac_cv_var_PS_STRINGS],
16651662
[AC_LINK_IFELSE([AC_LANG_PROGRAM(

src/Makefile.global.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -497,9 +497,6 @@ host_tuple = @host@
497497
host_os = @host_os@
498498
host_cpu = @host_cpu@
499499

500-
# Make HAVE_IPV6 available for initdb script creation
501-
HAVE_IPV6= @HAVE_IPV6@
502-
503500
# This is mainly for use on FreeBSD, where we have both a.out and elf
504501
# systems now. May be applicable to other systems to?
505502
ELF_SYSTEM= @ELF_SYS@

0 commit comments

Comments
 (0)