[monkey-bubble: 140/753] Depend on libgnomebase, not gnome-support. Check for gnome-maketypes.awk

[Sven Herzberg <herzi src gnome org>]

commit c10d79d798c00dc59158e7aacc811816e0e0442e
Author: Martin Baulig <baulig suse de>
Date:   Sun Apr 15 14:23:40 2001 +0000

    Depend on libgnomebase, not gnome-support. Check for gnome-maketypes.awk
    
    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.

 ChangeLog    |    6 ++++++
 Makefile.am  |    2 +-
 configure.in |   27 ++++++++++++---------------
 3 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a287c23..6b76516 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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 faa4f0b..e0527c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = tools libgnome po intl doc
+SUBDIRS = libgnome po intl doc
 
 EXTRA_DIST = message-of-doom
 
diff --git a/configure.in b/configure.in
index 4432797..36fe922 100644
--- a/configure.in
+++ b/configure.in
@@ -39,11 +39,14 @@ GNOME_COMPILE_WARNINGS(maximum)
 dnl Define GNOME_ENABLE_DEBUG if the --enable-debug switch was given.
 GNOME_DEBUG_CHECK
 
-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_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_ARG_ENABLE(prefer-db1, [  --enable-prefer-db1     Prefer Berkeley DB 1.x],[prefer_db1="$enableval"],[prefer_db1=yes])
 dnl
@@ -93,9 +96,9 @@ AC_PATH_PROG(ORBIT_IDL, orbit-idl, no)
 AC_SUBST(ORBIT_CFLAGS)
 AC_SUBST(ORBIT_LIBS)
 
-GNOME_PKGCONFIG_CHECK_MODULES(GNOMESUPPORT, gnome-support-2.0:1.2.1)
-AC_SUBST(GNOMESUPPORT_CFLAGS)
-AC_SUBST(GNOMESUPPORT_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)
@@ -159,15 +162,9 @@ AC_OUTPUT([
 Makefile
 po/Makefile.in
 intl/Makefile
-tools/Makefile
-tools/gnome-maketypes.awk
 libgnome/Makefile
 libgnome/gnome-portability.h
 libgnome/libgnome-2.0.pc
-doc/Makefile
-],[case "$CONFIG_FILES" in
-*tools/gnome-maketypes.awk*)chmod +x tools/gnome-maketypes.awk;;
-esac]
-)
+doc/Makefile])
 
 cat $srcdir/message-of-doom