Added contrib/mailman-config.py and changes to configure.in and

configure to support it.

mailman-config.py is added to the build/contrib directory when
configure is run, and when executed, emits, to stdout, a number of
useful configuration options, including the option string provided to
configure at build time. This is useful when updating Mailman 2, or
when trying to synchronize a manual install of Mailman with a
distribution's FHS.

2 files changed, 35 insertions, 0 deletions

diff --git a/configure b/configure
index 2c31df3f..3f67f85e 100755
--- a/configure
+++ b/configure
@@ -651,8 +651,11 @@ INSTALL_PROGRAM
 KOCODECSPKG
 JACODECSPKG
 EMAILPKG
+MM_VERSION
 PYTHON
 with_python
+BUILD_DATE
+CONFIGURE_OPTS
 target_alias
 host_alias
 build_alias
@@ -2127,6 +2130,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # /usr/local/mailman is the default installation directory
 
 
+CONFIGURE_OPTS=`echo $@`
+
+BUILD_DATE=`date`
+
 
 # Check for Python!  Better be found on $PATH
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-python" >&5
@@ -2292,6 +2299,17 @@ $PYTHON conftest.py
 needemailpkg=`cat conftest.out`
 rm -f conftest.out conftest.py
 
+cat > getver.py <<EOF
+from Mailman.Version import VERSION
+fp = open("getver.out", "w")
+fp.write("%s\n" % VERSION)
+fp.close()
+EOF
+$PYTHON getver.py
+MM_VERSION=`cat getver.out`
+rm -f getver.out getver.py
+
+
 # Should we rely on Python's own email package or use the pre-packaged version?
 
 if test "$needemailpkg" = "ok"
@@ -4548,6 +4566,7 @@ build/contrib/check_perms_grsecurity.py:contrib/check_perms_grsecurity.py \
 build/contrib/qmail-to-mailman.py:contrib/qmail-to-mailman.py \
 build/contrib/courier-to-mailman.py:contrib/courier-to-mailman.py \
 build/contrib/rotatelogs.py:contrib/rotatelogs.py \
+build/contrib/mailman-config.py:contrib/mailman-config.py \
 build/cron/bumpdigests:cron/bumpdigests \
 build/cron/checkdbs:cron/checkdbs \
 build/cron/cull_bad_shunt:cron/cull_bad_shunt \
diff --git a/configure.in b/configure.in
index f7bb7919..ead04a3a 100644
--- a/configure.in
+++ b/configure.in
@@ -23,6 +23,10 @@ AC_INIT(src/common.h)
 # /usr/local/mailman is the default installation directory
 AC_PREFIX_DEFAULT(/usr/local/mailman)
 
+CONFIGURE_OPTS=`echo $@`
+AC_SUBST(CONFIGURE_OPTS)
+BUILD_DATE=`date`
+AC_SUBST(BUILD_DATE)
 
 # Check for Python!  Better be found on $PATH
 AC_MSG_CHECKING(for --with-python)
@@ -135,6 +139,17 @@ $PYTHON conftest.py
 needemailpkg=`cat conftest.out`
 rm -f conftest.out conftest.py
 
+cat > getver.py <<EOF
+from Mailman.Version import VERSION
+fp = open("getver.out", "w")
+fp.write("%s\n" % VERSION)
+fp.close()
+EOF
+$PYTHON getver.py
+MM_VERSION=`cat getver.out`
+rm -f getver.out getver.py
+AC_SUBST(MM_VERSION)
+
 # Should we rely on Python's own email package or use the pre-packaged version?
 AC_SUBST(EMAILPKG)
 if test "$needemailpkg" = "ok"
@@ -711,6 +726,7 @@ contrib/check_perms_grsecurity.py \
 contrib/qmail-to-mailman.py \
 contrib/courier-to-mailman.py \
 contrib/rotatelogs.py \
+contrib/mailman-config.py \
 cron/bumpdigests \
 cron/checkdbs \
 cron/cull_bad_shunt \