summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2009-10-03 06:57:32 +0000
committerVincent Torri <vincent.torri@gmail.com>2009-10-03 06:57:32 +0000
commita398c256906c6719aa5bed5f6e9d64902adaca94 (patch)
tree28b867405d50b6e9088fdc5254fcd980c56c3e8b
parent289e87a43cd1f1dff3c00f941120aa2f4457d196 (diff)
* use Requires.private field in elementary.pc if pkg-config 0.22 or later is installed. We list in it the required packages needed to compile elementary.
* remove uneeded flags that are in Libs.private and Cflags (those from the packages that are listed in Requires.private) SVN revision: 42866
Diffstat (limited to '')
-rw-r--r--configure.ac8
-rw-r--r--elementary.pc.in7
2 files changed, 11 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 24cd9081a..84241a93f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,14 @@ requirement_elm=""
49 49
50PKG_PROG_PKG_CONFIG 50PKG_PROG_PKG_CONFIG
51 51
52# Check whether pkg-config supports Requires.private
53if $PKG_CONFIG --atleast-pkgconfig-version 0.22; then
54 pkgconfig_requires_private="Requires.private"
55else
56 pkgconfig_requires_private="Requires"
57fi
58AC_SUBST(pkgconfig_requires_private)
59
52lt_enable_auto_import="" 60lt_enable_auto_import=""
53ELM_UNIX_DEF="#undef" 61ELM_UNIX_DEF="#undef"
54ELM_WIN32_DEF="#undef" 62ELM_WIN32_DEF="#undef"
diff --git a/elementary.pc.in b/elementary.pc.in
index ecf8705a1..307d3ade0 100644
--- a/elementary.pc.in
+++ b/elementary.pc.in
@@ -5,9 +5,8 @@ includedir=@includedir@
5 5
6Name: elementary 6Name: elementary
7Description: Mobile device touchscreen widget library 7Description: Mobile device touchscreen widget library
8Requires: @requirement_elm@ 8@pkgconfig_requires_private@: @requirement_elm@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lelementary 10Libs: -L${libdir} -lelementary
11Libs.private: @dlopen_libs@ @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ 11Libs.private: @dlopen_libs@ @my_libs@
12@ELEMENTARY_FB_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ 12Cflags: -I${includedir} -I${includedir}/elementary
13Cflags: -I${includedir} -I${includedir}/elementary @ELEMENTARY_CFLAGS@ @ELEMENTARY_X_CFLAGS@ @ELEMENTARY_FB_CFLAGS@ @ELEMENTARY_WINCE_CFLAGS@ @ELEMENTARY_EDBUS_CFLAGS@ @ELEMENTARY_EFREET_CFLAGS@