From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 6 Nov 2012 14:40:54 +0000 (+0000)
Subject: Move static feature defines from radiusd.h to features-h and use them as a template... 
X-Git-Tag: release_3_0_0_beta1~1599
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8551b9f40d28b532558cb83f01b045e9b0be8314;p=thirdparty%2Ffreeradius-server.git

Move static feature defines from radiusd.h to features-h and use them as a template for features.h as a temporary fix

Use -imacros to make features.h available everywhere

Commit missed autoconf.h.in file to include WITH_TCP and WITH_THREADS
---

diff --git a/Make.inc.in b/Make.inc.in
index a27b7e27338..b4b0c5bb52a 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -28,7 +28,7 @@ datarootdir	= @datarootdir@
 MAKE		= @MAKE@
 CC		= @CC@
 RANLIB		= @RANLIB@
-IMACROS		= -imacros ${top_srcdir}/src/freeradius-devel/autoconf.h
+IMACROS		= -imacros ${top_srcdir}/src/freeradius-devel/autoconf.h -imacros ${top_srcdir}/src/freeradius-devel/features.h
 INCLUDE		= -I${top_srcdir} -I${top_srcdir}/src
 CFLAGS		= $(IMACROS) $(INCLUDE) @CFLAGS@
 CPPFLAGS	= @CPPFLAGS@
diff --git a/configure b/configure
index 81bfead24f6..bb2cf442f1f 100755
--- a/configure
+++ b/configure
@@ -16083,7 +16083,7 @@ fi
 
 fi
 
-if test "x$WITH_THEADS" = "xyes"; then
+if test "x$WITH_THREADS" = "xyes"; then
 
 $as_echo "#define WITH_THREADS 1" >>confdefs.h
 
diff --git a/configure.in b/configure.in
index b2adc7517a4..aebce0bbe37 100644
--- a/configure.in
+++ b/configure.in
@@ -561,7 +561,7 @@ else
    )
 fi
 
-if test "x$WITH_THEADS" = "xyes"; then
+if test "x$WITH_THREADS" = "xyes"; then
 	AC_DEFINE(WITH_THREADS, [1], [define if you want thread support])
 fi
 
diff --git a/src/include/Makefile b/src/include/Makefile
index e50c2b37f0e..b4067762b58 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -24,8 +24,12 @@ all: radpaths.h features.h $(PREPROC)
 radpaths.h: build-radpaths-h
 	@/bin/sh ./build-radpaths-h
 
+#
+# This is hacky, feature defines should go away or be set with configure.in
+#
 features.h:
-	@grep -o "^\#define\s*WITH_.*" autoconf.h > features.h
+	@cp features-h features.h
+	@grep -o "^\#define\s*WITH_.*" autoconf.h >> features.h
 	
 autoconf.sed:
 	@grep ^#define autoconf.h | sed 's,/\*\*/,1,;' | awk '{print "\
diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index 91b2b694448..2739b8e6897 100644
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -3,9 +3,6 @@
 /* Define if building universal (internal helper macro) */
 #undef AC_APPLE_UNIVERSAL_BUILD
 
-/* Include support for Ascend binary filter attributes */
-#undef ASCEND_BINARY
-
 /* BSD-Style get*byaddr_r */
 #undef BSDSTYLE
 
@@ -456,9 +453,18 @@
 #endif
 
 
+/* Include support for Ascend binary filter attributes */
+#undef WITH_ASCEND_BINARY
+
 /* define if you want DHCP support */
 #undef WITH_DHCP
 
+/* define if you want TCP support (For RADSec et al) */
+#undef WITH_TCP
+
+/* define if you want thread support */
+#undef WITH_THREADS
+
 /* define if you want udpfromto */
 #undef WITH_UDPFROMTO