From 2a1abdc8fe640583dac90dc316caf2d40b9ee4e2 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 14 Jan 2013 15:13:52 +0100
Subject: libxtrans xwininfo libX11 libXau libXmu libXdmcp mesa mkfontscale
 xkeyboard-config git update 14 jan 2013

libxtrans: ec3136232f7ce930f9ca812b6ab42a71b60af4af
xwininfo: 3e60a26559221e561770710a8c4ed0b8ebc31afb
libX11: 3cd974b1d4d1fa6389d3695fa9fcc0c22a51d50c
libXau: 8570d287396934f26224c76d48d7f17d87380e72
libXmu: 9b253d99d5b4f3fbb681c2cb1b84f8f9acfee528
libXdmcp: ca65a92405500393f09d34388edbbf6350e6c146
mesa: e3e1ffb2520498584ef402213d0c8aa4303a46a3
mkfontscale: 1157b3039551b552b483f05f6a411e57941a87c0
---
 libXau/AuLock.c    | 3 ---
 libXau/Makefile.am | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'libXau')

diff --git a/libXau/AuLock.c b/libXau/AuLock.c
index a816b2454..7bf9e5d30 100644
--- a/libXau/AuLock.c
+++ b/libXau/AuLock.c
@@ -43,9 +43,6 @@ extern unsigned	sleep ();
 #define link rename
 #endif
 #endif
-#ifdef __UNIXOS2__
-#define link rename
-#endif
 
 int
 XauLockAuth (
diff --git a/libXau/Makefile.am b/libXau/Makefile.am
index 9e8d95b84..1049614fd 100644
--- a/libXau/Makefile.am
+++ b/libXau/Makefile.am
@@ -3,8 +3,7 @@ SUBDIRS=man
 lib_LTLIBRARIES = libXau.la
 
 AM_CFLAGS = $(XAU_CFLAGS) $(CWARNFLAGS)
-
-INCLUDES = -I${top_srcdir}/include
+AM_CPPFLAGS = -I${top_srcdir}/include
 
 libXau_la_LDFLAGS = -version-number 6:0:0 -no-undefined
 
-- 
cgit v1.2.3