Mercurial > pidgin.yaz

comparison configure.ac @ 32383:e44af4d2e01b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 218f7cd8f439bacd4fef6897f0389a7cd18ba67d) to branch 'im.pidgin.pidgin' (head a838619f39988fb46c2305600984725495b15ee1)
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 22 Aug 2011 16:00:57 +0000
parents 4f2d99bcb195
children ac6353ffa129 3a19c7068b53
comparison
equal deleted inserted replaced
32382:8c6254c23e32 32383:e44af4d2e01b
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], [10]) 46 m4_define([purple_lt_current], [20])
47 m4_define([purple_major_version], [2]) 47 m4_define([purple_major_version], [3])
48 m4_define([purple_minor_version], [10]) 48 m4_define([purple_minor_version], [0])
49 m4_define([purple_micro_version], [0]) 49 m4_define([purple_micro_version], [0])
50 m4_define([purple_version_suffix], []) 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], [8]) 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], [8]) 57 m4_define([gnt_minor_version], [8])
58 m4_define([gnt_micro_version], [9]) 58 m4_define([gnt_micro_version], [9])
59 m4_define([gnt_version_suffix], []) 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
64 64
326 AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes") 326 AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
327 327
328 dnl ####################################################################### 328 dnl #######################################################################
329 dnl # Check for GLib 2.16 (required) 329 dnl # Check for GLib 2.16 (required)
330 dnl ####################################################################### 330 dnl #######################################################################
331 # TODO: gmodule-2.0 is only needed if enable_plugins is 'yes'. It
332 # might be nice to change this check so that it's not required
333 # if enable_plugins is 'no'.
331 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [ 334 PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.16.0 gobject-2.0 gmodule-2.0 gthread-2.0], , [
332 AC_MSG_RESULT(no) 335 AC_MSG_RESULT(no)
333 AC_MSG_ERROR([ 336 AC_MSG_ERROR([
334 337
335 You must have GLib 2.16.0 or newer development headers installed to build. 338 You must have GLib 2.16.0 or newer development headers installed to build.
936 silcincludes="yes" 939 silcincludes="yes"
937 silcclient="yes" 940 silcclient="yes"
938 ], [ 941 ], [
939 have_silc="no" 942 have_silc="no"
940 ]) 943 ])
941 if test "x$have_silc" = "xno"; then
942 PKG_CHECK_MODULES(SILC, silcclient, [
943 have_silc="yes"
944 silc10includes="yes"
945 silc10client="yes"
946 ], [
947 have_silc="no"
948 ])
949 dnl If silcclient.pc wasn't found, check for just silc.pc
950 if test "x$have_silc" = "xno"; then
951 PKG_CHECK_MODULES(SILC, silc, [
952 have_silc="yes"
953 silc10includes="yes"
954 silc10client="yes"
955 ], [
956 have_silc="no"
957 ])
958 fi
959 fi
960 else 944 else
961 if test "$ac_silc_includes" != "no"; then 945 if test "$ac_silc_includes" != "no"; then
962 SILC_CFLAGS="-I$ac_silc_includes" 946 SILC_CFLAGS="-I$ac_silc_includes"
963 fi 947 fi
964 CPPFLAGS_save="$CPPFLAGS" 948 CPPFLAGS_save="$CPPFLAGS"
972 SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL" 956 SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL"
973 AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS) 957 AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
974 958
975 if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then 959 if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
976 have_silc="yes" 960 have_silc="yes"
977 else
978 CPPFLAGS_save="$CPPFLAGS"
979 CPPFLAGS="$CPPFLAGS $SILC_CFLAGS"
980 AC_CHECK_HEADER(silcincludes.h, [silc10includes=yes])
981 CPPFLAGS="$CPPFLAGS_save"
982
983 SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL"
984 AC_CHECK_LIB(silcclient, silc_client_init, [silc10client=yes], , $SILC_LIBS)
985 if test "x$silc10includes" = "xyes" -a "x$silc10client" = "xyes"; then
986 have_silc="yes"
987 fi
988 fi 961 fi
989 fi 962 fi
990 AC_SUBST(SILC_LIBS) 963 AC_SUBST(SILC_LIBS)
991 AC_SUBST(SILC_CFLAGS) 964 AC_SUBST(SILC_CFLAGS)
992 dnl SILC Toolkit >= 1.0.1 has a new MIME API 965 dnl SILC Toolkit >= 1.0.1 has a new MIME API
993 if test "x$silcclient" = "xyes"; then 966 if test "x$silcclient" = "xyes"; then
994 AC_DEFINE(HAVE_SILCMIME_H, 1, [Define if we have silcmime.h]) 967 AC_DEFINE(HAVE_SILCMIME_H, 1, [Define if we have silcmime.h])
995 elif test "x$silc10client" = "xyes"; then
996 CPPFLAGS_save="$CPPFLAGS"
997 CPPFLAGS="$CPPFLAGS $SILC_CFLAGS"
998 AC_MSG_CHECKING(for silcmime.h)
999 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1000 #include <silcincludes.h>
1001 #include <silcmime.h>
1002 ]], [[]])], [
1003 AC_MSG_RESULT(yes)
1004 AC_DEFINE(HAVE_SILCMIME_H, 1, [Define if we have silcmime.h])
1005 ], [
1006 AC_MSG_RESULT(no)
1007 ])
1008 CPPFLAGS="$CPPFLAGS_save"
1009 fi 968 fi
1010 969
1011 dnl ####################################################################### 970 dnl #######################################################################
1012 dnl # Check for Gadu-Gadu client includes and libraries 971 dnl # Check for Gadu-Gadu client includes and libraries
1013 dnl ####################################################################### 972 dnl #######################################################################
1118 fi 1077 fi
1119 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then 1078 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
1120 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` 1079 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
1121 fi 1080 fi
1122 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then 1081 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
1123 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc/silc10/'` 1082 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc//'`
1124 fi
1125 if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then
1126 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc10//'`
1127 fi 1083 fi
1128 AC_SUBST(STATIC_PRPLS) 1084 AC_SUBST(STATIC_PRPLS)
1129 STATIC_LINK_LIBS= 1085 STATIC_LINK_LIBS=
1130 extern_init= 1086 extern_init=
1131 load_proto= 1087 load_proto=
1145 load_proto="$load_proto purple_init_yahoo_plugin();" 1101 load_proto="$load_proto purple_init_yahoo_plugin();"
1146 load_proto="$load_proto purple_init_yahoojp_plugin();" 1102 load_proto="$load_proto purple_init_yahoojp_plugin();"
1147 else 1103 else
1148 if test "x$i" = "xsilc"; then 1104 if test "x$i" = "xsilc"; then
1149 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" 1105 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
1150 elif test "x$i" = "xsilc10"; then
1151 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
1152 else 1106 else
1153 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" 1107 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
1154 fi 1108 fi
1155 extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" 1109 extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
1156 load_proto="$load_proto purple_init_${i}_plugin();" 1110 load_proto="$load_proto purple_init_${i}_plugin();"
1167 oscar) static_oscar=yes ;; 1121 oscar) static_oscar=yes ;;
1168 aim) static_oscar=yes ;; 1122 aim) static_oscar=yes ;;
1169 icq) static_oscar=yes ;; 1123 icq) static_oscar=yes ;;
1170 sametime) static_sametime=yes ;; 1124 sametime) static_sametime=yes ;;
1171 silc) static_silc=yes ;; 1125 silc) static_silc=yes ;;
1172 silc10) static_silc=yes ;;
1173 simple) static_simple=yes ;; 1126 simple) static_simple=yes ;;
1174 yahoo) static_yahoo=yes ;; 1127 yahoo) static_yahoo=yes ;;
1175 zephyr) static_zephyr=yes ;; 1128 zephyr) static_zephyr=yes ;;
1176 *) echo "Invalid static protocol $i!!" ; exit ;; 1129 *) echo "Invalid static protocol $i!!" ; exit ;;
1177 esac 1130 esac
1203 fi 1156 fi
1204 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then 1157 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
1205 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` 1158 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
1206 fi 1159 fi
1207 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then 1160 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
1208 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc/silc10/'` 1161 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc//'`
1209 fi
1210 if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then
1211 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc10//'`
1212 fi 1162 fi
1213 AC_SUBST(DYNAMIC_PRPLS) 1163 AC_SUBST(DYNAMIC_PRPLS)
1214 for i in $DYNAMIC_PRPLS ; do 1164 for i in $DYNAMIC_PRPLS ; do
1215 case $i in 1165 case $i in
1216 bonjour) dynamic_bonjour=yes ;; 1166 bonjour) dynamic_bonjour=yes ;;
1225 oscar) dynamic_oscar=yes ;; 1175 oscar) dynamic_oscar=yes ;;
1226 aim) dynamic_oscar=yes ;; 1176 aim) dynamic_oscar=yes ;;
1227 icq) dynamic_oscar=yes ;; 1177 icq) dynamic_oscar=yes ;;
1228 sametime) dynamic_sametime=yes ;; 1178 sametime) dynamic_sametime=yes ;;
1229 silc) dynamic_silc=yes ;; 1179 silc) dynamic_silc=yes ;;
1230 silc10) dynamic_silc=yes ;;
1231 simple) dynamic_simple=yes ;; 1180 simple) dynamic_simple=yes ;;
1232 yahoo) dynamic_yahoo=yes ;; 1181 yahoo) dynamic_yahoo=yes ;;
1233 zephyr) dynamic_zephyr=yes ;; 1182 zephyr) dynamic_zephyr=yes ;;
1234 *) echo "Invalid dynamic protocol $i!!" ; exit ;; 1183 *) echo "Invalid dynamic protocol $i!!" ; exit ;;
1235 esac 1184 esac
2528 doc/pidgin.1 2477 doc/pidgin.1
2529 doc/finch.1 2478 doc/finch.1
2530 m4macros/Makefile 2479 m4macros/Makefile
2531 pidgin.apspec 2480 pidgin.apspec
2532 pidgin/Makefile 2481 pidgin/Makefile
2533 pidgin/pidgin.pc 2482 pidgin/pidgin-3.pc
2534 pidgin/pidgin-uninstalled.pc 2483 pidgin/pidgin-3-uninstalled.pc
2535 pidgin/pidgin-2.pc
2536 pidgin/pidgin-2-uninstalled.pc
2537 pidgin/pixmaps/Makefile 2484 pidgin/pixmaps/Makefile
2538 pidgin/pixmaps/emotes/default/24/Makefile 2485 pidgin/pixmaps/emotes/default/24/Makefile
2539 pidgin/pixmaps/emotes/none/Makefile 2486 pidgin/pixmaps/emotes/none/Makefile
2540 pidgin/pixmaps/emotes/small/16/Makefile 2487 pidgin/pixmaps/emotes/small/16/Makefile
2541 pidgin/plugins/Makefile 2488 pidgin/plugins/Makefile
2548 pidgin/plugins/perl/common/Makefile.PL 2495 pidgin/plugins/perl/common/Makefile.PL
2549 pidgin/plugins/ticker/Makefile 2496 pidgin/plugins/ticker/Makefile
2550 libpurple/ciphers/Makefile 2497 libpurple/ciphers/Makefile
2551 libpurple/example/Makefile 2498 libpurple/example/Makefile
2552 libpurple/gconf/Makefile 2499 libpurple/gconf/Makefile
2553 libpurple/purple.pc 2500 libpurple/purple-3.pc
2554 libpurple/purple-uninstalled.pc 2501 libpurple/purple-3-uninstalled.pc
2555 libpurple/purple-2.pc
2556 libpurple/purple-2-uninstalled.pc
2557 libpurple/plugins/Makefile 2502 libpurple/plugins/Makefile
2558 libpurple/plugins/mono/Makefile 2503 libpurple/plugins/mono/Makefile
2559 libpurple/plugins/mono/api/Makefile 2504 libpurple/plugins/mono/api/Makefile
2560 libpurple/plugins/mono/loader/Makefile 2505 libpurple/plugins/mono/loader/Makefile
2561 libpurple/plugins/perl/Makefile 2506 libpurple/plugins/perl/Makefile
2574 libpurple/protocols/novell/Makefile 2519 libpurple/protocols/novell/Makefile
2575 libpurple/protocols/null/Makefile 2520 libpurple/protocols/null/Makefile
2576 libpurple/protocols/oscar/Makefile 2521 libpurple/protocols/oscar/Makefile
2577 libpurple/protocols/sametime/Makefile 2522 libpurple/protocols/sametime/Makefile
2578 libpurple/protocols/silc/Makefile 2523 libpurple/protocols/silc/Makefile
2579 libpurple/protocols/silc10/Makefile
2580 libpurple/protocols/simple/Makefile 2524 libpurple/protocols/simple/Makefile
2581 libpurple/protocols/yahoo/Makefile 2525 libpurple/protocols/yahoo/Makefile
2582 libpurple/protocols/zephyr/Makefile 2526 libpurple/protocols/zephyr/Makefile
2583 libpurple/tests/Makefile 2527 libpurple/tests/Makefile
2584 libpurple/purple.h 2528 libpurple/purple.h