use pkg-config to find xrdp headers

neutrinolabs · Nov 17, 2016 · f2ebbad · f2ebbad
1 parent c424f7c
commit f2ebbad
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/configure.ac b/configure.ac
@@ -15,6 +15,12 @@ PKG_CHECK_MODULES([XORG_SERVER], [xorg-server >= 0], [],
 AC_SUBST([XORG_SERVER_CFLAGS])
 AC_SUBST([XORG_SERVER_LIBS])
 
+PKG_CHECK_MODULES([XRDP], [xrdp >= 0], [],
+  [AC_MSG_ERROR([please install xrdp >= 0])])
+
+AC_SUBST([XRDP_CFLAGS])
+AC_SUBST([XRDP_LIBS])
+
 moduledir=`pkg-config xorg-server --variable=moduledir`
 AC_SUBST([moduledir])
 

diff --git a/module/Makefile.am b/module/Makefile.am
@@ -27,6 +27,7 @@ endif
 
 AM_CFLAGS = \
   $(XORG_SERVER_CFLAGS) \
+  $(XRDP_CFLAGS) \
   -I$(top_srcdir)/../common \
   -I$(top_srcdir)/module \
   $(EXTRA_FLAGS)

diff --git a/xrdpdev/Makefile.am b/xrdpdev/Makefile.am
@@ -2,6 +2,7 @@ EXTRA_DIST =
 
 AM_CFLAGS = \
   $(XORG_SERVER_CFLAGS) \
+  $(XRDP_CFLAGS) \
   -I$(top_srcdir)/module \
   -I$(top_srcdir)/../common
 

diff --git a/xrdpkeyb/Makefile.am b/xrdpkeyb/Makefile.am
@@ -2,6 +2,7 @@ EXTRA_DIST =
 
 AM_CFLAGS = \
   $(XORG_SERVER_CFLAGS) \
+  $(XRDP_CFLAGS) \
   -I$(top_srcdir)/module \
   -I$(top_srcdir)/../common
 

diff --git a/xrdpmouse/Makefile.am b/xrdpmouse/Makefile.am
@@ -2,6 +2,7 @@ EXTRA_DIST =
 
 AM_CFLAGS = \
   $(XORG_SERVER_CFLAGS) \
+  $(XRDP_CFLAGS) \
   -I$(top_srcdir)/module \
   -I$(top_srcdir)/../common