aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/backend/port/inet_aton.c3
-rwxr-xr-xsrc/configure2
-rw-r--r--src/configure.in2
-rw-r--r--src/include/config.h.in6
4 files changed, 9 insertions, 4 deletions
diff --git a/src/backend/port/inet_aton.c b/src/backend/port/inet_aton.c
index 098de3ddb55..cf9f6fd7f5d 100644
--- a/src/backend/port/inet_aton.c
+++ b/src/backend/port/inet_aton.c
@@ -1,4 +1,4 @@
-/* $Id: inet_aton.c,v 1.11 1997/12/19 13:34:28 scrappy Exp $
+/* $Id: inet_aton.c,v 1.12 1998/01/23 19:13:14 scrappy Exp $
*
* This inet_aton() function was taken from the GNU C library and
* incorporated into Postgres for those systems which do not have this
@@ -45,7 +45,6 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <ctype.h>
-#include "inet_aton.h"
/*
* Check whether "cp" is a valid ascii representation
diff --git a/src/configure b/src/configure
index f4fd35a1141..acb6d2f741d 100755
--- a/src/configure
+++ b/src/configure
@@ -2738,7 +2738,7 @@ else
fi
done
-for ac_hdr in sys/resource.h netdb.h
+for ac_hdr in sys/resource.h netdb.h arpa/inet.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
diff --git a/src/configure.in b/src/configure.in
index df67ed72315..c77c33bb029 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -428,7 +428,7 @@ dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h)
-AC_CHECK_HEADERS(sys/resource.h netdb.h)
+AC_CHECK_HEADERS(sys/resource.h netdb.h arpa/inet.h)
AC_CHECK_HEADERS(readline.h history.h dld.h crypt.h endian.h float.h)
AC_CHECK_HEADERS(readline/history.h)
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 1e99ac39547..74f84894db7 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -14,6 +14,9 @@
* The following is set using configure.
*/
+/* Set to 1 if you have <arpa/inet.h> */
+#undef HAVE_ARPA_INET_H
+
/* Set to 1 if you have <netdb.h> */
#undef HAVE_NETDB_H
@@ -74,6 +77,9 @@ int gethostname(char *name, int namelen);
/* Set to 1 if you have inet_aton() */
#undef HAVE_INET_ATON
#ifndef HAVE_INET_ATON
+# ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+# endif
extern int inet_aton(const char *cp, struct in_addr * addr);
#endif