* 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) SVN revision: 42861
This commit is contained in:
parent
1b89795722
commit
4821f141a7
|
@ -165,6 +165,15 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != : ])
|
||||||
|
|
||||||
PKG_PROG_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)
|
||||||
|
|
||||||
|
|
||||||
### Checks for libraries
|
### Checks for libraries
|
||||||
|
|
||||||
|
@ -220,7 +229,7 @@ PKG_CHECK_MODULES([ECORE_IMF],
|
||||||
[
|
[
|
||||||
AC_DEFINE(HAVE_ECORE_IMF, 1, [Input Method Support for Edje Entry])
|
AC_DEFINE(HAVE_ECORE_IMF, 1, [Input Method Support for Edje Entry])
|
||||||
have_ecore_imf="yes"
|
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"])
|
[have_ecore_imf="no"])
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,8 @@ datadir=@datadir@/edje
|
||||||
|
|
||||||
Name: edje
|
Name: edje
|
||||||
Description: Enlightened graphical design and layout engine.
|
Description: Enlightened graphical design and layout engine.
|
||||||
Requires: @requirement_edje@
|
@pkgconfig_requires_private@: @requirement_edje@
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
Libs: -L${libdir} -ledje
|
Libs: -L${libdir} -ledje
|
||||||
Libs.private: @EDJE_LIBS@ @EVIL_LIBS@ @ECORE_IMF_LIBS@
|
Libs.private:
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir}
|
||||||
|
|
Loading…
Reference in New Issue