From c1c61bc305a222aaa75d3d6803d08225552f0eed Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 9 Oct 2018 18:33:11 +0200 Subject: [PATCH] Drop AIM and Gadu-Gadu https://bugzilla.redhat.com/show_bug.cgi?id=1026505 https://bugzilla.redhat.com/show_bug.cgi?id=1500403 https://bugzilla.redhat.com/show_bug.cgi?id=1579978 --- configure.ac | 4 ++-- libpurple/protocols/oscar/Makefile.am | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index f973af051bcb..e477f47a78af 100644 --- a/configure.ac +++ b/configure.ac @@ -1189,7 +1189,7 @@ if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then fi if test "x$STATIC_PRPLS" = "xall" ; then - STATIC_PRPLS="bonjour gg irc jabber novell oscar sametime silc simple zephyr" + STATIC_PRPLS="bonjour irc jabber novell oscar sametime silc simple zephyr" fi if test "x$have_meanwhile" != "xyes" ; then STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` @@ -1260,7 +1260,7 @@ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) if test "x$DYNAMIC_PRPLS" = "xall" ; then - DYNAMIC_PRPLS="bonjour gg irc jabber novell oscar sametime silc simple zephyr" + DYNAMIC_PRPLS="bonjour irc jabber novell oscar sametime silc simple zephyr" fi if test "x$have_meanwhile" != "xyes"; then DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` diff --git a/libpurple/protocols/oscar/Makefile.am b/libpurple/protocols/oscar/Makefile.am index d7663b025b59..75d80f746728 100644 --- a/libpurple/protocols/oscar/Makefile.am +++ b/libpurple/protocols/oscar/Makefile.am @@ -51,25 +51,21 @@ OSCARSOURCES = \ AM_CFLAGS = $(st) -libaim_la_LDFLAGS = -module -avoid-version libicq_la_LDFLAGS = -module -avoid-version if STATIC_OSCAR st = -DPURPLE_STATIC_PRPL noinst_LTLIBRARIES = liboscar.la -liboscar_la_SOURCES = $(OSCARSOURCES) libaim.c libicq.c +liboscar_la_SOURCES = $(OSCARSOURCES) libicq.c liboscar_la_CFLAGS = $(AM_CFLAGS) else st = -pkg_LTLIBRARIES = liboscar.la libaim.la libicq.la +pkg_LTLIBRARIES = liboscar.la libicq.la liboscar_la_SOURCES = $(OSCARSOURCES) liboscar_la_LIBADD = $(GLIB_LIBS) -libaim_la_SOURCES = libaim.c -libaim_la_LIBADD = liboscar.la - libicq_la_SOURCES = libicq.c libicq_la_LIBADD = liboscar.la -- 2.14.4