comparison: configure.ac
configure.ac
- changeset 38242
- 640928dfa2fc
- parent 38241
- 3be724397dfd
- child 38243
- 6230261df73c
equal
deleted
inserted
replaced
| 38241:3be724397dfd | 38242:640928dfa2fc |
|---|---|
| 1226 if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then | 1226 if test "x$STATIC_PRPLS" != "x" -a "x$DYNAMIC_PRPLS" = "xall"; then |
| 1227 DYNAMIC_PRPLS="" | 1227 DYNAMIC_PRPLS="" |
| 1228 fi | 1228 fi |
| 1229 | 1229 |
| 1230 if test "x$STATIC_PRPLS" = "xall" ; then | 1230 if test "x$STATIC_PRPLS" = "xall" ; then |
| 1231 <<<<<<< working copy | |
| 1232 STATIC_PRPLS="bonjour facebook gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr" | |
| 1233 ||||||| base | |
| 1234 STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" | |
| 1235 ======= | |
| 1236 STATIC_PRPLS="bonjour gg irc jabber novell oscar sametime silc simple zephyr" | 1231 STATIC_PRPLS="bonjour gg irc jabber novell oscar sametime silc simple zephyr" |
| 1237 >>>>>>> merge rev | |
| 1238 fi | 1232 fi |
| 1239 if test "x$have_meanwhile" != "xyes" ; then | 1233 if test "x$have_meanwhile" != "xyes" ; then |
| 1240 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` | 1234 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` |
| 1241 fi | 1235 fi |
| 1242 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then | 1236 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then |
| 1257 load_proto= | 1251 load_proto= |
| 1258 extern_unload= | 1252 extern_unload= |
| 1259 unload_proto= | 1253 unload_proto= |
| 1260 for i in $STATIC_PRPLS ; do | 1254 for i in $STATIC_PRPLS ; do |
| 1261 dnl Ugly special case for "libsilcpurple.la": | 1255 dnl Ugly special case for "libsilcpurple.la": |
| 1262 <<<<<<< working copy | |
| 1263 if test "x$i" = "xsilc"; then | 1256 if test "x$i" = "xsilc"; then |
| 1264 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" | 1257 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" |
| 1265 ||||||| base | |
| 1266 dnl ... and Ugly special case for multi-protocol oscar and yahoo | |
| 1267 if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then | |
| 1268 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la" | |
| 1269 extern_init="$extern_init extern gboolean purple_init_aim_plugin();" | |
| 1270 extern_init="$extern_init extern gboolean purple_init_icq_plugin();" | |
| 1271 load_proto="$load_proto purple_init_aim_plugin();" | |
| 1272 load_proto="$load_proto purple_init_icq_plugin();" | |
| 1273 elif test "x$i" = "xyahoo"; then | |
| 1274 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la" | |
| 1275 extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();" | |
| 1276 extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();" | |
| 1277 load_proto="$load_proto purple_init_yahoo_plugin();" | |
| 1278 load_proto="$load_proto purple_init_yahoojp_plugin();" | |
| 1279 ======= | |
| 1280 dnl ... and Ugly special case for multi-protocol oscar | |
| 1281 if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then | |
| 1282 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la" | |
| 1283 extern_init="$extern_init extern gboolean purple_init_aim_plugin();" | |
| 1284 extern_init="$extern_init extern gboolean purple_init_icq_plugin();" | |
| 1285 load_proto="$load_proto purple_init_aim_plugin();" | |
| 1286 load_proto="$load_proto purple_init_icq_plugin();" | |
| 1287 >>>>>>> merge rev | |
| 1288 else | 1258 else |
| 1289 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" | 1259 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" |
| 1290 fi | 1260 fi |
| 1291 extern_load="$extern_load extern gboolean ${i}_plugin_load();" | 1261 extern_load="$extern_load extern gboolean ${i}_plugin_load();" |
| 1292 load_proto="$load_proto ${i}_plugin_load();" | 1262 load_proto="$load_proto ${i}_plugin_load();" |
| 1297 bonjour) static_bonjour=yes ;; | 1267 bonjour) static_bonjour=yes ;; |
| 1298 facebook) static_facebook=yes ;; | 1268 facebook) static_facebook=yes ;; |
| 1299 gg) static_gg=yes ;; | 1269 gg) static_gg=yes ;; |
| 1300 irc) static_irc=yes ;; | 1270 irc) static_irc=yes ;; |
| 1301 jabber) static_jabber=yes ;; | 1271 jabber) static_jabber=yes ;; |
| 1302 <<<<<<< working copy | |
| 1303 msn) static_msn=yes ;; | |
| 1304 mxit) static_mxit=yes ;; | |
| 1305 ||||||| base | |
| 1306 msn) static_msn=yes ;; | |
| 1307 myspace) static_myspace=yes ;; | |
| 1308 mxit) static_mxit=yes ;; | |
| 1309 ======= | |
| 1310 >>>>>>> merge rev | |
| 1311 novell) static_novell=yes ;; | 1272 novell) static_novell=yes ;; |
| 1312 oscar) static_oscar=yes ;; | 1273 oscar) static_oscar=yes ;; |
| 1313 aim) static_oscar=yes ;; | 1274 aim) static_oscar=yes ;; |
| 1314 icq) static_oscar=yes ;; | 1275 icq) static_oscar=yes ;; |
| 1315 sametime) static_sametime=yes ;; | 1276 sametime) static_sametime=yes ;; |
| 1322 AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes") | 1283 AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes") |
| 1323 AM_CONDITIONAL(STATIC_FACEBOOK, test "x$static_facebook" = "xyes") | 1284 AM_CONDITIONAL(STATIC_FACEBOOK, test "x$static_facebook" = "xyes") |
| 1324 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") | 1285 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") |
| 1325 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") | 1286 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") |
| 1326 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") | 1287 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") |
| 1327 <<<<<<< working copy | |
| 1328 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") | |
| 1329 AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes") | |
| 1330 ||||||| base | |
| 1331 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") | |
| 1332 AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes") | |
| 1333 AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes") | |
| 1334 ======= | |
| 1335 >>>>>>> merge rev | |
| 1336 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") | 1288 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") |
| 1337 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") | 1289 AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") |
| 1338 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") | 1290 AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") |
| 1339 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes") | 1291 AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes") |
| 1340 AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes") | 1292 AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes") |
| 1345 AC_DEFINE_UNQUOTED(STATIC_PROTO_UNLOAD, $extern_unload static void static_proto_unload(void) { $unload_proto }, | 1297 AC_DEFINE_UNQUOTED(STATIC_PROTO_UNLOAD, $extern_unload static void static_proto_unload(void) { $unload_proto }, |
| 1346 [Unloads protocols from static protocol plugin modules.]) | 1298 [Unloads protocols from static protocol plugin modules.]) |
| 1347 | 1299 |
| 1348 AC_ARG_WITH(dynamic_prpls, [AS_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) | 1300 AC_ARG_WITH(dynamic_prpls, [AS_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) |
| 1349 if test "x$DYNAMIC_PRPLS" = "xall" ; then | 1301 if test "x$DYNAMIC_PRPLS" = "xall" ; then |
| 1350 <<<<<<< working copy | |
| 1351 DYNAMIC_PRPLS="bonjour facebook gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr" | |
| 1352 ||||||| base | |
| 1353 DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" | |
| 1354 ======= | |
| 1355 DYNAMIC_PRPLS="bonjour gg irc jabber novell oscar sametime silc simple zephyr" | 1302 DYNAMIC_PRPLS="bonjour gg irc jabber novell oscar sametime silc simple zephyr" |
| 1356 >>>>>>> merge rev | |
| 1357 fi | 1303 fi |
| 1358 if test "x$have_meanwhile" != "xyes"; then | 1304 if test "x$have_meanwhile" != "xyes"; then |
| 1359 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` | 1305 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` |
| 1360 fi | 1306 fi |
| 1361 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then | 1307 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then |
| 1376 bonjour) dynamic_bonjour=yes ;; | 1322 bonjour) dynamic_bonjour=yes ;; |
| 1377 facebook) dynamic_facebook=yes ;; | 1323 facebook) dynamic_facebook=yes ;; |
| 1378 gg) dynamic_gg=yes ;; | 1324 gg) dynamic_gg=yes ;; |
| 1379 irc) dynamic_irc=yes ;; | 1325 irc) dynamic_irc=yes ;; |
| 1380 jabber) dynamic_jabber=yes ;; | 1326 jabber) dynamic_jabber=yes ;; |
| 1381 <<<<<<< working copy | |
| 1382 msn) dynamic_msn=yes ;; | |
| 1383 mxit) dynamic_mxit=yes ;; | |
| 1384 ||||||| base | |
| 1385 msn) dynamic_msn=yes ;; | |
| 1386 myspace) dynamic_myspace=yes ;; | |
| 1387 mxit) dynamic_mxit=yes ;; | |
| 1388 ======= | |
| 1389 >>>>>>> merge rev | |
| 1390 novell) dynamic_novell=yes ;; | 1327 novell) dynamic_novell=yes ;; |
| 1391 null) dynamic_null=yes ;; | 1328 null) dynamic_null=yes ;; |
| 1392 oscar) dynamic_oscar=yes ;; | 1329 oscar) dynamic_oscar=yes ;; |
| 1393 aim) dynamic_oscar=yes ;; | 1330 aim) dynamic_oscar=yes ;; |
| 1394 icq) dynamic_oscar=yes ;; | 1331 icq) dynamic_oscar=yes ;; |
