From f9c314d07c9df284ee02a28aa084d98bfb4ab0fc Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Wed, 10 Oct 2012 21:37:47 +0000 Subject: [PATCH] efl: do not support old pkg-config. if the distro still wants to support the SUPER OLD pkg-config, then it will have to fix the generated .pc before installing them: {{{ sed -i 's/^Requires.private:/Requires:/g' pc/*.pc }}} SVN revision: 77818 --- configure.ac | 8 -------- pc/eet.pc.in | 2 +- pc/eina.pc.in | 2 +- pc/eo.pc.in | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 9d0fa93099..f1a07782ef 100644 --- a/configure.ac +++ b/configure.ac @@ -169,14 +169,6 @@ if test "x${PKG_CONFIG}" = "x" ; then AC_MSG_ERROR([pkg-config tool not found. Install it or set PKG_CONFIG environment variable to that path tool. Exiting...]) fi -# 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/pc/eet.pc.in b/pc/eet.pc.in index ee958878be..af3304cf38 100644 --- a/pc/eet.pc.in +++ b/pc/eet.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: eet Description: Library for speedy data storage, retrieval, and compression Version: @VERSION@ -@pkgconfig_requires_private@: @requirements_pc_eet@ +Requires.private: @requirements_pc_eet@ Libs: -L${libdir} -leet Libs.private: @requirements_libs_eet@ -lm Cflags: -I${includedir}/eet-@VMAJ@ diff --git a/pc/eina.pc.in b/pc/eina.pc.in index 95b815b05f..c45b84f7d7 100644 --- a/pc/eina.pc.in +++ b/pc/eina.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: Eina Description: A Library that implements fast data types and miscellaneous tools -@pkgconfig_requires_private@: @requirements_pc_eina@ +Requires.private: @requirements_pc_eina@ Version: @VERSION@ Libs: -L${libdir} -leina @EFL_PTHREAD_LIBS@ Libs.private: @EFL_PTHREAD_LIBS@ @requirements_libs_eina@ -lm diff --git a/pc/eo.pc.in b/pc/eo.pc.in index 9abb5260c3..a58711bd4b 100644 --- a/pc/eo.pc.in +++ b/pc/eo.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: Eo Description: EFL's generic object system library. Version: @PACKAGE_VERSION@ -@pkgconfig_requires_private@: @requirements_pc_eo@ +Requires.private: @requirements_pc_eo@ Libs: -L${libdir} -leo Libs.private: Cflags: -I${includedir}/eo-@VMAJ@