diff -ru sitecopy-0.16.3/Makefile.in sitecopy-0.16.3-patched/Makefile.in
--- sitecopy-0.16.3/Makefile.in	2006-02-04 05:06:02.000000000 -0500
+++ sitecopy-0.16.3-patched/Makefile.in	2006-12-22 14:15:06.000000000 -0500
@@ -26,7 +26,7 @@
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/lib
 CPPFLAGS = @CPPFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\"
 CFLAGS = @CFLAGS@
-ALL_CFLAGS = $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
+ALL_CFLAGS = $(INCLUDES) $(CFLAGS) $(CPPFLAGS)
 LIBS = @NEON_LIBS@ @LIBINTL@ @LIBS@
 CC = @CC@
 
diff -ru sitecopy-0.16.3/configure sitecopy-0.16.3-patched/configure
--- sitecopy-0.16.3/configure	2006-03-12 05:09:54.000000000 -0500
+++ sitecopy-0.16.3-patched/configure	2006-12-22 14:23:26.000000000 -0500
@@ -13576,7 +13576,7 @@
 
 
     CFLAGS="$CFLAGS -I$neon_bundled_srcdir"
-    NEON_LIBS="-L$neon_bundled_builddir -lneon $NEON_LIBS"
+    NEON_LIBS="$neon_bundled_builddir/libneon.a $NEON_LIBS"
     NEON_NEED_XML_PARSER=yes
     neon_library_message="included libneon (${NEON_VERSION})"
 else
@@ -22196,7 +22196,7 @@
 fi
 
 # This goes in CPPFLAGS so libneon/Makefile can pick up config.h
-CPPFLAGS="$CPPFLAGS -I\$(top_builddir)"
+CPPFLAGS="-I\$(top_builddir) $CPPFLAGS"
 
 
 
diff -ru sitecopy-0.16.3/lib/neon/Makefile.in sitecopy-0.16.3-patched/lib/neon/Makefile.in
--- sitecopy-0.16.3/lib/neon/Makefile.in	2006-01-02 06:43:19.000000000 -0500
+++ sitecopy-0.16.3-patched/lib/neon/Makefile.in	2006-12-22 14:30:50.000000000 -0500
@@ -32,7 +32,7 @@
 # build of this directory, @LIBS@ may include -lneon.
 LIBS = @NEON_LIBS@ @NEON_LTLIBS@
 
-COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
+COMPILE = $(CC) $(CFLAGS) $(CPPFLAGS)
 LINK = $(LIBTOOL) --quiet --mode=link $(CC) -no-undefined $(LDFLAGS)
 
 NEON_BASEOBJS = ne_request.@NEON_OBJEXT@ ne_session.@NEON_OBJEXT@ 	    \