From 74a22e367ffaa2f319d7e8e33800444caffaeca9 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Wed, 9 Sep 2009 15:50:52 +0000 Subject: [PATCH] * use Requires.private field in eet.pc if pkg-config 0.22 is installed. We list in it the required packages needed to compile eet. * remove uneeded flags that are in Libs.private (those from the packages that are listed in Requires.private) Patch by dottedmag, modified a bit. SVN revision: 42367 --- legacy/eet/configure.ac | 12 ++++++++++++ legacy/eet/eet.pc.in | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac index a513148ce4..119cd7bbb1 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/configure.ac @@ -146,6 +146,18 @@ AC_SUBST(DEBUG_CFLAGS) ### Checks for programs AC_PROG_CC +# 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) + + # doxygen program for documentation building EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) diff --git a/legacy/eet/eet.pc.in b/legacy/eet/eet.pc.in index 2acd9e1907..065acf817a 100644 --- a/legacy/eet/eet.pc.in +++ b/legacy/eet/eet.pc.in @@ -5,8 +5,8 @@ includedir=@includedir@ Name: eet Description: Library for speedy data storage, retrieval, and compression -Requires: @requirement_eet@ +@pkgconfig_requires_private@: @requirement_eet@ Version: @VERSION@ Libs: -L${libdir} -leet -Libs.private: @GNUTLS_LIBS@ @OPENSSL_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ @EET_LIBS@ @fnmatch_libs@ -ljpeg -lz -lm +Libs.private: @EET_LIBS@ @fnmatch_libs@ -ljpeg -lz -lm Cflags: -I${includedir}