Mercurial > pidgin.yaz
diff configure.ac @ 27755:9a60b9fab0ea
propagate from branch 'im.pidgin.pidgin' (head d50f362e369f486aaf9a95a0d79ec0632743f07d)
to branch 'im.pidgin.pidgin.yaz' (head 85b37cd20a00067af5a2da2760336b0c1016ef47)
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Mon, 07 Jan 2008 03:40:27 +0000 |
parents | 2de9ab207c8e 0503cd74cb56 |
children | 5f2dc6845abe |
line wrap: on
line diff
--- a/configure.ac Mon Dec 17 08:20:42 2007 +0000 +++ b/configure.ac Mon Jan 07 03:40:27 2008 +0000 @@ -43,19 +43,19 @@ # # Make sure to update finch/libgnt/configure.ac with libgnt version changes. # -m4_define([purple_lt_current], [3]) +m4_define([purple_lt_current], [4]) m4_define([purple_major_version], [2]) -m4_define([purple_minor_version], [3]) -m4_define([purple_micro_version], [2]) +m4_define([purple_minor_version], [4]) +m4_define([purple_micro_version], [0]) m4_define([purple_version_suffix], [devel]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) -m4_define([gnt_lt_current], [3]) +m4_define([gnt_lt_current], [4]) m4_define([gnt_major_version], [2]) -m4_define([gnt_minor_version], [3]) -m4_define([gnt_micro_version], [2]) +m4_define([gnt_minor_version], [4]) +m4_define([gnt_micro_version], [0]) m4_define([gnt_version_suffix], [devel]) m4_define([gnt_version], [gnt_major_version.gnt_minor_version.gnt_micro_version]) @@ -142,7 +142,7 @@ dnl If we don't have msgfmt, then po/ is going to fail -- ensure that dnl AM_GLIB_GNU_GETTEXT found it. -if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT = x +if test x$MSGFMT = xno -o x$MSGFMT$GMSGFMT$INTLTOOL_MSGFMT = x then AC_ERROR([ @@ -678,7 +678,6 @@ PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [ have_meanwhile="yes" ], [ - AC_MSG_RESULT(no) have_meanwhile="no" ]) AC_SUBST(MEANWHILE_CFLAGS) @@ -697,7 +696,6 @@ avahiincludes="yes" avahilibs="yes" ], [ - AC_MSG_RESULT(no) avahiincludes="no" avahilibs="no" ]) @@ -742,7 +740,6 @@ silcincludes="yes" silcclient="yes" ], [ - AC_MSG_RESULT(no) have_silc="no" ]) if test "x$have_silc" = "xno"; then @@ -751,7 +748,6 @@ silc10includes="yes" silc10client="yes" ], [ - AC_MSG_RESULT(no) have_silc="no" ]) dnl If silcclient.pc wasn't found, check for just silc.pc @@ -761,7 +757,6 @@ silc10includes="yes" silc10client="yes" ], [ - AC_MSG_RESULT(no) have_silc="no" ]) fi @@ -982,7 +977,7 @@ AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes") AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes") AC_SUBST(STATIC_LINK_LIBS) -AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init() { $load_proto }, +AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto }, [Loads static protocol plugin module initialization functions.]) AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) @@ -1153,7 +1148,6 @@ AC_SUBST(DBUS_LIBS) enable_dbus=yes ], [ - AC_MSG_RESULT(no) enable_dbus=no ])