Common subdirectories: binreloc-orig/CVS and binreloc/CVS
diff -u binreloc-orig/binreloc.m4 binreloc/binreloc.m4
--- binreloc-orig/binreloc.m4	2004-06-19 00:33:40.000000000 -0700
+++ binreloc/binreloc.m4	2004-07-11 13:40:43.000000000 -0700
@@ -47,6 +47,7 @@
 
 	if test "x$br_cv_binreloc" = "xyes"; then
 		BINRELOC_CFLAGS="-DENABLE_BINRELOC"
+		AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?])
 		if test "x$enable_binreloc_threads" = "xyes"; then
 			AC_CHECK_LIB([pthread], [pthread_getspecific])
 		fi
@@ -65,8 +66,10 @@
 
 		if test "x$br_cv_binreloc_threads" = "xyes"; then
 			BINRELOC_LIBS="-lpthread"
-		else
+			AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?])
+                else
 			BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREAD=0"
+			AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?])
 		fi
 	fi
 	AC_SUBST(BINRELOC_CFLAGS)
Only in binreloc: binreloc.m4.orig
Only in binreloc: binreloc.m4.rej
diff -u binreloc-orig/prefix.c binreloc/prefix.c
--- binreloc-orig/prefix.c	2004-07-10 02:45:16.000000000 -0700
+++ binreloc/prefix.c	2004-07-11 13:36:48.000000000 -0700
@@ -26,6 +26,10 @@
 #ifndef _PREFIX_C_
 #define _PREFIX_C_
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #ifndef BR_PTHREADS
 	/* Change 1 to 0 if you don't want pthread support */
 	#define BR_PTHREADS 1