comparison configure.ac @ 26045:62b41bb71a60

merge of '36ce4dcc4d637d6227ef52b2e9e72f957f0435ff' and 'fc5fe0f88226b374c4d42d65ed90e97a059f4d0f'
author Marcus Lundblad <ml@update.uu.se>
date Tue, 13 Jan 2009 09:00:57 +0000
parents 3fd5bda55d76
children ff4212a5268f
comparison
equal deleted inserted replaced
26044:b04508e5cc6c 26045:62b41bb71a60
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], [5]) 46 m4_define([purple_lt_current], [5])
47 m4_define([purple_major_version], [2]) 47 m4_define([purple_major_version], [2])
48 m4_define([purple_minor_version], [5]) 48 m4_define([purple_minor_version], [5])
49 m4_define([purple_micro_version], [4]) 49 m4_define([purple_micro_version], [5])
50 m4_define([purple_version_suffix], [vv-devel]) 50 m4_define([purple_version_suffix], [vv-devel])
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], [5]) 55 m4_define([gnt_lt_current], [5])
56 m4_define([gnt_major_version], [2]) 56 m4_define([gnt_major_version], [2])
57 m4_define([gnt_minor_version], [5]) 57 m4_define([gnt_minor_version], [5])
58 m4_define([gnt_micro_version], [4]) 58 m4_define([gnt_micro_version], [5])
59 m4_define([gnt_version_suffix], [vv-devel]) 59 m4_define([gnt_version_suffix], [vv-devel])
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
2336 ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)) 2336 ], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
2337 if test $ac_cv_struct_tm_gmtoff = yes; then 2337 if test $ac_cv_struct_tm_gmtoff = yes; then
2338 AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if you have a tm_gmtoff member in struct tm]) 2338 AC_DEFINE(HAVE_TM_GMTOFF, 1, [Define if you have a tm_gmtoff member in struct tm])
2339 fi 2339 fi
2340 2340
2341 AC_CACHE_CHECK([whether va_lists can be copied by value], ac_cv_va_val_copy,[
2342 AC_TRY_RUN([#include <stdarg.h>
2343 #include <stdlib.h>
2344 void f (int i, ...) {
2345 va_list args1, args2;
2346 va_start (args1, i);
2347 args2 = args1;
2348 if (va_arg (args2, int) != 42 || va_arg (args1, int) != 42)
2349 exit (1);
2350 va_end (args1); va_end (args2);
2351 }
2352 int main() {
2353 f (0, 42);
2354 return 0;
2355 }],
2356 [ac_cv_va_val_copy=yes],
2357 [ac_cv_va_val_copy=no],
2358 [ac_cv_va_val_copy=yes])
2359 ])
2360
2361 if test "x$ac_cv_va_val_copy" = "xno"; then
2362 AC_DEFINE(VA_COPY_AS_ARRAY, 1, ['va_lists' cannot be copied as values])
2363 fi
2364
2341 dnl ####################################################################### 2365 dnl #######################################################################
2342 dnl # Check for check 2366 dnl # Check for check
2343 dnl ####################################################################### 2367 dnl #######################################################################
2344 PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], , [AC_MSG_RESULT([no, testing is disabled])]) 2368 PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], , [AC_MSG_RESULT([no, testing is disabled])])
2345 AM_CONDITIONAL(HAVE_CHECK, [test "x$CHECK_LIBS" != "x"]) 2369 AM_CONDITIONAL(HAVE_CHECK, [test "x$CHECK_LIBS" != "x"])
2363 dnl ####################################################################### 2387 dnl #######################################################################
2364 dnl # Check for Doxygen and dot (part of GraphViz) 2388 dnl # Check for Doxygen and dot (part of GraphViz)
2365 dnl ####################################################################### 2389 dnl #######################################################################
2366 AC_ARG_ENABLE(doxygen, 2390 AC_ARG_ENABLE(doxygen,
2367 [AC_HELP_STRING([--disable-doxygen], 2391 [AC_HELP_STRING([--disable-doxygen],
2368 [enable documentation with doxygen])], 2392 [disable documentation with doxygen])],
2369 enable_doxygen="$enableval", enable_doxygen="yes") 2393 enable_doxygen="$enableval", enable_doxygen="yes")
2370 AC_ARG_ENABLE(dot, 2394 AC_ARG_ENABLE(dot,
2371 [AC_HELP_STRING([--enable-dot], 2395 [AC_HELP_STRING([--disable-dot],
2372 [enable graphs in doxygen via 'dot'])], 2396 [disable graphs in doxygen via 'dot'])],
2373 enable_dot="$enableval", enable_dot="yes") 2397 enable_dot="$enableval", enable_dot="yes")
2374 AC_ARG_ENABLE(devhelp, 2398 AC_ARG_ENABLE(devhelp,
2375 [AC_HELP_STRING([--enable-devhelp], 2399 [AC_HELP_STRING([--disable-devhelp],
2376 [enable building index for devhelp documentation browser])], 2400 [disable building index for devhelp documentation browser])],
2377 enable_devhelp="$enableval", enable_devhelp="yes") 2401 enable_devhelp="$enableval", enable_devhelp="yes")
2378 2402
2379 if test "x$enable_doxygen" = xyes; then 2403 if test "x$enable_doxygen" = xyes; then
2380 AC_CHECK_PROG(DOXYGEN, doxygen, true, false) 2404 AC_CHECK_PROG(DOXYGEN, doxygen, true, false)
2381 if test $DOXYGEN = false; then 2405 if test $DOXYGEN = false; then