[Gnucash-changes] r11890 - gnucash/trunk - Remove automatic call to ./configure from ./autogen.sh.

[Christian Stimming]

Author: cstim
Date: 2005-11-09 15:51:03 -0500 (Wed, 09 Nov 2005)
New Revision: 11890

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/README.svn
   gnucash/trunk/doc/TRANSLATION_HOWTO
   gnucash/trunk/macros/autogen.sh
Log:
Remove automatic call to ./configure from ./autogen.sh.

2005-11-09  Christian Stimming  <stimming at tuhh.de>

        * macros/autogen.sh: Remove the automatic call to ./configure
        * from
        autogen.sh; instead, only print a reminder that from now on,
        ./configure has to be called separately.



Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-11-09 20:49:10 UTC (rev 11889)
+++ gnucash/trunk/ChangeLog	2005-11-09 20:51:03 UTC (rev 11890)
@@ -1,5 +1,9 @@
 2005-11-09  Christian Stimming  <stimming at tuhh.de>
 
+	* macros/autogen.sh: Remove the automatic call to ./configure from
+	autogen.sh; instead, only print a reminder that from now on,
+	./configure has to be called separately.
+
 	* po/cs.po, po/glossary/pt_BR.po, po/ca.po, po/tr.po: Merge
 	language files from branches/1.8 so that all languages are now
 	available in HEAD.

Modified: gnucash/trunk/README.svn
===================================================================
--- gnucash/trunk/README.svn	2005-11-09 20:49:10 UTC (rev 11889)
+++ gnucash/trunk/README.svn	2005-11-09 20:51:03 UTC (rev 11890)
@@ -4,18 +4,25 @@
 Owen Taylor.
 
  + In order to build GnuCash from SVN, you need to run the autogen.sh
-   command to generate and execute a configure script.  When building
-   from CVS you should ALWAYS pass your configure options directly to
-   autogen.sh.  For example:
+   command to generate a configure script:
 
-	./autogen.sh --enable-ofx --enable-opt-style-install --prefix=/opt/gnucash
+	./autogen.sh
 
-   Autogen will automatically generate the configure script and then
-   run it. After that, configure can also be run by hand.
+   After the ./configure script has been created, you need to run it
+   with all the usual options.  See ./configure --help for a
+   reminder.  For example:
 
+	./configure --enable-ofx --enable-opt-style-install --prefix=/opt/gnucash
+
    If in doubt, you can run autogen.sh, run ./configure --help,
    then re-run ./configure with your options.
 
+   (Note: Previously, autogen.sh automatically called configure as
+   well. This behaviour was dropped in favor of two separate calls
+   because: Autogen should be an additional step taken by only by
+   developers using SVN sources.  Configure is a step taken by
+   everyone compiling the sources, be it from svn or a tarball.)
+
  + Some versions of gettextize don't deal well with re-running themselves.
    You will see this as an error like:
 

Modified: gnucash/trunk/doc/TRANSLATION_HOWTO
===================================================================
--- gnucash/trunk/doc/TRANSLATION_HOWTO	2005-11-09 20:49:10 UTC (rev 11889)
+++ gnucash/trunk/doc/TRANSLATION_HOWTO	2005-11-09 20:51:03 UTC (rev 11890)
@@ -48,8 +48,11 @@
 http://www.iro.umontreal.ca/contrib/po/HTML/
 
 ==============================================================================
-2) Get the source from CVS
+2) Get the source from CVS/SVN
 
+  FIXME: This section is now outdated since the source is now in SVN
+  instead of CVS. Please check the website.
+
 The first thing to do is to download the latest STABLE branch of gnucash
 from CVS and get it to compile.  Do not use the HEAD branch, since the text
 in the HEAD branch changes so much, it would be a waste of time to translate 
@@ -117,14 +120,16 @@
 to actually run gnucash with your new translations because it is quite 
 helpful to see the phrases in the context of the running program.
 
-Enter the gnucash directory and run the autogen.sh script.  There are many 
-options available when compiling gnucash, see the README.cvs file for more
-information on the options.  For now, we will just enable debugging and 
-change the default prefix because these two changes will be handly later 
-for tracking down problems and installing multiple versions.
+Enter the gnucash directory. Run the autogen.sh script.  Then run the
+./configure script, as described in README.svn. There are many options
+available when compiling gnucash.  For now, we will just enable
+debugging and change the default prefix because these two changes will
+be handly later for tracking down problems and installing multiple
+versions.
 
 cd gnucash
-./autogen.sh --enable-debug --prefix=/opt/gnucash-1.8
+./autogen.sh
+./configure  --enable-debug --prefix=/opt/gnucash-1.8
 
 If autogen complains about missing development packages, find them on your
 favorite OS distribution, install it, and try to re-run the autogen command.
@@ -138,12 +143,6 @@
 
 make
 
-Note: when you are configuring and building gnucash, do *not* run the 
-configure script, aclocal, autoconf, or any other programs.  EVEN IF THE 
-AUTOGEN OUTPUT SUGGESTS THAT THEY DO.  This is important, and has caused a 
-lot of confusion.  Unfortunately the auto tools complain and cause bogus 
-warnings.
-
 To install (assuming "make" completed without any problems) you must be 
 root.  
 
@@ -153,7 +152,8 @@
 To compile the documentation, enter the gnucash-doc directory and go 
 through the same process:
 
-./autogen.sh --prefix=/opt/gnucash-1.8
+./autogen.sh
+./configure --prefix=/opt/gnucash-1.8
 make
 su -
 make install
@@ -310,7 +310,7 @@
 This will report any errors in your .po file if it finds them.
 
 If you want to see your translations within a running version of gnucash,
-simply place your .po file in you CVS copy of the gnucash source code (which
+simply place your .po file in you SVN copy of the gnucash source code (which
 you have previously installed) and from within the po/ directory type (you
 may nee to be root to do this):
 
@@ -340,7 +340,7 @@
 **Error**: autoheader failed.
 
 Reload the configure.in script:
-cvs up -C configure.in
+svn revert configure.in
 
 ---------------------------------
 If you see any "Gtk-CRITICAL" messages while running gnucash, it is probably
@@ -399,6 +399,7 @@
 1) Checkout the documentation
 cvs -z3 -d :pserver:cvs at cvs.gnucash.org:/home/cvs/cvsroot checkout \
 	gnucash-docs
+  FIXME: change the cvs command to svn here
 2) Create a new directory (if it doesn't already exist) in guide/<locale> 
    where <locale> is something like es, en_GB, or pt_PT.
 3) Copy the files from guide/C into this directory.

Modified: gnucash/trunk/macros/autogen.sh
===================================================================
--- gnucash/trunk/macros/autogen.sh	2005-11-09 20:49:10 UTC (rev 11889)
+++ gnucash/trunk/macros/autogen.sh	2005-11-09 20:51:03 UTC (rev 11890)
@@ -257,10 +257,4 @@
 
 conf_flags="--enable-error-on-warning --enable-compile-warnings" # --enable-iso-c
 
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile $PKG_NAME || exit 1
-else
-  echo Skipping configure process.
-fi
+echo You must now run $srcdir/configure $conf_flags "$@" ...