Mercurial > pidgin

comparison configure.ac @ 30404:8e9b04071e79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 9166d0ffe82472b17cee09aabbef61d8ec6e3e44) to branch 'im.pidgin.soc.2010.icq-tlc' (head 4c9bb4231e46e234d01e6dc64bf4be49fb12c27c)
author Mark Doliner <mark@kingant.net>
date Thu, 12 Aug 2010 15:30:11 +0000
parents d21c8058ead0
children a95e7ed3d7d2
comparison
equal deleted inserted replaced
30403:a4d7d154d00d 30404:8e9b04071e79
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], [7]) 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], [7]) 48 m4_define([purple_minor_version], [7])
49 m4_define([purple_micro_version], [2]) 49 m4_define([purple_micro_version], [4])
50 m4_define([purple_version_suffix], [devel]) 50 m4_define([purple_version_suffix], [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], [7]) 55 m4_define([gnt_lt_current], [8])
56 m4_define([gnt_major_version], [2]) 56 m4_define([gnt_major_version], [2])
57 m4_define([gnt_minor_version], [7]) 57 m4_define([gnt_minor_version], [8])
58 m4_define([gnt_micro_version], [2]) 58 m4_define([gnt_micro_version], [1])
59 m4_define([gnt_version_suffix], [devel]) 59 m4_define([gnt_version_suffix], [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
73 fi 73 fi
74 74
75 AC_CANONICAL_HOST 75 AC_CANONICAL_HOST
76 AC_CONFIG_HEADERS([config.h]) 76 AC_CONFIG_HEADERS([config.h])
77 AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2]) 77 AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2])
78 dnl TODO: Always use AM_SILENT_RULES when we depend on automake >= 1.11
79 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
78 80
79 PURPLE_MAJOR_VERSION=purple_major_version 81 PURPLE_MAJOR_VERSION=purple_major_version
80 PURPLE_MINOR_VERSION=purple_minor_version 82 PURPLE_MINOR_VERSION=purple_minor_version
81 PURPLE_MICRO_VERSION=purple_micro_version 83 PURPLE_MICRO_VERSION=purple_micro_version
82 PURPLE_VERSION=[purple_display_version] 84 PURPLE_VERSION=[purple_display_version]
658 dnl # Some distros put the headers in ncursesw/, some don't 660 dnl # Some distros put the headers in ncursesw/, some don't
659 found_ncurses_h=no 661 found_ncurses_h=no
660 for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include 662 for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
661 do 663 do
662 f="$location/ncurses.h" 664 f="$location/ncurses.h"
665 orig_CFLAGS="$CFLAGS"
666 orig_CPPFLAGS="$CPPFLAGS"
667 CFLAGS="$CFLAGS -I$location"
668 CPPFLAGS="$CPPFLAGS -I$location"
663 AC_CHECK_HEADER($f,[ 669 AC_CHECK_HEADER($f,[
664 AC_MSG_CHECKING([if $f supports wide characters]) 670 AC_MSG_CHECKING([if $f supports wide characters])
665 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ 671 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
666 #define _XOPEN_SOURCE_EXTENDED 672 #define _XOPEN_SOURCE_EXTENDED
667 #include <$f> 673 #include <$f>
676 else 682 else
677 GNT_CFLAGS="" 683 GNT_CFLAGS=""
678 fi 684 fi
679 685
680 found_ncurses_h=yes 686 found_ncurses_h=yes
687 CFLAGS="$orig_CFLAGS"
688 CPPFLAGS="$orig_CPPFLAGS"
681 AC_MSG_RESULT([yes]) 689 AC_MSG_RESULT([yes])
682 break 690 break
683 ], [ 691 ], [
692 CFLAGS="$orig_CFLAGS"
693 CPPFLAGS="$orig_CPPFLAGS"
684 AC_MSG_RESULT([no]) 694 AC_MSG_RESULT([no])
685 ]) 695 ])
686 ]) 696 ])
687 done 697 done
688 698
2236 if test "$enable_tcl" = yes -a "$enable_tk" = yes; then 2246 if test "$enable_tcl" = yes -a "$enable_tk" = yes; then
2237 AC_MSG_CHECKING([for tkConfig.sh]) 2247 AC_MSG_CHECKING([for tkConfig.sh])
2238 TKCONFIG=no 2248 TKCONFIG=no
2239 TKCONFIGDIRS="/usr/lib \ 2249 TKCONFIGDIRS="/usr/lib \
2240 /usr/lib64 \ 2250 /usr/lib64 \
2251 /usr/lib/tk8.5 \
2241 /usr/lib/tk8.4 \ 2252 /usr/lib/tk8.4 \
2242 /usr/lib/tk8.3 \ 2253 /usr/lib/tk8.3 \
2243 /usr/lib/tk8.2 \ 2254 /usr/lib/tk8.2 \
2244 /usr/local/lib" 2255 /usr/local/lib"
2245 for dir in $with_tkconfig $TKCONFIGDIRS; do 2256 for dir in $with_tkconfig $TKCONFIGDIRS; do