[PATCH 1/2] Split image up into its own repository
Arnaud Fontaine
arnau at debian.org
Sat Sep 4 15:40:46 PDT 2010
---
.gitmodules | 3 +
Makefile.am | 5 ++
configure.ac | 100 ++------------------------------------------
image/Makefile.am | 4 +-
image/test_bitmap.c | 4 +-
image/test_formats.c | 4 +-
image/test_swap.c | 2 +-
image/test_xcb_image.c | 2 +-
image/test_xcb_image_shm.c | 2 +-
image/xcb_image.c | 4 +-
m4 | 1 +
11 files changed, 24 insertions(+), 107 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..c8ef05b
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = image
diff --git a/configure.ac b/configure.ac
index dc3be2c..2088894 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,110 +1,18 @@
-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
-
-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
-
+XCB_UTIL_COMMON([1.4], [1.6])
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)
+PKG_CHECK_MODULES(XCB_AUX, xcb-aux)
+PKG_CHECK_MODULES(XCB_EVENT, xcb-event)
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/image/Makefile.am b/image/Makefile.am
index 2382b2f..d9ecab1 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -40,5 +40,5 @@ test_formats_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
test_formats_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
test_bitmap_SOURCES = test_bitmap.c test.xbm
-test_bitmap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS)
-test_bitmap_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS)
+test_bitmap_CPPFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_AUX_CFLAGS) $(XCB_EVENT_CFLAGS)
+test_bitmap_LDADD = $(XCB_LIBS) $(XCB_AUX_LIBS) $(XCB_IMAGE_LIBS) $(XCB_EVENT_LIBS)
diff --git a/image/test_bitmap.c b/image/test_bitmap.c
index 3464743..c999b22 100644
--- a/image/test_bitmap.c
+++ b/image/test_bitmap.c
@@ -32,8 +32,8 @@
#include <string.h>
#include <assert.h>
#include <xcb/xcb.h>
-#include "../aux/xcb_aux.h"
-#include "../event/xcb_event.h"
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_event.h>
#include "xcb_image.h"
#include "test.xbm"
diff --git a/image/test_formats.c b/image/test_formats.c
index be3b217..4becc6c 100644
--- a/image/test_formats.c
+++ b/image/test_formats.c
@@ -30,8 +30,8 @@
#include <stdlib.h>
#include <string.h>
#include <xcb/xcb.h>
-#include "../aux/xcb_aux.h"
-#include "../aux/xcb_bitops.h"
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_bitops.h>
#include "xcb_image.h"
#define WIDTH 50
diff --git a/image/test_swap.c b/image/test_swap.c
index becf26b..a34e23e 100644
--- a/image/test_swap.c
+++ b/image/test_swap.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <assert.h>
#include <xcb/xcb.h>
-#include "../aux/xcb_aux.h"
+#include <xcb/xcb_aux.h>
#include "xcb_image.h"
xcb_image_format_t formats[] = {
diff --git a/image/test_xcb_image.c b/image/test_xcb_image.c
index ec1c924..30b61ff 100644
--- a/image/test_xcb_image.c
+++ b/image/test_xcb_image.c
@@ -33,7 +33,7 @@
#include <xcb/xcb.h>
-#include "../aux/xcb_aux.h"
+#include <xcb/xcb_aux.h>
#include "xcb_image.h"
#define W_W 64
diff --git a/image/test_xcb_image_shm.c b/image/test_xcb_image_shm.c
index b68d637..76f7f71 100644
--- a/image/test_xcb_image_shm.c
+++ b/image/test_xcb_image_shm.c
@@ -33,7 +33,7 @@
#include <xcb/xcb.h>
#include <xcb/shm.h>
-#include "../aux/xcb_aux.h"
+#include <xcb/xcb_aux.h>
#include "xcb_image.h"
#define W_W 40
diff --git a/image/xcb_image.c b/image/xcb_image.c
index 413bdc5..ab2d144 100644
--- a/image/xcb_image.c
+++ b/image/xcb_image.c
@@ -29,8 +29,8 @@
#include <xcb/xcb.h>
#include <xcb/shm.h>
-#include "../aux/xcb_aux.h"
-#include "../aux/xcb_bitops.h"
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_bitops.h>
#include "xcb_image.h"
#define BUILD
#include "xcb_pixel.h"
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
More information about the Xcb
mailing list