comparison configure.ac @ 26028:bcad7dc4b453

propagate from branch 'im.pidgin.pidgin' (head 633ffe234af48ead3631ae62e23840b4438fcf5f) to branch 'im.pidgin.maiku.vv' (head 5585b8e919d9adb0eb491c714768027e81f1918c)
author Mike Ruprecht <maiku@soc.pidgin.im>
date Thu, 06 Nov 2008 03:20:05 +0000
parents 46387cbfaf85 8282911d5e17
children adf153852bcf
comparison
equal deleted inserted replaced
26027:94224a5563db 26028:bcad7dc4b453
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], [2]) 49 m4_define([purple_micro_version], [3])
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], [2]) 58 m4_define([gnt_micro_version], [3])
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
72 ]) 72 ])
73 fi 73 fi
74 74
75 AC_CANONICAL_SYSTEM 75 AC_CANONICAL_SYSTEM
76 AM_CONFIG_HEADER(config.h) 76 AM_CONFIG_HEADER(config.h)
77 AM_INIT_AUTOMAKE([dist-bzip2]) 77 AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2])
78 78
79 PURPLE_MAJOR_VERSION=purple_major_version 79 PURPLE_MAJOR_VERSION=purple_major_version
80 PURPLE_MINOR_VERSION=purple_minor_version 80 PURPLE_MINOR_VERSION=purple_minor_version
81 PURPLE_MICRO_VERSION=purple_micro_version 81 PURPLE_MICRO_VERSION=purple_micro_version
82 PURPLE_VERSION=[purple_display_version] 82 PURPLE_VERSION=[purple_display_version]
1194 AC_CHECK_HEADERS(sys/utsname.h) 1194 AC_CHECK_HEADERS(sys/utsname.h)
1195 AC_CHECK_FUNC(uname) 1195 AC_CHECK_FUNC(uname)
1196 1196
1197 AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes) 1197 AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes)
1198 1198
1199 DEBUG_CFLAGS="$DEBUG_CFLAGS -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED -DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED"
1199 if test "x$GCC" = "xyes"; then 1200 if test "x$GCC" = "xyes"; then
1200 dnl We enable -Wall later. 1201 dnl We enable -Wall later.
1201 dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags. 1202 dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags.
1202 dnl This leads to warnings we don't want. 1203 dnl This leads to warnings we don't want.
1203 CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'` 1204 CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`