From 5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 10 Apr 2012 14:58:33 +0200
Subject: Updated following packages:

bigreqsproto-1.1.2
fontsproto-2.1.2
recordproto-1.14.2
scrnsaverproto-1.2.2
xcmiscproto-1.2.2
libXt-1.1.3
xhost-1.0.5
kbproto-1.0.6
libXrender-0.9.7
libxkbfile-1.0.8
freetype-2.4.9
libXaw-1.0.10
libXpm-3.5.10
xproto-7.0.23
---
 apps/xhost/configure.ac | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'apps/xhost/configure.ac')

diff --git a/apps/xhost/configure.ac b/apps/xhost/configure.ac
index 9d70b8c60..1b069e8c3 100644
--- a/apps/xhost/configure.ac
+++ b/apps/xhost/configure.ac
@@ -1,8 +1,13 @@
-# $XdotOrg: app/xhost/configure.ac,v 1.10 2005/12/15 00:24:07 kem Exp $
+dnl Process this file with autoconf to create configure.
 
+# Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([xhost], [1.0.4],
+AC_INIT([xhost], [1.0.5],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xhost])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
@@ -10,15 +15,15 @@ AM_MAINTAINER_MODE
 m4_ifndef([XORG_MACROS_VERSION],
 	  [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
 XORG_MACROS_VERSION(1.8)
-
-AM_CONFIG_HEADER(config.h)
+XORG_DEFAULT_OPTIONS
 
 AC_TYPE_SIGNAL
 
-XORG_DEFAULT_OPTIONS
-
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XHOST, x11 xmuu xau)
+# - Both CFLAGS & LIBS needed:
+PKG_CHECK_MODULES(XHOST, x11 xmuu)
+# - Only CFLAGS needed, not libs:
+PKG_CHECK_MODULES(XAU, xau)
 
 # Transport selection macro from xtrans.m4
 XTRANS_CONNECTION_FLAGS
@@ -26,4 +31,7 @@ XTRANS_CONNECTION_FLAGS
 # Secure RPC detection macro from xtrans.m4
 XTRANS_SECURE_RPC_FLAGS
 
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([
+	Makefile
+	man/Makefile])
+AC_OUTPUT
-- 
cgit v1.2.3