Thu, 07 Jun 2007 04:31:02 +0000
propagate from branch 'im.pidgin.pidgin' (head 16ff20de7f03b8e2c758df62949bb31b7a594312)
to branch 'im.pidgin.pidgin.2.1.0' (head ab653ee99e42e8ff8be56de272b0a29409b0f9fb)
| configure.ac | file | annotate | diff | comparison | revisions | |
| pidgin/plugins/gevolution/gevolution.c | file | annotate | diff | comparison | revisions |
--- a/configure.ac Thu Jun 07 04:26:57 2007 +0000 +++ b/configure.ac Thu Jun 07 04:31:02 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 Thu Jun 07 04:26:57 2007 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Thu Jun 07 04:31:02 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>