From: Roy Marples <roy@marples.name>
Date: Mon, 22 Oct 2007 13:06:18 +0000 (+0000)
Subject: dhcpcd --version now shows what compile time options were used.
X-Git-Tag: v3.2.3~176
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=402cb88f5624dcf619fe7adfe8fb6a793062c346;p=thirdparty%2Fdhcpcd.git

dhcpcd --version now shows what compile time options were used.
---

diff --git a/ChangeLog b/ChangeLog
index 9cca3ff3..d3d393b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+dhcpcd --version now shows what compile time options were used.
+
 dhcpcd-3.1.7
 Add warnings about requesting a link local address.
 Always add a link local route unless we're given a non-private
diff --git a/dhcpcd.c b/dhcpcd.c
index e053bf2c..2f0c4bbf 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -391,8 +391,35 @@ int main(int argc, char **argv)
 				exit (EXIT_FAILURE);
 		}
 	}
-	if (doversion)
+	if (doversion) {
 		printf (""PACKAGE" "VERSION"\n");
+		printf ("Compile time options:"
+#ifdef ENABLE_ARP
+				" ARP"
+#endif
+#ifdef ENABLE_DUID
+				" DUID"
+#endif
+#ifdef ENABLE_INFO
+				" INFO"
+#endif
+#ifdef ENABLE_INFO_COMPAT
+				" INFO_COMPAT"
+#endif
+#ifdef ENABLE_IPV4LL
+				" IPV4LL"
+#endif
+#ifdef ENABLE_NIS
+				" NIS"
+#endif
+#ifdef ENABLE_NTP
+				" NTP"
+#endif
+#ifdef THERE_IS_NO_FORK
+				" THERE_IS_NO_FORK"
+#endif
+				"\n");
+	}
 
 	if (dohelp)
 		usage ();