summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2009-10-02 17:21:36 +0000
committercaro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2009-10-02 17:21:36 +0000
commit24952b2cc2099ae8723ac17af74c8d5ebaa7e8f5 (patch)
treee3589e258245b02c2afb5530b5b209689574188c
parent8d33e99de8312fad369a80f9903149c89cd0d59e (diff)
downloadedje-24952b2cc2099ae8723ac17af74c8d5ebaa7e8f5.tar.gz
edje-24952b2cc2099ae8723ac17af74c8d5ebaa7e8f5.tar.bz2
edje-24952b2cc2099ae8723ac17af74c8d5ebaa7e8f5.zip
* use Requires.private field in edje.pc if pkg-config 0.22 or later is installed. We list in it the required packages needed to compile edje.
* remove uneeded flags that are in Libs.private (those from the packages that are listed in Requires.private) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@42861 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
-rw-r--r--configure.ac11
-rw-r--r--edje.pc.in4
2 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index dd82a51..890aad0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,6 +165,15 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != : ])
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)
+
### Checks for libraries
@@ -220,7 +229,7 @@ PKG_CHECK_MODULES([ECORE_IMF],
[
AC_DEFINE(HAVE_ECORE_IMF, 1, [Input Method Support for Edje Entry])
have_ecore_imf="yes"
- requirement_edje="ecore-imf ecore-imf-evas ${requirement_edje}"
+ requirement_edje="ecore-imf-evas ecore-imf ${requirement_edje}"
],
[have_ecore_imf="no"])
diff --git a/edje.pc.in b/edje.pc.in
index 7d2d4bf..48412ff 100644
--- a/edje.pc.in
+++ b/edje.pc.in
@@ -7,8 +7,8 @@ datadir=@datadir@/edje
Name: edje
Description: Enlightened graphical design and layout engine.
-Requires: @requirement_edje@
+@pkgconfig_requires_private@: @requirement_edje@
Version: @VERSION@
Libs: -L${libdir} -ledje
-Libs.private: @EDJE_LIBS@ @EVIL_LIBS@ @ECORE_IMF_LIBS@
+Libs.private:
Cflags: -I${includedir}