Mercurial > pidgin.yaz
diff configure.ac @ 18080:bb2e5f6ff2b4
propagate from branch 'im.pidgin.pidgin' (head 5fdf4fa0a7dcefa78c9ec2e7c25b151f1e3acf18)
to branch 'im.pidgin.pidgin.2.1.0' (head 1d53de833ec35c1899f24b60e7d79db753917c15)
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sun, 10 Jun 2007 01:46:31 +0000 |
parents | 226b9109179c 980a104267da |
children | 7e0bd339533c |
line wrap: on
line diff
--- a/configure.ac Fri Jun 08 13:25:28 2007 +0000 +++ b/configure.ac Sun Jun 10 01:46:31 2007 +0000 @@ -647,13 +647,14 @@ AC_ARG_WITH(silc-libs, [AC_HELP_STRING([--with-silc-libs=DIR], [compile the SILC plugin against the SILC libs in DIR])], [ac_silc_libs="$withval"], [ac_silc_libs="no"]) SILC_CFLAGS="" SILC_LIBS="" +have_silc="no" if test -n "$with_silc_includes" || test -n "$with_silc_libs"; then silc_manual_check="yes" else silc_manual_check="no" fi if test "x$silc_manual_check" = "xno"; then - PKG_CHECK_MODULES(SILC, silcclient, [ + PKG_CHECK_MODULES(SILC, [silcclient >= 1.1], [ have_silc="yes" silcincludes="yes" silcclient="yes" @@ -661,16 +662,26 @@ AC_MSG_RESULT(no) have_silc="no" ]) - dnl If silcclient.pc wasn't found, check for just silc.pc if test "x$have_silc" = "xno"; then - PKG_CHECK_MODULES(SILC, silc, [ + PKG_CHECK_MODULES(SILC, silcclient, [ have_silc="yes" - silcincludes="yes" - silcclient="yes" + silc10includes="yes" + silc10client="yes" ], [ AC_MSG_RESULT(no) have_silc="no" ]) + dnl If silcclient.pc wasn't found, check for just silc.pc + if test "x$have_silc" = "xno"; then + PKG_CHECK_MODULES(SILC, silc, [ + have_silc="yes" + silc10includes="yes" + silc10client="yes" + ], [ + AC_MSG_RESULT(no) + have_silc="no" + ]) + fi fi else if test "$ac_silc_includes" != "no"; then @@ -678,7 +689,7 @@ fi CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $SILC_CFLAGS" - AC_CHECK_HEADER(silcincludes.h, [silcincludes=yes]) + AC_CHECK_HEADER(silc.h, [silcincludes=yes]) CPPFLAGS="$CPPFLAGS_save" if test "$ac_silc_libs" != "no"; then @@ -686,11 +697,28 @@ fi SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL" AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS) + + if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then + have_silc="yes" + else + CPPFLAGS_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $SILC_CFLAGS" + AC_CHECK_HEADER(silcincludes.h, [silc10includes=yes]) + CPPFLAGS="$CPPFLAGS_save" + + SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL" + AC_CHECK_LIB(silcclient, silc_client_init, [silc10client=yes], , $SILC_LIBS) + if test "x$silc10includes" = "xyes" -a "x$silc10client" = "xyes"; then + have_silc="yes" + fi + fi fi AC_SUBST(SILC_LIBS) AC_SUBST(SILC_CFLAGS) dnl SILC Toolkit >= 1.0.1 has a new MIME API if test "x$silcclient" = "xyes"; then + AC_DEFINE(HAVE_SILCMIME_H, 1, [Define if we have silcmime.h]) +elif test "x$silc10client" = "xyes"; then CPPFLAGS_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $SILC_CFLAGS" AC_MSG_CHECKING(for silcmime.h) @@ -795,7 +823,10 @@ STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` fi if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then - STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc//'` + STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc/silc10/'` +fi +if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then + STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc10//'` fi AC_SUBST(STATIC_PRPLS) STATIC_LINK_LIBS= @@ -803,13 +834,24 @@ load_proto= for i in $STATIC_PRPLS ; do dnl Ugly special case for "libsilcpurple.a": - if test "x$i" = "xsilc"; then - STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib${i}purple.a" + dnl ... and Ugly special case for multi-protocol oscar + if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then + STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.a" + extern_init="$extern_init extern gboolean purple_init_aim_plugin();" + extern_init="$extern_init extern gboolean purple_init_icq_plugin();" + load_proto="$load_proto purple_init_aim_plugin();" + load_proto="$load_proto purple_init_icq_plugin();" else - STATIC_LINK_LIBS="$STATIC_LINK_LIBS protocols/$i/lib$i.a" + if test "x$i" = "xsilc"; then + STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.a" + elif test "x$i" = "xsilc10"; then + STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.a" + else + STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.a" + fi + extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" + load_proto="$load_proto purple_init_${i}_plugin();" fi - extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" - load_proto="$load_proto purple_init_${i}_plugin();" case $i in bonjour) static_bonjour=yes ;; gg) static_gg=yes ;; @@ -823,6 +865,7 @@ qq) static_qq=yes ;; sametime) static_sametime=yes ;; silc) static_silc=yes ;; + silc10) static_silc=yes ;; simple) static_simple=yes ;; toc) static_toc=yes ;; yahoo) static_yahoo=yes ;; @@ -839,7 +882,7 @@ AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") AM_CONDITIONAL(STATIC_QQ, test "x$static_qq" = "xyes") 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$silcincludes" = "xyes" -a "x$silcclient" = "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") @@ -859,7 +902,10 @@ DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` fi if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then - DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc//'` + DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc/silc10/'` +fi +if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then + DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc10//'` fi AC_SUBST(DYNAMIC_PRPLS) for i in $DYNAMIC_PRPLS ; do @@ -876,6 +922,7 @@ qq) dynamic_qq=yes ;; sametime) dynamic_sametime=yes ;; silc) dynamic_silc=yes ;; + silc10) dynamic_silc=yes ;; simple) dynamic_simple=yes ;; toc) dynamic_toc=yes ;; yahoo) dynamic_yahoo=yes ;; @@ -892,7 +939,7 @@ AM_CONDITIONAL(DYNAMIC_OSCAR, test "x$dynamic_oscar" = "xyes") AM_CONDITIONAL(DYNAMIC_QQ, test "x$dynamic_qq" = "xyes") AM_CONDITIONAL(DYNAMIC_SAMETIME, test "x$dynamic_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") -AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes") +AM_CONDITIONAL(DYNAMIC_SILC, test "x$dynamic_silc" = "xyes" -a "x$have_silc" = "xyes") AM_CONDITIONAL(DYNAMIC_SIMPLE, test "x$dynamic_simple" = "xyes") AM_CONDITIONAL(DYNAMIC_TOC, test "x$dynamic_toc" = "xyes") AM_CONDITIONAL(DYNAMIC_YAHOO, test "x$dynamic_yahoo" = "xyes") @@ -2091,6 +2138,7 @@ libpurple/protocols/qq/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile + libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/toc/Makefile libpurple/protocols/yahoo/Makefile