From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 5 Nov 2012 20:41:51 +0000 (+0000)
Subject: Make autoconf.h available everywhere implicitly using -imacros
X-Git-Tag: release_3_0_0_beta1~1601^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc67c41449f1dcb45eda843ac505e9f4cd624451;p=thirdparty%2Ffreeradius-server.git

Make autoconf.h available everywhere implicitly using -imacros
---

diff --git a/Make.inc.in b/Make.inc.in
index b279fcfc2f8..a27b7e27338 100644
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -28,8 +28,9 @@ datarootdir	= @datarootdir@
 MAKE		= @MAKE@
 CC		= @CC@
 RANLIB		= @RANLIB@
+IMACROS		= -imacros ${top_srcdir}/src/freeradius-devel/autoconf.h
 INCLUDE		= -I${top_srcdir} -I${top_srcdir}/src
-CFLAGS		= $(INCLUDE) @CFLAGS@
+CFLAGS		= $(IMACROS) $(INCLUDE) @CFLAGS@
 CPPFLAGS	= @CPPFLAGS@
 LIBPREFIX	= @LIBPREFIX@
 EXEEXT		= @EXEEXT@
@@ -59,7 +60,7 @@ LIBLTDL		= @LIBLTDL@
 INCLTDL		= @INCLTDL@
 CFLAGS		+= $(INCLTDL)
 
-#USE_SHARED_LIBS	= @USE_SHARED_LIBS@
+#USE_SHARED_LIBS = @USE_SHARED_LIBS@
 #USE_STATIC_LIBS = @USE_STATIC_LIBS@
 
 USE_SHARED_LIBS = yes
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 0505abcb75b..c24110413c0 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -15,8 +15,8 @@ SRCS		= dict.c filters.c hash.c hmac.c hmacsha1.c isaac.c log.c \
 LT_OBJS		= $(SRCS:.c=.$(LO))
 
 INCLUDES	= ../include/radius.h ../include/libradius.h \
-		  ../include/missing.h ../include/autoconf.h \
-		  ../include/ident.h
+		  ../include/missing.h ../include/ident.h
+
 
 CFLAGS		+= -D_LIBRADIUS -I$(top_builddir)/src
 
diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index dd2642e2a84..1a3aeaebe9a 100644
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -15,8 +15,7 @@ endif
 
 SERVER_OBJS	+= $(SERVER_SRCS:.c=.lo)
 
-INCLUDES	= ../include/autoconf.h ../include/conf.h    \
-		  ../include/libradius.h ../include/radius.h \
+INCLUDES	= ../include/conf.h ../include/libradius.h ../include/radius.h \
 		  ../include/radiusd.h ../include/ident.h ../include/stats.h
 
 CFLAGS		+= -I$(top_builddir)/src