diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-22 22:46:39 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-22 22:46:39 +0000 |
| commit | b413f4c1dddc467014adf16bfe31627e65508c12 (patch) | |
| tree | 1c11b9a27cc139f3dc66b0e23bc47a9ae1ac167d | |
| parent | 57aac0006e27624a41f04c5d0c458b9f0108a084 (diff) | |
| download | xorg-lib-libxtrans-b413f4c1dddc467014adf16bfe31627e65508c12.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,11 @@ +2005-06-22 Theo van Klaveren <t.vanklaveren@student.utwente.nl> + + Fix make distcheck. + + * Makefile.am: Add xtrans.m4 to EXTRA_DIST. Revert installation + of xtrans.m4 outside of prefix. + * configure.ac: Remove check for aclocal include dir. + 2005-06-09 Alexander Gottwald <ago@freedesktop.org> * Makefile.am: diff --git a/Makefile.am b/Makefile.am index 41e8927..8bbe84c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,10 +11,10 @@ Xtransinclude_HEADERS = \ Xtransutil.c \ transport.c -aclocaldir = @ACLOCALDIR@ +aclocaldir = $(datadir)/aclocal aclocal_DATA = xtrans.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xtrans.pc -EXTRA_DIST = xtrans.pc.in +EXTRA_DIST = xtrans.pc.in ${aclocal_DATA} diff --git a/configure.ac b/configure.ac index 37d351f..d48834b 100644 --- a/configure.ac +++ b/configure.ac @@ -37,10 +37,6 @@ AC_CHECK_FUNC(fchown, [fchown_define="-DHAS_FCHOWN"], [fchown_define=""]) AC_SUBST(fchown_define) -ACLOCALDIR=`aclocal --print-ac-dir` - -AC_SUBST(ACLOCALDIR) - # sticky bit # # if any system exists without sticky dir bits this |