aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2000-04-14 00:42:06 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2000-04-14 00:42:06 +0000
commitbf00aec8d057cfc1c0036660876968ce1f85fb9d (patch)
tree59b6f77425f5556425d20457c199e882636873de /src
parent977fad3f173986038fec864ed8abddb6841b079a (diff)
downloadpostgresql-bf00aec8d057cfc1c0036660876968ce1f85fb9d.tar.gz
postgresql-bf00aec8d057cfc1c0036660876968ce1f85fb9d.zip
If configure finds that inet_aton() is not present on this platform,
include the version from backend/port into libpq. There is a second-rate implementation of inet_aton() already present in fe-connect.c, #ifdef'd WIN32. That ought to be removed in favor of using the better version from port/. However, since I'm not in a position to test the WIN32 code, I will leave well enough alone for this release...
Diffstat (limited to 'src')
-rw-r--r--src/interfaces/libpq/Makefile.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index 5801ffc6412..0a4358a3faf 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -6,7 +6,7 @@
# Copyright (c) 1994, Regents of the University of California
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.53 2000/01/19 02:59:03 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.54 2000/04/14 00:42:06 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -24,7 +24,7 @@ CFLAGS+= $(KRBFLAGS)
endif
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
- pqexpbuffer.o dllist.o pqsignal.o @SNPRINTF@
+ pqexpbuffer.o dllist.o pqsignal.o @SNPRINTF@ @INET_ATON@
ifdef MULTIBYTE
OBJS+= common.o wchar.o conv.o big5.o
@@ -50,6 +50,10 @@ dllist.c: $(SRCDIR)/backend/lib/dllist.c
snprintf.c: $(SRCDIR)/backend/port/snprintf.c
-$(LN_S) $(SRCDIR)/backend/port/snprintf.c .
+# this only gets done if configure finds system doesn't have inet_aton()
+inet_aton.c: $(SRCDIR)/backend/port/inet_aton.c
+ -$(LN_S) $(SRCDIR)/backend/port/inet_aton.c .
+
ifdef MULTIBYTE
common.c: $(SRCDIR)/backend/utils/mb/common.c
-$(LN_S) $(SRCDIR)/backend/utils/mb/common.c .
@@ -89,7 +93,7 @@ install-headers: libpq-fe.h libpq-int.h
clean: clean-shlib
rm -f lib$(NAME).a $(OBJS)
- rm -f dllist.c snprintf.c common.c wchar.c conv.c big5.c
+ rm -f dllist.c snprintf.c inet_aton.c common.c wchar.c conv.c big5.c
depend dep:
$(CC) -MM $(CFLAGS) *.c >depend