This commit was manufactured by cvs2svn to create branch 'GNOME_STABLE'.

svn path=/branches/GNOME_STABLE/; revision=542

3 files changed, 849 insertions, 0 deletions

diff --git a/macros/ChangeLog b/macros/ChangeLog
new file mode 100644
index 00000000..c7061e93
--- /dev/null
+++ b/macros/ChangeLog
@@ -0,0 +1,684 @@
+1998-12-22  Jeff Garzik  <jgarzik@pobox.com>
+
+	* gnome.m4:  Added and exported GNOME_APPLET_LIBS.
+
+1998-12-16  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* gnome-support.m4: Removed all the stuff for argp, that was
+	causing gnomesupport not to build.
+
+1998-12-15  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-gettext.m4: Add the hacked version of the gettext
+	macros that is used in Gtk+ here.
+
+	* autogen.sh: Accept both AM_GNU_GETTEXT and AM_GNOME_GETTEXT.
+	 
+1998-12-15  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: All parts of GNOME will now require
+	LibGTop >= 0.99.0 which is the latest version from CVS and
+	already feature-freezed for GNOME 1.0.
+	
+1998-12-09  Martin Baulig  <martin@home-of-linux.org>
+
+	* aclocal-include.m4 (AM_ACLOCAL_INCLUDE): Make this work
+	with more than one directory.
+
+1998-12-08  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4: Moved into the LibGTop module.
+	This file contains too much stuff that should only be used
+	internally in LibGTop, so it's better to have it there.
+
+1998-12-06  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4: Recognice OpenBSD as a valid
+	system and use the `freebsd' sysdeps directory for it.
+
+Sat Dec  5 23:30:01 PST 1998 Manish Singh <yosh@gimp.org>
+
+	* gnome-guile-checks.m4: clear GUILE_LIBS and GUILE_INCS if
+	guile isn't there (quick fix)
+
+1998-12-05  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4: Recognice NetBSD as a valid
+	system and use the `freebsd' sysdeps directory for it.
+
+1998-12-03  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4 (GLIBTOP_LINUX_VERSION_CODE):
+	Define this to be the same as LINUX_VERSION_CODE either from
+	<linux/version.h> or from the running kernel.
+
+1998-12-02  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* autogen.sh: "Improve" indentation and messages somewhat.
+
+1998-12-01  Jeff Garzik  <jgarzik@pobox.com>
+
+	* autogen.sh:
+	Platform fixes.  grep -q is not portable, do not use.
+
+1998-12-01  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
+
+	* autogen.sh: Run gettextize if needed.
+	: Run libtoolize only if configure.in has "^AM_PROG_LIBTOOL".
+
+1998-11-30  Jeff Garzik  <jgarzik@pobox.com>
+
+	* gnome.m4: Re-arranged tests such that "--without-gnome" is
+	fully supported.  Not only is the logic now correct, programs
+	can test "want_gnome=yes/no" for the results of this arg.
+
+1998-11-27  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: All parts of GNOME will now require
+	LibGTop >= 0.29.0 which is the latest version from CVS.
+
+1998-11-20  James Henstridge  <james@daa.com.au>
+
+	* gnome.m4(GNOME_INIT_HOOK): Changed the call to GNOME_GNORBA_CHECK
+	to GNOME_GNORBA_HOOK([],$2).  Before if you specified that the
+	macro should not exit on errors, and you didn't have ORBit, the
+	script would fail anyway.
+
+1998-11-17  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4: We need to check for <net/if_var.h>
+	and conditionally include it before <net/if_isppp.h> in the code
+	that check for I4B to make it work on FreeBSD 3.0.
+	
+1998-10-25  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* gnome-guile-checks.m4: Add GUILE_LIBS to LIBS when checking
+	whether guile works.  Adding them to LDFLAGS does not work on all
+	systems.  (Thanks to Rusty Chris Holleman)
+
+1998-11-12  Andrew T. Veliath  <andrewtv@usa.net>
+
+	* gnome-orbit-check.m4: Remove AC_DEFINE(HAVE_ORBIT). Add
+	AM_CONDITIONAL for HAVE_ORBIT.  gnome-gnorba-check.m4: Same with
+	HAVE_GNORBA.  Change GNOME_ORBIT_HOOK and GNOME_GNORBA_HOOK to use
+	AC_CACHE_CHECK, setting both gnome_cv_orbit_found and
+	gnome_cv_gnorba_found.
+
+	* gnome.m4: (GNOME_INIT_HOOK): Add GNOME_GNORBA_CHECK if
+	gnome-config is found.  New GNOMEGNORBA_LIBS library variable
+	(GNOMEGNORBA_LIBS is a superset of GNOMEUI_LIBS).  Update
+	GNOME_LIBDIR and GNOME_INCLUDEDIR to to include the required
+	Gnorba info, if it is in a different location.
+
+	* Makefile.am (MACROS): Add gnome-gnorba-check.m4 to Makefile.
+	
+	* gnome-gnorba-check.m4: New file.
+
+1998-11-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4 (vsnprintf): Remove easy-vsnprintf hack -- it
+	doesn't work for Solaris 2.5 binaries running on Solaris 2.6.
+	From Frederic Devernay <devernay@istar.fr>.
+
+1998-11-06  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4: Fix stupid type (sterror_r -> strerror_r).
+
+1998-11-04  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4 (need_gnome_support): Set this unconditionally
+	to `yes'.  We'll soon be losing this variable.
+
+1998-10-20  Andrew Veliath  <andrewtv@usa.net>
+
+	* gnome-orbit-check.m4 (GNOME_ORBIT_HOOK): Add ORBIT_IDL
+	detection; fix failure flag.
+
+1998-10-12  Martin Baulig  <martin@home-of-linux.org>
+
+	* compiler-flags.m4 (warnCFLAGS): Added `-Wno-unused'.
+
+1998-10-11  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4 (libgtop_postinstall): Use `:' instead
+	of the empty string if there is nothing to do since the empty string
+	is no valid shell sytax.
+
+1998-10-11  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* gnome-guile-checks.m4: Check for "guile-config" and then for
+	"build-guile", if guile-config couldn't be found.  Do not
+	explicitely include output from "info libdir", it is already
+	included in "link".  Use "compile" instead of "info includedir".  Do
+	not include "1.2" in error message when Guile can't be found at
+	all.
+	
+1998-10-11  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Added optional
+	third parameter which is the `script-if-enabled' parameter of
+	the GNOME_LIBGTOP_HOOOK.
+
+1998-10-05  Karl Eichwalder <ke@suse.de>
+
+	* gnome-xml-check.m4: Fix typo while signaling the error.
+
+1998-10-05  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* compiler-flags.m4 (warnCFLAGS): Remove `-W'.
+	(warn-unused): Remove.
+
+1998-10-01  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4 (libgtop_postinstall): 
+	Added `AC_SUBST(libgtop_postinstall)'. This is used in
+	`src/daemon/Makefile.am' to make the server suid root or
+	sgid kmem if required.
+
+1998-09-28  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: Make it accept libgtop >= 0.25.0 again.
+
+	* gnome-libgtop-sysdeps.m4: Make the default not to build the
+	LibGTop examples.
+
+	* compiler-flags.m4 (--enable-warn-unused): New configure parameter
+	to add `-Wunused' to the warning flags.
+	
+1998-09-27  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: Make it require libgtop >= 0.26.2.
+
+1998-09-24  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-ghttp-check.m4: Add checks for -lsocket -lnsl.
+
+1998-09-18  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4: Remove commented out code.
+
+1998-09-12  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4: Added (AC_SUBST): `libgtop_have_sysinfo'.
+
+1998-09-09  Martin Baulig  <baulig@merkur.uni-trier.de>
+
+	* gnome-libgtop-sysdeps.m4: Added check for SMP support.
+	(--with-libgtop-smp): New parameter, default is to enable
+	it only if you're running configure on a SMP system.
+	Added (AC_DEFINE): `HAVE_LIBGTOP_SMP' if enabled.
+	(LIBGTOP_SMP): New automake conditional.
+
+1998-09-02  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4: Remove check for `canonicalize_file_name'.
+
+1998-09-02  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-support.m4: Check for canonicalize_file_name () and
+ 	realpath () and add `canonicalize.o' to LIBOBJS if required.
+
+1998-08-30  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: Added (AC_SUBST): `LIBGTOP_VERSION_CODE'.
+	Added (AC_DEFINE_UNQUOTED): `LIBGTOP_VERSION', `LIBGTOP_VERSION_CODE',
+	`LIBGTOP_{MAJOR,MINOR,MICRO,SERVER}_VERSION'.
+
+1998-08-29  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: Make it require libgtop >= 0.26.0.
+	Added (AC_SUBST): `LIBGTOP_INTERFACE_AGE' and `LIBGTOP_BINARY_AGE'.
+
+1998-08-27  Christopher Blizzard  <blizzard@appliedtheory.com>
+
+	* gnome-ghttp-check.m4: Umm...I think this works better.  Doesn't
+ 	break anything anyway.
+	Oooo...it actually works now.  Forgot a ,
+
+1998-08-26  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Make it work
+	with a brain-dead /bin/sh and a brain-dead /bin/test.
+	
+	* gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Use `AC_MSG_WARN'
+	if LibGTop cannot be found and the `fail' argument is not given.
+
+1998-08-24  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-support.m4 (GCC_NEED_DECLARATIONS): Added `setreuid',
+	`setregid' and `getpagesize'.
+	(AC_TYPE_UID_T): New check.
+
+1998-08-24  Christopher Blizzard  <blizzard@appliedtheory.com>
+
+	* Makefile.am (MACROS): Add gnome-ghttp-check.m4 to the Makefile.
+
+1998-08-23  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): You can give
+	this macro two parameters: the required version number and
+	an optional `fail' argument to make it fail if LibGTop is
+	not found.
+
+1998-08-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-guile-checks.m4: Added check for `-lnsl' and `-lsocket'
+	if `build-guile' cannot be found.
+
+1998-08-20  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* compiler-flags.m4: New file.  Defines the
+	GNOME_COMPILER_WARNINGS macro.
+	* autogen.sh (conf_flags): Add `--enable-compile-warnings' to list
+	of flags passed to `configure'.
+	* Makefile.am (MACROS): Add compiler-flags.m4.
+
+1998-08-18  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: make it require libgtop >= 0.25.0.
+	Added (AC_SUBST): `LIBGTOP_MICRO_VERSION' and `LIBGTOP_EXTRA_LIBS'.
+	
+1998-08-17  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: Completely rewrote this file. It
+	uses now the `libgtop-config' script and also checks for
+	correct libgtop version.
+
+1998-08-06  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4: Added `freebsd' directory.
+
+1998-08-04  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-x-checks.m4: Define USE_DEVGTK unconditionally to `true'.
+
+1998-08-04  Stuart Parmenter  <pavlov@innerx.net>
+
+	* gnome-x-checks.m4: (AM_PATH_GTK) make it require GTK >= 1.1.1
+	dnl'd the dev_gtk since they will have to anyways.
+
+1998-08-04  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+	* gnome.m4: (GNOME_INIT_HOOK): Call $1 also, if `gnome-config' is
+	found and used
+
+1998-08-02  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome.m4 (GNOME_CONFIG): Use the `gnome-config' program if it
+	exists. 
+
+1998-08-01  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* Makefile.am (EXTRA_DIST): Remove `macros.dep'.
+
+1998-07-30  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4 (GNOME_LIBGTOP_TYPES): New macro.
+	Checks for `u_int64_t' and `int64_t'.
+
+1998-07-29  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: Added (AC_SUBST):
+	`LIBGTOP_NAMES_LIBS', `LIBGTOP_NAMES_INCS',
+	`LIBGTOP_GUILE_LIBS', `LIBGTOP_GUILE_NAMES_LIBS',
+	`LIBGTOP_MAJOR_VERSION', `LIBGTOP_MINOR_VERSION',
+	`LIBGTOP_VERSION'.
+
+	* gnome-libgtop-sysdeps.m4 (libgtop_sysdeps_dir):
+	Added `AC_SUBST(libgtop_sysdeps_dir)'.
+
+1998-07-29  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4: Check for functions that `error.c' looks for.
+
+1998-07-29  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-fileutils.m4 (AM_FUNC_ERROR_AT_LINE): Removed.
+
+	* gnome-support.m4 (AM_FUNC_ERROR_AT_LINE): New check.
+
+1998-07-27  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gnome-x-checks.m4: Changed Gtk version test to use
+	GTK_HAVE_FEATURES_1_1_0.
+
+Sun Jul 26 13:59:53 EDT 1998  Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* Makefile.am (MACROS): Added gnome-xml-check.m4
+	* gnome-xml-check.m4: New file.
+
+1998-07-24  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4: No longer requiring
+	`GNOME_LIBGTOP_SYSDEPS'.
+
+Fri Jul 24 00:45:38 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.am (MACROS): Added linger.m4.
+	* linger.m4: New file.
+
+Thu Jul 23 22:41:23 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.am (MACROS): Added gnome-undelfs.m4, gnome-vfs.m4.
+	* gnome-undelfs.m4: New file.
+	* gnome-vfs.m4: New file.
+
+1998-07-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-fileutils.m4: Added some reasonable defaults to allow
+	cross compiling; removed `mountlist.o' and `fsusage.o' from
+	LIBOBJS.
+
+Tue Jul 21 23:44:53 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome-guile-checks.m4: If no build-guile, link against readline
+	before termcap.
+
+1998-07-15  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* Makefile.am (MACROS): Add `need-declaration.m4'.
+
+	* gnome-support.m4 (AC_REPLACE_FUNCS): Add memmove, strtod,
+	strtol, strtoul.
+	(GCC_NEED_DECLARATIONS): New check.  Check whether `gethostname'
+	needs to be declared.
+
+	* need-declaration.m4: New file.  Stolen from EGCS.
+
+1998-07-13  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4 (AC_REPLACE_FUNCS): Add check for `mkstemp'.
+
+Wed Jul  1 13:50:39 1998  Scott D. Heavner  <sdh@po.cwru.edu>
+
+	* curses.m4: add some docs and start using with tcd
+
+1998-06-29  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* Makefile.am (MACROS): Add all the `.m4' files here.
+
+Mon Jun 29 11:12:04 1998  Scott D. Heavner  <sdh@po.cwru.edu>
+
+	* curses.m4: Need AC_SUBST(CURSES_INCLUDEDIR) not CURSES_INCLUDES
+
+Mon Jun 29 10:35:22 1998  Scott D. Heavner  <sdh@po.cwru.edu>
+
+	* curses.m4: rm conftext* should read rm conftest*, was leaving 
+	conftest.c files around.
+
+1998-06-27  Christopher Blizzard  <blizzard@foo.appliedtheory.com>
+
+	* gnome-objc-checks.m4: Use egcs if it's available.  The gcc that
+	ships with RedHat 5.1 doesn't do objc, egcs does.
+
+Fri Jun 26 14:36:08 1998  Scott D. Heavner  <sdh@po.cwru.edu>
+
+	* curses.m4 (AC_CHECK_CURSES): New check. mangled out of mc's
+	configure.in 
+
+1998-06-24  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-fileutils.m4 (AM_FUNC_ERROR_AT_LINE): New check.
+	(vprintf): New check.
+	(ftruncate.c): Remove check.  
+	This needs to be further cleaned up to only list what is
+	needed for gdiskfree.
+	* Makefile.am (MACROS): Add gnome-fileutils.m4.
+	
+1998-06-14  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4 (LINUX_TABLE): New automake conditional;
+	also defines HAVE_LINUX_TABLE.
+
+1998-06-13  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4: Added check for the table ()
+	system call in the linux kernel.
+
+1998-06-11  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-x-checks.m4 (USE_DEVGTK): Use AC_EGREP_CPP rather than
+	AC_CHECK_HEADER.  AC_CHECK_HEADER is fooled by warnings.
+
+	* gnome-support.m4 (AC_PROG_AWK): Look for awk.
+	(CROSS_COMPILING): Remove conditional.
+	
+Wed Jun 10 14:19:39 EDT 1998 Gregory McLean <gregm@comstar.net>
+
+	* gnome-x-checks.m4: More tweeks to make building against gtk 1.0
+	  and gtk1.1 less painful.
+
+1998-06-08  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-support.m4 (CROSS_COMPILING): New automake conditional;
+	(need_gnome_support): added `AC_SUBST(need_gnome_support)'.
+
+1998-06-07  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-guile-checks.m4 (GNOME_CHECK_GUILE): When
+	cross-compiling, we now check for `$host_alias-buile-guile'.
+
+1998-06-03  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-guile-checks.m4 (GNOME_CHECK_GUILE): Looks also
+	in $GNOME_LIBDIR; added failflag: GNOME_CHECK_GUILE(fail)
+	will abort if guile cannot be found.
+
+1998-05-23  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4 (GNOME_LIBGTOP_HOOK):
+	(libgtop_use_machine_h): Set this to true on SunOS.
+
+1998-05-22  Martin Baulig  <baulig@merkur.uni-trier.de>
+
+	* gnome-fileutils.m4 (GNOME_FILEUTILS_CHECKS): New file.
+	Imported from `configure.in' in GNU fileutils 3.16. It does
+	all the checks that are needed for the diskusage applet.
+
+1998-05-22  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-check.m4 (GNOME_LIBGTOP_HOOK): New file.
+	Checks whether libgtop is installed and reads its `libgtopConf.sh'
+	file if it can be found. Defines HAVE_LIBGTOP on success and
+	provides HAVE_LIBGTOP automake conditional.
+
+1998-05-21  Martin Baulig  <martin@home-of-linux.org>
+
+	* gnome-libgtop-sysdeps.m4 (GNOME_LIBGTOP_SYSDEPS): New file.
+	(libgtop_sysdeps_dir): sysdeps directory libgtop uses.
+	(libgtop_use_machine_h): define HAVE_GLIBTOP_MACHINE_H if this
+	is `yes'.
+	(libgtop_need_server): we only need the libgtop server, when
+	this has a value of `yes'. Defines NEED_LIBGTOP and NEED_LIBGTOP
+	automake conditional.
+
+1998-05-19  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4 (strerror): New check.
+	(sys_errlist): Check for this variable, needed for `strerror'.
+	(program_invocation_name, program_invocation_short_name): Change
+	method used to check for these.
+
+1998-05-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* autogen.sh: Remove simple-minded check for `gtk+'.
+
+Fri Apr 24 16:43:38 1998  Owen Taylor  <otaylor@gtk.org>
+
+	* autogen.sh: Pass the results of the environment variable
+	ACLOCAL_FLAGS to aclocal. This allows, for instance,
+
+	 ACLOCAL_FLAGS="-I /home/owen/share/aclocal/" autogen.sh
+	
+Sun Apr 19 01:35:53 EDT 1998 Gregory McLean <gregm@comstar.net>
+
+        * gnome-x-checks.m4: Updated the gtk check to check for 1.0.0.
+
+1998-04-08  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* autogen.sh: Update to list newer versions of packages.
+	* gnome-support.m4: Add `scandir' to AC_REPLACE_FUNCS.
+	Also run AC_HEADER_DIRENT.
+
+1998-03-31  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4 (AC_REPLACE_FUNCS): Look for vasprintf.
+
+Thu Mar 19 23:23:30 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome.m4: An empty true branch of an `if' statement is not valid
+	sh syntax.  If GNOME_INIT_HOOK argument $1 is empty, use ":"
+	instead.
+
+1998-03-19  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gnome.m4 (GNOME_INIT_HOOK): Provide a way to hook some code to
+	execute;  Accept a probe mode.
+	
+	(GNOME_INIT): Define in terms of GNOME_INIT_HOOK.
+
+Thu Mar 19 00:17:46 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome-support.m4: Cache results of check for
+	program_invocation_short_name, program_invocation_name.  Check to
+	make sure argp functions are in a library.
+
+	* gnome-support.m4: Cache results of argp check.
+
+Sun Mar 15 15:54:43 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gnome-x-checks.m4: Replaced checks for X and GTK
+	with AM_PATH_GTK. x_include, X_LIBS, etc, variables no longer
+	defined.
+
+1998-03-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4: Add a check for <linewrap.h> -- this enables
+	some optimizations when compiling `argp'.
+
+Mon Mar  9 19:32:42 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome-support.m4: Build vsnprintf.o, not vsnprint.o.
+
+1998-03-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4: Add check for `vsnprintf'.
+
+Sun Mar  8 17:04:28 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome-support.m4: Set need_gnome_support shell variable.  Define
+	BUILD_GNOME_SUPPORT automake conditional.  Define LTLIBOBJS.  Look
+	for argp_domain element in struct argp.
+
+Sat Mar  7 00:04:22 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome-support.m4 (GNOME_SUPPORT_CHECKS): Add argp-pvh.o to
+	LIBOBJS.
+
+	* gnome-support.m4 (GNOME_SUPPORT_CHECKS): Check for strnlen().
+
+Wed Mar  4 01:02:55 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome-support.m4 (GNOME_SUPPORT_CHECKS): Check for argp code,
+	strndup, program_invocation_name, program_invocation_short_name.
+
+Mon Mar  2 15:27:44 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome-x-checks.m4 (GNOME_X_CHECKS): Also check for SMlib.h; some
+	Solaris systems have -lSM but not SMlib.h.
+
+Sun Mar  1 17:49:42 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome.m4 (GNOME_INIT): Changed spacing so --help output looks
+	right.
+
+Fri Feb 27 10:05:34 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* gnome-objc-checks.m4 (GNOME_CHECK_OBJC): Set OBJECTIVE_C shell
+	variable.
+
+1998-02-26  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-x-checks.m4 (CPPFLAGS): Put $X_CFLAGS here, not in
+	$CFLAGS. 
+	(GNOME_HAVE_SM): New var.  `true' if we have libSM, `false'
+	otherwise. 
+
+1998-02-19  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome.m4: Remove `GNOME_CHECK_GNOME'.
+
+1998-02-18  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4 (GNOME_SUPPORT_CHECKS): Replace `strcasecmp' if
+	necessary. 
+
+1998-02-15  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* Makefile.am (MACROS): Add `gnome-pthread-check.m4'.
+	* gnome-pthread-check.m4: New file.  Moved pthread check from
+	gnome-x-checks.m4 to here.
+	* gnome-objc-checks.m4: Use `gnome-pthread-check'.
+	(OBJC_LIBS): New config var.
+	* gnome-x-checks.m4: Add `AC_DEFINE(HAVE_LIBSM)' if `-lSM' is
+	already part of `$x_libs'.
+	Move pthread check to new file.
+	
+Sat Feb 14 12:45:35 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.am (macros.dep): Use single quotes, not double quotes.
+	Otherwise bash will interpret `$(...)' incorrectly.
+	(EXTRA_DIST): Include macros.dep in distribution.
+
+1998-02-14  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* Makefile.am (macros.dep): Put back doubled `$'.  We want the
+	expansion to occur in the including Makefile, not here.
+	Otherwise, there will be an extra `../' in the rule.
+
+Sat Feb 14 17:41:28 KST 1998  Changwoo Ryu  <cwryu@adam.kaist.ac.kr>
+
+	* autogen.sh: multilple aclocal -I directories.
+
+Sat Feb 14 01:09:37 1998  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.am (macros.dep): Removed extra `$' from rule.
+
+	* gnome-x-checks.m4: Only check for -lSM if not already in
+	x_libs.
+
+1998-02-13  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* Makefile.am (EXTRA_DIST): Add `autogen.sh'.
+
+	* gnome-objc-checks.m4 (GNOME_INIT_OBJC): Solaris /bin/sh doesn't
+	understand `test -e'.
+
+	* autogen.sh: New file.
+
+	* gnome.m4 (GNOME_INIT): Look for gnomeConf.sh in $libdir, where
+	the installation actually installs it.
+
+	* Makefile.am (macros.dep): New maintainer rule for handling
+	automatic rebuilding of aclocal.m4 if any of the macros change.
+	(MACROS): New variable.  List of all `m4' macros in this
+	directory.
+
+1998-02-12  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome-support.m4: New file.  Defines GNOME_SUPPORT_CHECKS for
+	libsupport.a support.
+
+1998-02-10  Raja R Harinath  <harinath@cs.umn.edu>
+
+	* gnome.m4: New file.  Moved AC_CHECK_GNOME from `configure.in' to
+	here, and renamed macro to GNOME_CHECK_GNOME.
+	* gnome-x-checks.m4: Likewise, move and renaming AC_GNOME_X_CHECKS 
+	to GNOME_X_CHECKS.
+	
+	* aclocal-include.m4: New file.  Defines AM_ACLOCAL_INCLUDE macro
+	to provide extra search directories to `aclocal'.
+
+*Local Variables:
+*backup-inhibited: t
+*End:
diff --git a/macros/gnome-support.m4 b/macros/gnome-support.m4
new file mode 100644
index 00000000..bfdad36e
--- /dev/null
+++ b/macros/gnome-support.m4
@@ -0,0 +1,63 @@
+dnl GNOME_SUPPORT_CHECKS
+dnl    Check for various support functions needed by the standard
+dnl    Gnome libraries.  Sets LIBOBJS, might define some macros.
+dnl    This should only be used when building the Gnome libs; 
+dnl    Gnome clients should not need this macro.
+AC_DEFUN([GNOME_SUPPORT_CHECKS],[
+  # we need an `awk' to build `gnomesupport.h'
+  AC_REQUIRE([AC_PROG_AWK])
+
+  # this should go away soon
+  need_gnome_support=yes
+
+  save_LIBOBJS="$LIBOBJS"
+  LIBOBJS=
+
+  AC_CHECK_FUNCS(getopt_long,,LIBOBJS="$LIBOBJS getopt.o getopt1.o")
+
+  # for `scandir'
+  AC_HEADER_DIRENT
+
+  # copied from `configure.in' of `libiberty'
+  vars="program_invocation_short_name program_invocation_name sys_errlist"
+  for v in $vars; do
+    AC_MSG_CHECKING([for $v])
+    AC_CACHE_VAL(gnome_cv_var_$v,
+      [AC_TRY_LINK([int *p;], [extern int $v; p = &$v;],
+		   [eval "gnome_cv_var_$v=yes"],
+		   [eval "gnome_cv_var_$v=no"])])
+    if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then
+      AC_MSG_RESULT(yes)
+      n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+      AC_DEFINE_UNQUOTED($n)
+    else
+      AC_MSG_RESULT(no)
+    fi
+  done
+
+  AC_REPLACE_FUNCS(memmove mkstemp scandir strcasecmp strerror strndup strnlen)
+  AC_REPLACE_FUNCS(strtok_r strtod strtol strtoul vasprintf vsnprintf)
+
+  AC_CHECK_FUNCS(realpath,,LIBOBJS="$LIBOBJS canonicalize.o")
+
+  # to include `error.c' error.c has some HAVE_* checks
+  AC_CHECK_FUNCS(vprintf doprnt strerror_r)
+  AM_FUNC_ERROR_AT_LINE
+
+  # This is required if we declare setreuid () and setregid ().
+  AC_TYPE_UID_T
+
+  # see if we need to declare some functions.  Solaris is notorious for
+  # putting functions into the `libc' but not listing them in the headers
+  AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h)
+  GCC_NEED_DECLARATIONS(gethostname setreuid setregid getpagesize)
+
+  # Turn our LIBOBJS into libtool objects.  This is gross, but it
+  # requires changes to autoconf before it goes away.
+  LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
+  AC_SUBST(need_gnome_support)
+  AC_SUBST(LTLIBOBJS)
+
+  LIBOBJS="$save_LIBOBJS"
+  AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
+])
diff --git a/macros/gnome.m4 b/macros/gnome.m4
new file mode 100644
index 00000000..c1c98491
--- /dev/null
+++ b/macros/gnome.m4
@@ -0,0 +1,102 @@
+dnl
+dnl GNOME_INIT_HOOK (script-if-gnome-enabled, failflag)
+dnl
+dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh
+dnl is not found. 
+dnl
+
+AC_DEFUN([GNOME_INIT_HOOK],
+[	
+	AC_SUBST(GNOME_LIBS)
+	AC_SUBST(GNOMEUI_LIBS)
+	AC_SUBST(GNOMEGNORBA_LIBS)
+	AC_SUBST(GTKXMHTML_LIBS)
+	AC_SUBST(GNOME_APPLET_LIBS)
+	AC_SUBST(GNOME_LIBDIR)
+	AC_SUBST(GNOME_INCLUDEDIR)
+
+	AC_ARG_WITH(gnome-includes,
+	[  --with-gnome-includes   Specify location of GNOME headers],[
+	CFLAGS="$CFLAGS -I$withval"
+	])
+	
+	AC_ARG_WITH(gnome-libs,
+	[  --with-gnome-libs       Specify location of GNOME libs],[
+	LDFLAGS="$LDFLAGS -L$withval"
+	gnome_prefix=$withval
+	])
+
+	AC_ARG_WITH(gnome,
+	[  --with-gnome            Specify prefix for GNOME files],
+		if test x$withval = xyes; then
+	    		want_gnome=yes
+	    		dnl Note that an empty true branch is not
+			dnl valid sh syntax.
+	    		ifelse([$1], [], :, [$1])
+        	else
+	    		if test "x$withval" = xno; then
+	        		want_gnome=no
+	    		else
+	        		want_gnome=yes
+	    			LDFLAGS="$LDFLAGS -L$withval/lib"
+	    			CFLAGS="$CFLAGS -I$withval/include"
+	    			gnome_prefix=$withval/lib
+	    		fi
+  		fi,
+		want_gnome=yes)
+
+	if test "x$want_gnome" = xyes; then
+
+	    AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
+	    if test "$GNOME_CONFIG" = "no"; then
+	      no_gnome_config="yes"
+	    else
+	      AC_MSG_CHECKING(if $GNOME_CONFIG works)
+	      if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
+	        AC_MSG_RESULT(yes)
+	        GNOME_GNORBA_HOOK([],$2)
+	        GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
+	        GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
+	        GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"
+	        GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`"
+	        GNOME_APPLET_LIBS="`$GNOME_CONFIG --libs-only-l applets`"
+	        GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
+	        GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
+                $1
+	      else
+	        AC_MSG_RESULT(no)
+	        no_gnome_config="yes"
+              fi
+            fi
+
+	    if test x$exec_prefix = xNONE; then
+	        if test x$prefix = xNONE; then
+		    gnome_prefix=$ac_default_prefix/lib
+	        else
+ 		    gnome_prefix=$prefix/lib
+	        fi
+	    else
+	        gnome_prefix=`eval echo \`echo $libdir\``
+	    fi
+	
+	    if test "$no_gnome_config" = "yes"; then
+              AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
+	      if test -f $gnome_prefix/gnomeConf.sh; then
+	        AC_MSG_RESULT(found)
+	        echo "loading gnome configuration from" \
+		     "$gnome_prefix/gnomeConf.sh"
+	        . $gnome_prefix/gnomeConf.sh
+	        $1
+	      else
+	        AC_MSG_RESULT(not found)
+ 	        if test x$2 = xfail; then
+	          AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
+ 	        fi
+	      fi
+            fi
+	fi
+])
+
+AC_DEFUN([GNOME_INIT],[
+	GNOME_INIT_HOOK([],fail)
+])