comparison configure.ac @ 30942:0712ce23901e

propagate from branch 'im.pidgin.pidgin' (head 37329f033a30f4f4f5048f9fdc86df4400e3ada5) to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 19964a278756296718ce9887b3e8b98a575f9310)
author Marcus Lundblad <ml@update.uu.se>
date Mon, 09 Nov 2009 19:01:03 +0000
parents 69aa4660401a
children 0399f8ef665a f5e31099a351 39fae7199fa9 be31e811cb26 585d6f844f79
comparison
equal deleted inserted replaced
30941:2702ca44d963 30942:0712ce23901e
1076 if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then 1076 if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then
1077 DYNAMIC_PRPLS="" 1077 DYNAMIC_PRPLS=""
1078 fi 1078 fi
1079 1079
1080 if test "x$STATIC_PRPLS" = "xall" ; then 1080 if test "x$STATIC_PRPLS" = "xall" ; then
1081 STATIC_PRPLS="bonjour gg irc jabber msn myspace novell oscar qq sametime silc simple yahoo zephyr" 1081 STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar qq sametime silc simple yahoo zephyr"
1082 fi 1082 fi
1083 if test "x$have_meanwhile" != "xyes" ; then 1083 if test "x$have_meanwhile" != "xyes" ; then
1084 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` 1084 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
1085 fi 1085 fi
1086 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then 1086 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
1133 irc) static_irc=yes ;; 1133 irc) static_irc=yes ;;
1134 jabber) static_jabber=yes ;; 1134 jabber) static_jabber=yes ;;
1135 msn) static_msn=yes ;; 1135 msn) static_msn=yes ;;
1136 msnp9) static_msn=yes ;; 1136 msnp9) static_msn=yes ;;
1137 myspace) static_myspace=yes ;; 1137 myspace) static_myspace=yes ;;
1138 mxit) static_mxit=yes ;;
1138 novell) static_novell=yes ;; 1139 novell) static_novell=yes ;;
1139 oscar) static_oscar=yes ;; 1140 oscar) static_oscar=yes ;;
1140 aim) static_oscar=yes ;; 1141 aim) static_oscar=yes ;;
1141 icq) static_oscar=yes ;; 1142 icq) static_oscar=yes ;;
1142 qq) static_qq=yes ;; 1143 qq) static_qq=yes ;;
1153 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") 1154 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
1154 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") 1155 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
1155 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") 1156 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
1156 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") 1157 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
1157 AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes") 1158 AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes")
1159 AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes")
1158 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") 1160 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
1159 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") 1161 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
1160 AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes") 1162 AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes")
1161 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") 1163 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
1162 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes") 1164 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
1167 AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto }, 1169 AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
1168 [Loads static protocol plugin module initialization functions.]) 1170 [Loads static protocol plugin module initialization functions.])
1169 1171
1170 AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) 1172 AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
1171 if test "x$DYNAMIC_PRPLS" = "xall" ; then 1173 if test "x$DYNAMIC_PRPLS" = "xall" ; then
1172 DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace novell oscar qq sametime silc simple yahoo zephyr" 1174 DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar qq sametime silc simple yahoo zephyr"
1173 fi 1175 fi
1174 if test "x$have_meanwhile" != "xyes"; then 1176 if test "x$have_meanwhile" != "xyes"; then
1175 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` 1177 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
1176 fi 1178 fi
1177 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then 1179 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
1194 irc) dynamic_irc=yes ;; 1196 irc) dynamic_irc=yes ;;
1195 jabber) dynamic_jabber=yes ;; 1197 jabber) dynamic_jabber=yes ;;
1196 msn) dynamic_msn=yes ;; 1198 msn) dynamic_msn=yes ;;
1197 msnp9) dynamic_msn=yes ;; 1199 msnp9) dynamic_msn=yes ;;
1198 myspace) dynamic_myspace=yes ;; 1200 myspace) dynamic_myspace=yes ;;
1201 mxit) dynamic_mxit=yes ;;
1199 novell) dynamic_novell=yes ;; 1202 novell) dynamic_novell=yes ;;
1200 null) dynamic_null=yes ;; 1203 null) dynamic_null=yes ;;
1201 oscar) dynamic_oscar=yes ;; 1204 oscar) dynamic_oscar=yes ;;
1202 aim) dynamic_oscar=yes ;; 1205 aim) dynamic_oscar=yes ;;
1203 icq) dynamic_oscar=yes ;; 1206 icq) dynamic_oscar=yes ;;
2527 libpurple/protocols/irc/Makefile 2530 libpurple/protocols/irc/Makefile
2528 libpurple/protocols/jabber/Makefile 2531 libpurple/protocols/jabber/Makefile
2529 libpurple/protocols/msn/Makefile 2532 libpurple/protocols/msn/Makefile
2530 libpurple/protocols/msnp9/Makefile 2533 libpurple/protocols/msnp9/Makefile
2531 libpurple/protocols/myspace/Makefile 2534 libpurple/protocols/myspace/Makefile
2535 libpurple/protocols/mxit/Makefile
2532 libpurple/protocols/novell/Makefile 2536 libpurple/protocols/novell/Makefile
2533 libpurple/protocols/null/Makefile 2537 libpurple/protocols/null/Makefile
2534 libpurple/protocols/oscar/Makefile 2538 libpurple/protocols/oscar/Makefile
2535 libpurple/protocols/qq/Makefile 2539 libpurple/protocols/qq/Makefile
2536 libpurple/protocols/sametime/Makefile 2540 libpurple/protocols/sametime/Makefile