From 1501bb88e955d47262d17f14e9fa9df2bdc3f88e Mon Sep 17 00:00:00 2001
From: jkar8572 <jkar8572>
Date: Sat, 20 Oct 2007 00:34:44 +0000
Subject: Print more verbose list of compile options when --version specified.
 (Jan Kara)

---
 Changelog    |  1 +
 Makefile.in  |  2 +-
 common.c     | 11 +----------
 configure.in | 13 +++++++++++--
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Changelog b/Changelog
index d87ce8d..b6f344c 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 Changes in quota-tools from 3.15 to 3.16
+* print more verbose list of compile options when --version specified (Jan Kara)
 * quotaon(8) should work only on local filesystems (Ladislav Michnovic)
 * made possible to use quota rpc in mixed NFSv3 and NFSv4 environments (Jan Kara) 
 * fixed compilation with openLDAP library versions 2.1 and 2.2 (Jan Kara)
diff --git a/Makefile.in b/Makefile.in
index fa5a2c9..305929c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 PROGS         = quotacheck quotaon quota quot repquota warnquota quotastats xqmstats edquota setquota convertquota rpc.rquotad @QUOTA_NETLINK_PROG@
 SOURCES       = bylabel.c common.c convertquota.c edquota.c pot.c quot.c quota.c quotacheck.c quotacheck_v1.c quotacheck_v2.c quotaio.c quotaio_rpc.c quotaio_v1.c quotaio_v2.c quotaio_xfs.c quotaio_generic.c quotaon.c quotaon_xfs.c quotaops.c quotastats.c quotasys.c repquota.c rquota_client.c rquota_server.c rquota_svc.c setquota.c warnquota.c xqmstats.c svc_socket.c
 VERSIONDEF    = -DQUOTA_VERSION=\"3.15\"
-CFLAGS        = @CFLAGS@ @EXT2_DIRECT@ -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(VERSIONDEF)
+CFLAGS        = @CFLAGS@ @EXT2_DIRECT@ -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 $(VERSIONDEF) -DCOMPILE_OPTS="\"@COMPILE_OPTS@\""
 CPPFLAGS      = @CPPFLAGS@
 EXT2LIBS      = @EXT2LIBS@
 NETLINKLIBS   = @NETLINKLIBS@
diff --git a/common.c b/common.c
index f1e8cfb..a039352 100644
--- a/common.c
+++ b/common.c
@@ -120,15 +120,6 @@ char *sstrdup(const char *s)
 void version(void)
 {
 	printf(_("Quota utilities version %s.\n"), QUOTA_VERSION);
-#if defined(RPC) || defined(EXT2_DIRECT)
-	printf(_("Compiled with "));
-#if defined(RPC) && defined(EXT2_DIRECT)
-	puts(_("RPC and EXT2_DIRECT"));
-#elif defined(RPC)
-	puts(_("RPC"));
-#else
-	puts(_("EXT2_DIRECT"));
-#endif /* defined RPC && EXT2_DIRECT */
-#endif /* defined RPC || EXT2_DIRECT */
+	printf(_("Compiled with:%s\n"), COMPILE_OPTS);
 	printf(_("Bugs to %s\n"), MY_EMAIL);
 }
diff --git a/configure.in b/configure.in
index cb4bcca..d409e00 100644
--- a/configure.in
+++ b/configure.in
@@ -32,6 +32,7 @@ if test "x$enable_ldapmail" != "xno"; then
 	if test "x$have_new_ldap" != "xno" -o "x$have_old_ldap" != "xno"; then
 		LDAPLIBS="-L/usr/lib -lldap -llber -lssl -lresolv"
 		CFLAGS="$CFLAGS -DUSE_LDAP_MAIL_LOOKUP"
+		COMPILE_OPTS="$COMPILE_OPTS USE_LDAP_MAIL_LOOKUP"
 		if test "x$have_new_ldap" = "xyes"; then
 			CFLAGS="$CFLAGS -DUSE_LDAP_23"
 			AC_CHECK_DECL(ldap_perror, , CFLAGS="$CFLAGS -DNEED_LDAP_PERROR", [#include <ldap.h>])
@@ -89,6 +90,7 @@ if test "x$enable_ext2direct" != "xno"; then
 	fi
 	if test "x$enable_ext2direct" = "xyes"; then
 		EXT2_DIRECT="-DEXT2_DIRECT"
+		COMPILE_OPTS="$COMPILE_OPTS EXT2_DIRECT"
 		AC_SUBST(EXT2_DIRECT)
 	fi
 fi
@@ -164,6 +166,7 @@ if test ${ac_cv_lib_wrap_main} = yes; then
 	])
 	LIBS="$LIBS -lwrap"
 	HOSTS_ACCESS="-DHOSTS_ACCESS"
+	COMPILE_OPTS="$COMPILE_OPTS HOST_ACCESS"
 	AC_SUBST(HOSTS_ACCESS)
 fi
 
@@ -206,19 +209,24 @@ AC_ARG_ENABLE(rootsbin,
 	enable_rootsbin="no")
 
 if test "$enable_altformat" = "yes" ; then
-	CFLAGS="-DALT_FORMAT $CFLAGS";
+	CFLAGS="-DALT_FORMAT $CFLAGS"
+	COMPILE_OPTS="$COMPILE_OPTS ALT_FORMAT"
 fi
 if test "$enable_rpc" = "yes" ; then
-	CFLAGS="-DRPC $CFLAGS";
+	CFLAGS="-DRPC $CFLAGS"
+	COMPILE_OPTS="$COMPILE_OPTS RPC"
 fi
 if test "$enable_rpcsetquota" = "yes" ; then
 	CFLAGS="-DRPC_SETQUOTA $CFLAGS"
+	COMPILE_OPTS="$COMPILE_OPTS RPC_SETQUOTA"
 fi
 if test "$enable_xfs_roothack" = "yes" ; then
 	CFLAGS="-DXFS_ROOTHACK $CFLAGS"
+	COMPILE_OPTS="$COMPILE_OPTS XFS_ROOTHACK"
 fi
 if test "$enable_bsd_behaviour" = "yes" ; then
 	CFLAGS="-DBSD_BEHAVIOUR $CFLAGS"
+	COMPILE_OPTS="$COMPILE_OPTS BSD_BEHAVIOUR"
 fi
 if test "$enable_libefence" = "yes" ; then
 	LIBMALLOC="/usr/lib/libefence.a"
@@ -232,6 +240,7 @@ if test "$enable_rootsbin" = "yes" ; then
 else
 	ROOTSBIN='$(prefix)/sbin'
 fi
+AC_SUBST(COMPILE_OPTS)
 AC_SUBST(LIBMALLOC)
 AC_SUBST(INSTMO)
 AC_SUBST(ROOTSBIN)
-- 
cgit v1.2.3