[svn] GnuPG - r4452 - trunk

[svn author wk]

Author: wk
Date: 2007-03-08 15:21:35 +0100 (Thu, 08 Mar 2007)
New Revision: 4452

Modified:
   trunk/ChangeLog
   trunk/autogen.sh
   trunk/configure.ac
Log:
Well, missed to change the SVN flag


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-03-08 14:16:15 UTC (rev 4451)
+++ trunk/ChangeLog	2007-03-08 14:21:35 UTC (rev 4452)
@@ -2,6 +2,8 @@
 
 	Released 2.0.3.
 
+	* autogen.sh: Add option --force.
+
 2007-01-31  Werner Koch  <wk at g10code.com>
 
 	Released 2.0.2.

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2007-03-08 14:16:15 UTC (rev 4451)
+++ trunk/autogen.sh	2007-03-08 14:21:35 UTC (rev 4452)
@@ -39,6 +39,11 @@
 MSGMERGE=${GETTEXT_PREFIX}${MSGMERGE:-msgmerge}${GETTEXT_SUFFIX}
 
 DIE=no
+FORCE=
+if test "$1" == "--force"; then
+  FORCE=" --force"
+  shift
+fi
 
 # ***** W32 build script *******
 # Used to cross-compile for Windows.
@@ -198,7 +203,7 @@
 $AUTOHEADER
 echo "Running automake --gnu ..."
 $AUTOMAKE --gnu;
-echo "Running autoconf..."
-$AUTOCONF
+echo "Running autoconf${FORCE} ..."
+$AUTOCONF${FORCE}
 
 echo "You may now run \"./configure --sysconfdir=/etc --enable-maintainer-mode && make\"."

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-03-08 14:16:15 UTC (rev 4451)
+++ trunk/configure.ac	2007-03-08 14:21:35 UTC (rev 4452)
@@ -27,7 +27,7 @@
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [2.0.3])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 
 m4_define([svn_revision], m4_esyscmd([echo -n $( (svn info 2>/dev/null \