Thu Dec 12 06:26:04 PST 2013
- Previous message: [Slony1-general] Patches
- Next message: [Slony1-general] Slony 2.2.1: execute script: option set id not allowed here
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
When building with --with-pgport slonik needs to include port.h port.h is normally found under the server include directory but some distributions (ie debian libpq-dev) also include it in /usr/include/postgresql The fix for bug 315 removed the server include paths from all client programs including slonik. This went too far, the actual issue with bug 315 was src/backend failing because it pulled in the client headers. If we are building with pgport we will pull in the server include directories for slonik --- src/slonik/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/slonik/Makefile b/src/slonik/Makefile index 9929882..54c8792 100644 --- a/src/slonik/Makefile +++ b/src/slonik/Makefile @@ -10,8 +10,11 @@ slony_subdir = src/slonik slony_top_builddir = ../.. SLFILEDESC="Slony command interpreter" include $(slony_top_builddir)/Makefile.global +ifeq ($(HAVE_PGPORT),1) +CPPFLAGS:=$(CPPFLAGS_SERVER) $(CPPFLAGS_CLIENT) +else CPPFLAGS:=$(CPPFLAGS_CLIENT) - +endif ifeq ($(PORTNAME), aix) CFLAGS += -D_LARGE_FILES endif -- 1.7.10.4 --------------090005010403000008080601--
- Previous message: [Slony1-general] Patches
- Next message: [Slony1-general] Slony 2.2.1: execute script: option set id not allowed here
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-general mailing list