[Gnucash-changes] r11859 - gnucash/trunk - Revert the autogen.sh change for now. To be reconsidered after more

[Christian Stimming]

Author: cstim
Date: 2005-11-06 09:34:31 -0500 (Sun, 06 Nov 2005)
New Revision: 11859

Added:
   gnucash/trunk/macros/autogen.sh
Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/Makefile.am
   gnucash/trunk/README.svn
   gnucash/trunk/autogen.sh
Log:
Revert the autogen.sh change for now. To be reconsidered after more
testing.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-11-06 14:23:03 UTC (rev 11858)
+++ gnucash/trunk/ChangeLog	2005-11-06 14:34:31 UTC (rev 11859)
@@ -1,3 +1,8 @@
+2005-11-06  Christian Stimming  <stimming at tuhh.de>
+
+	* autogen.sh: Revert autogen.sh simplificatoin for now; to be
+	reconsidered after more testing.
+
 2005-11-06  Neil Williams <linux at codehelp.co.uk>
 
 	* doc/build-osx.txt : Document some OSX-specific 

Modified: gnucash/trunk/Makefile.am
===================================================================
--- gnucash/trunk/Makefile.am	2005-11-06 14:23:03 UTC (rev 11858)
+++ gnucash/trunk/Makefile.am	2005-11-06 14:34:31 UTC (rev 11859)
@@ -43,6 +43,7 @@
   make-gnucash-potfiles.in \
   macros/aqbanking.m4 \
   macros/as-scrub-include.m4 \
+  macros/autogen.sh \
   macros/compiler-flags.m4 \
   macros/gnome-guile-checks.m4 \
   macros/legacy_macros.m4 \

Modified: gnucash/trunk/README.svn
===================================================================
--- gnucash/trunk/README.svn	2005-11-06 14:23:03 UTC (rev 11858)
+++ gnucash/trunk/README.svn	2005-11-06 14:34:31 UTC (rev 11859)
@@ -4,23 +4,23 @@
 Owen Taylor.
 
  + In order to build GnuCash from SVN, you need to run the autogen.sh
-   command to generate a configure script and other files. autogen.sh does
-   NOT accept any options but it may output some options that you should
-   add to your own ./configure command.
+   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:
 
-   For example:
+	./autogen.sh --enable-ofx --enable-opt-style-install --prefix=/opt/gnucash
 
-	./autogen.sh
+   Autogen will automatically generate the configure script and then
+   run it WITH SPECIAL ARGUMENTS to make sure certain files get built.
+   If you run "configure" without these special arguments, it is very likely
+   that GnuCash will fail to build.  Therefore, do not run configure by
+   hand.
 
-	./configure --enable-maintainer-mode --enable-error-on-warning \
-	--enable-compiler-warnings --enable-ofx --enable-opt-style-install \
-	--prefix=/opt/gnucash
+   At the moment it seems that ./configure has to be called with
+   --enable-maintainer-mode always in order so that certain files get
+   built.  If you run "configure" without this argument, it is very
+   likely that GnuCash will fail to build.
 
-   Autogen will automatically generate the configure script but you must
-   run it WITH SPECIAL ARGUMENTS to make sure that certain files get built.
-   If you run "configure" without these special arguments, it is very likely
-   that GnuCash will fail to build.
-
    If in doubt, you can run autogen.sh, run ./configure --help,
    then re-run ./configure with your options.
 

Modified: gnucash/trunk/autogen.sh
===================================================================
--- gnucash/trunk/autogen.sh	2005-11-06 14:23:03 UTC (rev 11858)
+++ gnucash/trunk/autogen.sh	2005-11-06 14:34:31 UTC (rev 11859)
@@ -1,26 +1,18 @@
-#!/bin/sh -x
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
 
-# Exit this script if any command fails with non-zero exit status.
-set -e
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
 
-# First cache the command names in variables. If you want to
-# override the names, simply set the variables before calling this
-# script.
+PKG_NAME="gnucash"
 
-: ${GLIB_GETTEXTIZE=glib-gettextize}
-: ${INTLTOOLIZE=intltoolize}
-: ${LIBTOOLIZE=libtoolize}
-: ${ACLOCAL=aclocal}
-: ${AUTOHEADER=autoheader}
-: ${AUTOMAKE=automake}
-: ${AUTOCONF=autoconf}
+(test -f $srcdir/configure.in \
+## put other tests here
+) || {
+    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+    echo " top-level $PKG_NAME directory"
+    exit 1
+}
 
-${GLIB_GETTEXTIZE} --force
-${INTLTOOLIZE} --force
-${LIBTOOLIZE} --force --automake
-${ACLOCAL} -I macros ${ACLOCAL_FLAGS}
-${AUTOHEADER}
-${AUTOMAKE} --add-missing
-${AUTOCONF}
-
-echo "Now you can run ./configure --enable-maintainer-mode --enable-error-on-warning --enable-compile-warnings"
+USE_GNOME2_MACROS=1
+. $srcdir/macros/autogen.sh

Copied: gnucash/trunk/macros/autogen.sh (from rev 11840, gnucash/trunk/macros/autogen.sh)


Property changes on: gnucash/trunk/macros/autogen.sh
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision