Index: configure
--- configure.orig	2009-04-24 16:35:53 +0200
+++ configure	2009-04-29 19:34:17 +0200
@@ -20186,7 +20186,11 @@
 
 if test $vortex_p_t_r = yes; then
 
-      vortex_cv_pthreads_cflags="$flag"
+      if test ".$flag" != ".none"; then
+          vortex_cv_pthreads_cflags="$flag"
+      else 
+          vortex_cv_pthreads_cflags=""
+      fi
       break
 
 fi
Index: data/Makefile.in
--- data/Makefile.in.orig	2009-04-24 16:35:50 +0200
+++ data/Makefile.in	2009-04-29 19:34:42 +0200
@@ -208,7 +208,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-dtddir = $(datadir)/libvortex-1.1
+dtddir = $(datadir)/vortex
 dtd_DATA = channel.dtd sasl.dtd tls.dtd xml-rpc-boot.dtd vortex-listener-conf.dtd
 EXTRA_DIST = $(dtd_DATA)
 all: all-am
Index: test/Makefile.in
--- test/Makefile.in.orig	2009-04-24 16:35:51 +0200
+++ test/Makefile.in	2009-04-29 19:35:17 +0200
@@ -479,7 +479,7 @@
 @ENABLE_SASL_SUPPORT_TRUE@SASL_SUPPORT_LIBS = $(top_builddir)/sasl/libvortex-sasl-1.1.la 
 @ENABLE_TLS_SUPPORT_TRUE@INCLUDE_TLS_SUPPORT = -DENABLE_TLS_SUPPORT
 @ENABLE_TLS_SUPPORT_TRUE@TLS_SUPPORT_LIBS = $(top_builddir)/tls/libvortex-tls-1.1.la 
-certfilesdir = $(datadir)/libvortex-1.1
+certfilesdir = $(datadir)/vortex
 certfiles_DATA = test-certificate.pem test-private-key.pem
 EXTRA_DIST = Makefile.win $(certfiles_DATA) vortex-regression-client.vcproj  vortex-regression-listener.vcproj vortex-regression-client.idl \
 	mime.example.1.txt  mime.example.body.1.txt  mime.example.2.txt  mime.example.3.txt  mime.example.body.2.txt 
Index: xml-rpc-gen/Makefile.in
--- xml-rpc-gen/Makefile.in.orig	2009-04-24 16:35:51 +0200
+++ xml-rpc-gen/Makefile.in	2009-04-29 19:34:17 +0200
@@ -231,7 +231,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-dtddir = $(datadir)/libvortex-1.1
+dtddir = $(datadir)/vortex
 dtd_DATA = xml-rpc.dtd
 idl_files = reg-test08.idl reg-test02.idl reg-test06.idl reg-test07.idl \
 	reg-test01.idl reg-test05.idl reg-test04.idl reg-test03.idl