Mercurial > pidgin.yaz
changeset 11778:a13143b46c28
[gaim-migrate @ 14069]
Stop compiling napster by default since it doesn't load. I remove the AM_CONDITIONALS so I had to force it to only build as dynamic, I don't see this as too much of a problem...
committer: Tailor Script <tailor@pidgin.im>
| author | Gary Kramlich <grim@reaperworld.com> |
|---|---|
| date | Mon, 24 Oct 2005 00:15:32 +0000 |
| parents | 1253620ea5f2 |
| children | 80af53b5b3c5 |
| files | configure.ac src/protocols/napster/Makefile.am |
| diffstat | 2 files changed, 2 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sun Oct 23 23:52:17 2005 +0000 +++ b/configure.ac Mon Oct 24 00:15:32 2005 +0000 @@ -192,7 +192,7 @@ fi if test "x$STATIC_PRPLS" = "xall" ; then - STATIC_PRPLS="bonjour gg irc jabber msn napster novell oscar sametime silc simple yahoo zephyr" + STATIC_PRPLS="bonjour gg irc jabber msn novell oscar sametime silc simple yahoo zephyr" fi if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` @@ -214,7 +214,6 @@ irc) static_irc=yes ;; jabber) static_jabber=yes ;; msn) static_msn=yes ;; - napster) static_napster=yes ;; novell) static_novell=yes ;; oscar) static_oscar=yes ;; sametime) static_sametime=yes ;; @@ -231,7 +230,6 @@ AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") -AM_CONDITIONAL(STATIC_NAPSTER, test "x$static_napster" = "xyes") AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes") @@ -246,7 +244,7 @@ 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 msn napster novell oscar sametime silc simple yahoo zephyr" + DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar sametime silc simple yahoo zephyr" fi if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` @@ -262,7 +260,6 @@ irc) dynamic_irc=yes ;; jabber) dynamic_jabber=yes ;; msn) dynamic_msn=yes ;; - napster) dynamic_napster=yes ;; novell) dynamic_novell=yes ;; oscar) dynamic_oscar=yes ;; sametime) dynamic_sametime=yes ;; @@ -279,7 +276,6 @@ AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes") AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes") AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes") -AM_CONDITIONAL(DYNAMIC_NAPSTER, test "x$dynamic_napster" = "xyes") AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes") AM_CONDITIONAL(DYNAMIC_OSCAR, test "x$dynamic_oscar" = "xyes") AM_CONDITIONAL(DYNAMIC_SAMETIME, test "x$dynamic_sametime" = "xyes")
--- a/src/protocols/napster/Makefile.am Sun Oct 23 23:52:17 2005 +0000 +++ b/src/protocols/napster/Makefile.am Mon Oct 24 00:15:32 2005 +0000 @@ -9,21 +9,10 @@ libnapster_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS) -if STATIC_NAPSTER - -st = -DGAIM_STATIC_PRPL -noinst_LIBRARIES = libnapster.a -libnapster_a_SOURCES = $(NAPSTERSOURCES) -libnapster_a_CFLAGS = $(AM_CFLAGS) - -else - st = pkg_LTLIBRARIES = libnapster.la libnapster_la_SOURCES = $(NAPSTERSOURCES) -endif - AM_CPPFLAGS = \ -I$(top_srcdir)/src \ $(GLIB_CFLAGS) \