Mercurial > pidgin
diff configure.ac @ 26397:f5f08111da52
propagate from branch 'im.pidgin.pidgin' (head a609160715ae18beed98b084aac19bc0f6551362)
to branch 'im.pidgin.pidgin.vv' (head 6e683319559d829234bc548e0795ed03403af478)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Wed, 01 Apr 2009 04:25:37 +0000 |
| parents | ff4212a5268f 7b197bc1d196 |
| children | c9b22d710a22 |
line wrap: on
line diff
--- a/configure.ac Wed Apr 01 04:24:11 2009 +0000 +++ b/configure.ac Wed Apr 01 04:25:37 2009 +0000 @@ -1101,7 +1101,6 @@ silc) static_silc=yes ;; silc10) static_silc=yes ;; simple) static_simple=yes ;; - toc) static_toc=yes ;; yahoo) static_yahoo=yes ;; zephyr) static_zephyr=yes ;; *) echo "Invalid static protocol $i!!" ; exit ;; @@ -1119,7 +1118,6 @@ AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes") AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes") -AM_CONDITIONAL(STATIC_TOC, test "x$static_toc" = "xyes") AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes") AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes") AC_SUBST(STATIC_LINK_LIBS) @@ -1165,7 +1163,6 @@ silc) dynamic_silc=yes ;; silc10) dynamic_silc=yes ;; simple) dynamic_simple=yes ;; - toc) dynamic_toc=yes ;; yahoo) dynamic_yahoo=yes ;; zephyr) dynamic_zephyr=yes ;; *) echo "Invalid dynamic protocol $i!!" ; exit ;; @@ -2503,7 +2500,6 @@ libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile - libpurple/protocols/toc/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile