merged macros2/ChangeLog with the main one

svn path=/trunk/; revision=3594

2 files changed, 470 insertions, 461 deletions

diff --git a/ChangeLog b/ChangeLog
index 251ae17..3971e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2005-03-15  Stepan Kasal  <kasal@ucw.cz>
+
+	* macros2/ChangeLog: Removed; the contents merged into the main one.
+
+2005-02-11  James Henstridge  <james@jamesh.id.au>
+
+	* macros2/gnome-autogen.sh: preserve COPYING and INSTALL files over
+	the "automake --force" call.  Fixes bug #161916.
+
+2005-01-22  Rodney Dawes  <dobey@novell.com>
+
+	* macros2/gnome-autogen.sh: Fix the (AC|IT)_PROG_INTLTOOL support
+	for both places where we grep for it
+	(version_check): If we are checking for automake = 1.4, then make
+	sure we error out with that error when we find it, and not >= 1.4
+	since we don't actually check for >= 1.4
+
+	Fixes #129903
+
 2005-01-03  James Henstridge  <james@jamesh.id.au>
 
 	* macros2/gnome-common.m4 (GNOME_COMMON_INIT): add some code to
@@ -6,6 +25,50 @@
 	* doc-build/xmldocs.make (clean-local-doc): add rule to clean up
 	copied entities if srcdir!=builddir.
 
+2004-11-24  Mariano Suárez-Alvarez <mariano@gnome.org>
+
+	* macros2/gnome-autogen.sh: grep wants basic regexps, not extended
+	ones: fix the regular expression for INTLTOOL.
+
+2004-11-24  Rodney Dawes  <dobey@novell.com>
+
+	* macros2/gnome-autogen.sh: Add support for IT_PROG_INTLTOOL which
+	deprecates AC_PROG_INTLTOOL
+
+2004-11-09  Jordi Mallach  <jordi@sindominio.net>
+
+	* macros2/gnome-autogen.sh: Workaround automake-1.4 limitations by
+	just using --force if $REQUIRED_AUTOMAKE_VERSION != 1.4. This avoids
+	Louie's wrath too. :)
+
+2004-11-09  Jordi Mallach  <jordi@sindominio.net>
+
+	* macros2/gnome-autogen.sh: Call all the bootstrap programs
+	(libtoolize, intltoolize, gtkdocize, automake) using --force and
+	--copy consistently.
+
+2004-10-28  James Henstridge  <james@jamesh.id.au>
+
+	* macros2/gnome-autogen.sh: get rid of the code that modified PATH,
+	ACLOCAL_FLAGS and LD_LIBRARY_PATH based on $GNOME2_PATH, since
+	this was broken.  It could cause configure tests to pass, when the
+	subsequent build would fail due to path problems.  For more
+	details, see bug #140210.
+
+	* macros2/gnome-autogen.sh: if the directory is read only, skip it.
+	This helps in cases where a directory from a failed "make distcheck"
+	is lying around.  Should fix bug #136093.
+
+	* macros2/gnome-autogen.sh (m4dir): fix up the AC_CONFIG_MACRO_DIR
+	check to work with sub-package configure.in's.
+
+2004-10-27  James Henstridge  <james@jamesh.id.au>
+
+	* macros2/gnome-autogen.sh (ACLOCAL): if AC_CONFIG_MACRO_DIR() is
+	used in configure.ac, pass that directory to aclocal.
+	Run libtoolize if the configure.ac file calls LT_INIT (the new
+	name for AC_PROG_LIBTOOL in libtool-2.0).
+
 2004-10-06  James Henstridge  <james@jamesh.id.au>
 
 	* doc-build/omf.make (uninstall-local-omf): use $(DESTDIR) in
@@ -24,6 +87,10 @@
 	* macros2/gnome-autogen.sh: Revert Rodney's changes, since
 	glib-gettextize has been fixed on the HEAD and 2.4 branches.
 
+2004-08-16  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* macros2/gnome-autogen.sh: Add some foo to handle automake-1.9.x too.
+
 2004-06-10  Rodney Dawes  <dobey@ximian.com>
 
 	* macros2/gnome-autogen.sh: Add code to check for mkinstalldirs in
@@ -34,8 +101,6 @@
 
 2004-05-26  James Henstridge  <james@daa.com.au>
 
-	* macros2/gnome-compiler-warnings.m4: some small cleanups.
-
 	* macros2/gnome-common.m4 (GNOME_COMMON_INIT): since caching is
 	turned off in all recent Autoconfs, it doesn't make sense to use
 	it.  Change implementation to instead make sure ${ACLOCAL_FLAGS}
@@ -49,7 +114,7 @@
 	automake.
 
 	* macros2/gnome-compiler-flags.m4: move from compiler-flags.m4 to
-	reduce chance of collisions.
+	reduce chance of collisions; some small cleanups.
 
 	* macros2/gnome-autogen.sh: move from autogen.sh
 
@@ -64,6 +129,11 @@
 
 	* gnome-common.spec.in: simplify and update spec file.
 
+2004-05-13  James Henstridge  <james@daa.com.au>
+
+	* macros2/autogen.sh: Change the order the various tools are called
+	in to match that of autoconf's autoupdate tool.  See bug 138584.
+
 2004-02-27  Sven Herzberg  <herzi@abi02.de>
 
 	* macros2/autogen.sh: fix #135557
@@ -73,6 +143,60 @@
 	* doc-build/xmldocs.make: fix one last occurrence of
 	not using $(DESTDIR).
 
+2004-01-31  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Use automake-1.8 if available. Patch from
+	alexander.winston@comcast.net (Alexander Winston). Bug #132966.
+
+2004-01-25  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Deprecate the use of GNOME2_DIR and allow the
+	use of GNOME2_PATH (bug #130516).
+
+2004-01-02  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Run intltoolize after automake, since
+	intltoolize wants mkinstalldirs now.
+	Should fix bugs #130309 and #130366.
+
+2003-12-13  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Change the use of head to be 'head -n -1',
+	since the GNU version of head appears to have changed behaviour
+	between version 5.0 and 5.0.9 somewhere. This should be portable
+	across all versions now. Fixed bug #128867.
+
+2003-12-08  Rodney Dawes  <dobey@free.fr>
+
+	* macros2/autogen.sh: Update automake checks to check incremental
+	versions in the correct order, Fixes #128691
+
+2003-11-19  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Replace use of -or in a find command with -o.
+	Makes things work for people with less functional versions of
+	find. Fixes bug #127354 reported by Rolf Sponsel.
+
+2003-11-03    <clahey@ximian.com>
+
+	* macros2/gnome-common.m4: Removed ENABLE_WERROR and changed name
+	to GNOME_MAINTAINER_MODE_DEFINES.
+
+2003-11-01  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Make version checking work, as pointed out by
+	Michael H Schimek in bug #125818.
+
+2003-10-31    <clahey@ximian.com>
+
+	* macros2/gnome-common.m4: Changed name of new macro to
+	AM_MAINTAINER_MODE_DEFINES and added definition for ENABLE_WERROR.
+
+2003-10-31    <clahey@ximian.com>
+
+	* macros2/gnome-common.m4: New macro to disable deprecated
+	functions and widgets when maintainer mode is on.
+
 === gnome-common 2.4.0 ===
 
 2003-10-02  Malcolm Tredinnick <malcolm@commsecure.com.au>
@@ -90,6 +214,40 @@
 	Define WARN_CXXFLAGS instead of overwriting
 	CXXFLAGS (like WARN_FLAGS).
 
+2003-08-10  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Show the version found for the various build
+	tools like automake, autoconf, libtool, etc.
+	Patch from Steve Chaplin (bug #119533).
+
+2003-08-05  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/compile-flags.m4: Continuing to try and get the flags
+	passed to g++ in GNOME_CXX_WARNINGS correct. Based on our best
+	attempts, the current set should work for the widest range of
+	g++ versions (see bug #118987 for the discussion).
+
+2003-08-03  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/compile-flags.m4: Simplify GNOME_CXX_WARNINGS.
+	Fixes bug #118987.
+
+2003-07-28  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/compiler-flags.m4: Default setting in the
+	GNOME_COMPILE_WARNINGS macro is now "yes". This fixes bug
+	#118479 (another good bit of debugging from Steve Chaplin).
+
+2003-07-20  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/compiler-flags.m4: Remove some redundant options as
+	suggested by Steve Chaplin in bug #115475. The warnings list looks
+	simpler now, but is no less functional.
+
+2003-07-15  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Fix a typo when reporting "forbidden" m4 macros.
+
 2003-07-04  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* macros2/compiler-flags.m4: don't use -Wsign-promo, it is 
@@ -103,6 +261,19 @@
 	passed to configure because it break GNOME_COMPILE_WARNINGS
 	macro.
 
+2003-06-20  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Fix some strangeness in the gnome-doc-common test.
+
+2003-06-19  Gustavo J. A. M. Carneiro  <gustavo@users.sourceforge.net>
+
+	* macros2/autogen.sh: Inserted missing "cd $dirname" to effectively
+	process subdirectories, since all it was doing was to process the
+	toplevel dir multiple times.
+
+	[Editor's note: also reported with patch by Elijah Newren in bug
+	#115481.]
+
 2003-05-24  Malcolm Tredinnick <malcolm@commsecure.com.au>
 
 	* MAINTAINERS: Put myself in as maintainer.
@@ -114,31 +285,196 @@
 	from some common files. This will not affect existing packages.
 	The changes required to use this are given in doc-build/README.
 
+2003-05-21  Malcolm Tredinnick <malcolm@commsecure.com.au>
+
+	* macros2/autogen.sh: Ignore {arch} subdirectories. Fixes bug #113327.
+
+2003-05-04  Malcolm Tredinnick <malcolm@commsecure.com.au>
+	
+	* macros2/autogen.sh:
+	- Make this portable to Bourne-like shells. Fixes the problems
+	  pointed out by Morten Welinder in bug #110177.
+	- Extend the check_m4macros() function to handle Cygwin
+	  environments. Fixes bug #110947.
+
+2003-04-10  Ross Burton  <ross@burtonini.com>
+
+	* macros2/autogen.sh: Fix a typo in the glib-gettext checks.
+
+2003-03-07  Malcolm Tredinnick <malcolm@commsecure.com.au>
+	
+	* macros2/autogen.sh: Replace PACKAGE with PKG_NAME, since PKG_NAME
+	is what is defined by the various applications' autogen.sh. Also,
+	call autopoint rather than gettextize when appropriate (when
+	AM_GNU_GETTEXT_VERSION is present).
+
+2003-02-27  Mark McLoughlin  <mark@skynet.ie>
+
+	* macros2/compiler-flags.m4: fix mixed up order of arguments to
+	AC_ARG_ENABLE that made --enable-compile-warnings not work
+	as expected.
+
 2003-02-26  Frederic Crozat  <fcrozat@mandrakesoft.com>
 
 	* macros2/autogen.sh: set WANT_AUTOCONF_2_5 variable to tell 
 	Mandrake autoconf wrapper we want to check if autoconf 2.5x is here..
 
+2003-02-24  James Henstridge  <james@daa.com.au>
+
+	* macros2/autogen.sh (forbid_m4macro): add function to forbid m4
+	macros.  Forbid gnome-cxx-check.m4, to try and catch setups where
+	stale macros are left on the system.
+
+2003-02-21  James Henstridge  <james@daa.com.au>
+
+	* macros2/autogen.sh (version_check): if $variable is set, then
+	assume it is correct and skip the version check.
+	(autoconf): check for autoconf2.50 first, so we don't trigger
+	Debian's sometimes broken autoconf version sniffer.
+
+2003-02-19  James Henstridge  <james@daa.com.au>
+
+	* macros2/Makefile.am (GNOME2_MACROS): remove check-utmp.m4 (copied
+	it to libzvt, which is the only thing using it).
+
+	* macros2/gnome-deprecated-macros.m4(GNOME_CHECK_CXX): AC_REQUIRE
+	does not work within AU_DEFUN, so change to a simple call to
+	AC_PROG_CXX.
+
+2003-02-18  James Henstridge  <james@daa.com.au>
+
+	* macros2/autogen.sh (topdir): check to see if
+	gnome-deprecated-macros.m4 ended up in aclocal.m4, and warn if so.
+
+	* macros2/gnome-platform.m4: kill this too (with a deprecation warning).
+
+	* macros2/gnome-cxx-check.m4: move to gnome-deprecated-macros.m4
+
+	* macros2/gnome-pkgconfig.m4: remove, and add a deprecation warning
+	in its place.
+
+	* macros2/gnome-x-checks.m4: remove, and add an AU_DEFUN in its place
+	telling people not to use it.
+
+	* macros2/linger.m4: removed outright.
+
+	* macros2/gnome-common.m4: remove GNOME_GTKDOC_CHECK, deprecated in
+	favour of GTK_DOC_CHECK.
+
+	* macros2/gnome-gettext.m4: remove file (people should be using
+	gettextize or glib-gettextize).
+
+	* macros2/gnome-deprecated-macros.m4: new file to hold deprecated
+	macros.
+
 2003-02-18  Jody Goldberg <jody@gnome.org>
 
-	* configure.in : Don't depend on a file that James just deleted
+	* configure.in: Don't depend on a file that James just deleted
+
+2003-02-14  Kalpesh Shah <kalpesh.shah@sun.com>
+
+	* macros2/check-utmp.m4: initialize UTMP structure properly. 
+	Fixes Bug#93774.
+	Patch reviewed by Andersca <andersca@gnu.org>
 
 2002-12-12  Jody Goldberg <jody@gnome.org>
 
-	* macros2/gnome-common.m4 (GNOME_DEBUG_CHECK) : now that autoconf-2.52
+	* macros2/gnome-common.m4 (GNOME_DEBUG_CHECK): now that autoconf-2.52
 	  is a prereq for things the build broke on the use of
 	      AC_DEFINE(GNOME_ENABLE_DEBUG) 
 	  without the additional arguments.
 
+2002-09-23  Bastien Nocera  <hadess@hadess.net>
+
+	* macros2/autogen.sh: exit if aclocal, autoheader, automake or
+	autoconf fails to run without warnings. Usually compilation would
+	fail afterwards with funky errors.
+	This is more anal than the version committed to the gnome-2-0 branch.
+
+2002-08-18  Havoc Pennington  <hp@pobox.com>
+
+	* macros2/autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users
+	with both automake 1.6 and 1.4 installed get the right automake. Means
+	compilation from CVS will now require the latest automake 1.4
+	release, or manually creating symlinks called "automake-1.4" and
+	"aclocal-1.4"
+
+Mon Aug 12 23:49:41 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+	* macros2/autogen.sh: use portable -o instead of GNU-ish -or for
+	  find test.
+
+2002-08-10  Miles Lane  <miles_lane@yahoo.com>
+
+	* macros2/autogen.sh: fix the "find" test so that the presence of
+	  configure.in is reporteded.  Each expression requires its own
+	  -print flag.
+
+2002-08-10  Sebastian Rittau  <srittau@jroger.in-berlin.de>
+
+	* macros2/autogen.sh: support for configure.ac
+
+2002-05-10  Chema Celorio  <chema@celorio.com>
+
+	* macros2/compiler-flags.m4: fix GNOME_COMPILE_WARNINGS to work when
+	  a parameter is passed.  The arguments to AC_ARG_ENABLE were swapped.
+
+2002-04-01  jacob berkman  <jacob@ximian.com>
+
+	* macros2/gnome-x-checks.m4 (GNOME2_X_CHECKS): kill bogus clearing
+	  of LDFLAGS
+
 2001-12-11  Anders Carlsson  <andersca@gnu.org>
 
 	* configure.in: Up to 1.2.4.
 
+2001-10-29  jacob berkman  <jacob@ximian.com>
+
+	* macros2/autogen.sh: add check for glib-gettextize
+
+2001-10-15  Bastien Nocera  <hadess@hadess.net>
+
+	* macros2/Makefile.am, curses.m4: added curses.m4 (copied from
+	  the gnome1 macros.  this file is needed to gdialog
+
+2001-10-02  Darin Adler  <darin@bentspoon.com>
+
+	* macros2/autogen.sh: Complete intltool support.
+
+2001-10-02  Darin Adler  <darin@bentspoon.com>
+
+	* macros2/autogen.sh: Add intltool support.
+
 2001-09-20 Glynn Foster <glynn.foster@sun.com>
 
 	* macros2/gnome-x-checks.m4: replaced  
 	GNOME_PKGCONFIG_CHECK_MODULES with  PKG_CHECK_MODULES
 
+2001-09-04  Frank Belew  <frb@ximian.com>
+
+	* macros2/autogen.sh: change gettext regexp to work with non-gnu grep
+
+2001-08-18  Darin Adler  <darin@bentspoon.com>
+
+	* macros2/autogen.sh: Don't ask people to ignore xml-i18n-tools
+	  messages.
+
+2001-08-04  Darin Adler  <darin@bentspoon.com>
+
+	* macros2/autogen.sh: Update gettext logic to allow anything that
+	starts with AM and ends with gettext. This makes it work with
+	AM_GLIB_GNU_GETTEXT, which is what libbonobo is now using.
+
+2001-08-03  Martin Baulig  <baulig@suse.de>
+
+	* macros2/gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Removed.
+	(GNOME_PKGCONFIG_CHECK_CFLAG): Removed.
+	(GNOME_PKGCONFIG_ACLOCALFLAGS): Removed.
+	(GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES): Removed.
+	(GNOME_PKGCONFIG_CHECK_MODULES): Removed.
+	(GNOME_CHECK_PKGCONFIG): Use $PKG_CONFIG --atleast-pkgconfig-version
+	to check for the pkg-config version.
+
 2001-08-02  Michael Meeks  <michael@ximian.com>
 
 	* Version 1.2.3
@@ -153,11 +489,37 @@
 	* doc/usage.txt: Point to the new home of pkgconfig at
 	www.freedesktop.org.
 
+2001-07-20  Martin Baulig  <baulig@suse.de>
+
+	* macros2/gnome-pkgconfig.m4: Require pkg-config 0.8.0.
+
 2001-07-12  Darin Adler  <darin@bentspoon.com>
 
 	* configure.in: Remove AC_ARG_PROGRAM, because AM_INIT_AUTOMAKE
 	already takes care of that.
 
+2001-06-29  Laszlo Peter <laca@ireland.sun.com>
+
+	* macros2/gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Fix
+	  the regexp to process all 6 version numbers.
+
+2001-06-22  Elliot Lee  <sopwith@redhat.com>
+
+	* macros2/gnome-gettext.m4: N'sync with the gnome1 version,
+	  bye bye buggies.
+
+2001-06-13  Martin Baulig  <baulig@suse.de>
+
+	* macros2/gnome-pkgconfig.m4 (GNOME_CHECK_PKGCONFIG): Require
+	  pkg-config 0.7.0 and fix download URL.
+
+	* macros2/gnome-platform.m4: Require pkgconfig on the GNOME 2.0
+	  platform.
+
+2001-06-01  Peter Williams  <peterw@ximian.com>
+
+	* macros2/autogen.sh: s,Gnome,$PKG_NAME,g
+
 2001-05-22  Darin Adler  <darin@eazel.com>
 
 	* hack-macros/gnome.m4: Add BUILD_INCLUDED_LIBINTL for
@@ -183,6 +545,13 @@
 	version of it is in gnome-libs/support and the GNOME 2.0 one is in
 	libgnomebase/libgnomesupport.
 
+2001-04-13  Martin Baulig  <baulig@suse.de>
+
+	* macros2/gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES):
+	Set variable `have_<name>' to yes or no depending on whether the
+	module was found or not; allows you to define automake conditionals
+	for optional modules.
+
 2001-03-26  Robin * Slomkowski  <rslomkow@eazel.com>
 
 	* Makefile.am: added gnome-common.spec.in to EXTRA_DISTS
@@ -191,10 +560,58 @@
                              generic
 	* gnome-common.spec.in: new spec file using Martin's suggestions
 
+2001-03-24  Martin Baulig  <baulig@suse.de>
+
+	* macros2/autogen.sh: Add the xml-i18n-tools stuff here.
+
 2000-12-01  Martin Baulig  <baulig@suse.de>
 
 	Released gnome-common 1.2.1.
 
+2000-12-01  Martin Baulig  <baulig@suse.de>
+
+	* macros2/compiler-flags.m4: Improved compile warnings check; the
+	--enable-compile-warnings parameter now takes 5 different
+	values (no/minimum/yes/maximum/error). AC_SUBST(WARN_CFLAGS).
+
+2000-11-29  Martin Baulig  <baulig@suse.de>
+
+	* macros2/gnome.m4, gnome-gnorba-check.m4, gnome-fileutils.m4: Removed.
+
+2000-11-26  Martin Baulig  <martin@home-of-linux.org>
+
+	* macros2/gnome-x-checks.m4 (GNOME2_X_CHECKS): Use
+	GNOME_PKGCONFIG_CHECK_MODULES.
+
+	* macros2/gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Don't
+	AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]).
+	(GNOME_CHECK_PKGCONFIG): Check for pkg-config >= 0.4.1.
+
+2000-11-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* macros2/gnome-pkgconfig.m4: Added GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES
+	to check for a list of optional modules.
+
+	* macros2/gnome-platform.m4: Require GNOME_REQUIRE_PKGCONFIG.
+
+2000-11-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* macros2/gnome-platform.m4: New file. This defines
+	GNOME_PLATFORM_GNOME_2.
+
+	* macros2/gnome-pkgconfig.m4: Disable the --extra-flags argument to
+	pkg-config, this doesn't exist anymore.
+
+2000-11-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* macros2/gnome-pkgconfig.m4: New file. This defines
+	GNOME_CHECK_PKGCONFIG, GNOME_REQUIRE_PKGCONFIG and
+	GNOME_PKGCONFIG_* macros from pkg-config.
+
+2000-11-21  Martin Baulig  <baulig@suse.de>
+
+	* macros2/gnome-support.m4, need-declaration.m4: Removed.
+
 2000-11-21  Martin Baulig  <martin@home-of-linux.org>
 
 	* configure.in: Set version number to 1.2.1.
@@ -212,10 +629,58 @@
 	* acinclude.m4: New file. Put stuff from gnome-support.m4
 	and need-declaration.m4 here.
 
+2000-09-30  Martin Baulig  <baulig@suse.de>
+
+	* macros2/gnome-x-checks.m4: Switch to pkg-config to check for GTK+ 2.0.
+	  Removed all `gnome_cv_passdown_x_*' variables and `USE_DEVGTK'.
+
+	* macros2/gnome-common.m4 (GNOME_COMMON_INIT): Added the always-false
+	  INSIDE_GNOME_COMMON automake conditional.
+	(GNOME_GTKDOC_CHECK): New macro.
+	(GNOME_DEBUG_CHECK): New macro.
+
+Thu Aug 24 02:28:57 2000  George Lebl <jirka@5z.com>
+
+	* macros2/gnome-x-checks.m4: use the correct name in AC_PROVIDE
+
+2000-08-06  Martin Baulig  <baulig@suse.de>
+
+	* macros2/gnome-x-checks.m4 (GNOME_X_CHECKS): Renamed
+	  to GNOME2_X_CHECKS.
+
+2000-07-24  Martin Baulig  <martin@home-of-linux.org>
+
+	* macros2/autogen.sh: Removed some old crap in it.
+	* macros2/aclocal-include.m4: Removed.
+
+	* macros2/gnome-x-checks.m4: Check for GTK+ 2.0.
+
+2000-07-24  Martin Baulig  <baulig@suse.de>
+
+	* macros2/autogen.sh: Make it work with AM_GNOME2_GETTEXT.
+	* macros2/check-utmp.m4: New file.
+
+2000-07-24  Martin Baulig  <baulig@suse.de>
+
+	Synced with gnome-libs/gnome-data.
+
+2000-06-09  Martin Baulig  <martin@home-of-linux.org>
+
+	* macros2/gnome-common.m4: We need this here as well.
+
 2000-05-29  Martin Baulig  <baulig@suse.de>
 
 	* configure.in: Set version number to 1.2.0.
 
+2000-05-29  Martin Baulig  <baulig@suse.de>
+
+	* macros2/Makefile.am: New file. Install this stuff into
+	  `$(datadir)/aclocal/gnome2-macros'.
+
+	* macros2/gnome.m4: New file. Copied from `hack-macros' dir.
+
+	* macros2/autogen.sh: New file. Copied from `macros' dir.
+
 1998-02-19  Raja R Harinath  <harinath@cs.umn.edu>
 
 	* autogen.sh: New sample file.
diff --git a/macros2/ChangeLog b/macros2/ChangeLog
deleted file mode 100644
index 30a71d9..0000000
--- a/macros2/ChangeLog
+++ /dev/null
@@ -1,456 +0,0 @@
-2005-02-11  James Henstridge  <james@jamesh.id.au>
-
-	* gnome-autogen.sh: preserve COPYING and INSTALL files over the
-	"automake --force" call.  Fixes bug #161916.
-
-2005-01-22  Rodney Dawes  <dobey@novell.com>
-
-	* gnome-autogen.sh: Fix the (AC|IT)_PROG_INTLTOOL support for
-	both places where we grep for it
-	(version_check): If we are checking for automake = 1.4, then make
-	sure we error out with that error when we find it, and not >= 1.4
-	since we don't actually check for >= 1.4
-
-	Fixes #129903
-
-2004-11-24  Mariano Suárez-Alvarez <mariano@gnome.org>
-
-	* gnome-autogen.sh: grep wants basic regexps, not extended ones:
-	fix the	regular expression for INTLTOOL.
-
-2004-11-24  Rodney Dawes  <dobey@novell.com>
-
-	* gnome-autogen.sh: Add support for IT_PROG_INTLTOOL which
-	deprecates AC_PROG_INTLTOOL
-
-2004-11-09  Jordi Mallach  <jordi@sindominio.net>
-
-	* gnome-autogen.sh: Workaround automake-1.4 limitations by just
-	using --force if $REQUIRED_AUTOMAKE_VERSION != 1.4. This avoids
-	Louie's wrath too. :)
-
-2004-11-09  Jordi Mallach  <jordi@sindominio.net>
-
-	* gnome-autogen.sh: Call all the bootstrap programs (libtoolize,
-	intltoolize, gtkdocize, automake) using --force and --copy
-	consistently.
-
-2004-10-28  James Henstridge  <james@jamesh.id.au>
-
-	* gnome-autogen.sh: get rid of the code that modified PATH,
-	ACLOCAL_FLAGS and LD_LIBRARY_PATH based on $GNOME2_PATH, since
-	this was broken.  It could cause configure tests to pass, when the
-	subsequent build would fail due to path problems.  For more
-	details, see bug #140210.
-
-	* gnome-autogen.sh: if the directory is read only, skip it.  This
-	helps in cases where a directory from a failed "make distcheck" is
-	lying around.  Should fix bug #136093.
-
-	* gnome-autogen.sh (m4dir): fix up the AC_CONFIG_MACRO_DIR check
-	to work with sub-package configure.in's.
-
-2004-10-27  James Henstridge  <james@jamesh.id.au>
-
-	* gnome-autogen.sh (ACLOCAL): if AC_CONFIG_MACRO_DIR() is used in
-	configure.ac, pass that directory to aclocal.
-	Run libtoolize if the configure.ac file calls LT_INIT (the new
-	name for AC_PROG_LIBTOOL in libtool-2.0).
-
-2004-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* gnome-autogen.sh: Add some foo to handle automake-1.9.x too.
-
-2004-05-13  James Henstridge  <james@daa.com.au>
-
-	* autogen.sh: Change the order the various tools are called in to
-	match that of autoconf's autoupdate tool.  See bug 138584.
-
-2004-01-31  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Use automake-1.8 if available. Patch from
-	alexander.winston@comcast.net (Alexander Winston). Bug #132966.
-
-2004-01-25  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Deprecate the use of GNOME2_DIR and allow the use
-	of GNOME2_PATH (bug #130516).
-
-2004-01-02  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Run intltoolize after automake, since intltoolize
-	wants mkinstalldirs now. Should fix bugs #130309 and #130366.
-
-2003-12-13  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Change the use of head to be 'head -n -1', since
-	the GNU version of head appears to have changed behaviour
-	between version 5.0 and 5.0.9 somewhere. This should be portable
-	across all versions now. Fixed bug #128867.
-
-2003-12-08  Rodney Dawes  <dobey@free.fr>
-
-	* autogen.sh: Update automake checks to check incremental
-	versions in the correct order, Fixes #128691
-
-2003-11-19  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Replace use of -or in a find command with -o.
-	Makes things work for people with less functional versions of
-	find. Fixes bug #127354 reported by Rolf Sponsel.
-
-2003-11-03    <clahey@ximian.com>
-
-	* gnome-common.m4: Removed ENABLE_WERROR and changed name to
-	GNOME_MAINTAINER_MODE_DEFINES.
-
-2003-11-01  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Make version checking work, as pointed out by
-	Michael H Schimek in bug #125818.
-
-2003-10-31    <clahey@ximian.com>
-
-	* gnome-common.m4: Changed name of new macro to
-	AM_MAINTAINER_MODE_DEFINES and added definition for ENABLE_WERROR.
-
-2003-10-31    <clahey@ximian.com>
-
-	* gnome-common.m4: New macro to disable deprecated functions and
-	widgets when maintainer mode is on.
-
-2003-08-10  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Show the version found for the various build tools
-	like automake, autoconf, libtool, etc. Patch from Steve Chaplin
-	(bug #119533).
-
-2003-08-05  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* compile-flags.m4: Continuing to try and get the flags passed
-	to g++ in GNOME_CXX_WARNINGS correct. Based on our best
-	attempts, the current set should work for the widest range of
-	g++ versions (see bug #118987 for the discussion).
-
-2003-08-03  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* compile-flags.m4: Simplify GNOME_CXX_WARNINGS. Fixes bug
-	#118987.
-
-2003-07-28  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* compiler-flags.m4: Default setting in the
-	GNOME_COMPILE_WARNINGS macro is now "yes". This fixes bug
-	#118479 (another good bit of debugging from Steve Chaplin).
-
-2003-07-20  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* compiler-flags.m4: Remove some redundant options as suggested
-	by Steve Chaplin in bug #115475. The warnings list looks simpler
-	now, but is no less functional.
-
-2003-07-15  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Fix a typo when reporting "forbidden" m4 macros.
-
-2003-06-20  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Fix some strangeness in the gnome-doc-common test.
-
-2003-06-19  Gustavo J. A. M. Carneiro  <gustavo@users.sourceforge.net>
-
-	* autogen.sh: Inserted missing "cd $dirname" to effectively
-	process subdirectories, since all it was doing was to process the
-	toplevel dir multiple times.
-
-	[Editor's note: also reported with patch by Elijah Newren in bug
-	#115481.]
-
-2003-05-21  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* autogen.sh: Ignore {arch} subdirectories. Fixes bug #113327.
-
-2003-05-04  Malcolm Tredinnick <malcolm@commsecure.com.au>
-	
-	* autogen.sh:
-	- Make this portable to Bourne-like shells. Fixes the problems
-	  pointed out by Morten Welinder in bug #110177.
-	- Extend the check_m4macros() function to handle Cygwin
-	  environments. Fixes bug #110947.
-
-2003-04-10  Ross Burton  <ross@burtonini.com>
-
-	* autogen.sh: Fix a typo in the glib-gettext checks.
-
-2003-03-07  Malcolm Tredinnick <malcolm@commsecure.com.au>
-	
-	* autogen.sh: Replace PACKAGE with PKG_NAME, since PKG_NAME is
-	what is defined by the various applications' autogen.sh. Also,
-	call autopoint rather than gettextize when appropriate (when
-	AM_GNU_GETTEXT_VERSION is present).
-
-2003-02-27  Mark McLoughlin  <mark@skynet.ie>
-
-	* compiler-flags.m4: fix mixed up order of arguments to
-	AC_ARG_ENABLE that made --enable-compile-warnings not work
-	as expected.
-
-2003-02-24  James Henstridge  <james@daa.com.au>
-
-	* autogen.sh (forbid_m4macro): add function to forbid m4 macros.
-	Forbid gnome-cxx-check.m4, to try and catch setups where stale
-	macros are left on the system.
-
-2003-02-21  James Henstridge  <james@daa.com.au>
-
-	* autogen.sh (version_check): if $variable is set, then assume
-	it is correct and skip the version check.
-	(autoconf): check for autoconf2.50 first, so we don't trigger
-	Debian's sometimes broken autoconf version sniffer.
-
-2003-02-19  James Henstridge  <james@daa.com.au>
-
-	* Makefile.am (GNOME2_MACROS): remove check-utmp.m4 (copied it to
-	libzvt, which is the only thing using it).
-
-	* gnome-deprecated-macros.m4(GNOME_CHECK_CXX): AC_REQUIRE does not
-	work within AU_DEFUN, so change to a simple call to AC_PROG_CXX.
-
-2003-02-18  James Henstridge  <james@daa.com.au>
-
-	* autogen.sh (topdir): check to see if gnome-deprecated-macros.m4
-	ended up in aclocal.m4, and warn if so.
-
-	* gnome-platform.m4: kill this too (with a deprecation warning).
-
-	* gnome-cxx-check.m4: move to gnome-deprecated-macros.m4
-
-	* gnome-pkgconfig.m4: remove, and add a deprecation warning in its
-	place.
-
-	* gnome-x-checks.m4: remove, and add an AU_DEFUN in its place
-	telling people not to use it.
-
-	* linger.m4: removed outright.
-
-	* gnome-common.m4: remove GNOME_GTKDOC_CHECK, deprecated in favour
-	of GTK_DOC_CHECK.
-
-	* gnome-gettext.m4: remove file (people should be using gettextize
-	or glib-gettextize).
-
-	* gnome-deprecated-macros.m4: new file to hold deprecated macros.
-
-2003-02-14  Kalpesh Shah <kalpesh.shah@sun.com>
-
-	* check-utmp.m4: initialize UTMP structure properly. 
-	Fixes Bug#93774.
-	Patch reviewed by Andersca <andersca@gnu.org>
-
-2002-09-23  Bastien Nocera  <hadess@hadess.net>
-
-	* autogen.sh: exit if aclocal, autoheader, automake or autoconf
-	fails to run without warnings. Usually compilation would fail
-	afterwards with funky errors.
-	This is more anal than the version committed to the gnome-2-0 branch
-
-2002-08-18  Havoc Pennington  <hp@pobox.com>
-
-	* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
-	both automake 1.6 and 1.4 installed get the right automake. Means
-	compilation from CVS will now require the latest automake 1.4
-	release, or manually creating symlinks called "automake-1.4" and
-	"aclocal-1.4"
-
-Mon Aug 12 23:49:41 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
-
-	* autogen.sh : use portable -o instead of GNU-ish -or for find test
-
-2002-08-10  Miles Lane  <miles_lane@yahoo.com>
-
-	* autogen.sh: fix the "find" test so that the presence of
-	  configure.in is reporteded.  Each expression requires its
-	  own -print flag.
-
-2002-08-10  Sebastian Rittau  <srittau@jroger.in-berlin.de>
-
-	* autogen.sh: support for configure.ac
-
-2002-05-10  Chema Celorio  <chema@celorio.com>
-
-	* compiler-flags.m4: fix GNOME_COMPILE_WARNINGS to work when a parameter is
-	passed. The arguments to AC_ARG_ENABLE where swapped
-
-2002-04-01  jacob berkman  <jacob@ximian.com>
-
-	* gnome-x-checks.m4 (GNOME2_X_CHECKS): kill bogus clearing of
-	LDFLAGS
-
-2001-10-29  jacob berkman  <jacob@ximian.com>
-
-	* autogen.sh: add check for glib-gettextize
-
-2001-10-15  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am, curses.m4: added curses.m4 (copied from the gnome1
-	macros. this file is needed to gdialog
-
-2001-10-02  Darin Adler  <darin@bentspoon.com>
-
-	* autogen.sh: Complete intltool support.
-
-2001-10-02  Darin Adler  <darin@bentspoon.com>
-
-	* autogen.sh: Add intltool support.
-
-2001-09-04  Frank Belew  <frb@ximian.com>
-
-	* autogen.sh: change gettext regexp to work with non-gnu grep
-
-2001-08-18  Darin Adler  <darin@bentspoon.com>
-
-	* autogen.sh: Don't ask people to ignore xml-i18n-tools messages.
-
-2001-08-04  Darin Adler  <darin@bentspoon.com>
-
-	* autogen.sh: Update gettext logic to allow anything that
-	starts with AM and ends with gettext. This makes it work with
-	AM_GLIB_GNU_GETTEXT, which is what libbonobo is now using.
-
-2001-08-03  Martin Baulig  <baulig@suse.de>
-
-	* gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Removed.
-	(GNOME_PKGCONFIG_CHECK_CFLAG): Removed.
-	(GNOME_PKGCONFIG_ACLOCALFLAGS): Removed.
-	(GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES): Removed.
-	(GNOME_PKGCONFIG_CHECK_MODULES): Removed.
-	(GNOME_CHECK_PKGCONFIG): Use $PKG_CONFIG --atleast-pkgconfig-version
-	to check for the pkg-config version.
-
-2001-07-20  Martin Baulig  <baulig@suse.de>
-
-	* gnome-pkgconfig.m4: Require pkg-config 0.8.0.
-
-2001-06-29  Laszlo Peter <laca@ireland.sun.com>
-
-	* gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Fix the regexp
-	to process all 6 version numbers.
-
-2001-06-22  Elliot Lee  <sopwith@redhat.com>
-
-	* gnome-gettext.m4: N'sync with the gnome1 version, bye bye buggies.
-
-2001-06-13  Martin Baulig  <baulig@suse.de>
-
-	* gnome-pkgconfig.m4 (GNOME_CHECK_PKGCONFIG): Require pkg-config 0.7.0
-	and fix download URL.
-
-	* gnome-platform.m4: Require pkgconfig on the GNOME 2.0 platform.
-
-2001-06-01  Peter Williams  <peterw@ximian.com>
-
-	* autogen.sh: s,Gnome,$PKG_NAME,g
-
-2001-04-13  Martin Baulig  <baulig@suse.de>
-
-	* gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES):
-	Set variable `have_<name>' to yes or no depending on whether the
-	module was found or not; allows you to define automake conditionals
-	for optional modules.
-
-2001-03-24  Martin Baulig  <baulig@suse.de>
-
-	* autogen.sh: Add the xml-i18n-tools stuff here.
-
-2000-12-01  Martin Baulig  <baulig@suse.de>
-
-	* compile-warnings.m4: Improved compile warnings check; the
-	--enable-compile-warnings parameter now takes 5 different
-	values (no/minimum/yes/maximum/error). AC_SUBST(WARN_CFLAGS).
-
-2000-11-29  Martin Baulig  <baulig@suse.de>
-
-	* gnome.m4, gnome-gnorba-check.m4, gnome-fileutils.m4: Removed.
-
-2000-11-26  Martin Baulig  <martin@home-of-linux.org>
-
-	* gnome-x-checks.m4 (GNOME2_X_CHECKS): Use
-	GNOME_PKGCONFIG_CHECK_MODULES.
-
-	* gnome-pkgconfig.m4 (GNOME_PKGCONFIG_CHECK_VERSION): Don't
-	AC_REQUIRE([GNOME_REQUIRE_PKGCONFIG]).
-	(GNOME_CHECK_PKGCONFIG): Check for pkg-config >= 0.4.1.
-
-2000-11-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* gnome-pkgconfig.m4: Added GNOME_PKGCONFIG_CHECK_OPTIONAL_MODULES
-	to check for a list of optional modules.
-
-	* gnome-platform.m4: Require GNOME_REQUIRE_PKGCONFIG.
-
-2000-11-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* gnome-platform.m4: New file. This defines
-	GNOME_PLATFORM_GNOME_2.
-
-	* gnome-pkgconfig.m4: Disable the --extra-flags argument to
-	pkg-config, this doesn't exist anymore.
-
-2000-11-22  Martin Baulig  <martin@home-of-linux.org>
-
-	* gnome-pkgconfig.m4: New file. This defines
-	GNOME_CHECK_PKGCONFIG, GNOME_REQUIRE_PKGCONFIG and
-	GNOME_PKGCONFIG_* macros from pkg-config.
-
-2000-11-21  Martin Baulig  <baulig@suse.de>
-
-	* gnome-support.m4, need-declaration.m4: Removed.
-
-2000-09-30  Martin Baulig  <baulig@suse.de>
-
-	* gnome-x-checks.m4: Switch to pkg-config to check for GTK+ 2.0;
-	Removed all `gnome_cv_passdown_x_*' variables and `USE_DEVGTK'.
-
-	* gnome-common.m4 (GNOME_COMMON_INIT): Added the always-false
-	INSIDE_GNOME_COMMON automake conditional.
-	(GNOME_GTKDOC_CHECK): New macro.
-	(GNOME_DEBUG_CHECK): New macro.
-
-Thu Aug 24 02:28:57 2000  George Lebl <jirka@5z.com>
-
-	* gnome-x-checks.m4: use the correct name in AC_PROVIDE
-
-2000-08-06  Martin Baulig  <baulig@suse.de>
-
-	* gnome-x-checks.m4 (GNOME_X_CHECKS): Renamed
-	to GNOME2_X_CHECKS.
-
-2000-07-24  Martin Baulig  <martin@home-of-linux.org>
-
-	* autogen.sh: Removed some old crap in it.
-	* aclocal-include.m4: Removed.
-
-	* gnome-x-checks.m4: Check for GTK+ 2.0.
-
-2000-07-24  Martin Baulig  <baulig@suse.de>
-
-	* autogen.sh: Make it work with AM_GNOME2_GETTEXT.
-	* check-utmp.m4: New file.
-
-2000-07-24  Martin Baulig  <baulig@suse.de>
-
-	Synced with gnome-libs/gnome-data.
-
-2000-06-09  Martin Baulig  <martin@home-of-linux.org>
-
-	* gnome-common.m4: We need this here as well.
-
-2000-05-29  Martin Baulig  <baulig@suse.de>
-
-	* Makefile.am: New file. Install this stuff into
-	`$(datadir)/aclocal/gnome2-macros'.
-
-	* gnome.m4: New file. Copied from `hack-macros' dir.
-
-	* autogen.sh: New file. Copied from `macros' dir.
-