From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 11 Jun 2010 14:33:13 +0000 (-0400)
Subject: Print configure args with verbose version information.
X-Git-Tag: SUDO_1_7_3~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ffe4a4dbe7453640173d6719e8a7a0c05a8b0e3;p=sudo

Print configure args with verbose version information.

--HG--
branch : 1.7
---

diff --git a/configure b/configure
index 7ae3b4546..7b230c0fc 100755
--- a/configure
+++ b/configure
@@ -815,6 +815,7 @@ sudo_umask
 password_timeout
 timeout
 timedir
+CONFIGURE_ARGS
 ZLIB
 NONUNIX_GROUPS_IMPL
 LOGINCAP_USAGE
@@ -2762,6 +2763,7 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;}
 
 
 
+
 
 
 timeout=5
@@ -2817,6 +2819,8 @@ shadow_funcs=
 shadow_libs=
 shadow_libs_optional=
 
+CONFIGURE_ARGS="$@"
+
 if test X"$prefix" = X"NONE"; then
     test "$mandir" = '${datarootdir}/man' && mandir='$(prefix)/man'
 else
@@ -6523,13 +6527,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6526: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6530: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6529: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6533: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6532: output\"" >&5)
+  (eval echo "\"\$as_me:6536: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7734,7 +7738,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7737 "configure"' > conftest.$ac_ext
+  echo '#line 7741 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9127,11 +9131,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9130: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9134: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9134: \$? = $ac_status" >&5
+   echo "$as_me:9138: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9466,11 +9470,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9469: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9473: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9473: \$? = $ac_status" >&5
+   echo "$as_me:9477: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9571,11 +9575,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9574: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9578: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9578: \$? = $ac_status" >&5
+   echo "$as_me:9582: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9626,11 +9630,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9629: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9633: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9633: \$? = $ac_status" >&5
+   echo "$as_me:9637: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11993,7 +11997,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11996 "configure"
+#line 12000 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12089,7 +12093,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12092 "configure"
+#line 12096 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/configure.in b/configure.in
index aa018104b..bdc7189d5 100644
--- a/configure.in
+++ b/configure.in
@@ -53,6 +53,7 @@ AC_SUBST([REPLAY])
 AC_SUBST([LOGINCAP_USAGE])
 AC_SUBST([NONUNIX_GROUPS_IMPL])
 AC_SUBST([ZLIB])
+AC_SUBST([CONFIGURE_ARGS])
 dnl
 dnl Variables that get substituted in docs (not overridden by environment)
 dnl
@@ -150,6 +151,8 @@ shadow_funcs=
 shadow_libs=
 shadow_libs_optional=
 
+CONFIGURE_ARGS="$@"
+
 dnl
 dnl Override default configure dirs...
 dnl
diff --git a/sudo.c b/sudo.c
index 158485211..6cbb198cc 100644
--- a/sudo.c
+++ b/sudo.c
@@ -1301,6 +1301,7 @@ show_version()
     (void) printf("Sudo version %s\n", PACKAGE_VERSION);
     if (getuid() == 0) {
 	putchar('\n');
+	(void) printf("Configure args: %s\n", CONFIGURE_ARGS);
 	(void) printf("Sudoers path: %s\n", _PATH_SUDOERS);
 #ifdef HAVE_LDAP
 # ifdef _PATH_NSSWITCH_CONF
diff --git a/sudo_usage.h.in b/sudo_usage.h.in
index 018156da3..af15b8790 100644
--- a/sudo_usage.h.in
+++ b/sudo_usage.h.in
@@ -31,4 +31,9 @@ void usage __P((int)) __attribute__((__noreturn__));
 #define SUDO_USAGE4 " [-AbEHknPS] @BSDAUTH_USAGE@@SELINUX_USAGE@[-C fd] @LOGINCAP_USAGE@[-g groupname|#gid] [-p prompt] [-u user name|#uid] [-g groupname|#gid] [VAR=value] [-i|-s] [<command>]"
 #define SUDO_USAGE5 " -e [-AknS] @BSDAUTH_USAGE@@SELINUX_USAGE@[-C fd] @LOGINCAP_USAGE@[-g groupname|#gid] [-p prompt] [-u user name|#uid] file ..."
 
+/*
+ * Configure script arguments used to build sudo.
+ */
+#define CONFIGURE_ARGS "@CONFIGURE_ARGS@"
+
 #endif /* _SUDO_USAGE_H */