Index: Makefile.in
--- Makefile.in.orig	2008-02-11 11:29:53 +0100
+++ Makefile.in	2009-12-16 19:48:05 +0100
@@ -34,7 +34,7 @@
 CFLAGS = @CFLAGS@
 ALL_CFLAGS = $(CPPFLAGS) $(INCLUDES) $(CFLAGS)
 LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@ @NEON_LIBS@
+LIBS = @NEON_LIBS@ @LIBS@
 
 TARGET = $(PACKAGE)
 SUBDIRS = lib/neon lib/intl
@@ -56,7 +56,7 @@
 .PHONY: subdirs install clean distclean
 
 $(TARGET): $(ALLOBJS) subdirs
-	$(CC) $(LDFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
+	$(CC) -o $(TARGET) $(ALLOBJS) $(LDFLAGS) $(LIBS)
 
 .c.o:
 	$(CC) $(ALL_CFLAGS) -o $@ -c $<
Index: src/cadaver.c
--- src/cadaver.c.orig	2008-10-29 10:35:33 +0100
+++ src/cadaver.c	2009-12-16 19:48:05 +0100
@@ -855,7 +855,7 @@
 
     progname = argv[0];
 
-#ifdef HAVE_SETLOCALE
+#if defined(HAVE_SETLOCALE) && defined(HAVE_LOCALE_H)
     setlocale(LC_ALL, "");
 #endif