[Gnucash-changes] Build CVS directly with recent gettextize; no AC_OUTPUT errors.

[Derek Atkins]

Log Message:
-----------
	Build CVS directly with recent gettextize; no AC_OUTPUT errors.

	* configure.in: move m4/Makefile to its own line
	* macros/autogen.sh: add code to remove "intl/Makefile po/Makefile"
	  from AC_OUTPUT in configure.in prior to calling gettextize
	  to make sure that you can build from CVS with recent versions
	  of gettextize.  Tested with both RH9 and RH7.3 to make sure
	  it works with both old and new.  Fixes #120206.

Modified Files:
--------------
    gnucash:
        ChangeLog
        Makefile.am
        configure.in
    gnucash/macros:
        autogen.sh

Revision Data
-------------
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.390
retrieving revision 1.391
diff -Lconfigure.in -Lconfigure.in -u -r1.390 -r1.391
--- configure.in
+++ configure.in
@@ -1160,7 +1160,8 @@
 LIBOBJS_SEDSCRIPT="s,\.[[^.]]* ,$U&,g;s,\.[[^.]]*\$\$,$U&,"
 AC_SUBST(LIBOBJS_SEDSCRIPT)
 
-AC_OUTPUT( m4/Makefile  intl/Makefile po/Makefile.in
+AC_OUTPUT(intl/Makefile po/Makefile.in
+	  m4/Makefile
           dnl # Makefiles
           Makefile
           accounts/Makefile
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1794
retrieving revision 1.1795
diff -LChangeLog -LChangeLog -u -r1.1794 -r1.1795
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,12 @@
+2004-03-31  Derek Atkins  <derek at ihtfp.com>
+
+	* configure.in: move m4/Makefile to its own line
+	* macros/autogen.sh: add code to remove "intl/Makefile po/Makefile"
+	  from AC_OUTPUT in configure.in prior to calling gettextize
+	  to make sure that you can build from CVS with recent versions
+	  of gettextize.  Tested with both RH9 and RH7.3 to make sure
+	  it works with both old and new.  Fixes #120206.
+
 2004-03-30  Derek Atkins  <derek at ihtfp.com>
 
 	* src/report/report-system/report-system.scm:
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -LMakefile.am -LMakefile.am -u -r1.58 -r1.59
--- Makefile.am
+++ Makefile.am
@@ -33,7 +33,7 @@
 # Don't list any directories or you'll get *everything*, including the
 # CVS dirs.
 
-EXTRA_DIST = config.rpath  config.rpath  \
+EXTRA_DIST = config.rpath  \
   .cvsignore \
   ChangeLog.1 \
   HACKING \
Index: autogen.sh
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/macros/autogen.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -Lmacros/autogen.sh -Lmacros/autogen.sh -u -r1.19 -r1.20
--- macros/autogen.sh
+++ macros/autogen.sh
@@ -111,17 +111,14 @@
   DIE=1
 }
 
-GETTEXTIZE_VERSION=`${GETTEXTIZE} --version`
-gettextize_major_version=`echo ${GETTEXTIZE_VERSION} | \
-	sed 's/^.*GNU gettext.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\).*$/\1/'`
-gettextize_minor_version=`echo ${GETTEXTIZE_VERSION} | \
-	sed 's/^.*GNU gettext.* \([0-9]*\)\.\([0-9]*\).\([0-9]*\).*$/\2/'`
-if [  $gettextize_major_version -gt 0   -o \
-      $gettextize_minor_version -gt 10  ]; then
-  INTL="--intl";
-else
-  INTL="";
-fi
+gettext_version=`gettextize --version 2>&1 | sed -n 's/^.*GNU gettext.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+case $gettext_version in
+0.10.*)
+	;;
+	
+*)
+	INTL="--intl --no-changelog";;
+esac
 
 #(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
 #  (${LIBTOOL} --version) < /dev/null > /dev/null 2>&1 || {
@@ -224,13 +221,16 @@
 	  fi
         fi
       done
+      grep "intl/Makefile" configure.in > /dev/null &&
+      ( sed -e 's#^AC_OUTPUT(.*intl/Makefile po/Makefile.in#AC_OUTPUT(#' \
+	  configure.in >configure.in.new && mv configure.in.new configure.in )
       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 "Running ${GETTEXTIZE}...  Ignore non-fatal messages."
+	  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
@@ -239,7 +239,7 @@
       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 "Running ${GETTEXTIZE}...  Ignore non-fatal messages."
+	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
@@ -249,6 +249,15 @@
       echo "*** Ignore any instruction above about running aclocal by hand."
       echo "*** I repeat, do not run aclocal by hand.  You have been warned....."
       echo
+      case $gettext_version in
+      0.10.*)
+    	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 )
+	;;
+      *)
+        ;;
+      esac
       if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
         echo "Running ${INTLTOOLIZE} ..."
         ${INTLTOOLIZE} --copy --force --automake