Merge pull request #493 from proski/pkgconfig

Fixes for pkg-config

4 files changed, 40 insertions, 50 deletions

diff --git a/configure.ac b/configure.ac
index 052634f9..c4198119 100644
--- a/configure.ac
+++ b/configure.ac
@@ -258,42 +258,36 @@ fi
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)
 
-AC_CONFIG_FILES([Makefile
-                 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
-                 instfiles/Makefile
-                 instfiles/pam.d/Makefile
-                 instfiles/init.d/Makefile
-                 instfiles/rc.d/Makefile
-                 instfiles/default/Makefile
-                 instfiles/pulse/Makefile
-                 genkeymap/Makefile
-                 xrdpapi/Makefile
-                 xrdpvr/Makefile
-                 pkgconfig/Makefile
-])
-#                 fontdump/Makefile
-#                 xrdp/cursors/Makefile
-#                 Xserver/hw/rdp/Makefile
-AC_OUTPUT([pkgconfig/xrdp.pc
+AC_CONFIG_FILES([
+  common/Makefile
+  docs/Makefile
+  docs/man/Makefile
+  genkeymap/Makefile
+  instfiles/default/Makefile
+  instfiles/init.d/Makefile
+  instfiles/Makefile
+  instfiles/pam.d/Makefile
+  instfiles/pulse/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
+  xup/Makefile
 ])
 
-# example of how to check for a struct in a header
-#AC_CHECK_MEMBER([struct in6_addr.s6_addr],
-#                [],
-#                [AC_DEFINE(NO_ARPA_INET_H_IP6, 1, [for IPv6])],
-#                [#include <arpa/inet.h>])
+AC_OUTPUT
diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 8c3b1af2..4fa572f9 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -1,12 +1,2 @@
-pkg_config_files = \
-	xrdp.pc \
-	$(NULL)
-
 pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = $(pkg_config_files)
-
-DISTCLEANFILES = \
-	$(pkg_config_files) \
-	Makefile.in \
-	$(NULL)
-
+pkgconfig_DATA = xrdp.pc
diff --git a/pkgconfig/xrdp-uninstalled.pc.in b/pkgconfig/xrdp-uninstalled.pc.in
new file mode 100644
index 00000000..ae725d9a
--- /dev/null
+++ b/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}
diff --git a/pkgconfig/xrdp.pc.in b/pkgconfig/xrdp.pc.in
index 038247c0..d5aa33ee 100644
--- a/pkgconfig/xrdp.pc.in
+++ b/pkgconfig/xrdp.pc.in
@@ -4,6 +4,6 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: xrdp
-Description: An open source remote desktop protocol(RDP) server
-Version: 0.9.2
+Description: An open source Remote Desktop Protocol (RDP) server
+Version: @VERSION@
 Cflags: -I${includedir}