diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-08-29 00:47:35 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-08-29 00:47:35 +0000 |
| commit | 1a6fe830112d31bc4cd50cc11e49661d64598412 (patch) | |
| tree | 5502f7d70838d712bcd63f6c5c6251f5b5955ad8 | |
| parent | 2d0339094592d202dc97e00f0524c03bdab9b81a (diff) | |
| download | postgresql-1a6fe830112d31bc4cd50cc11e49661d64598412.tar.gz postgresql-1a6fe830112d31bc4cd50cc11e49661d64598412.zip | |
Allow Win32 libpq will use it's minimal pthread implementation, and ecpg
will use pthreadGC2.
Dave Page
| -rw-r--r-- | config/acx_pthread.m4 | 2 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/Makefile | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/config/acx_pthread.m4 b/config/acx_pthread.m4 index 2ca565c1440..ceb161a556a 100644 --- a/config/acx_pthread.m4 +++ b/config/acx_pthread.m4 @@ -43,7 +43,7 @@ fi # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config pthreadGC2" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: diff --git a/configure b/configure index 3cc7ba747a0..0fc920fbab7 100755 --- a/configure +++ b/configure @@ -16248,7 +16248,7 @@ fi # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" +acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config pthreadGC2" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile index 9a61803cce8..c8aca1b2129 100644 --- a/src/interfaces/libpq/Makefile +++ b/src/interfaces/libpq/Makefile @@ -5,7 +5,7 @@ # Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group # Portions Copyright (c) 1994, Regents of the University of California # -# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.137 2005/08/23 21:02:03 momjian Exp $ +# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.138 2005/08/29 00:47:35 momjian Exp $ # #------------------------------------------------------------------------- @@ -21,7 +21,9 @@ SO_MINOR_VERSION= 1 DLTYPE= library override CPPFLAGS := -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port +ifneq ($(PORTNAME), win32) override CFLAGS += $(PTHREAD_CFLAGS) +endif # Need to recomple any libpgport object files LIBS := $(patsubst -lpgport,, $(LIBS)) @@ -51,7 +53,11 @@ endif # 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.) +ifneq ($(PORTNAME), win32) SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl, $(LIBS)) $(PTHREAD_LIBS) +else +SHLIB_LINK += $(filter -lcrypt -ldes -lcom_err -lcrypto -lk5crypto -lkrb5 -lssl -lsocket -lnsl -lresolv -lintl $(PTHREAD_LIBS), $(LIBS)) +endif ifeq ($(PORTNAME), win32) SHLIB_LINK += -lshfolder -lwsock32 -lws2_32 $(filter -leay32 -lssleay32 -lcomerr32 -lkrb5_32, $(LIBS)) endif |