From: Alan T. DeKok <aland@freeradius.org>
Date: Tue, 3 Nov 2015 17:42:28 +0000 (-0500)
Subject: Print out CFLAGS, etc. in version.c
X-Git-Tag: release_3_0_11~173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=824e97af85dc72943f3d8a912362896aa1396be0;p=thirdparty%2Ffreeradius-server.git

Print out CFLAGS, etc. in version.c

Since version.c is built in 3 places, just add the SRC_CFLAGS
definitions in 3 places.  It's easier than trying to hack the
build system to set the flags for version.c only once.
---

diff --git a/src/main/libfreeradius-server.mk b/src/main/libfreeradius-server.mk
index 230bd16e143..4495f724818 100644
--- a/src/main/libfreeradius-server.mk
+++ b/src/main/libfreeradius-server.mk
@@ -16,3 +16,7 @@ SOURCES	:=	conffile.c \
 
 # This lets the linker determine which version of the SSLeay functions to use.
 TGT_LDLIBS      := $(OPENSSL_LIBS)
+
+ifneq ($(MAKECMDGOALS),scan)
+SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
+endif
diff --git a/src/main/unittest.mk b/src/main/unittest.mk
index cdc6ec08699..09f39384cc6 100644
--- a/src/main/unittest.mk
+++ b/src/main/unittest.mk
@@ -19,3 +19,7 @@ TGT_PREREQS	:= libfreeradius-server.a libfreeradius-radius.a
 ifneq "$(filter rlm_eap_%,${ALL_TGTS})" ""
 TGT_PREREQS	+= libfreeradius-eap.a
 endif
+
+ifneq ($(MAKECMDGOALS),scan)
+SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
+endif
diff --git a/src/main/version.c b/src/main/version.c
index 39350905018..a1dd6cc3f9c 100644
--- a/src/main/version.c
+++ b/src/main/version.c
@@ -574,6 +574,7 @@ void version_print(void)
 #ifdef BUILT_WITH_LIBS
 		DEBUG2("  libs     : " BUILT_WITH_LIBS);
 #endif
+		DEBUG2("  ");
 	}
 	INFO("Copyright (C) 1999-2015 The FreeRADIUS server project and contributors");
 	INFO("There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A");
diff --git a/src/modules/rlm_eap/radeapclient.mk b/src/modules/rlm_eap/radeapclient.mk
index fe86f7d3207..6068f548137 100644
--- a/src/modules/rlm_eap/radeapclient.mk
+++ b/src/modules/rlm_eap/radeapclient.mk
@@ -21,4 +21,9 @@ endif
 
 SRC_CFLAGS += -DWITH_EAPCLIENT
 SRC_INCDIRS  := ${top_srcdir}/src/modules/rlm_eap/libeap
+
+ifneq ($(MAKECMDGOALS),scan)
+SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
+endif
+
 endif