comparison configure.ac @ 24750:95ef7beb926b

merge of '6ac9187d4f4437a087d58d63489c47664121f0b5' and 'f1327672337219c8907eea2d335efb0035e4b39e'
author Kevin Stange <kevin@simguy.net>
date Wed, 03 Dec 2008 03:09:32 +0000
parents 42fe79ca351d
children 2a507db5e715 adf153852bcf 1bae44bc4cc3
comparison
equal deleted inserted replaced
24749:333f03472486 24750:95ef7beb926b
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], [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], [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], [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
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 check-news]) 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]
142 ;; 142 ;;
143 *) 143 *)
144 ;; 144 ;;
145 esac 145 esac
146 146
147 ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu id it ja ka kn ko ku lo lt mk my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv ta te th tr uk ur vi xh zh_CN zh_HK zh_TW" 147 ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu id it ja ka kn ko ku lo lt mk mn my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
148 AM_GLIB_GNU_GETTEXT 148 AM_GLIB_GNU_GETTEXT
149 149
150 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that 150 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
151 dnl AM_GLIB_GNU_GETTEXT found it. 151 dnl AM_GLIB_GNU_GETTEXT found it.
152 152
1008 AC_SUBST(STATIC_PRPLS) 1008 AC_SUBST(STATIC_PRPLS)
1009 STATIC_LINK_LIBS= 1009 STATIC_LINK_LIBS=
1010 extern_init= 1010 extern_init=
1011 load_proto= 1011 load_proto=
1012 for i in $STATIC_PRPLS ; do 1012 for i in $STATIC_PRPLS ; do
1013 dnl Ugly special case for "libsilcpurple.a": 1013 dnl Ugly special case for "libsilcpurple.la":
1014 dnl ... and Ugly special case for multi-protocol oscar 1014 dnl ... and Ugly special case for multi-protocol oscar
1015 if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then 1015 if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then
1016 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.a" 1016 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la"
1017 extern_init="$extern_init extern gboolean purple_init_aim_plugin();" 1017 extern_init="$extern_init extern gboolean purple_init_aim_plugin();"
1018 extern_init="$extern_init extern gboolean purple_init_icq_plugin();" 1018 extern_init="$extern_init extern gboolean purple_init_icq_plugin();"
1019 load_proto="$load_proto purple_init_aim_plugin();" 1019 load_proto="$load_proto purple_init_aim_plugin();"
1020 load_proto="$load_proto purple_init_icq_plugin();" 1020 load_proto="$load_proto purple_init_icq_plugin();"
1021 else 1021 else
1022 if test "x$i" = "xsilc"; then 1022 if test "x$i" = "xsilc"; then
1023 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.a" 1023 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
1024 elif test "x$i" = "xsilc10"; then 1024 elif test "x$i" = "xsilc10"; then
1025 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.a" 1025 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
1026 elif test "x$i" = "xmsnp9"; then 1026 elif test "x$i" = "xmsnp9"; then
1027 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libmsn.a" 1027 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libmsn.la"
1028 else 1028 else
1029 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.a" 1029 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
1030 fi 1030 fi
1031 extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" 1031 extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
1032 load_proto="$load_proto purple_init_${i}_plugin();" 1032 load_proto="$load_proto purple_init_${i}_plugin();"
1033 fi 1033 fi
1034 case $i in 1034 case $i in
1141 AC_CHECK_HEADERS(sys/utsname.h) 1141 AC_CHECK_HEADERS(sys/utsname.h)
1142 AC_CHECK_FUNC(uname) 1142 AC_CHECK_FUNC(uname)
1143 1143
1144 AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes) 1144 AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes)
1145 1145
1146 DEBUG_CFLAGS="$DEBUG_CFLAGS -DPURPLE_DISABLE_DEPRECATED -DPIDGIN_DISABLE_DEPRECATED -DFINCH_DISABLE_DEPRECATED -DGNT_DISABLE_DEPRECATED"
1146 if test "x$GCC" = "xyes"; then 1147 if test "x$GCC" = "xyes"; then
1147 dnl We enable -Wall later. 1148 dnl We enable -Wall later.
1148 dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags. 1149 dnl If it's set after the warning CFLAGS in the compiler invocation, it counteracts the -Wno... flags.
1149 dnl This leads to warnings we don't want. 1150 dnl This leads to warnings we don't want.
1150 CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'` 1151 CFLAGS=`echo $CFLAGS |$sedpath 's/-Wall//'`
2381 pidgin/pidgin.pc 2382 pidgin/pidgin.pc
2382 pidgin/pidgin-uninstalled.pc 2383 pidgin/pidgin-uninstalled.pc
2383 pidgin/pixmaps/Makefile 2384 pidgin/pixmaps/Makefile
2384 pidgin/pixmaps/emotes/default/24/Makefile 2385 pidgin/pixmaps/emotes/default/24/Makefile
2385 pidgin/pixmaps/emotes/none/Makefile 2386 pidgin/pixmaps/emotes/none/Makefile
2387 pidgin/pixmaps/emotes/small/16/Makefile
2386 pidgin/plugins/Makefile 2388 pidgin/plugins/Makefile
2387 pidgin/plugins/cap/Makefile 2389 pidgin/plugins/cap/Makefile
2388 pidgin/plugins/gestures/Makefile 2390 pidgin/plugins/gestures/Makefile
2389 pidgin/plugins/gevolution/Makefile 2391 pidgin/plugins/gevolution/Makefile
2390 pidgin/plugins/musicmessaging/Makefile 2392 pidgin/plugins/musicmessaging/Makefile