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.
2016-01-30 11:42:39 -08:00
parent 334eeb970a
commit 00e70a5c54
4 changed files with 28 additions and 9 deletions
@@ -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)