Remove duplicate declaration of REQUIRED_AUTOMAKE_VERSION Removegnome-2-8

2004-10-13  Rodney Dawes  <dobey@novell.com>

	* autogen.sh: Remove duplicate declaration of REQUIRED_AUTOMAKE_VERSION
	Remove duplicated effort to run glib-gettextize and intltoolize

	* configure.in: Add requirement of Autoconf 2.53 or newer
	Update to use newer autoconf API and define bugzilla url
	General cleanup of layout and ordering
	Add workaround to define ACLOCAL_AMFLAGS for calling aclocal
	Add declaration and substitution of localedir

	Fixes #154668

3 files changed, 36 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e3152425..365c54593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-10-13  Rodney Dawes  <dobey@novell.com>
+
+	* autogen.sh: Remove duplicate declaration of REQUIRED_AUTOMAKE_VERSION
+	Remove duplicated effort to run glib-gettextize and intltoolize
+
+	* configure.in: Add requirement of Autoconf 2.53 or newer
+	Update to use newer autoconf API and define bugzilla url
+	General cleanup of layout and ordering
+	Add workaround to define ACLOCAL_AMFLAGS for calling aclocal
+	Add declaration and substitution of localedir
+
+	Fixes #154668
+
 2004-10-03  Jesus Bravo Alvarez  <suso@trasno.net>
 
 	* configure.in: Added gl (Galician) to ALL_LINGUAS
diff --git a/autogen.sh b/autogen.sh
index 68e0b99a2..d815f5237 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -15,12 +15,6 @@ REQUIRED_AUTOMAKE_VERSION=1.6
     exit 1
 }
 
-echo "Running glib-gettextize"
-glib-gettextize --copy --force
-
-echo "Running intltoolize"
-intltoolize --copy --force --automake
-
 gettext=`which gettext`
 gettext_prefix=`dirname $gettext | xargs dirname`
 
@@ -32,4 +26,4 @@ which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
     exit 1
 }
-REQUIRED_AUTOMAKE_VERSION=1.6 USE_GNOME2_MACROS=1 . gnome-autogen.sh
+USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index 2cc94760e..fda4d67f6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,23 +1,36 @@
-AC_INIT(index.theme.in)
-AM_INIT_AUTOMAKE(gnome-icon-theme, 2.8.0)
+# Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.53)
 
-AM_MAINTAINER_MODE
+AC_INIT([gnome-icon-theme], [2.8.0],
+        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-icon-theme])
+AC_CONFIG_SRCDIR(index.theme.in)
+
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AC_PROG_INTLTOOL
 
-ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja kn ko li lt lv mk ml mn ms nb ne nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tk tr uk vi wa zh_CN zh_TW"
-GETTEXT_PACKAGE=gnome-icon-theme
+GETTEXT_PACKAGE="${PACKAGE}"
 AC_SUBST(GETTEXT_PACKAGE)
+
+ALL_LINGUAS="am ar az be bg bn bs ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja kn ko li lt lv mk ml mn ms nb ne nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tk tr uk vi wa zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
+# AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME
+# this is the directory where the *.{mo,gmo} files are installed
+localedir='${prefix}/${DATADIRNAME}/locale'
+AC_SUBST(localedir)
+
+# Workaround to make aclocal get the right flags
+AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
+
 AC_ARG_ENABLE(hicolor-check,
    AC_HELP_STRING([--disable-hicolor-check],
                    [disable the check for hicolor [default=no]]),
     enable_hicolor_check=$enableval,
     enable_hicolor_check=yes)
- AM_CONDITIONAL(ENABLE_HICOLOR_CHECK, test x$enable_hicolor_check = xyes)
+AM_CONDITIONAL(ENABLE_HICOLOR_CHECK, test x$enable_hicolor_check = xyes)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
 gnome-icon-theme.spec
 gnome-icon-theme.pc
@@ -130,3 +143,5 @@ scalable/filesystems/Makefile
 scalable/mimetypes/Makefile    
 po/Makefile.in	
 ])	
+
+AC_OUTPUT