The configure script fails to find <netinet/tcp.h>.
As a result, backend/libpq/pqcomm.c and interfaces/libpq/fe-connect.c fail to compile. The <netinet/tcp.h> header needs to be preceded by <netinet/in.h>, at least on IRIX, Solaris and AIX. The simple configure test fails. (That header on Linux is idempotent.) The basic problem is that <netinet/tcp.h> is a BSD header. The correct header for TCP internals such as TCP_NODELAY on a UNIX system is <xti.h>. By UNIX I mean UNIX95 (aka XPG4v2 or SUSv1) or later. The current UNIX standard (UNIX98 aka SUSv2) is available online at <http://www.opengroup.org/onlinepubs/7908799/>. The fix is to add header support for <xti.h> into configure.in and config.h.in. The 2 files which conditionally include <netinet/tcp.h> need also to conditionally include <xti.h>. Pete Forman
This commit is contained in:
parent
d3902198b4
commit
0f07d644a3
@ -654,7 +654,7 @@ fi
|
|||||||
## Header files
|
## Header files
|
||||||
##
|
##
|
||||||
dnl sys/socket.h and sys/types.h are required by AC_FUNC_ACCEPT_ARGTYPES
|
dnl sys/socket.h and sys/types.h are required by AC_FUNC_ACCEPT_ARGTYPES
|
||||||
AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h netinet/tcp.h pwd.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/types.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h])
|
AC_CHECK_HEADERS([crypt.h dld.h endian.h fp_class.h getopt.h ieeefp.h xti.h netinet/tcp.h pwd.h sys/ipc.h sys/pstat.h sys/select.h sys/sem.h sys/socket.h sys/shm.h sys/types.h sys/un.h termios.h kernel/OS.h kernel/image.h SupportDefs.h])
|
||||||
|
|
||||||
AC_CHECK_HEADERS([readline/readline.h readline.h], [break])
|
AC_CHECK_HEADERS([readline/readline.h readline.h], [break])
|
||||||
AC_CHECK_HEADERS([readline/history.h history.h], [break])
|
AC_CHECK_HEADERS([readline/history.h history.h], [break])
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
|
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
|
||||||
* Portions Copyright (c) 1994, Regents of the University of California
|
* Portions Copyright (c) 1994, Regents of the University of California
|
||||||
*
|
*
|
||||||
* $Id: pqcomm.c,v 1.105 2000/10/05 20:18:33 tgl Exp $
|
* $Id: pqcomm.c,v 1.106 2000/10/14 23:56:58 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -69,6 +69,9 @@
|
|||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
#ifdef HAVE_XTI_H
|
||||||
|
# include <xti.h>
|
||||||
|
#endif
|
||||||
#ifdef HAVE_NETINET_TCP_H
|
#ifdef HAVE_NETINET_TCP_H
|
||||||
# include <netinet/tcp.h>
|
# include <netinet/tcp.h>
|
||||||
#endif
|
#endif
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
* or in config.h afterwards. Of course, if you edit config.h, then your
|
* or in config.h afterwards. Of course, if you edit config.h, then your
|
||||||
* changes will be overwritten the next time you run configure.
|
* changes will be overwritten the next time you run configure.
|
||||||
*
|
*
|
||||||
* $Id: config.h.in,v 1.141 2000/10/07 14:39:16 momjian Exp $
|
* $Id: config.h.in,v 1.142 2000/10/14 23:56:58 momjian Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef CONFIG_H
|
#ifndef CONFIG_H
|
||||||
@ -330,6 +330,9 @@
|
|||||||
/* Set to 1 if you have <ieeefp.h> */
|
/* Set to 1 if you have <ieeefp.h> */
|
||||||
#undef HAVE_IEEEFP_H
|
#undef HAVE_IEEEFP_H
|
||||||
|
|
||||||
|
/* Set to 1 if you have <xti.h> */
|
||||||
|
#undef HAVE_XTI_H
|
||||||
|
|
||||||
/* Set to 1 if you have <netinet/tcp.h> */
|
/* Set to 1 if you have <netinet/tcp.h> */
|
||||||
#undef HAVE_NETINET_TCP_H
|
#undef HAVE_NETINET_TCP_H
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
*
|
*
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.137 2000/10/03 19:16:17 petere Exp $
|
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.138 2000/10/14 23:56:59 momjian Exp $
|
||||||
*
|
*
|
||||||
*-------------------------------------------------------------------------
|
*-------------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
@ -31,6 +31,9 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <netdb.h>
|
#include <netdb.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
#ifdef HAVE_XTI_H
|
||||||
|
# include <xti.h>
|
||||||
|
#endif
|
||||||
#ifdef HAVE_NETINET_TCP_H
|
#ifdef HAVE_NETINET_TCP_H
|
||||||
# include <netinet/tcp.h>
|
# include <netinet/tcp.h>
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user