From c1ed34d39740625d52eca7f2c5bf5c6797f28097 Mon Sep 17 00:00:00 2001 From: Søren Sandmann Pedersen Date: Wed, 22 Jun 2005 22:46:38 +0000 Subject: Apply these patches from Theo van Klaveren: lib-dmx.patch lib-FS.patch lib-X11.patch lib-XRes.patch lib-XScrnSaver.patch lib-xtrans.patch to make the libraries distcheck. --- ChangeLog | 7 +++++++ configure.ac | 3 +++ src/Makefile.am | 4 +++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 16828ad..d367cc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-22 Theo van Klaveren + + Fix make distcheck. + + * configure.ac: Also subst RESOURCEEXT_LIBS and XRES_LIBS. + * src/Makefile.am: Add missing CFLAGS substitution. + 2004-05-10 Eric Anholt * Makefile.am: diff --git a/configure.ac b/configure.ac index 5f9ab54..dea5de8 100644 --- a/configure.ac +++ b/configure.ac @@ -44,6 +44,8 @@ AC_PROG_LIBTOOL # get modules PKG_CHECK_MODULES(XRES, x11 xext) +AC_SUBST(XRES_LIBS) + # Check xres configuration, strip extra digits from package version to # find the required protocol version @@ -51,6 +53,7 @@ RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`] PKG_CHECK_MODULES(RESOURCEEXT, resourceproto >= $RES_VERSION) AC_SUBST(RESOURCEEXT_CFLAGS) +AC_SUBST(RESOURCEEXT_LIBS) if test "x$GCC" = "xyes"; then GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \ diff --git a/src/Makefile.am b/src/Makefile.am index f06d3df..3153d52 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,9 @@ lib_LTLIBRARIES = libXRes.la libXRes_la_SOURCES = \ XRes.c -libXRes_la_LIBADD = @RESOURCE_EXT_LIBS@ @XRES_LIBS@ +libXRes_la_LIBADD = @RESOURCEEXT_LIBS@ @XRES_LIBS@ + +libXRes_la_CFLAGS = @RESOURCEEXT_CFLAGS@ INCLUDES = -I$(top_srcdir)/include -- cgit v1.2.3