comparison configure.ac @ 26398:04a9e8435bfb

merge of '21bd048f68510f25c5c854a1c7e395e88f530503' and '22ecf5b2d3d8874d498194695cb625a789c0754a'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Wed, 01 Apr 2009 05:24:19 +0000
parents f5f08111da52
children c9b22d710a22
comparison
equal deleted inserted replaced
26396:43dcfcdd6a73 26398:04a9e8435bfb
1099 qq) static_qq=yes ;; 1099 qq) static_qq=yes ;;
1100 sametime) static_sametime=yes ;; 1100 sametime) static_sametime=yes ;;
1101 silc) static_silc=yes ;; 1101 silc) static_silc=yes ;;
1102 silc10) static_silc=yes ;; 1102 silc10) static_silc=yes ;;
1103 simple) static_simple=yes ;; 1103 simple) static_simple=yes ;;
1104 toc) static_toc=yes ;;
1105 yahoo) static_yahoo=yes ;; 1104 yahoo) static_yahoo=yes ;;
1106 zephyr) static_zephyr=yes ;; 1105 zephyr) static_zephyr=yes ;;
1107 *) echo "Invalid static protocol $i!!" ; exit ;; 1106 *) echo "Invalid static protocol $i!!" ; exit ;;
1108 esac 1107 esac
1109 done 1108 done
1117 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") 1116 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
1118 AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes") 1117 AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes")
1119 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") 1118 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
1120 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes") 1119 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes")
1121 AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes") 1120 AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes")
1122 AM_CONDITIONAL(STATIC_TOC, test "x$static_toc" = "xyes")
1123 AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes") 1121 AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
1124 AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes") 1122 AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
1125 AC_SUBST(STATIC_LINK_LIBS) 1123 AC_SUBST(STATIC_LINK_LIBS)
1126 AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto }, 1124 AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
1127 [Loads static protocol plugin module initialization functions.]) 1125 [Loads static protocol plugin module initialization functions.])
1163 qq) dynamic_qq=yes ;; 1161 qq) dynamic_qq=yes ;;
1164 sametime) dynamic_sametime=yes ;; 1162 sametime) dynamic_sametime=yes ;;
1165 silc) dynamic_silc=yes ;; 1163 silc) dynamic_silc=yes ;;
1166 silc10) dynamic_silc=yes ;; 1164 silc10) dynamic_silc=yes ;;
1167 simple) dynamic_simple=yes ;; 1165 simple) dynamic_simple=yes ;;
1168 toc) dynamic_toc=yes ;;
1169 yahoo) dynamic_yahoo=yes ;; 1166 yahoo) dynamic_yahoo=yes ;;
1170 zephyr) dynamic_zephyr=yes ;; 1167 zephyr) dynamic_zephyr=yes ;;
1171 *) echo "Invalid dynamic protocol $i!!" ; exit ;; 1168 *) echo "Invalid dynamic protocol $i!!" ; exit ;;
1172 esac 1169 esac
1173 done 1170 done
2501 libpurple/protocols/qq/Makefile 2498 libpurple/protocols/qq/Makefile
2502 libpurple/protocols/sametime/Makefile 2499 libpurple/protocols/sametime/Makefile
2503 libpurple/protocols/silc/Makefile 2500 libpurple/protocols/silc/Makefile
2504 libpurple/protocols/silc10/Makefile 2501 libpurple/protocols/silc10/Makefile
2505 libpurple/protocols/simple/Makefile 2502 libpurple/protocols/simple/Makefile
2506 libpurple/protocols/toc/Makefile
2507 libpurple/protocols/yahoo/Makefile 2503 libpurple/protocols/yahoo/Makefile
2508 libpurple/protocols/zephyr/Makefile 2504 libpurple/protocols/zephyr/Makefile
2509 libpurple/tests/Makefile 2505 libpurple/tests/Makefile
2510 libpurple/purple.h 2506 libpurple/purple.h
2511 libpurple/version.h 2507 libpurple/version.h