[Gpg4win-commits] r368 - trunk

[scm-commit@wald.intevation.org]

Author: werner
Date: 2006-12-06 14:37:39 +0100 (Wed, 06 Dec 2006)
New Revision: 368

Modified:
   trunk/ChangeLog
   trunk/README.SVN
   trunk/autogen.sh
Log:
New option --force for autogen.sh


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-12-06 13:32:11 UTC (rev 367)
+++ trunk/ChangeLog	2006-12-06 13:37:39 UTC (rev 368)
@@ -2,6 +2,8 @@
 
 	Released 1.0.8.
 
+	* autogen.sh: Add option --force.
+
 	* src/Makefile.am: GnuPG man pages are now below share.
 	* src/inst-gnupg.nsi: Ditto
 

Modified: trunk/README.SVN
===================================================================
--- trunk/README.SVN	2006-12-06 13:32:11 UTC (rev 367)
+++ trunk/README.SVN	2006-12-06 13:37:39 UTC (rev 368)
@@ -1,11 +1,13 @@
 If you are building from Subversion, run the script
 
-./autogen.sh
+ ./autogen.sh
 
 first, to make sure that you have all the necessary maintainer tools
-are installed and to build the actual configuration files.  Then run
+are installed and to build the actual configuration files.  If you
+have just updated from SVN, you should add the option "--force" to
+autogen.sh so that meta data from SVN is noticed.  Then run
 
-./configure --enable-maintainer-mode --host=i586-mingw32msvc
+ ./configure --enable-maintainer-mode --host=i586-mingw32msvc
 
 followed by the usual make.
 
@@ -45,7 +47,3 @@
 The maintainer should also make sure that the required version of
 automake et al. are properly indicated at the top of configure.ac and
 take care to copy the files and not merely use symlinks.
-
-
-
-

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2006-12-06 13:32:11 UTC (rev 367)
+++ trunk/autogen.sh	2006-12-06 13:37:39 UTC (rev 368)
@@ -36,6 +36,11 @@
 ACLOCAL=${AUTOMAKE_PREFIX}${ACLOCAL:-aclocal}${AUTOMAKE_SUFFIX}
 
 DIE=no
+FORCE=
+if test "$1" == "--force"; then
+  FORCE=" --force"
+  shift
+fi
 
 # ***** W32 build script *******
 # Used to cross-compile for Windows.
@@ -133,7 +138,7 @@
 #$AUTOHEADER
 echo "Running automake --gnu ..."
 $AUTOMAKE --gnu;
-echo "Running autoconf..."
-$AUTOCONF
+echo "Running autoconf${FORCE} ..."
+$AUTOCONF${FORCE}
 
 echo "You may now run \"./configure --host=i586-mingw32msvc && make\"."