From 9bb8ad30520e9e9d688e844e18590b371a2ac1a9 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu, 22 Jan 2009 15:40:27 -0200
Subject: Correct make distcheck and sparse warnings.

---
 configure.ac | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index dbd75ab..13fd703 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,21 +25,20 @@ AC_INIT(xlogo,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
 AM_CONFIG_HEADER(config.h)
 
 AC_PROG_CC
 AC_PROG_INSTALL
 
+XORG_CWARNFLAGS
+
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XLOGO, xaw7)
 
-if test "x$xaw_use_xprint" = "xyes" ; then
-   PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil xp)
-
-   XLOGO_CFLAGS="$XLOGO_CFLAGS $XPRINT_UTIL_CFLAGS"
-   XLOGO_LIBS="$XLOGO_LIBS $XPRINT_UTIL_LIBS"
-fi
-
 # Use render & xft2 to draw logo?
 
 AC_ARG_WITH(render, 
@@ -64,14 +63,20 @@ PKG_CHECK_MODULES(XEXT, xext)
 XLOGO_CFLAGS="$XLOGO_CFLAGS $XEXT_CFLAGS"
 XLOGO_LIBS="$XLOGO_LIBS $XEXT_LIBS"
 
+XLOGO_CFLAGS="$CWARNFLAGS $XLOGO_CFLAGS"
 AC_SUBST(XLOGO_CFLAGS)
 AC_SUBST(XLOGO_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
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile])
-- 
cgit v1.2.3