From f8eae5e26cf2f84a9d6c20e0100bcbf761d54b34 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 20 Jul 2007 21:54:19 -0400
Subject: [PATCH] update for the new autopoint

---
 Makefile.am    |  3 +--
 m4/Makefile.am | 53 ++++++++++++++++++++++++++++++--------------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 07c7ce68..dd6d6835 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -482,8 +482,7 @@ nodist_man_MANS = \
 	doc/openbox-kde-session.1
 
 EXTRA_DIST = \
-	config.rpath \
-	mkinstalldirs
+	config.rpath
 
 # make clean doesn't delete these for some reason, even though they are
 # built by make
diff --git a/m4/Makefile.am b/m4/Makefile.am
index c0d2a5b6..da7255eb 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,22 +1,33 @@
 EXTRA_DIST=\
-  codeset.m4 \
-  gettext.m4 \
-  glibc21.m4 \
-  iconv.m4 \
-  intdiv0.m4 \
-  inttypes-pri.m4 \
-  inttypes.m4 \
-  inttypes_h.m4 \
-  isc-posix.m4 \
-  lcmessage.m4 \
-  lib-ld.m4 \
-  lib-link.m4 \
-  lib-prefix.m4 \
-  progtest.m4 \
-  stdint_h.m4 \
-  uintmax_t.m4 \
-  ulonglong.m4 \
-  nls.m4 \
-  po.m4 \
-  openbox.m4 \
-  x11.m4
+	codeset.m4 \
+	gettext.m4 \
+	glibc21.m4 \
+	glibc2.m4 \
+	iconv.m4 \
+	intdiv0.m4 \
+	intmax.m4 \
+	inttypes_h.m4 \
+	inttypes-h.m4 \
+	inttypes-pri.m4 \
+	lcmessage.m4 \
+	lib-ld.m4 \
+	lib-link.m4 \
+	lib-prefix.m4 \
+	lock.m4 \
+	longdouble.m4 \
+	longlong.m4 \
+	nls.m4 \
+	openbox.m4 \
+	po.m4 \
+	printf-posix.m4 \
+	progtest.m4 \
+	signed.m4 \
+	size_max.m4 \
+	stdint_h.m4 \
+	uintmax_t.m4 \
+	ulonglong.m4 \
+	visibility.m4 \
+	wchar_t.m4 \
+	wint_t.m4 \
+	x11.m4 \
+	xsize.m4