From 4afe793eedc6b822ac2aa9465808239cacaa9cf8 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Wed, 11 Jan 2012 12:23:46 +0000 Subject: [PATCH] build: Add infrastructure for inserting Requires.private into pkg-config files --- clutter/clutter.pc.in | 2 ++ configure.ac | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/clutter/clutter.pc.in b/clutter/clutter.pc.in index 12e382033..0dccaa745 100644 --- a/clutter/clutter.pc.in +++ b/clutter/clutter.pc.in @@ -5,6 +5,7 @@ includedir=@includedir@ apiversion=@CLUTTER_API_VERSION@ requires=@CLUTTER_REQUIRES@ +requires_private=@CLUTTER_REQUIRES_PRIVATE@ backends=@CLUTTER_BACKENDS@ # only kept for backward compatibility @@ -20,3 +21,4 @@ Version: @VERSION@ Libs: -L${libdir} -lclutter-${apiversion} Cflags: -I${includedir}/clutter-${apiversion} Requires: ${requires} +Requires.private: ${requires_private} diff --git a/configure.ac b/configure.ac index aa10d433e..526933097 100644 --- a/configure.ac +++ b/configure.ac @@ -958,6 +958,11 @@ CLUTTER_REQUIRES="$CLUTTER_BASE_PC_FILES $IMAGE_PC_FILES $BACKEND_PC_FILES" PKG_CHECK_MODULES(CLUTTER_DEPS, [$CLUTTER_REQUIRES]) AC_SUBST(CLUTTER_REQUIRES) + +CLUTTER_REQUIRES_PRIVATE="$CLUTTER_BASE_PC_FILES_PRIVATE $IMAGE_PC_FILES_PRIVATE $BACKEND_PC_FILES_PRIVATE" +PKG_CHECK_MODULES(CLUTTER_DEPS_PRIVATE, [$CLUTTER_REQUIRES_PRIVATE]) +AC_SUBST(CLUTTER_REQUIRES_PRIVATE) + CLUTTER_CFLAGS="$FLAVOUR_CFLAGS $CLUTTER_DEPS_CFLAGS $CLUTTER_PROFILE_CFLAGS $GLIB_CFLAGS" CLUTTER_LIBS="$FLAVOUR_LIBS $CLUTTER_DEPS_LIBS $CLUTTER_PROFILE_LDFLAGS $GLIB_LIBS" AC_SUBST(CLUTTER_CFLAGS)