git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/configure b/configure

index 27dd34841ae1d520569594e29ed243ceb5f43e02..96ee289d050e07baf4119e8ed0dc01b30652f6bf 100755 (executable)

--- a/configure

+++ b/configure

# set thread flags

-# ACX_PTHREAD sets PTHREAD_CFLAGS that should be used for linking too

-PTHREAD_LIBS="$PTHREAD_CFLAGS $PTHREAD_LIBS"

-

# At this point, we don't want to muck with the compiler name for threading.

# Let's see who fails, perhaps AIX. 2004年04月23日

if test "$PTHREAD_CC" != "$CC"; then

diff --git a/configure.in b/configure.in

index ced20fc6107d8bca7edc751c2ce5582416cce018..e09e80b4eeef319b76d3c2c940298a952bdd056e 100644 (file)

--- a/configure.in

+++ b/configure.in

dnl Process this file with autoconf to produce a configure script.

-dnl $PostgreSQL: pgsql/configure.in,v 1.326 2004年04月24日 03:09:35 momjian Exp $

+dnl $PostgreSQL: pgsql/configure.in,v 1.327 2004年04月25日 20:57:32 momjian Exp $

dnl

dnl Developers, please strive to achieve this order:

dnl

if test "$enable_thread_safety" = yes; then

ACX_PTHREAD # set thread flags

-# ACX_PTHREAD sets PTHREAD_CFLAGS that should be used for linking too

-PTHREAD_LIBS="$PTHREAD_CFLAGS $PTHREAD_LIBS"

-

# At this point, we don't want to muck with the compiler name for threading.

# Let's see who fails, perhaps AIX. 2004年04月23日

if test "$PTHREAD_CC" != "$CC"; then

diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile

index 253b2970f473bb3fd417b7ab147133027766e89f..18ab49d25905be792f87807d2c96e5d4dc3e8c16 100644 (file)

--- a/src/interfaces/ecpg/compatlib/Makefile

+++ b/src/interfaces/ecpg/compatlib/Makefile

#

# Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.15 2004年04月23日 18:15:54 momjian Exp $

+# $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/Makefile,v 1.16 2004年04月25日 20:57:32 momjian Exp $

#

#-------------------------------------------------------------------------

SO_MAJOR_VERSION= 1

SO_MINOR_VERSION= 1

-override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS) $(PTHREAD_CFLAGS)

+override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS)

+override CFLAGS += $(PTHREAD_CFLAGS)

SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \

$(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS)) $(PTHREAD_LIBS)

diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile

index 5fa654d8fe7fe2d2b97dd5fc8a697f9ecacdb05a..4596158db955fa44d27d8abbd1c2c494d9d93cfe 100644 (file)

--- a/src/interfaces/ecpg/ecpglib/Makefile

+++ b/src/interfaces/ecpg/ecpglib/Makefile

#

# Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.15 2004年04月23日 18:15:54 momjian Exp $

+# $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/Makefile,v 1.16 2004年04月25日 20:57:32 momjian Exp $

#

#-------------------------------------------------------------------------

SO_MAJOR_VERSION= 4

SO_MINOR_VERSION= 2

-override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS) $(PTHREAD_CFLAGS)

+override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include -I$(libpq_srcdir) $(CPPFLAGS)

+override CFLAGS += $(PTHREAD_CFLAGS)

OBJS= execute.o typename.o descriptor.o data.o error.o prepare.o memory.o \

connect.o misc.o

diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile

index 52fa7f79a6d2a09c72114d8db329b102256d2582..7ef3a0ed33467ff190e8c54a1674bb050f7ccb25 100644 (file)

--- a/src/interfaces/ecpg/preproc/Makefile

+++ b/src/interfaces/ecpg/preproc/Makefile

-# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.100 2004年04月23日 18:15:55 momjian Exp $

+# $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.101 2004年04月25日 20:57:32 momjian Exp $

subdir = src/interfaces/ecpg/preproc

top_builddir = ../../../..

MINOR_VERSION=2

PATCHLEVEL=0

-override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) $(PTHREAD_CFLAGS) \

+override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) \

-DMAJOR_VERSION=$(MAJOR_VERSION) \

-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \

-DINCLUDEDIR=\"$(includedir)\" \

ifeq ($(GCC), yes)

override CFLAGS += -Wno-error

endif

+override CFLAGS += $(PTHREAD_CFLAGS)

OBJS=preproc.o type.o ecpg.o ecpg_keywords.o output.o\

keywords.o c_keywords.o ../ecpglib/typename.o descriptor.o variable.o

diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile

index c1afd84af84a600090b89c4d378562bb2204413c..92a3eb7e882b5adfaa338928d0bf1453b5b77497 100644 (file)

--- a/src/interfaces/ecpg/test/Makefile

+++ b/src/interfaces/ecpg/test/Makefile

-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.45 2004年04月23日 18:15:55 momjian Exp $

+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.46 2004年04月25日 20:57:32 momjian Exp $

subdir = src/interfaces/ecpg/test

top_builddir = ../../../..

include $(top_builddir)/src/Makefile.global

-override CPPFLAGS := -I$(srcdir)/../include -I$(libpq_srcdir) $(CPPFLAGS) $(PTHREAD_CFLAGS)

+override CPPFLAGS := -I$(srcdir)/../include -I$(libpq_srcdir) $(CPPFLAGS)

+override CFLAGS += $(PTHREAD_CFLAGS)

ECPG = ../preproc/ecpg -I$(srcdir)/../include

diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile

index 0221bf9285d8a1af2281d873ba8dc91e2cf0e1fd..2c8a4fcf71c3dab361ba862be51ffbc183c769fb 100644 (file)

--- a/src/interfaces/libpq/Makefile

+++ b/src/interfaces/libpq/Makefile

#

# Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.102 2004年04月23日 18:15:55 momjian Exp $

+# $PostgreSQL: pgsql/src/interfaces/libpq/Makefile,v 1.103 2004年04月25日 20:57:32 momjian Exp $

#

#-------------------------------------------------------------------------

SO_MINOR_VERSION= 2

override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) $(PTHREAD_CFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'

+override CFLAGS += $(PTHREAD_CFLAGS)

OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \

fe-protocol2.o fe-protocol3.o pqexpbuffer.o pqsignal.o fe-secure.o \