summaryrefslogtreecommitdiff
path: root/src/Makefile.shlib
diff options
context:
space:
mode:
authorPeter Eisentraut2000-10-25 16:13:52 +0000
committerPeter Eisentraut2000-10-25 16:13:52 +0000
commit53f300d49ea08531d48f710aca0286d283dd473a (patch)
tree0c21d1f3082906f88c6c419e73cb97ac804f769d /src/Makefile.shlib
parentc404d91c0bf15442a3dc38644263a05e258c3c52 (diff)
Rearrange handling of -L linker options so that they are always before all
the -l options. (This was not the case when using the OpenSSL or Kerberos options.) Also make sure that shared library links get to see all the -L options. Get Kerberos 5 support to compile on Redhat 7.0. Add OpenSSL and -lsocket (if used/found) to libpq link.
Diffstat (limited to 'src/Makefile.shlib')
-rw-r--r--src/Makefile.shlib5
1 files changed, 4 insertions, 1 deletions
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