diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2012-01-12 10:10:09 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2012-01-12 10:10:09 +0000 |
| commit | 7ca37b6e58a8aed699fd2d461fcbb9a2704550a7 (patch) | |
| tree | febe164289fce2071d3130f902824fd44ff5ae46 /configure.ac | |
| parent | ed9c3ee54ebafb6e477cafc39d36cc96574938ee (diff) | |
| download | clutter-7ca37b6e58a8aed699fd2d461fcbb9a2704550a7.tar.gz | |
build: Fix the private pkg-config requirements
Private pkg-config requirements are conditional.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index cc0bcbb67..cc1e5512f 100644 --- a/configure.ac +++ b/configure.ac @@ -201,9 +201,15 @@ experimental_input_backend=no # base dependencies for core CLUTTER_BASE_PC_FILES="cogl-1.0 >= $COGL_REQ_VERSION cairo-gobject >= $CAIRO_REQ_VERSION atk >= $ATK_REQ_VERSION pangocairo >= $PANGO_REQ_VERSION cogl-pango-1.0 json-glib-1.0 >= $JSON_GLIB_REQ_VERSION" +# private base dependencies +CLUTTER_BASE_PC_FILES_PRIVATE="" + # backend specific pkg-config files BACKEND_PC_FILES="" +# private backend specific dependencies +BACKEND_PC_FILES_PRIVATE="" + dnl === Clutter windowing system backend ====================================== AC_ARG_ENABLE([x11-backend], @@ -570,9 +576,6 @@ AC_SUBST([CLUTTER_FLAVOUR], [deprecated]) AC_SUBST([CLUTTER_COGL], [deprecated]) AC_SUBST([COGL_DRIVER], [deprecated]) -dnl === Image loading backend ================================================= -IMAGE_PC_FILES="" - dnl === X11 checks, only for X11-based backends =============================== X11_PC_FILES="" X11_EXTS="" @@ -957,13 +960,21 @@ dnl === Dependencies, compiler flags and linker libraries ===================== # strip leading space BACKEND_PC_FILES=${BACKEND_PC_FILES#* } -CLUTTER_REQUIRES="$CLUTTER_BASE_PC_FILES $IMAGE_PC_FILES $BACKEND_PC_FILES" +CLUTTER_REQUIRES="$CLUTTER_BASE_PC_FILES $BACKEND_PC_FILES" PKG_CHECK_MODULES(CLUTTER_DEPS, [$CLUTTER_REQUIRES]) AC_SUBST(CLUTTER_REQUIRES) +AS_IF([test "x$CLUTTER_BASE_PC_FILES_PRIVATE" != "x" && test "x$BACKEND_PC_FILES_PRIVATE" != "x"], + [ + CLUTTER_REQUIRES_PRIVATE="$CLUTTER_BASE_PC_FILES_PRIVATE $BACKEND_PC_FILES_PRIVATE" + PKG_CHECK_MODULES(CLUTTER_DEPS_PRIVATE, [$CLUTTER_REQUIRES_PRIVATE]) + ], + [ + CLUTTER_REQUIRES_PRIVATE="" + CLUTTER_DEPS_PRIVATE_CFLAGS="" + CLUTTER_DEPS_PRIVATE_LIBS="" + ]) -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" |