summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2012-02-27 11:04:36 -0500
committerChase Douglas <chase.douglas@canonical.com>2012-02-29 11:01:15 -0800
commitc444aebf7a56183531055767bf982f0206da3db0 (patch)
tree99c2eb073656fa0dcec6c33b31dae2156ccad133
parente19ee59526198734118a5894ef2c4cef97528064 (diff)
distcheck: cannot create directory `xorg-gtest-0.1.1': Permission denied
Use the util-macros implementation to generate the ChangeLog and the INSTALL file. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-rw-r--r--ChangeLog0
-rw-r--r--Changelog0
-rw-r--r--INSTALL0
-rw-r--r--Makefile.am6
-rw-r--r--configure.ac6
5 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/ChangeLog
+++ /dev/null
diff --git a/Changelog b/Changelog
deleted file mode 100644
index e69de29..0000000
--- a/Changelog
+++ /dev/null
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index e69de29..0000000
--- a/INSTALL
+++ /dev/null
diff --git a/Makefile.am b/Makefile.am
index a3f51a3..19598ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,11 +5,11 @@ pkgconfig_DATA = xorg-gtest.pc
ACLOCAL_AMFLAGS = -I m4
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
.PHONY: ChangeLog INSTALL
ChangeLog:
- cd ${top_srcdir} && \
- mkdir -p ${distdir} && \
- git log > ${distdir}/ChangeLog
+ $(CHANGELOG_CMD)
INSTALL:
$(INSTALL_CMD)
diff --git a/configure.ac b/configure.ac
index da94219..ae254be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,12 @@ AC_PROG_LIBTOOL
LT_INIT
+# Require X.Org macros 1.16 or later for XORG_TESTSET_CFLAG
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.16 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.16)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_PROG_CXX
AC_PROG_INSTALL