[PATCH 1/2] Split up keysyms into its own repository

[Arnaud Fontaine]

---
 .gitmodules  |    3 ++
 Makefile.am  |    5 +++
 configure.ac |   99 +--------------------------------------------------------
 m4           |    1 +
 4 files changed, 11 insertions(+), 97 deletions(-)
 create mode 100644 .gitmodules
 create mode 100644 Makefile.am
 create mode 160000 m4

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..459533d
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "m4"]
+	path = m4
+	url = ../util-common-m4.git
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..6f19953
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = keysyms
diff --git a/configure.ac b/configure.ac
index dc3be2c..185729b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,110 +1,15 @@
-dnl AC_TYPE_SSIZE_T is defined from 2.59c
 AC_PREREQ(2.59c)
 AC_INIT([xcb-util],0.3.7,[xcb at lists.freedesktop.org])
 AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-AC_CHECK_PROGS(M4, [m4 gm4], [no])
-if test $M4 != "no" ; then
-	AC_MSG_CHECKING([if $M4 supports -I])
-	if $M4 -I. /dev/null > /dev/null 2>&1 ; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		# Try finding the gnu version
-		AC_CHECK_PROGS(GM4, gm4, [no])
-		if test $GM4 = "no" ; then
-			AC_PATH_PROGS(GNUM4, m4, [no], [/usr/gnu/bin])
-			M4="$GNUM4"
-		else
-			M4="$GM4"
-		fi
-	fi
-fi
-if test $M4 = "no"; then
-	AC_MSG_ERROR([Can't find usable m4, please install it and try again])
-fi
-AC_CHECK_PROGS(GPERF, gperf, [no])
-if test $GPERF = "no"; then
-	AC_MSG_ERROR([Can't find gperf, please install it and try again])
-fi
-AC_PROG_CC
-AC_PROG_LIBTOOL
+XCB_UTIL_COMMON([1.4], [1.6])
 
-if  test "x$GCC" = xyes ; then
-    CWARNFLAGS="-Wall"
-else
-    AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
-    if test "x$SUNCC" = "xyes"; then
-	CWARNFLAGS="-v"
-    fi
-fi
-AC_SUBST(CWARNFLAGS)
-
-dnl Checking whether ssize_t is defined (xcb-util-common.h)
-AC_TYPE_SSIZE_T
-
-xcbincludedir='${includedir}/xcb'
-AC_SUBST(xcbincludedir)
-
-pkgconfigdir='${libdir}/pkgconfig'
-AC_SUBST(pkgconfigdir)
-
-PKG_CHECK_MODULES(XCB, xcb >= 1.2)
-
-######
-# Check version of xcb-proto that xcb was compiled against
-######
-xcbproto_required=1.5
-
-# Moved from AX_COMPARE_VERSION to maintain proper output
-AC_PROG_AWK
-
-AC_MSG_CHECKING([whether libxcb was compiled against xcb-proto >= $xcbproto_required])
-xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb`
-AX_COMPARE_VERSION([$xcbproto_version],[ge],[$xcbproto_required], xcbproto_ok="yes", xcbproto_ok="no")
-AC_MSG_RESULT([$xcbproto_ok])
-
-if test $xcbproto_ok = no; then
-	AC_MSG_ERROR([libxcb was compiled against xcb-proto $xcbproto_version; it needs to be compiled against version $xcbproto_required or higher])
-fi
-
-
-PKG_CHECK_MODULES(XCB_SHM, xcb-shm)
-PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
 PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8)
 
-XCB_AUX_CFLAGS='-I$(top_srcdir)/convenient'
-XCB_AUX_LIBS='$(top_builddir)/convenient/libxcb-aux.la'
-XCB_ATOM_CFLAGS='-I$(top_srcdir)/atom -I$(top_builddir)/atom'
-XCB_ATOM_LIBS='$(top_builddir)/atom/libxcb-atom.la'
-XCB_EVENT_CFLAGS='-I$(top_srcdir)/event'
-XCB_EVENT_LIBS='$(top_builddir)/event/libxcb-event.la'
-XCB_PROPERTY_CFLAGS='-I$(top_srcdir)/property'
-XCB_PROPERTY_LIBS='$(top_builddir)/property/libxcb-property.la'
-XCB_ICCCM_CFLAGS='-I$(top_srcdir)/icccm'
-XCB_ICCCM_LIBS='$(top_builddir)/icccm/libxcb-icccm.la'
-AC_SUBST(XCB_AUX_CFLAGS)
-AC_SUBST(XCB_AUX_LIBS)
-AC_SUBST(XCB_ATOM_CFLAGS)
-AC_SUBST(XCB_ATOM_LIBS)
-AC_SUBST(XCB_EVENT_CFLAGS)
-AC_SUBST(XCB_EVENT_LIBS)
-AC_SUBST(XCB_PROPERTY_CFLAGS)
-AC_SUBST(XCB_PROPERTY_LIBS)
-AC_SUBST(XCB_ICCCM_CFLAGS)
-AC_SUBST(XCB_ICCCM_LIBS)
-
 AC_OUTPUT([Makefile
-	convenient/Makefile convenient/xcb-aux.pc
-	reply/Makefile reply/xcb-reply.pc
-	image/Makefile image/xcb-image.pc
-	atom/Makefile atom/xcb-atom.pc
-	event/Makefile event/xcb-event.pc
 	keysyms/Makefile keysyms/xcb-keysyms.pc
-	property/Makefile property/xcb-property.pc
-	icccm/Makefile icccm/xcb-icccm.pc
-	wm/Makefile wm/xcb-wm.pc
 	xcb_util_intro
 	])
diff --git a/m4 b/m4
new file mode 160000
index 0000000..55e8069
--- /dev/null
+++ b/m4
@@ -0,0 +1 @@
+Subproject commit 55e8069773efd794a91d5fb37bfceeebae2e378a
-- 
1.7.2.3


--=-=-=
Content-Type: text/x-diff
Content-Disposition: attachment; filename=0002-Bump-version-to-0.3.8.patch