[glibmm] Do not recurse into scripts/ subdirectory

[Daniel Elstner <daniel src gnome org>]

commit bb6ee6c15569136ba878c7bd1548483ee325befc
Author: Daniel Elstner <daniel kitta gmail com>
Date:   Sun Aug 9 03:59:22 2009 +0200

    Do not recurse into scripts/ subdirectory
    
    * Makefile.am: Install scripts/glibmm_check_perl.m4 from here.
    * scripts/Makefile.am: Delete file.
    * configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile.

 ChangeLog           |    8 ++++++++
 Makefile.am         |    4 ++++
 configure.ac        |    2 --
 scripts/Makefile.am |    8 --------
 4 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ae4939e..5796f8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2009-08-09  Daniel Elstner  <danielk openismus com>
 
+	Do not recurse into scripts/ subdirectory
+
+	* Makefile.am: Install scripts/glibmm_check_perl.m4 from here.
+	* scripts/Makefile.am: Delete file.
+	* configure.ac (AC_CONFIG_FILES): Remove scripts/Makefile.
+
+2009-08-09  Daniel Elstner  <danielk openismus com>
+
 	Convert tools/ directory to new build system
 
 	* configure.ac (AC_CONFIG_FILES): Remove the output files
diff --git a/Makefile.am b/Makefile.am
index c5c771b..4ffbc21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,3 +44,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA = glib/$(GLIBMM_MODULE_NAME).pc gio/$(GIOMM_MODULE_NAME).pc
 
 dist_noinst_DATA = README.win32 COPYING.tools glib/README gio/README
+
+# TODO: Obsolete; remove after grace period.
+aclocal_macrodir = $(datadir)/aclocal
+dist_aclocal_macro_DATA = scripts/glibmm_check_perl.m4
diff --git a/configure.ac b/configure.ac
index 061514f..64fe5b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,8 +193,6 @@ AC_CONFIG_FILES([
     examples/regex/Makefile
     examples/network_io/Makefile
 
-  scripts/Makefile
-
   docs/Makefile
     docs/images/Makefile
     docs/reference/Makefile