diff options
author | Götz Waschk <waschk@mandriva.org> | 2009-04-14 21:19:27 +0000 |
---|---|---|
committer | Paul Pogonyshev <paulp@src.gnome.org> | 2009-04-14 21:19:27 +0000 |
commit | 6a7db6bf2ee6f9d80cac4578a7d4314df3c3bcdd (patch) | |
tree | dcc76697c2c7c4b4a36a166cf7f1f48902b96971 | |
parent | 04ddc898bf30b9202b9c3809ff3db66e63d66f22 (diff) | |
download | pygobject-6a7db6bf2ee6f9d80cac4578a7d4314df3c3bcdd.tar.gz |
Bug 550231 – missing dep on libffi in pygobject-2.0.pc
2009-04-15 Götz Waschk <waschk@mandriva.org>
Bug 550231 – missing dep on libffi in pygobject-2.0.pc
* configure.ac: Define `LIBFFI_PC' subst.
* pygobject-2.0.pc.in:
* pygobject-2.0-uninstalled.pc.in: Use it.
svn path=/trunk/; revision=1065
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | pygobject-2.0-uninstalled.pc.in | 3 | ||||
-rw-r--r-- | pygobject-2.0.pc.in | 3 |
4 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2009-04-15 Götz Waschk <waschk@mandriva.org> + + Bug 550231 – missing dep on libffi in pygobject-2.0.pc + + * configure.ac: Define `LIBFFI_PC' subst. + + * pygobject-2.0.pc.in: + * pygobject-2.0-uninstalled.pc.in: Use it. + 2009-04-15 Paul Pogonyshev <pogonyshev@gmx.net> Bug 555613 – gio.VolumeMonitor segfaults diff --git a/configure.ac b/configure.ac index 5427f361..18892179 100644 --- a/configure.ac +++ b/configure.ac @@ -169,11 +169,13 @@ if test x"$with_libffi" = xyes && test x"$have_libffi" = xno ; then fi if test x"$have_libffi" = xyes; then AC_DEFINE(HAVE_FFI_H,1,[Have libffi include files]) + LIBFFI_PC=libffi fi AC_MSG_RESULT([$have_libffi]) AM_CONDITIONAL(HAVE_LIBFFI, test "$have_libffi" = "yes") AC_SUBST(FFI_CFLAGS) AC_SUBST(FFI_LIBS) +AC_SUBST(LIBFFI_PC) dnl gio PKG_CHECK_MODULES(GIO, gio-2.0 >= gio_required_version, diff --git a/pygobject-2.0-uninstalled.pc.in b/pygobject-2.0-uninstalled.pc.in index 5170d09a..871d7e05 100644 --- a/pygobject-2.0-uninstalled.pc.in +++ b/pygobject-2.0-uninstalled.pc.in @@ -1,8 +1,7 @@ Name: PyGObject Description: Python bindings for GObject -Requires: gobject-2.0 +Requires: gobject-2.0 @LIBFFI_PC@ Version: @VERSION@ -Libs: @FFI_LIBS@ Cflags: -I${pc_top_builddir}/${pcfiledir}/gobject # you can use the --variable=pygtkincludedir argument to diff --git a/pygobject-2.0.pc.in b/pygobject-2.0.pc.in index 39d12f01..6b633388 100644 --- a/pygobject-2.0.pc.in +++ b/pygobject-2.0.pc.in @@ -16,7 +16,6 @@ codegendir=${datadir}/pygobject/2.0/codegen Name: PyGObject Description: Python bindings for GObject -Requires: gobject-2.0 +Requires: gobject-2.0 @LIBFFI_PC@ Version: @VERSION@ -Libs: -L${libdir} @FFI_LIBS@ Cflags: -I${pygtkincludedir} |