Merge pull request #493 from proski/pkgconfig

Fixes for pkg-config

configure.ac

@@ -258,42 +258,36 @@ fi
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)
 
-AC_CONFIG_FILES([Makefile
+AC_CONFIG_FILES([
   common/Makefile
-                 vnc/Makefile
-                 rdp/Makefile
-                 libxrdp/Makefile
-                 xup/Makefile
-                 mc/Makefile
-                 neutrinordp/Makefile
-                 xrdp/Makefile
-                 sesman/Makefile
-                 sesman/libscp/Makefile
-                 sesman/tools/Makefile
-                 sesman/sessvc/Makefile
-                 sesman/chansrv/Makefile
-                 keygen/Makefile
   docs/Makefile
   docs/man/Makefile
+  genkeymap/Makefile
+  instfiles/default/Makefile
+  instfiles/init.d/Makefile
   instfiles/Makefile
   instfiles/pam.d/Makefile
-                 instfiles/init.d/Makefile
-                 instfiles/rc.d/Makefile
-                 instfiles/default/Makefile
   instfiles/pulse/Makefile
-                 genkeymap/Makefile
+  instfiles/rc.d/Makefile
+  keygen/Makefile
+  libxrdp/Makefile
+  Makefile
+  mc/Makefile
+  neutrinordp/Makefile
+  pkgconfig/Makefile
+  pkgconfig/xrdp.pc
+  pkgconfig/xrdp-uninstalled.pc
+  rdp/Makefile
+  sesman/chansrv/Makefile
+  sesman/libscp/Makefile
+  sesman/Makefile
+  sesman/sessvc/Makefile
+  sesman/tools/Makefile
+  vnc/Makefile
   xrdpapi/Makefile
+  xrdp/Makefile
   xrdpvr/Makefile
-                 pkgconfig/Makefile
+  xup/Makefile
-])
-#                 fontdump/Makefile
-#                 xrdp/cursors/Makefile
-#                 Xserver/hw/rdp/Makefile
-AC_OUTPUT([pkgconfig/xrdp.pc
 ])
 
-# example of how to check for a struct in a header
+AC_OUTPUT
-#AC_CHECK_MEMBER([struct in6_addr.s6_addr],
-#                [],
-#                [AC_DEFINE(NO_ARPA_INET_H_IP6, 1, [for IPv6])],
-#                [#include <arpa/inet.h>])

pkgconfig/Makefile.am

@@ -1,12 +1,2 @@
-pkg_config_files = \
-	xrdp.pc \
-	$(NULL)
-
 pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = $(pkg_config_files)
+pkgconfig_DATA = xrdp.pc
-
-DISTCLEANFILES = \
-	$(pkg_config_files) \
-	Makefile.in \
-	$(NULL)
-

pkgconfig/xrdp-uninstalled.pc.in

@@ -0,0 +1,6 @@
+includedir=${pc_top_builddir}/${pcfiledir}/common
+
+Name: xrdp
+Description: An open source Remote Desktop Protocol (RDP) server
+Version: @VERSION@
+Cflags: -I${includedir}

pkgconfig/xrdp.pc.in

@@ -4,6 +4,6 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: xrdp
-Description: An open source remote desktop protocol(RDP) server
+Description: An open source Remote Desktop Protocol (RDP) server
-Version: 0.9.2
+Version: @VERSION@
 Cflags: -I${includedir}