From f76f005f756f491e0f15dc4a6ec8fc5db895ad7e Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sat, 3 Oct 2009 06:57:32 +0000 Subject: [PATCH] * 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 --- legacy/elementary/configure.ac | 8 ++++++++ legacy/elementary/elementary.pc.in | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac index 24cd9081aa..84241a93f8 100644 --- a/legacy/elementary/configure.ac +++ b/legacy/elementary/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/legacy/elementary/elementary.pc.in b/legacy/elementary/elementary.pc.in index ecf8705a11..307d3ade01 100644 --- a/legacy/elementary/elementary.pc.in +++ b/legacy/elementary/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