From bb19bb3d1dd5bb9c0070f867324f740894c76887 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Mon, 12 Jan 2009 20:33:01 -0200
Subject: Correct problems in make distcheck.

---
 .gitignore   | 5 +++++
 Makefile.am  | 2 ++
 configure.ac | 6 +++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6ae1380..5a2f6ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,8 @@ stamp-h1
 xedit
 xedit.1
 *~
+*.a
+*.o
+xedit-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 24aabef..ee22432 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -163,6 +163,8 @@ lisp_re_tests_SOURCES = lisp/re/tests.c
 
 # App default files
 
+DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
+
 appdefaultdir = @appdefaultdir@
 appdefault_DATA = \
         app-defaults/Xedit-color \
diff --git a/configure.ac b/configure.ac
index cd74d5e..b756fde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,7 +70,11 @@ AC_SUBST(PKGDEPS_CFLAGS)
 AC_SUBST(PKGDEPS_LIBS)
 
 PKG_CHECK_MODULES(APPDEFS, xt)
-appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
+AC_ARG_WITH(appdefaultdir,
+	AC_HELP_STRING([--with-appdefaultdir=<pathname>],
+	  [specify directory for app-defaults files (default is autodetected)]),
+	[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
 AC_SUBST(appdefaultdir)
 
 XORG_MANPAGE_SECTIONS
-- 
cgit v1.2.3