use Requires.private field in edbus .pc files if pkg-config 0.22 is installed. We...

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@42893 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 2378bcb..2d3fd7e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,16 @@ AC_ARG_ENABLE(enotify,
                                  [enable_enotify=$enableval],
                                  [enable_enotify="yes"])
 
+# pkg-config
+PKG_PROG_PKG_CONFIG
+
+# Check whether pkg-config supports Requires.private
+if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
+   pkgconfig_requires_private="Requires.private"
+else
+   pkgconfig_requires_private="Requires"
+fi
+AC_SUBST(pkgconfig_requires_private)
 
 PKG_CHECK_MODULES([EINA], [eina-0])
 
@@ -86,9 +96,9 @@ AC_ARG_ENABLE(build-test-gui,
  ]
 )
 
-AM_CONDITIONAL([BUILD_EHAL],    [test "x${enable_ehal}"    = "xyes"])
-AM_CONDITIONAL([BUILD_ENM],     [test "x${enable_enm}"     = "xyes"])
-AM_CONDITIONAL([BUILD_ENOTIFY], [test "x${enable_enotify}" = "xyes"])
+AM_CONDITIONAL([BUILD_EHAL],     [test "x${enable_ehal}"     = "xyes"])
+AM_CONDITIONAL([BUILD_ENM],      [test "x${enable_enm}"      = "xyes"])
+AM_CONDITIONAL([BUILD_ENOTIFY],  [test "x${enable_enotify}"  = "xyes"])
 AM_CONDITIONAL([BUILD_ECONNMAN], [test "x${enable_econnman}" = "xyes"])
 
 AC_OUTPUT([

diff --git a/econnman.pc.in b/econnman.pc.in
index 68b4248..c306ee6 100644 (file)
--- a/econnman.pc.in
+++ b/econnman.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: econnman
 Description: network connection manager (connman)
-Requires: ecore edbus
+@pkgconfig_requires_private@: ecore edbus
 Version: @VERSION@
 Libs: -L${libdir} -leconnman
 Cflags: -I${includedir}

diff --git a/edbus.pc.in b/edbus.pc.in
index 705d4a2..fa7c0e3 100644 (file)
--- a/edbus.pc.in
+++ b/edbus.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: edbus
 Description: DBus convenience library
-Requires: ecore dbus-1
+@pkgconfig_requires_private@: ecore dbus-1
 Version: @VERSION@
 Libs: -L${libdir} -ledbus
 Cflags: -I${includedir}

diff --git a/ehal.pc.in b/ehal.pc.in
index 0382713..a68d112 100644 (file)
--- a/ehal.pc.in
+++ b/ehal.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: ehal
 Description: Hal convenience library
-Requires: ecore edbus
+@pkgconfig_requires_private@: ecore edbus
 Version: @VERSION@
 Libs: -L${libdir} -lehal
 Cflags: -I${includedir}

diff --git a/enm.pc.in b/enm.pc.in
index 2247ced..cdfe8fd 100644 (file)
--- a/enm.pc.in
+++ b/enm.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: enotify
 Description: Network Manager convenience library
-Requires: ecore edbus
+@pkgconfig_requires_private@: ecore edbus
 Version: @VERSION@
 Libs: -L${libdir} -lenm
 Cflags: -I${includedir}

diff --git a/enotify.pc.in b/enotify.pc.in
index e97fbde..d7059da 100644 (file)
--- a/enotify.pc.in
+++ b/enotify.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: enotify
 Description: Notification convenience library
-Requires: ecore edbus
+@pkgconfig_requires_private@: ecore edbus
 Version: @VERSION@
 Libs: -L${libdir} -lenotify
 Cflags: -I${includedir}