Mercurial > pidgin.yaz
diff configure.ac @ 21300:abbf74f4732b
propagate from branch 'im.pidgin.pidgin' (head e3fd21e6dabb99e5604e8337380353fcbe1a7279)
to branch 'im.pidgin.elb.make' (head 7422b9a549f752c05cc75f0c8e56fdd2bced034a)
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sat, 10 Nov 2007 16:17:54 +0000 |
parents | f2dcad9572b2 5b1acbab99cf |
children | 708b51ddddc4 |
line wrap: on
line diff
--- a/configure.ac Tue Nov 06 17:13:21 2007 +0000 +++ b/configure.ac Sat Nov 10 16:17:54 2007 +0000 @@ -43,10 +43,10 @@ # # Make sure to update finch/libgnt/configure.ac with libgnt version changes. # -m4_define([purple_lt_current], [2]) +m4_define([purple_lt_current], [3]) m4_define([purple_major_version], [2]) -m4_define([purple_minor_version], [2]) -m4_define([purple_micro_version], [3]) +m4_define([purple_minor_version], [3]) +m4_define([purple_micro_version], [0]) m4_define([purple_version_suffix], []) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) @@ -233,6 +233,30 @@ dnl FreeBSD doesn't have libdl, dlopen is provided by libc AC_CHECK_FUNC(dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) +AC_MSG_CHECKING(for fileno()) +AC_TRY_RUN([ +#include <stdio.h> + +int main(int argc, char *argv[]) +{ + int fd; + + fd = fileno(stdout); + + return !(fd > 0); +} +], [ + AC_MSG_RESULT(yes) + AC_DEFINE([HAVE_FILENO], [1], + [Define to 1 if your stdio has int fileno(FILE *).]) +], [ + AC_MSG_RESULT(no) +], [ + # Fallback for Cross Compiling... + # This will enable the compatibility code. + AC_MSG_RESULT(no) +]) + AC_MSG_CHECKING(for the %z format string in strftime()) AC_TRY_RUN([ #ifdef HAVE_SYS_TIME_H @@ -1979,9 +2003,12 @@ if test "x$enable_plugins" = "xyes" ; then AC_DEFINE(PURPLE_PLUGINS, 1, [Define if plugins are enabled.]) AM_CONDITIONAL(PLUGINS, true) + PLUGINS_DEFINE="#define PURPLE_PLUGINS 1" else AM_CONDITIONAL(PLUGINS, false) + PLUGINS_DEFINE="#undef PURPLE_PLUGINS" fi +AC_SUBST(PLUGINS_DEFINE) dnl ####################################################################### dnl # Check for Cyrus-SASL (for Jabber) @@ -2226,6 +2253,7 @@ libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile + libpurple/purple.h libpurple/version.h share/Makefile share/sounds/Makefile