[monkey-bubble: 184/753] Moved tools/ back here.

[Sven Herzberg <herzi src gnome org>]

commit 9b2c4ad180c0fc49cbb107cb1ec30d0d18c76621
Author: Martin Baulig <martin src gnome org>
Date:   Sat Apr 21 13:47:50 2001 +0000

    Moved tools/ back here.

 ChangeLog            |   10 ----------
 Makefile.am          |    2 +-
 configure.in         |   17 +++++------------
 libgnome/Makefile.am |    5 +++--
 4 files changed, 9 insertions(+), 25 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b0767b8..a433de9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-2001-04-21  Martin Baulig  <baulig suse de>
-
-	* tools/: Moved back from libgnomebase.
-
 2001-04-21  Kjartan Maraas  <kmaraas gnome org>
 
 	* configure.in: Added nn and no to ALL_LINGUAS.
@@ -24,12 +20,6 @@
 
 	* configure.in (HAVE_LIBBONOBO): #define this if we have libbonobo.
 
-2001-04-15  Martin Baulig  <baulig suse de>
-
-	* configure.in: Depend on libgnomebase, not gnome-support. Check
-	for gnome-maketypes.awk and gnome-makeenums.pl which are installed
-	by libgnomebase.
-
 2001-04-13  Martin Baulig  <baulig suse de>
 
 	NOTE: You must update your gnome-common to make this work !
diff --git a/Makefile.am b/Makefile.am
index e0527c0..faa4f0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libgnome po intl doc
+SUBDIRS = tools libgnome po intl doc
 
 EXTRA_DIST = message-of-doom
 
diff --git a/configure.in b/configure.in
index ee5c980..0ac1bfc 100644
--- a/configure.in
+++ b/configure.in
@@ -39,14 +39,11 @@ GNOME_COMPILE_WARNINGS(maximum)
 dnl Define GNOME_ENABLE_DEBUG if the --enable-debug switch was given.
 GNOME_DEBUG_CHECK
 
-AC_PATH_PROG(GNOME_MAKETYPES, gnome-maketypes.awk)
-AC_PATH_PROG(GNOME_MAKEENUMS, gnome-makeenums.pl)
-if test -z "$GNOME_MAKETYPES" || test -z "$GNOME_MAKEENUMS" ; then
-  AC_MSG_ERROR([
-*** Cannot find the gnome-maketypes.awk and gnome-makeenums.pl scripts
-*** which are installed from libgnomebase
-])
-fi
+AC_PROG_AWK
+
+dnl Don't use AC_PROG_AWK since we need the full pathname.
+AC_PATH_PROGS(AWK, mawk gawk nawk awk, )
+AC_PATH_PROGS(PERL, perl5 perl)
 
 AC_ARG_ENABLE(prefer-db1, [  --enable-prefer-db1     Prefer Berkeley DB 1.x],[prefer_db1="$enableval"],[prefer_db1=yes])
 dnl
@@ -96,10 +93,6 @@ AC_PATH_PROG(ORBIT_IDL, orbit-idl, no)
 AC_SUBST(ORBIT_CFLAGS)
 AC_SUBST(ORBIT_LIBS)
 
-GNOME_PKGCONFIG_CHECK_MODULES(LIBGNOMEBASE, libgnomebase-2.0:1.2.1)
-AC_SUBST(LIBGNOMEBASE_CFLAGS)
-AC_SUBST(LIBGNOMEBASE_LIBS)
-
 GNOME_PKGCONFIG_CHECK_MODULES(GLIB, glib-2.0:1.3.1)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index d515a5c..7767891 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -4,6 +4,9 @@
 # Targets
 #
 
+GNOME_MAKEENUMS = $(top_srcdir)/tools/gnome-makeenums.pl
+GNOME_MAKETYPES = $(top_builddir)/tools/gnome-maketypes.awk
+
 LIB_VERSION=0:0:0
 LIB_VERSION_NUM=0.0.0
 
@@ -17,7 +20,6 @@ INCLUDES = \
 	-I..					\
 	-I$(srcdir)/..				\
 	$(WARN_CFLAGS)				\
-	$(LIBGNOMEBASE_CFLAGS)			\
 	$(GLIB_CFLAGS)				\
 	$(OAF_CFLAGS)				\
 	$(GCONF_CFLAGS)				\
@@ -122,7 +124,6 @@ gnome-config.o: parse-path.cP
 
 libgnome_2_la_LDFLAGS = -version-info $(LIB_VERSION)
 libgnome_2_la_LIBADD =		\
-	$(LIBGNOMEBASE_LIBS)	\
 	$(OAF_LIBS)		\
 	$(GCONF_LIBS)		\
 	$(LIBXML_LIBS)		\