Allow --enable-thread-safety with --disable-shared libraries by passing
authorBruce Momjian <[email protected]>
Thu, 16 Dec 2004 18:13:07 +0000 (18:13 +0000)
committerBruce Momjian <[email protected]>
Thu, 16 Dec 2004 18:13:07 +0000 (18:13 +0000)
PTHREAD_LIBS to all libpq-usage builds.

src/Makefile.global.in

index 2cb6f59f46f876b2856238395deac856a992a882..65aad56c862cefe8a330f350ec5a80f7463c500e 100644 (file)
@@ -308,11 +308,17 @@ endif
 
 libpq = -L$(libpq_builddir) -lpq
 
+# If doing static linking, shared library dependency can't be
+# used so we specify pthread libs for every usage of libpq
+ifeq ($(enable_shared), no)
+libpq += $(PTHREAD_LIBS)
+else
 # AIX libraries do not remember their required libs so we have to force
 # thread dependent libraires in the link
 ifeq ($(PORTNAME), aix)
 libpq += $(PTHREAD_LIBS)
 endif
+endif
 
 submake-libpq:
        $(MAKE) -C $(libpq_builddir) all