diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | src/Makefile.shlib | 5 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile | 11 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 55030693957..27dd83ba391 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.104 2000/10/23 21:43:56 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.105 2000/10/25 16:13:52 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -162,7 +162,6 @@ LIBS = @LIBS@ LD = @LD@ with_gnu_ld = @with_gnu_ld@ LDFLAGS = @LDFLAGS@ $(LIBS) -KRB_LIBS = @KRB_LIBS@ LDREL = -r LDOUT = -o RANLIB = @RANLIB@ diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 374e3dd9229..cab71b0a745 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.27 2000/10/23 21:43:56 petere Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.28 2000/10/25 16:13:52 petere Exp $ # #------------------------------------------------------------------------- @@ -200,6 +200,9 @@ ifeq ($(PORTNAME), beos) SHLIB_LINK += -ltermcap -lstdc++.r4 -lbind -lsocket -L/boot/develop/lib/x86 endif +# Pull in any extra -L options that the user might have specified. +SHLIB_LINK := $(filter -L%, $(LDFLAGS)) $(SHLIB_LINK) + endif # enable_shared diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index a34b22746e6..7f651fa8854 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -4,7 +4,7 @@ # # Copyright (c) 1994, Regents of the University of California # -# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.45 2000/10/20 21:04:11 petere Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/libpq/Makefile,v 1.46 2000/10/25 16:13:52 petere Exp $ # #------------------------------------------------------------------------- @@ -26,12 +26,11 @@ ifdef MULTIBYTE OBJS+= common.o wchar.o conv.o big5.o mbutils.o endif -# If crypt is a separate library, rather than part of libc, -# make sure it gets included in shared libpq. -SHLIB_LINK+= $(findstring -lcrypt, $(LIBS)) +# Add libraries that libpq depends (or might depend) on into the +# shared library link. (The order in which you list them here doesn't +# matter.) +SHLIB_LINK += $(filter -lcrypt -ldes -lkrb -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl, $(LIBS)) -# Include kerberos libraries into libpq -SHLIB_LINK += $(KRB_LIBS) all: all-lib |