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 230bd16e14311b5cca7687f92e3cc77b2a2f7bf1..4495f72481876d954856dc0d022a43a24e592acd 100644 (file)
--- 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 cdc6ec086991303228946100d60cd313db683a50..09f39384cc69ee0a1b2fe72508bffe453962c9ae 100644 (file)
--- 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 3935090501842e1245a259acf545092b2e799640..a1dd6cc3f9cdfe4bd78ba6797bc92bea8d6df972 100644 (file)
--- 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 fe86f7d32073f912bc7e6bfa355f3aba9a76a1c8..6068f548137700ab8705f246e53d1ad55be82861 100644 (file)
--- 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