Mercurial > pidgin.yaz
changeset 18066:5c4efa98e8dd
propagate from branch 'im.pidgin.pidgin' (head 4d9e228029b9b7850d000c2edadc108c40f9e59a)
to branch 'im.pidgin.pidgin.2.1.0' (head 6a22d95caf705430ccb49e98a7000ad83484b5fe)
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Thu, 07 Jun 2007 02:39:48 +0000 |
| parents | 89adae2f1a6e (diff) 891f22c7e884 (current diff) |
| children | 098a1d6896be |
| files | configure.ac |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Jun 06 16:00:27 2007 +0000 +++ b/configure.ac Thu Jun 07 02:39:48 2007 +0000 @@ -569,14 +569,15 @@ AC_ARG_ENABLE(gstreamer, [AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], enable_gst="$enableval", enable_gst="yes") -PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], , [ - AC_MSG_RESULT(no) - enable_gst="no" -]) if test "x$enable_gst" != "xno"; then - AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) - AC_SUBST(GSTREAMER_CFLAGS) - AC_SUBST(GSTREAMER_LIBS) + PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], [ + AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) + AC_SUBST(GSTREAMER_CFLAGS) + AC_SUBST(GSTREAMER_LIBS) + ], [ + AC_MSG_RESULT(no) + enable_gst="no" + ]) fi dnl #######################################################################
--- a/pidgin/plugins/gevolution/gevolution.c Wed Jun 06 16:00:27 2007 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Thu Jun 07 02:39:48 2007 +0000 @@ -38,7 +38,6 @@ #include <libedata-book/Evolution-DataServer-Addressbook.h> -#include <libebook/e-book-listener.h> #include <libedata-book/e-data-book-factory.h> #include <bonobo/bonobo-main.h>