[Gnucash-changes] r11974 - gnucash-docs/trunk - Simplify autogen
script; remove the automatic call
Christian Stimming
cstim at cvs.gnucash.org
Fri Nov 18 15:34:00 EST 2005
Author: cstim
Date: 2005-11-18 15:34:00 -0500 (Fri, 18 Nov 2005)
New Revision: 11974
Trac: http://svn.gnucash.org/trac/changeset/11974
Removed:
gnucash-docs/trunk/acconfig.h
Modified:
gnucash-docs/trunk/
gnucash-docs/trunk/ChangeLog
gnucash-docs/trunk/HACKING
gnucash-docs/trunk/Makefile.am
gnucash-docs/trunk/autogen.sh
gnucash-docs/trunk/configure.in
Log:
Simplify autogen script; remove the automatic call
to ./configure from autogen.sh; instead, only print a reminder
that from now on, ./configure has to be called separately.
Property changes on: gnucash-docs/trunk
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
aclocal.m4
autom4te-2.53.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
gnucash-docs.spec
libtool
ltmain.sh
stamp-h
stamp-h.in
stamp-h1
autom4te.cache
+ Makefile
Makefile.in
aclocal.m4
autom4te-2.53.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
gnucash-docs.spec
libtool
ltmain.sh
stamp-h
stamp-h.in
stamp-h1
autom4te.cache
depcomp
INSTALL
COPYING
missing
install-sh
Modified: gnucash-docs/trunk/ChangeLog
===================================================================
--- gnucash-docs/trunk/ChangeLog 2005-11-18 18:44:52 UTC (rev 11973)
+++ gnucash-docs/trunk/ChangeLog 2005-11-18 20:34:00 UTC (rev 11974)
@@ -1,3 +1,9 @@
+2005-11-18 Christian Stimming <stimming at tuhh.de>
+
+ * autogen.sh: Simplify autogen script; remove the automatic call
+ to ./configure from autogen.sh; instead, only print a reminder
+ that from now on, ./configure has to be called separately.
+
2005-05-30 Christian Stimming <stimming at tuhh.de>
* guide/de_DE/ch_oview.xml, ch_basics.xml: Initial German Tutorial
Modified: gnucash-docs/trunk/HACKING
===================================================================
--- gnucash-docs/trunk/HACKING 2005-11-18 18:44:52 UTC (rev 11973)
+++ gnucash-docs/trunk/HACKING 2005-11-18 20:34:00 UTC (rev 11974)
@@ -26,7 +26,7 @@
Reviewers;
-Please check out the documentation module from the GnuCash CVS -
+Please check out the documentation module from the GnuCash SVN -
gnucash-docs. For those not familiar with cvs, the gnucash website has a
description at http://www.gnucash.org/en/hacking.phtml The only change
to get the docs is to change the checkout gnucash to checkout
@@ -43,7 +43,7 @@
contributors to GnuCash is to initially submit patches to the
gnucash-patches mailing list, though I will also accept patches
submitted to me directly. I will handle getting the patches added into
-CVS. You can also add the patch to a bug report in bugzilla if you wish.
+SVN. You can also add the patch to a bug report in bugzilla if you wish.
I would like writers to also let other know their intentions of which
section they wish to tackle. Please forward this to gnucash-devel so
Modified: gnucash-docs/trunk/Makefile.am
===================================================================
--- gnucash-docs/trunk/Makefile.am 2005-11-18 18:44:52 UTC (rev 11973)
+++ gnucash-docs/trunk/Makefile.am 2005-11-18 20:34:00 UTC (rev 11974)
@@ -2,14 +2,10 @@
guide \
doc-tools
-EXTRA_DIST = gnucash-docs.spec.in \
+EXTRA_DIST = gnucash-docs.spec \
COPYING-DOCS \
xmldocs.make \
omf.make \
stylesheet \
xsl \
HACKING
-
-dist-hook: gnucash-docs.spec
- cp gnucash-docs.spec $(distdir)
-
Deleted: gnucash-docs/trunk/acconfig.h
===================================================================
--- gnucash-docs/trunk/acconfig.h 2005-11-18 18:44:52 UTC (rev 11973)
+++ gnucash-docs/trunk/acconfig.h 2005-11-18 20:34:00 UTC (rev 11974)
@@ -1,110 +0,0 @@
-/********************************************************************\
- * acconfig.h -- configuration defines for gnucash *
- * Copyright (C) 1997 Robin D. Clark (rclark at cs.hmc.edu) *
- * *
- * This program is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License as *
- * published by the Free Software Foundation; either version 2 of *
- * the License, or (at your option) any later version. *
- * *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
- * GNU General Public License for more details. *
- * *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact: *
- * *
- * Free Software Foundation Voice: +1-617-542-5942 *
- * 59 Temple Place - Suite 330 Fax: +1-617-542-2652 *
- * Boston, MA 02111-1307, USA gnu at gnu.org *
- * *
-\********************************************************************/
-
-
-#ifndef GNC_CONFIG_H
-#define GNC_CONFIG_H
-
-/* Package name and version number */
-#undef PACKAGE
-#undef VERSION
-
-#undef GNUCASH_MAJOR_VERSION
-#undef GNUCASH_MINOR_VERSION
-#undef GNUCASH_MICRO_VERSION
-
-/* Are we compiling for GNOME? The answer right now is always yes... */
-#undef GNOME
-
-/* Do some memory debugging stuff */
-#define DEBUG_MEMORY
-
-/* limits.h header present */
-#undef HAVE_LIMITS_H
-
-/* ieeefp.h header present */
-#undef HAVE_IEEEFP_H
-
-/* memcpy present */
-#undef HAVE_MEMCPY
-
-/* check for stpcpy for Solaris */
-#undef HAVE_STPCPY
-
-/* If configure found libXpm, then use it */
-#undef HAVE_XPM
-
-/* is guile available */
-#undef HAVE_GUILE
-
-/* New or old Guile Smob for G-wrap */
-#undef GWRAP_OLD_GUILE_SMOB
-
-/* The db1 database library */
-#undef PREFER_DB1
-
-/* Should we add guppi support? */
-#undef USE_GUPPI
-
-/* Should we have efence linked in */
-#undef USE_EFENCE
-
-/* Use the new gtkhtml widget instead of the old xmhtml widget */
-#undef HAVE_LIBGTKHTML
-
-/* SSL support for ghttp is still not in the main tree, so test for it
- * separately */
-#undef HAVE_LIBGHTTP
-#undef HAVE_OPENSSL
-
-/* misc image and compression libs needed by html widget */
-#undef HAVE_ZLIB
-#undef HAVE_PNG
-#undef HAVE_JPEG
-
-/* Configure found the function malloc_usable_size */
-#undef HAVE_MALLOC_USABLE_SIZE
-
-
-/*** Begin i18n ***/
-
-/* internationalization with gettext */
-#undef HAVE_GETTEXT
-
-/* internationalization with catgets */
-#undef HAVE_CATGETS
-
-/* locale.h contains LC_MESSAGES */
-#undef HAVE_LC_MESSAGES
-
-/* specific locale directory */
-#undef HAVE_LOCALE_DIR
-
-/* defined if NLS is available */
-#undef ENABLE_NLS
-
-/*** End i18n ***/
-
-#undef HAVE_XML_VERSION_HEADER
-
-#endif
Modified: gnucash-docs/trunk/autogen.sh
===================================================================
--- gnucash-docs/trunk/autogen.sh 2005-11-18 18:44:52 UTC (rev 11973)
+++ gnucash-docs/trunk/autogen.sh 2005-11-18 20:34:00 UTC (rev 11974)
@@ -1,19 +1,25 @@
-#!/bin/sh
+#!/bin/sh -x
# Run this to generate all the initial makefiles, etc.
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+# Exit this script if any command fails with non-zero exit status.
+set -e
-ORIGDIR=`pwd`
-cd $srcdir
-
PROJECT=gnucash-docs
-TEST_TYPE=-f
-FILE=Makefile.am
-
DIE=0
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+# First cache the command names in variables. If you want to
+# override the names, simply set the variables before calling this
+# script.
+
+#: ${INTLTOOLIZE=intltoolize}
+#: ${GETTEXTIZE=gettextize}
+: ${LIBTOOLIZE=libtoolize}
+: ${ACLOCAL=aclocal}
+: ${AUTOHEADER=autoheader}
+: ${AUTOMAKE=automake}
+: ${AUTOCONF=autoconf}
+
+(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile $PROJECT."
echo "Download the appropriate package for your distribution,"
@@ -21,15 +27,15 @@
DIE=1
}
-(libtool --version) < /dev/null > /dev/null 2>&1 || {
+(${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
echo
- echo "You must have libtool installed to compile $PROJECT."
+ echo "You must have libtoolize installed to compile $PROJECT."
echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have automake installed to compile $PROJECT."
echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
@@ -41,40 +47,12 @@
exit 1
fi
-test $TEST_TYPE $FILE || {
- echo "You must run this script in the top-level $PROJECT directory"
- exit 1
-}
+#${INTLTOOLIZE}
+#${GETTEXTIZE}
+${LIBTOOLIZE} -f --automake
+${ACLOCAL} ${ACLOCAL_FLAGS}
+${AUTOHEADER}
+${AUTOMAKE} --add-missing
+${AUTOCONF}
-if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
-fi
-
-case $CC in
-*lcc | *lcc\ *) am_opt=--include-deps;;
-esac
-
-#echo "Running gettextize... Ignore non-fatal messages."
-# Hmm, we specify --force here, since otherwise things don't
-# get added reliably, but we don't want to overwrite intl
-# while making dist.
-#echo "no" | gettextize --copy --force
-
-echo "Running libtoolize"
-libtoolize --copy --force
-
-aclocal $ACLOCAL_FLAGS
-
-# optionally feature autoheader
-(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
-
-automake -a $am_opt
-autoconf
-
-cd $ORIGDIR
-
-$srcdir/configure --enable-maintainer-mode "$@"
-
-echo
-echo "Now type 'make' to compile $PROJECT."
+echo You must now run ./configure "$@"
Modified: gnucash-docs/trunk/configure.in
===================================================================
--- gnucash-docs/trunk/configure.in 2005-11-18 18:44:52 UTC (rev 11973)
+++ gnucash-docs/trunk/configure.in 2005-11-18 20:34:00 UTC (rev 11974)
@@ -161,7 +161,7 @@
if test "$ac_cv_header_db_185_h$ac_cv_header_db1_db_h$ac_cv_header_db4_db_185_h" = nonono; then
AC_MSG_ERROR([Berkeley db library required for GnuCash])
fi
- AC_DEFINE(PREFER_DB1)
+ AC_DEFINE([PREFER_DB1], [], [The db1 database library])
else
AC_CHECK_HEADERS(db.h db_185.h db1/db.h db4/db_185.h)
More information about the gnucash-changes
mailing list