diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2009-10-03 06:57:32 +0000 |
|---|---|---|
| committer | Vincent Torri <vincent.torri@gmail.com> | 2009-10-03 06:57:32 +0000 |
| commit | a398c256906c6719aa5bed5f6e9d64902adaca94 (patch) | |
| tree | 28b867405d50b6e9088fdc5254fcd980c56c3e8b | |
| parent | 289e87a43cd1f1dff3c00f941120aa2f4457d196 (diff) | |
| download | elementary-a398c256906c6719aa5bed5f6e9d64902adaca94.tar.gz | |
* 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
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | elementary.pc.in | 7 |
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="" 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) + lt_enable_auto_import="" ELM_UNIX_DEF="#undef" ELM_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@ Name: elementary Description: Mobile device touchscreen widget library -Requires: @requirement_elm@ +@pkgconfig_requires_private@: @requirement_elm@ Version: @VERSION@ Libs: -L${libdir} -lelementary -Libs.private: @dlopen_libs@ @my_libs@ @ELEMENTARY_LIBS@ @ELEMENTARY_X_LIBS@ -@ELEMENTARY_FB_LIBS@ @ELEMENTARY_WINCE_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ -Cflags: -I${includedir} -I${includedir}/elementary @ELEMENTARY_CFLAGS@ @ELEMENTARY_X_CFLAGS@ @ELEMENTARY_FB_CFLAGS@ @ELEMENTARY_WINCE_CFLAGS@ @ELEMENTARY_EDBUS_CFLAGS@ @ELEMENTARY_EFREET_CFLAGS@ +Libs.private: @dlopen_libs@ @my_libs@ +Cflags: -I${includedir} -I${includedir}/elementary |