[Gnucash-changes] r11887 - gnucash/trunk - Remove AM_MAINTAINER_MODE from configure.in.

Christian Stimming cstim at cvs.gnucash.org
Mon Nov 7 16:19:25 EST 2005


Author: cstim
Date: 2005-11-07 16:19:24 -0500 (Mon, 07 Nov 2005)
New Revision: 11887

Removed:
   gnucash/trunk/src/doc/design/mdate-sh
Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/README.svn
   gnucash/trunk/configure.in
   gnucash/trunk/macros/autogen.sh
Log:
Remove AM_MAINTAINER_MODE from configure.in.

        * configure.in: Remove AM_MAINTAINER_MODE since this causes only
        problems anyway. From now on the build system always behaves as
if
        --enable-maintainer-mode had been specified. This makes all
        related errors vanish.

        * macros/autogen.sh: Clean up autogen script a bit, but leave
        * the
        functionality unchanged.

Also, remove mdate-sh since this is installed by automake.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2005-11-07 20:48:11 UTC (rev 11886)
+++ gnucash/trunk/ChangeLog	2005-11-07 21:19:24 UTC (rev 11887)
@@ -1,5 +1,13 @@
 2005-11-07  Christian Stimming  <stimming at tuhh.de>
 
+	* configure.in: Remove AM_MAINTAINER_MODE since this causes only
+	problems anyway. From now on the build system always behaves as if
+	--enable-maintainer-mode had been specified. This makes all
+	related errors vanish.
+
+	* macros/autogen.sh: Clean up autogen script a bit, but leave the
+	functionality unchanged.
+
 	* po/ne.po: Add Nepali translation by Pawan Chitrakar
 	<pchitrakar at gmail.com>.
 

Modified: gnucash/trunk/README.svn
===================================================================
--- gnucash/trunk/README.svn	2005-11-07 20:48:11 UTC (rev 11886)
+++ gnucash/trunk/README.svn	2005-11-07 21:19:24 UTC (rev 11887)
@@ -11,16 +11,8 @@
 	./autogen.sh --enable-ofx --enable-opt-style-install --prefix=/opt/gnucash
 
    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.
+   run it. After that, configure can also be run by hand.
 
-   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.
-
    If in doubt, you can run autogen.sh, run ./configure --help,
    then re-run ./configure with your options.
 

Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in	2005-11-07 20:48:11 UTC (rev 11886)
+++ gnucash/trunk/configure.in	2005-11-07 21:19:24 UTC (rev 11887)
@@ -73,8 +73,6 @@
 AM_GLIB_GNU_GETTEXT
 
 
-AM_MAINTAINER_MODE
-
 # Enable only when we have autoconf --version >= 2.59
 # on all platforms. Note that AC_PREREQ(2.59) may be
 # insufficient to actually use v2.59 on OSX

Modified: gnucash/trunk/macros/autogen.sh
===================================================================
--- gnucash/trunk/macros/autogen.sh	2005-11-07 20:48:11 UTC (rev 11886)
+++ gnucash/trunk/macros/autogen.sh	2005-11-07 21:19:24 UTC (rev 11887)
@@ -3,10 +3,9 @@
 
 DIE=0
 
-#GETTEXTIZE=${GETTEXTIZE:-gettextize}
-INTLTOOLIZE=${INTLTOOLIZE:-intltoolize}
-LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
-LIBTOOL=${LIBTOOL:-libtool}
+: ${GLIB_GETTEXTIZE=glib-gettextize}
+: ${INTLTOOLIZE=intltoolize}
+: ${LIBTOOLIZE=libtoolize}
 
 if [ -n "$GNOME2_PATH" ]; then
 	for dir in `echo $GNOME2_PATH | sed 's/:/ /g'`; do
