summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2005-08-29 00:47:35 +0000
committerBruce Momjian2005-08-29 00:47:35 +0000
commit3917339fca670a858b3ae7110af1a11a6b3c65fd (patch)
tree412324dbc485fa3edb386aa565c9cf8f5ad17b9e
parentead31fc418554ce3611e14f600bfe5df2ce3d728 (diff)
Allow Win32 libpq will use it's minimal pthread implementation, and ecpg
will use pthreadGC2. Dave Page
-rw-r--r--config/acx_pthread.m42
-rwxr-xr-xconfigure2
-rw-r--r--src/interfaces/libpq/Makefile6
3 files changed, 8 insertions, 2 deletions
diff --git a/config/acx_pthread.m4 b/config/acx_pthread.m4
index 2ca565c144..ceb161a556 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 3cc7ba747a..0fc920fbab 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 66cc2d9b26..149197b54e 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -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