comparison configure.ac @ 29786:f549ad844d54

propagate from branch 'im.pidgin.pidgin.next.minor' (head 42544ec892337510146c931806a95dbf69c2fe30) to branch 'im.pidgin.pidgin' (head 32a27a2c6eebcccdecd7d7cd420b3789c69cbb09)
author Mark Doliner <mark@kingant.net>
date Thu, 18 Feb 2010 09:22:01 +0000
parents 4e42f18df200 f3745c3198b2
children 2dc86306dfa5
comparison
equal deleted inserted replaced
29785:4c266d9c17eb 29786:f549ad844d54
41 # For code under development: [devel] 41 # For code under development: [devel]
42 # For production releases: [] 42 # For production releases: []
43 # 43 #
44 # Make sure to update finch/libgnt/configure.ac with libgnt version changes. 44 # Make sure to update finch/libgnt/configure.ac with libgnt version changes.
45 # 45 #
46 m4_define([purple_lt_current], [6]) 46 m4_define([purple_lt_current], [7])
47 m4_define([purple_major_version], [2]) 47 m4_define([purple_major_version], [2])
48 m4_define([purple_minor_version], [6]) 48 m4_define([purple_minor_version], [7])
49 m4_define([purple_micro_version], [6]) 49 m4_define([purple_micro_version], [0])
50 m4_define([purple_version_suffix], []) 50 m4_define([purple_version_suffix], [])
51 m4_define([purple_version], 51 m4_define([purple_version],
52 [purple_major_version.purple_minor_version.purple_micro_version]) 52 [purple_major_version.purple_minor_version.purple_micro_version])
53 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) 53 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
54 54
55 m4_define([gnt_lt_current], [6]) 55 m4_define([gnt_lt_current], [7])
56 m4_define([gnt_major_version], [2]) 56 m4_define([gnt_major_version], [2])
57 m4_define([gnt_minor_version], [6]) 57 m4_define([gnt_minor_version], [7])
58 m4_define([gnt_micro_version], [6]) 58 m4_define([gnt_micro_version], [0])
59 m4_define([gnt_version_suffix], []) 59 m4_define([gnt_version_suffix], [])
60 m4_define([gnt_version], 60 m4_define([gnt_version],
61 [gnt_major_version.gnt_minor_version.gnt_micro_version]) 61 [gnt_major_version.gnt_minor_version.gnt_micro_version])
62 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix])) 62 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
63 63
209 [AC_DEFINE([HAVE_GETADDRINFO], [1], 209 [AC_DEFINE([HAVE_GETADDRINFO], [1],
210 [Define to 1 if you have the getaddrinfo function.])], 210 [Define to 1 if you have the getaddrinfo function.])],
211 [AC_CHECK_LIB(socket, getaddrinfo, 211 [AC_CHECK_LIB(socket, getaddrinfo,
212 [AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lsnl $LIBS"], , , -lnsl)]) 212 [AC_DEFINE([HAVE_GETADDRINFO]) LIBS="-lsocket -lsnl $LIBS"], , , -lnsl)])
213 AC_CHECK_FUNCS(inet_ntop) 213 AC_CHECK_FUNCS(inet_ntop)
214 AC_CHECK_FUNCS(getifaddrs)
214 dnl Check for socklen_t (in Unix98) 215 dnl Check for socklen_t (in Unix98)
215 AC_MSG_CHECKING(for socklen_t) 216 AC_MSG_CHECKING(for socklen_t)
216 AC_TRY_COMPILE([ 217 AC_TRY_COMPILE([
217 #include <sys/types.h> 218 #include <sys/types.h>
218 #include <sys/socket.h> 219 #include <sys/socket.h>
308 AC_MSG_RESULT(no) 309 AC_MSG_RESULT(no)
309 ] 310 ]
310 ) 311 )
311 312
312 dnl ####################################################################### 313 dnl #######################################################################
313 dnl # Check for GLib 2.0 (required) 314 dnl # Check for GLib 2.12 (required)
314 dnl ####################################################################### 315 dnl #######################################################################
315 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.4.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ 316 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.12.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [
316 AC_MSG_RESULT(no) 317 AC_MSG_RESULT(no)
317 AC_MSG_ERROR([ 318 AC_MSG_ERROR([
318 319
319 You must have GLib 2.4.0 or newer development headers installed to build. 320 You must have GLib 2.12.0 or newer development headers installed to build.
320 321
321 If you have these installed already you may need to install pkg-config so 322 If you have these installed already you may need to install pkg-config so
322 I can find them. 323 I can find them.
323 ])]) 324 ])])
324 AC_SUBST(GLIB_CFLAGS) 325 AC_SUBST(GLIB_CFLAGS)
350 AC_ARG_ENABLE(consoleui, [AC_HELP_STRING([--disable-consoleui], 351 AC_ARG_ENABLE(consoleui, [AC_HELP_STRING([--disable-consoleui],
351 [compile without console user interface])], 352 [compile without console user interface])],
352 [enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no]) 353 [enable_consoleui=$enableval force_finch=$enableval], [enable_consoleui=yes force_finch=no])
353 354
354 dnl ####################################################################### 355 dnl #######################################################################
355 dnl # Check for GTK+ 2.0 and other things used by the GTK UI 356 dnl # Check for GTK+ 2.10 and other things used by the GTK UI
356 dnl ####################################################################### 357 dnl #######################################################################
357 AC_ARG_ENABLE(screensaver, 358 AC_ARG_ENABLE(screensaver,
358 [AC_HELP_STRING([--disable-screensaver], 359 [AC_HELP_STRING([--disable-screensaver],
359 [compile without X screensaver extension (used to detect idleness)])], 360 [compile without X screensaver extension (used to detect idleness)])],
360 enable_screensaver="$enableval", enable_screensaver="yes") 361 enable_screensaver="$enableval", enable_screensaver="yes")
397 else 398 else
398 x_incpath_add="-I$x_includes" 399 x_incpath_add="-I$x_includes"
399 fi 400 fi
400 401
401 if test "x$enable_gtkui" = "xyes" ; then 402 if test "x$enable_gtkui" = "xyes" ; then
402 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.4.0], , [ 403 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.10.0], , [
403 AC_MSG_RESULT(no) 404 AC_MSG_RESULT(no)
404 AC_MSG_ERROR([ 405 AC_MSG_ERROR([
405 406
406 You must have GTK+ 2.4.0 or newer development headers installed to compile 407 You must have GTK+ 2.10.0 or newer development headers installed to compile
407 Pidgin. If you want to build only Finch then specify --disable-gtkui when 408 Pidgin. If you want to build only Finch then specify --disable-gtkui when
408 running configure. 409 running configure.
409 ])]) 410 ])])
410 411
411 AC_SUBST(GTK_CFLAGS) 412 AC_SUBST(GTK_CFLAGS)
2489 m4macros/Makefile 2490 m4macros/Makefile
2490 pidgin.apspec 2491 pidgin.apspec
2491 pidgin/Makefile 2492 pidgin/Makefile
2492 pidgin/pidgin.pc 2493 pidgin/pidgin.pc
2493 pidgin/pidgin-uninstalled.pc 2494 pidgin/pidgin-uninstalled.pc
2495 pidgin/pidgin-2.pc
2496 pidgin/pidgin-2-uninstalled.pc
2494 pidgin/pixmaps/Makefile 2497 pidgin/pixmaps/Makefile
2495 pidgin/pixmaps/emotes/default/24/Makefile 2498 pidgin/pixmaps/emotes/default/24/Makefile
2496 pidgin/pixmaps/emotes/none/Makefile 2499 pidgin/pixmaps/emotes/none/Makefile
2497 pidgin/pixmaps/emotes/small/16/Makefile 2500 pidgin/pixmaps/emotes/small/16/Makefile
2498 pidgin/plugins/Makefile 2501 pidgin/plugins/Makefile
2506 pidgin/plugins/ticker/Makefile 2509 pidgin/plugins/ticker/Makefile
2507 libpurple/example/Makefile 2510 libpurple/example/Makefile
2508 libpurple/gconf/Makefile 2511 libpurple/gconf/Makefile
2509 libpurple/purple.pc 2512 libpurple/purple.pc
2510 libpurple/purple-uninstalled.pc 2513 libpurple/purple-uninstalled.pc
2514 libpurple/purple-2.pc
2515 libpurple/purple-2-uninstalled.pc
2511 libpurple/plugins/Makefile 2516 libpurple/plugins/Makefile
2512 libpurple/plugins/mono/Makefile 2517 libpurple/plugins/mono/Makefile
2513 libpurple/plugins/mono/api/Makefile 2518 libpurple/plugins/mono/api/Makefile
2514 libpurple/plugins/mono/loader/Makefile 2519 libpurple/plugins/mono/loader/Makefile
2515 libpurple/plugins/perl/Makefile 2520 libpurple/plugins/perl/Makefile