Log Message:
-----------
Fix cygwin build. Added a cygwin case to the phread macro. Added the CPPFLAGS to the Makefile.win. Override the CFLAGS in slon/Makefile to ensure that config.h can be found.

Modified Files:
--------------
    slony1-engine/config:
        acx_pthread.m4 (r1.6 -> r1.7)
    slony1-engine/makefiles:
        Makefile.win (r1.5 -> r1.6)
    slony1-engine/src/slon:
        Makefile (r1.28 -> r1.29)

-------------- next part --------------
Index: acx_pthread.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/acx_pthread.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lconfig/acx_pthread.m4 -Lconfig/acx_pthread.m4 -u -w -r1.6 -r1.7
--- config/acx_pthread.m4
+++ config/acx_pthread.m4
@@ -71,6 +71,9 @@
 
         acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
         ;;
+	*cygwin*)
+	acx_pthread_flags="-lpthread $acx_pthread_flags"
+	;;
 esac
 
 if test x"$acx_pthread_ok" = xno; then
Index: Makefile.win
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/makefiles/Makefile.win,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lmakefiles/Makefile.win -Lmakefiles/Makefile.win -u -w -r1.5 -r1.6
--- makefiles/Makefile.win
+++ makefiles/Makefile.win
@@ -2,7 +2,7 @@
 LDFLAGS+= -g
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
-DLLLIBS= -lcygipc -lcrypt -lpostgres
+DLLLIBS= -lcygipc -lcrypt -lpostgres -lpthread
 BE_DLLLIBS=-lpostgres
 MK_NO_LORDER=true
 MAKE_DLL=true
@@ -21,6 +21,6 @@
 	$(DLLWRAP) -o $@ --def $*.def $< $(DLLLIBS)
 	rm -f $*.def
 %.o: %.c
-	$(CC) -c $(CFLAGS) -o $@ $<
+	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
 
 sqlmansect = 7
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.28 -r1.29
--- src/slon/Makefile
+++ src/slon/Makefile
@@ -13,7 +13,7 @@
 
 CC = $(PTHREAD_CC)
 
-CFLAGS+=  $(PTHREAD_CFLAGS) -I$(slony_top_builddir) -I$(pgincludedir)
+override CFLAGS +=  $(PTHREAD_CFLAGS) -I$(slony_top_builddir) -I$(pgincludedir)
 LDFLAGS+= $(rpath) $(PTHREAD_LIBS) -L$(pglibdir) -lpq