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

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 a27b7e27338b322afcedd8b2202c0b3116798473..b4b0c5bb52a975fe4306ed26a931e6d4ce451314 100644 (file)
--- 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 81bfead24f6fae7b9c12dfb8269f6e686b77a67d..bb2cf442f1f1f7ae0ace823dba682ef5c43097ca 100755 (executable)
--- 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 b2adc7517a489fbc04092de4bdeab4efabddf19a..aebce0bbe3743091f815bba6d727bc1cd13c1295 100644 (file)
--- 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 e50c2b37f0ebe42e20ca5b8a68e029f4f77b1ca4..b4067762b58079507c9299d48ce9a12da471fedd 100644 (file)
--- 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 91b2b6944489b9bc431d7fc2b1522951319e6d2d..2739b8e6897178a2cd30ed10f4cacad052387dea 100644 (file)
--- 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