--- a/configure.ac Mon Mar 08 05:18:03 2010 +0000
+++ b/configure.ac Mon Mar 08 05:56:34 2010 +0000
@@ -1075,9 +1075,6 @@
AC_SUBST(GADU_LIBS)
AC_SUBST(GADU_CFLAGS)
-# change the next line to not make MSNP15 the default (s/disable/enable/; s/yes/no/;)
-AC_ARG_ENABLE(msnp15,[AC_HELP_STRING([--disable-msnp15], [Disable the newer MSNP15 protocol])],enable_msnp15=$enableval,enable_msnp15=yes)
-
AC_ARG_ENABLE(distrib,,,enable_distrib=no)
AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
DYNAMIC_PRPLS=all
@@ -1095,9 +1092,6 @@
if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
fi
-if test "x$enable_msnp15" != "xyes" ; then
- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/msn/msnp9/'`
-fi
if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc/silc10/'`
fi
@@ -1128,8 +1122,6 @@
STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
elif test "x$i" = "xsilc10"; then
STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
- elif test "x$i" = "xmsnp9"; then
- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libmsn.la"
else
STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
fi
@@ -1142,7 +1134,6 @@
irc) static_irc=yes ;;
jabber) static_jabber=yes ;;
msn) static_msn=yes ;;
- msnp9) static_msn=yes ;;
myspace) static_myspace=yes ;;
mxit) static_mxit=yes ;;
novell) static_novell=yes ;;
@@ -1188,9 +1179,6 @@
if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
fi
-if test "x$enable_msnp15" != "xyes" ; then
- DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/msn/msnp9/'`
-fi
if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc/silc10/'`
fi
@@ -1205,7 +1193,6 @@
irc) dynamic_irc=yes ;;
jabber) dynamic_jabber=yes ;;
msn) dynamic_msn=yes ;;
- msnp9) dynamic_msn=yes ;;
myspace) dynamic_myspace=yes ;;
mxit) dynamic_mxit=yes ;;
novell) dynamic_novell=yes ;;
@@ -2552,7 +2539,6 @@
libpurple/protocols/irc/Makefile
libpurple/protocols/jabber/Makefile
libpurple/protocols/msn/Makefile
- libpurple/protocols/msnp9/Makefile
libpurple/protocols/myspace/Makefile
libpurple/protocols/mxit/Makefile
libpurple/protocols/novell/Makefile