Commit25004ee

committed

Fix more random breakage manifesting on FreeBSD.

1 parent4916f9e commit25004eeCopy full SHA for 25004ee

File tree

+15

-6

lines changed

+15

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Macros that test various C library quirks`
`2`		`-# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.12 2002/03/29 17:32:53 petere Exp $`
	`2`	`+# $Header: /cvsroot/pgsql/config/c-library.m4,v 1.13 2002/03/30 00:59:52 petere Exp $`
`3`	`3`
`4`	`4`
`5`	`5`	`# PGAC_VAR_INT_TIMEZONE`
`@@ -66,7 +66,7 @@ AC_SUBST(MEMCMP)dnl`
`66`	`66`	`# If it doesn't then one could define it as`
`67`	`67`	`# union semun { int val; struct semid_ds buf; unsigned short array; }`
`68`	`68`	`AC_DEFUN([PGAC_UNION_SEMUN],`
`69`		`-[AC_CHECK_TYPE([union semun],[],[],`
	`69`	`+[AC_CHECK_TYPES([union semun],[],[],`
`70`	`70`	`[#include <sys/types.h>`
`71`	`71`	`#include <sys/ipc.h>`
`72`	`72`	`#include <sys/sem.h>])])# PGAC_UNION_SEMUN`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7455,8 +7455,7 @@ done`
`7455`	`7455`
`7456`	`7456`
`7457`	`7457`
`7458`		`-`
`7459`		`-forac_headerin crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h strings.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h`
	`7458`	`+forac_headerin crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h`
`7460`	`7459`	`do`
`7461`	`7460`	as_ac_Header=`echo"ac_cv_header_$ac_header"\|$as_tr_sh`
`7462`	`7461`	`ifeval"test\"\${$as_ac_Header+set}\" = set";then`
`@@ -7698,6 +7697,7 @@ else`
`7698`	`7697`	`cat>conftest.$ac_ext<<_ACEOF`
`7699`	`7698`	`#line$LINENO "configure"`
`7700`	`7699`	`#include "confdefs.h"`
	`7700`	`+$ac_includes_default`
`7701`	`7701`	`#ifdef HAVE_NETINET_IN_H`
`7702`	`7702`	`#include <netinet/in.h>`
`7703`	`7703`	`#endif`
`@@ -9164,6 +9164,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext`
`9164`	`9164`	`fi`
`9165`	`9165`	`echo"$as_me:$LINENO: result:$ac_cv_type_union_semun">&5`
`9166`	`9166`	`echo"${ECHO_T}$ac_cv_type_union_semun">&6`
	`9167`	`+iftest$ac_cv_type_union_semun = yes;then`
	`9168`	`+`
	`9169`	`+cat>>confdefs.h<<_ACEOF`
	`9170`	`+#define HAVE_UNION_SEMUN 1`
	`9171`	`+_ACEOF`
	`9172`	`+`
	`9173`	`+`
	`9174`	`+fi`
`9167`	`9175`
`9168`	`9176`	`echo"$as_me:$LINENO: checking for struct sockaddr_un">&5`
`9169`	`9177`	`echo$ECHO_N"checking for struct sockaddr_un...$ECHO_C">&6`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`dnl Process this file with autoconf to produce a configure script.`
`2`		`-dnl $Header: /cvsroot/pgsql/configure.in,v 1.172 2002/03/30 00:20:15 petere Exp $`
	`2`	`+dnl $Header: /cvsroot/pgsql/configure.in,v 1.173 2002/03/30 00:59:52 petere Exp $`
`3`	`3`
`4`	`4`	`dnl Developers, please strive to achieve this order:`
`5`	`5`	`dnl`
`@@ -759,7 +759,8 @@ AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h pwd.h sys/`
`759`	`759`	`# netinet/in.h is included first.`
`760`	`760`	`AC_CHECK_HEADERS([netinet/in.h])`
`761`	`761`	`AC_CHECK_HEADERS([netinet/tcp.h], [], [],`
`762`		`-[#ifdef HAVE_NETINET_IN_H`
	`762`	`+[AC_INCLUDES_DEFAULT`
	`763`	`+#ifdef HAVE_NETINET_IN_H`
`763`	`764`	`#include <netinet/in.h>`
`764`	`765`	`#endif`
`765`	`766`	`])`

Comments

(0)