@@ -127,9 +126,9 @@
 esac
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
-  (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
+  (${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "**Error**: You must have \`libtool' installed to compile GnuCash."
+    echo "**Error**: You must have \`libtoolize' installed to compile GnuCash."
     echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.4.2.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
@@ -228,66 +227,35 @@
         fi
       done
 
-      if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
-	if grep "sed.*POTFILES" configure.in >/dev/null; then
-	  : do nothing -- we still have an old unmodified configure.in
-	else
-	  echo "Creating $dr/aclocal.m4 ..."
-	  test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	  echo "(1) Running ${GETTEXTIZE}...  Ignore non-fatal messages."
-	  echo "no" | ${GETTEXTIZE} --force --copy $INTL
-	  echo "Making $dr/aclocal.m4 writable ..."
-	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-        fi
-        grep "intl/Makefile" configure.in > /dev/null ||
-        ( sed -e 's#^AC_OUTPUT(#AC_OUTPUT( intl/Makefile po/Makefile.in#' \
-  	configure.in >configure.in.new && mv configure.in.new configure.in )
-      fi
-      if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
-        echo "Creating $dr/aclocal.m4 ..."
-        test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-	echo "(2) Running ${GETTEXTIZE}...  Ignore non-fatal messages."
-        echo "no" | gettextize --force --copy $INTL
-        echo "Making $dr/aclocal.m4 writable ..."
-        test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-        grep "intl/Makefile" configure.in > /dev/null ||
-        ( sed -e 's#^AC_OUTPUT(#AC_OUTPUT( intl/Makefile po/Makefile.in#' \
-  	configure.in >configure.in.new && mv configure.in.new configure.in )
-      fi
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
-        echo "Creating $dr/aclocal.m4 ..."
-        test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
-        echo "(3) Running gettextize...  Ignore non-fatal messages."
-        echo "no" | glib-gettextize --force --copy
-        echo "Making $dr/aclocal.m4 writable ..."
-        test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
-        grep "po/Makefile.in" configure.in > /dev/null ||
-        ( sed -e 's#^AC_OUTPUT(#AC_OUTPUT( po/Makefile.in#' \
-  	configure.in >configure.in.new && mv configure.in.new configure.in )
-      fi
-      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
-        echo "Running intltoolize ..."
-        intltoolize --force --copy
-      fi
-      if grep "^A[CM]_PROG_LIBTOOL" configure.in >/dev/null; then
-        echo "Running libtoolize..."
-        libtoolize --force --copy
-      fi
-      echo "Running $ACLOCAL $aclocalinclude ..."
-      $ACLOCAL $aclocalinclude
-      if grep "^AC_CONFIG_HEADER" configure.in >/dev/null; then
-	echo "Running ${AUTOHEADER}..."
-	${AUTOHEADER} || { echo "**Error**: autoheader failed."; exit 1; }
-      fi
-      echo "Running $AUTOMAKE --gnu $am_opt ..."
-      $AUTOMAKE --add-missing --gnu $am_opt
-      echo "Running autoconf ..."
-      autoconf
+      echo "Creating $dr/aclocal.m4 ..."
+      test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
+      echo "(3) Running gettextize...  Ignore non-fatal messages."
+      echo "no" | ${GLIB_GETTEXTIZE} --force --copy
+      echo "Making $dr/aclocal.m4 writable ..."
+      test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
+
+      echo "Running ${INTLTOOLIZE} ..."
+      ${INTLTOOLIZE} --force --copy
+
+      echo "Running ${LIBTOOLIZE}..."
+      ${LIBTOOLIZE} --force --copy
+
+      echo "Running ${ACLOCAL} $aclocalinclude ..."
+      ${ACLOCAL} $aclocalinclude
+
+      echo "Running ${AUTOHEADER}..."
+      ${AUTOHEADER} || { echo "**Error**: autoheader failed."; exit 1; }
+
+      echo "Running ${AUTOMAKE} --gnu $am_opt ..."
+      ${AUTOMAKE} --add-missing --gnu $am_opt
+
+      echo "Running ${AUTOCONF} ..."
+      ${AUTOCONF}
     )
   fi
 done
 
-conf_flags="--enable-maintainer-mode --enable-error-on-warning --enable-compile-warnings" # --enable-iso-c
+conf_flags="--enable-error-on-warning --enable-compile-warnings" # --enable-iso-c
 
 if test x$NOCONFIGURE = x; then
   echo Running $srcdir/configure $conf_flags "$@" ...

Deleted: gnucash/trunk/src/doc/design/mdate-sh
===================================================================
--- gnucash/trunk/src/doc/design/mdate-sh	2005-11-07 20:48:11 UTC (rev 11886)
+++ gnucash/trunk/src/doc/design/mdate-sh	2005-11-07 21:19:24 UTC (rev 11887)
@@ -1,92 +0,0 @@
-#!/bin/sh
-# Get modification time of a file or directory and pretty-print it.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-# written by Ulrich Drepper <drepper at gnu.ai.mit.edu>, June 1995
-#
-# 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, 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, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Prevent date giving response in another language.
-LANG=C
-export LANG
-LC_ALL=C
-export LC_ALL
-LC_TIME=C
-export LC_TIME
-
-# Get the extended ls output of the file or directory.
-# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
-if ls -L /dev/null 1>/dev/null 2>&1; then
-  set - x`ls -L -l -d $1`
-else
-  set - x`ls -l -d $1`
-fi
-# The month is at least the fourth argument
-# (3 shifts here, the next inside the loop).
-shift
-shift
-shift
-
-# Find the month.  Next argument is day, followed by the year or time.
-month=
-until test $month
-do
-  shift
-  case $1 in
-    Jan) month=January; nummonth=1;;
-    Feb) month=February; nummonth=2;;
-    Mar) month=March; nummonth=3;;
-    Apr) month=April; nummonth=4;;
-    May) month=May; nummonth=5;;
-    Jun) month=June; nummonth=6;;
-    Jul) month=July; nummonth=7;;
-    Aug) month=August; nummonth=8;;
-    Sep) month=September; nummonth=9;;
-    Oct) month=October; nummonth=10;;
-    Nov) month=November; nummonth=11;;
-    Dec) month=December; nummonth=12;;
-  esac
-done
-
-day=$2
-
-# Here we have to deal with the problem that the ls output gives either
-# the time of day or the year.
-case $3 in
-  *:*) set `date`; eval year=\$$#
-       case $2 in
-	 Jan) nummonthtod=1;;
-	 Feb) nummonthtod=2;;
-	 Mar) nummonthtod=3;;
-	 Apr) nummonthtod=4;;
-	 May) nummonthtod=5;;
-	 Jun) nummonthtod=6;;
-	 Jul) nummonthtod=7;;
-	 Aug) nummonthtod=8;;
-	 Sep) nummonthtod=9;;
-	 Oct) nummonthtod=10;;
-	 Nov) nummonthtod=11;;
-	 Dec) nummonthtod=12;;
-       esac
-       # For the first six month of the year the time notation can also
-       # be used for files modified in the last year.
-       if (expr $nummonth \> $nummonthtod) > /dev/null;
-       then
-	 year=`expr $year - 1`
-       fi;;
-  *) year=$3;;
-esac
-
-# The result.
-echo $day $month $year



More information about the gnucash-changes mailing list