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