/pidgin/main: ef015fb22744: Merge default back in
Gary Kramlich <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: ef015fb2274421900c97c0b49d75b3e739a71782 Author: Gary Kramlich <[email protected]> Date: 2015-12-21 22:14 -0600 Branch: use-gresolver URL: https://hg.pidgin.im/pidgin/main/rev/ef015fb22744 Description: Merge default back in diffstat: configure.ac | 252 +++---------------- finch/gntaccount.c | 3 +- finch/gntsound.c | 4 - libpurple/Makefile.am | 4 +- libpurple/ciphers/hmaccipher.c | 12 +- libpurple/example/Makefile.am | 4 +- libpurple/http.c | 17 +- libpurple/http.h | 10 - libpurple/media/backend-fs2.c | 58 ---- libpurple/mediamanager.c | 40 --- libpurple/network.c | 7 +- libpurple/plugins/perl/common/SSLConn.xs | 3 - libpurple/plugins/ssl/ssl-nss.c | 6 +- libpurple/protocols/bonjour/bonjour.h | 2 + libpurple/protocols/facebook/Makefile.mingw | 1 + libpurple/protocols/facebook/api.c | 36 +- libpurple/protocols/facebook/data.c | 20 +- libpurple/protocols/facebook/facebook.c | 7 - libpurple/protocols/facebook/facebook.h | 1 + libpurple/protocols/facebook/http.c | 74 +++++ libpurple/protocols/facebook/http.h | 91 ++++++- libpurple/protocols/facebook/id.h | 2 +- libpurple/protocols/facebook/json.c | 18 +- libpurple/protocols/facebook/json.h | 36 +- libpurple/protocols/facebook/mqtt.h | 8 +- libpurple/protocols/facebook/thrift.h | 22 +- libpurple/protocols/facebook/util.c | 31 +- libpurple/protocols/facebook/util.h | 62 ++-- libpurple/protocols/gg/gg.h | 1 + libpurple/protocols/gg/lib/http.c | 24 +- libpurple/protocols/gg/roster.c | 3 +- libpurple/protocols/gg/tcpsocket.c | 3 +- libpurple/protocols/irc/irc.c | 13 +- libpurple/protocols/irc/irc.h | 1 + libpurple/protocols/jabber/chat.c | 9 +- libpurple/protocols/jabber/ibb.c | 6 +- libpurple/protocols/jabber/jabber.c | 41 +-- libpurple/protocols/jabber/jabber.h | 1 + libpurple/protocols/jabber/message.c | 3 +- libpurple/protocols/jabber/presence.c | 14 +- libpurple/protocols/jabber/si.c | 3 +- libpurple/protocols/msn/msn.c | 9 - libpurple/protocols/msn/msn.h | 2 + libpurple/protocols/msn/object.c | 3 +- libpurple/protocols/mxit/client.c | 21 +- libpurple/protocols/mxit/formcmds.c | 3 +- libpurple/protocols/mxit/markup.c | 3 +- libpurple/protocols/mxit/multimx.c | 3 +- libpurple/protocols/mxit/mxit.c | 12 +- libpurple/protocols/mxit/mxit.h | 1 + libpurple/protocols/mxit/roster.c | 27 +- libpurple/protocols/novell/nmconference.c | 3 +- libpurple/protocols/novell/nmconn.c | 6 +- libpurple/protocols/novell/nmcontact.c | 24 +- libpurple/protocols/novell/nmevent.c | 51 +-- libpurple/protocols/novell/nmmessage.c | 3 +- libpurple/protocols/novell/nmrequest.c | 3 +- libpurple/protocols/novell/nmuserrecord.c | 63 +--- libpurple/protocols/novell/novell.c | 27 +- libpurple/protocols/novell/novell.h | 2 + libpurple/protocols/oscar/family_icq.c | 8 +- libpurple/protocols/oscar/family_locate.c | 12 +- libpurple/protocols/oscar/oscar.c | 9 +- libpurple/protocols/oscar/oscar.h | 1 + libpurple/protocols/sametime/sametime.h | 2 + libpurple/protocols/silc/silcpurple.h | 2 + libpurple/protocols/simple/simple.h | 1 + libpurple/protocols/yahoo/yahoo.h | 2 + libpurple/protocols/yahoo/yahoochat.c | 9 +- libpurple/protocols/yahoo/ymsg.c | 5 - libpurple/protocols/zephyr/zephyr.c | 6 +- libpurple/protocols/zephyr/zephyr.h | 2 + libpurple/proxy.c | 18 +- libpurple/purple-socket.c | 6 - libpurple/server.c | 2 +- libpurple/sslconn.c | 14 - libpurple/sslconn.h | 9 - pidgin/gtkaccount.c | 63 ----- pidgin/gtkblist.c | 219 ----------------- pidgin/gtkcertmgr.c | 4 - pidgin/gtkconv.c | 87 ------ pidgin/gtkdebug.c | 24 - pidgin/gtkdialogs.c | 9 - pidgin/gtkdnd-hints.c | 37 -- pidgin/gtkdocklet.c | 28 -- pidgin/gtkmedia.c | 19 +- pidgin/gtkmenutray.c | 20 - pidgin/gtknotify.c | 3 - pidgin/gtkplugin.c | 6 - pidgin/gtkpluginpref.c | 3 - pidgin/gtkpounce.c | 8 +- pidgin/gtkprefs.c | 148 ----------- pidgin/gtkrequest.c | 3 - pidgin/gtkroomlist.c | 39 --- pidgin/gtksmiley-manager.c | 38 --- pidgin/gtksound.c | 4 - pidgin/gtkstatusbox.c | 89 +------ pidgin/gtkutils.c | 34 -- pidgin/gtkwhiteboard.c | 53 ---- pidgin/gtkxfer.c | 4 - pidgin/libpidgin.c | 36 +-- pidgin/minidialog.c | 39 --- pidgin/pidginstock.c | 11 - pidgin/pidgintooltip.c | 25 - pidgin/pixmaps/emotes/default/24/scalable/shout.svg | 124 ++++++--- pidgin/pixmaps/emotes/default/24/shout.png | Bin pidgin/plugins/disco/gtkdisco.c | 8 - pidgin/plugins/gestures/stroke-draw.c | 23 +- pidgin/plugins/gestures/stroke.c | 6 +- pidgin/plugins/screencap.c | 31 -- pidgin/plugins/ticker/gtkticker.c | 68 ----- 111 files changed, 627 insertions(+), 2013 deletions(-) diffs (truncated from 6341 to 300 lines): diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -517,15 +517,9 @@ AC_ARG_WITH(x, [], AC_ARG_ENABLE(gtkui, [AS_HELP_STRING([--disable-gtkui], [compile without GTK+ user interface])], enable_gtkui="$enableval", enable_gtkui="yes") -AC_ARG_WITH(gtk, [AS_HELP_STRING([--with-gtk=<version>], - [compile with GTK+ 2 or 3 user interface (default: auto)])], - with_gtk="$withval", with_gtk="auto") AC_ARG_ENABLE(consoleui, [AS_HELP_STRING([--disable-consoleui], [compile without console user interface])], [enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no]) -AC_ARG_ENABLE(gstreamer, - [AS_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], - enable_gst="$enableval", enable_gst="yes") dnl ####################################################################### dnl # Check for GTK+ 2.18 and other things used by the GTK UI @@ -578,45 +572,22 @@ else x_incpath_add="-I$x_includes" fi +dnl ####################################################################### +dnl Check Pidgin dependencies +dnl ####################################################################### if test "x$enable_gtkui" = "xyes" ; then - if test "x$with_gtk" = "x3"; then - PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0], , [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([ + PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0], , [ + AC_MSG_RESULT(no) + AC_MSG_ERROR([ You must have GTK+ 3.0.0 or newer development headers installed to compile Pidgin. If you want to build only Finch then specify --disable-gtkui when running configure. ])]) - elif test "x$with_gtk" = "x2"; then - PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.18.0], , [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([ -You must have GTK+ 2.18.0 or newer development headers installed to compile -Pidgin. If you want to build only Finch then specify --disable-gtkui when -running configure. -])]) - elif test "x$with_gtk" = "xauto"; then - if test "x$enable_gst" != "xno"; then - gst10_pkg="gstreamer-1.0" - gst010_pkg="gstreamer-0.10" - fi - PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.0.0 $gst10_pkg], [with_gtk=3], [ - AC_MSG_RESULT(no) - PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.18.0 $gst010_pkg], [with_gtk=2], [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([ -You must have GTK+ 2.18.0 or newer and GStreamer development headers installed to compile -Pidgin. If you want to build only Finch then specify --disable-gtkui when -running configure. Use --disable-gstreamer if you do not need GStreamer (sound) support. -])])]) - else - AC_MSG_ERROR([--with-gtk must specify one of 2, 3 or auto.]) - fi AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) - GTK_PC_MODULE="gtk+-${with_gtk}.0" - GTK_VERSION=${with_gtk} + GTK_PC_MODULE="gtk+-3.0" + GTK_VERSION="3" AC_SUBST(GTK_PC_MODULE) AC_SUBST(GTK_VERSION) @@ -625,25 +596,14 @@ running configure. Use --disable-gstrea AC_DEFINE(HAVE_PANGO14, 1, [Define if we have Pango 1.4 or newer.]),:) WEBKIT_VERSION=1.3.7 - if test "x$with_gtk" = "x3"; then - WEBKIT_PC_MODULE="webkitgtk-3.0" - PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([ + WEBKIT_PC_MODULE="webkitgtk-3.0" + PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [ + AC_MSG_RESULT(no) + AC_MSG_ERROR([ You must have WebKit for GTK+3 $WEBKIT_VERSION or newer development headers installed to compile Pidgin. If you want to build only Finch then specify --disable-gtkui when running configure. ])]) - else - WEBKIT_PC_MODULE="webkit-1.0" - PKG_CHECK_MODULES(WEBKIT, [$WEBKIT_PC_MODULE >= $WEBKIT_VERSION], , [ - AC_MSG_RESULT(no) - AC_MSG_ERROR([ -You must have WebKit for GTK+2 $WEBKIT_VERSION or newer development headers -installed to compile Pidgin. If you want to build only Finch then specify ---disable-gtkui when running configure. -])]) - fi AC_SUBST(WEBKIT_CFLAGS) AC_SUBST(WEBKIT_LIBS) AC_SUBST(WEBKIT_PC_MODULE) @@ -822,29 +782,16 @@ Use --disable-cap if you do not need the dnl # Check for GCR for its certificate widgets dnl ####################################################################### if test "x$enable_gcr" = "xyes"; then - if test "x$with_gtk" = "x3"; then - PKG_CHECK_MODULES(GCR, gcr-3, [ - AC_DEFINE(ENABLE_GCR, 1, [Define to 1 if GCR is found.])], [ - AC_MSG_RESULT(no) - enable_gcr="no" - if test "x$force_deps" = "xyes" ; then - AC_MSG_ERROR([ + PKG_CHECK_MODULES(GCR, gcr-3, [ + AC_DEFINE(ENABLE_GCR, 1, [Define to 1 if GCR is found.])], [ + AC_MSG_RESULT(no) + enable_gcr="no" + if test "x$force_deps" = "xyes" ; then + AC_MSG_ERROR([ GCR for GTK+3 development headers not found. Use --disable-gcr if you do not need GCR certificate widgets. ]) - fi]) - else - PKG_CHECK_MODULES(GCR, gcr-0, [ - AC_DEFINE(ENABLE_GCR, 1, [Define to 1 if GCR is found.])], [ - AC_MSG_RESULT(no) - enable_gcr="no" - if test "x$force_deps" = "xyes" ; then - AC_MSG_ERROR([ -GCR for GTK+2 development headers not found. -Use --disable-gcr if you do not need GCR certificate widgets. -]) - fi]) - fi + fi]) fi @@ -1011,93 +958,32 @@ AM_GCONF_SOURCE_2 dnl ####################################################################### dnl # Check for GStreamer dnl ####################################################################### +AC_ARG_ENABLE(gstreamer, + [AS_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])], + enable_gst="$enableval", enable_gst="yes") -dnl AC_ARG_ENABLE is declared near GTK2/3 configuration -AC_ARG_WITH(gstreamer, [AS_HELP_STRING([--with-gstreamer=<version>], - [compile with GStreamer 0.10 or 1.0 interface (default: auto)])], - with_gstreamer="$withval", with_gstreamer="auto") -if test "x$enable_gst" != "xno"; then - if test "x$with_gstreamer" == "xauto" -a "x$with_gtk" = "x3"; then - with_gstreamer="1.0" - elif test "x$with_gstreamer" == "xauto" -a "x$with_gtk" = "x2"; then - with_gstreamer="0.10" - fi - if test "x$with_gstreamer" == "xauto"; then - PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0], [ - AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) - with_gstreamer="1.0" - AC_SUBST(GSTREAMER_CFLAGS) - AC_SUBST(GSTREAMER_LIBS) - dnl Check whether forking stuff is required for this version. - ], [ - PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], [ - AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) - with_gstreamer="0.10" - AC_SUBST(GSTREAMER_CFLAGS) - AC_SUBST(GSTREAMER_LIBS) - ], [ - AC_MSG_RESULT(no) - enable_gst="no" - if test "x$force_deps" = "xyes" ; then - AC_MSG_ERROR([ -GStreamer development headers not found. -Use --disable-gstreamer if you do not need GStreamer (sound) support. -]) - fi - ]) - ]) - elif test "x$with_gstreamer" == "x1.0"; then - PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0], [ - AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer 1.0 for playing sounds]) - AC_SUBST(GSTREAMER_CFLAGS) - AC_SUBST(GSTREAMER_LIBS) - ], [ - AC_MSG_RESULT(no) - enable_gst="no" - if test "x$force_deps" = "xyes" ; then - AC_MSG_ERROR([ -GStreamer development headers not found. -Use --disable-gstreamer if you do not need GStreamer (sound) support. -]) - fi - ]) - elif test "x$with_gstreamer" == "x0.10"; then - PKG_CHECK_MODULES(GSTREAMER, [gstreamer-0.10], [ - AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer 0.10 for playing sounds]) - AC_SUBST(GSTREAMER_CFLAGS) - AC_SUBST(GSTREAMER_LIBS) - ], [ - AC_MSG_RESULT(no) - enable_gst="no" - if test "x$force_deps" = "xyes" ; then - AC_MSG_ERROR([ -GStreamer development headers not found. -Use --disable-gstreamer if you do not need GStreamer (sound) support. -]) - fi - ]) - else - AC_MSG_ERROR([--with-gstreamer must specify one of 0.10, 1.0 or auto.]) - fi -fi - -if test "x$with_gtk" == "x3" -a "x$with_gstreamer" == "x0.10"; then - AC_MSG_ERROR([WebKitGTK+ 3.0 cannot be mixed with GStreamer 0.10. -Please switch to WebKitGTK+ 2.0 or GStreamer 1.0.]) -elif test "x$with_gtk" == "x2" -a "x$with_gstreamer" == "x1.0"; then - AC_MSG_ERROR([WebKitGTK+ 2.0 cannot be mixed with GStreamer 1.0. -Please switch to WebKitGTK+ 3.0 or GStreamer 0.10.]) -fi -if test "x$with_gstreamer" == "x0.10" -o "x$with_gstreamer" == "x1.0"; then - AC_SUBST(GSTREAMER_VER, [$with_gstreamer]) -else - AC_SUBST(GSTREAMER_VER, "") +if test x"$enable_gst" != "xno"; then + PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0], [ + AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds]) + with_gstreamer="1.0" + AC_SUBST(GSTREAMER_CFLAGS) + AC_SUBST(GSTREAMER_LIBS) + ], [ + AC_MSG_RESULT(no) + enable_gst="no" + if test "x$force_deps" = "xyes" ; then + AC_MSG_ERROR([ + GStreamer development headers not found. + Use --disable-gstreamer if you do not need GStreamer (sound) support. + ]) + fi + ]) fi dnl ####################################################################### dnl # Check for GStreamer Video dnl ####################################################################### -if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x1.0"; then +if test "x$enable_gst" != "xno"; then AC_ARG_ENABLE(gstreamer-video, [AS_HELP_STRING([--disable-gstreamer-video], [compile without GStreamer 1.0 Video Overlay support])], enable_gstvideo="$enableval", enable_gstvideo="yes") @@ -1115,47 +1001,18 @@ else fi dnl ####################################################################### -dnl # Check for GStreamer Interfaces -dnl ####################################################################### -if test "x$enable_gst" != "xno" -a "x$with_gstreamer" == "x0.10"; then - AC_ARG_ENABLE(gstreamer-interfaces, - [AS_HELP_STRING([--disable-gstreamer-interfaces], [compile without GStreamer 0.10 interface support])], - enable_gstinterfaces="$enableval", enable_gstinterfaces="yes") - if test "x$enable_gstinterfaces" != "xno"; then - PKG_CHECK_MODULES(GSTINTERFACES, [gstreamer-interfaces-0.10], [ - AC_DEFINE(USE_GSTINTERFACES, 1, [Use GStreamer 0.10 interfaces for X overlay support]) - AC_SUBST(GSTINTERFACES_CFLAGS) - AC_SUBST(GSTINTERFACES_LIBS) - ], [ - enable_gstinterfaces="no" - ]) - fi -else - enable_gstinterfaces="no" -fi - -dnl ####################################################################### dnl # Check for Farstream dnl ####################################################################### AC_ARG_ENABLE(farstream, [AS_HELP_STRING([--disable-farstream], [compile without farstream support])], enable_farstream="$enableval", enable_farstream="yes") if test "x$enable_farstream" != "xno"; then - if test "x$with_gstreamer" == "x1.0"; then - PKG_CHECK_MODULES(FARSTREAM, [farstream-0.2 >= 0.2.7], [ - AC_SUBST(FARSTREAM_CFLAGS) - AC_SUBST(FARSTREAM_LIBS) - ], [ - enable_farstream="no" - ]) - else - PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [ - AC_SUBST(FARSTREAM_CFLAGS) - AC_SUBST(FARSTREAM_LIBS) - ], [ - enable_farstream="no" - ]) - fi + PKG_CHECK_MODULES(FARSTREAM, [farstream-0.2 >= 0.2.7], [ _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits