From 00e70a5c5450579145ef077340d8148a1ba3338c Mon Sep 17 00:00:00 2001
From: Pavel Roskin <plroskin@gmail.com>
Date: Sat, 30 Jan 2016 11:42:39 -0800
Subject: Use standard autotools means to detect X11

Use AC_PATH_XTRA to search for X11 in configure.ac. In Makefiles, add
X_CFLAGS to AM_CFLAGS for the source compilation. Add X_LIBS to LDFLAGS.
Add X_PRE_LIBS and X_EXTRA_LIBS to LDADD.

With this patch, X Windows system is correctly detected on Mac OS X.
---
 genkeymap/Makefile.am | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'genkeymap')

diff --git a/genkeymap/Makefile.am b/genkeymap/Makefile.am
index aed72512..25767395 100644
--- a/genkeymap/Makefile.am
+++ b/genkeymap/Makefile.am
@@ -1,9 +1,12 @@
+AM_CFLAGS = $(X_CFLAGS)
 
 bin_PROGRAMS = \
   xrdp-genkeymap
 
 xrdp_genkeymap_SOURCES = genkeymap.c evdev-map.c
 
+xrdp_genkeymap_LDFLAGS = \
+  $(X_LIBS)
+
 xrdp_genkeymap_LDADD = \
-  -L/usr/X11R6/lib \
-  -lX11
+  $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)
-- 
cgit v1.2.1