Fix at least a few shared-library problems on Linux.

We have not seen the end of this issue :-(.

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 60ead6597c9eed5aebdad5025062844897e0961e..66b51fc118990a54f62893a7e87406796f1f2a7b 100644 (file)
--- 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.3 1998/10/31 03:58:51 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.4 1998/11/12 05:27:00 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -107,8 +107,9 @@ endif
 ifeq ($(PORTNAME), linux)
   install-shlib-dep    := install-shlib
   shlib                                := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
-  LDFLAGS_SL           := -shared -soname $(shlib)
+  LDFLAGS_SL           := -Bdynamic -shared -soname $(shlib)
   LDFLAGS_ODBC         := -Bsymbolic -lc -lm
+  SHLIB_LINK           += -lc
   CFLAGS                       += $(CFLAGS_SL)
 endif
 

diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index cff9f42834976e22a884af21f7956e44dda96e47..6d60876dd640efc63e8cac879805ce58a022b05b 100644 (file)
--- 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.40 1998/10/19 00:00:43 tgl Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.41 1998/11/12 05:27:01 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -34,6 +34,10 @@ ifdef MULTIBYTE
 OBJS+= common.o wchar.o conv.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))
+
 # Shared library stuff, also default 'all' target
 include $(SRCDIR)/Makefile.shlib