From 321385b5bb7f230d3b18aaef82e45a0450475766 Mon Sep 17 00:00:00 2001
From: Steven Schubiger <stsc@refcnt.org>
Date: Sat, 4 Mar 2017 22:02:47 +0100
Subject: Include all flags in version output

---
 Makefile   |  4 +++-
 colorize.c | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 17031ba..868ec4c 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,9 @@ FLAGS= # command-line macro
 
 colorize:	colorize.c
 			perl ./version.pl > version.h
-			$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o colorize colorize.c -DCFLAGS="$(CFLAGS)" -DHAVE_VERSION $(FLAGS)
+			$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o colorize colorize.c \
+  -DCPPFLAGS="\"$(CPPFLAGS)\"" -DCFLAGS="\"$(CFLAGS)\"" -DLDFLAGS="\"$(LDFLAGS)\"" \
+  -DHAVE_VERSION $(FLAGS)
 
 check:
 			perl ./test.pl --regular
diff --git a/colorize.c b/colorize.c
index 06f448b..7faeb80 100644
--- a/colorize.c
+++ b/colorize.c
@@ -473,7 +473,7 @@ print_version (void)
     const char *version = NULL;
 #endif
     const char *version_prefix, *version_string;
-    const char *c_flags;
+    const char *c_flags, *ld_flags, *cpp_flags;
     struct bytes_size bytes_size;
     bool debug;
 #ifdef CFLAGS
@@ -481,6 +481,16 @@ print_version (void)
 #else
     c_flags = "unknown";
 #endif
+#ifdef LDFLAGS
+    ld_flags = to_str (LDFLAGS);
+#else
+    ld_flags = "unknown";
+#endif
+#ifdef CPPFLAGS
+    cpp_flags = to_str (CPPFLAGS);
+#else
+    cpp_flags = "unknown";
+#endif
 #if DEBUG
     debug = true;
 #else
@@ -491,6 +501,8 @@ print_version (void)
     printf ("colorize %s%s (compiled at %s, %s)\n", version_prefix, version_string, __DATE__, __TIME__);
 
     printf ("Compiler flags: %s\n", c_flags);
+    printf ("Linker flags: %s\n", ld_flags);
+    printf ("Preprocessor flags: %s\n", cpp_flags);
     if (get_bytes_size (BUF_SIZE, &bytes_size))
       {
         if (BUF_SIZE % 1024 == 0)
-- 
cgit v1.2.3