Mercurial > pidgin

comparison configure.ac @ 31921:4f2d99bcb195

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove silc10
author Mark Doliner <mark@kingant.net>
date Mon, 22 Aug 2011 07:01:27 +0000
parents bb199bc835e6
children 3a19c7068b53 e2a1510da13d
comparison
equal deleted inserted replaced
31920:0cc718e10344 31921:4f2d99bcb195
939 silcincludes="yes" 939 silcincludes="yes"
940 silcclient="yes" 940 silcclient="yes"
941 ], [ 941 ], [
942 have_silc="no" 942 have_silc="no"
943 ]) 943 ])
944 if test "x$have_silc" = "xno"; then
945 PKG_CHECK_MODULES(SILC, silcclient, [
946 have_silc="yes"
947 silc10includes="yes"
948 silc10client="yes"
949 ], [
950 have_silc="no"
951 ])
952 dnl If silcclient.pc wasn't found, check for just silc.pc
953 if test "x$have_silc" = "xno"; then
954 PKG_CHECK_MODULES(SILC, silc, [
955 have_silc="yes"
956 silc10includes="yes"
957 silc10client="yes"
958 ], [
959 have_silc="no"
960 ])
961 fi
962 fi
963 else 944 else
964 if test "$ac_silc_includes" != "no"; then 945 if test "$ac_silc_includes" != "no"; then
965 SILC_CFLAGS="-I$ac_silc_includes" 946 SILC_CFLAGS="-I$ac_silc_includes"
966 fi 947 fi
967 CPPFLAGS_save="$CPPFLAGS" 948 CPPFLAGS_save="$CPPFLAGS"
975 SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL" 956 SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL"
976 AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS) 957 AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
977 958
978 if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then 959 if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then
979 have_silc="yes" 960 have_silc="yes"
980 else
981 CPPFLAGS_save="$CPPFLAGS"
982 CPPFLAGS="$CPPFLAGS $SILC_CFLAGS"
983 AC_CHECK_HEADER(silcincludes.h, [silc10includes=yes])
984 CPPFLAGS="$CPPFLAGS_save"
985
986 SILC_LIBS="$SILC_LIBS -lsilc -lsilcclient -lpthread $LIBDL"
987 AC_CHECK_LIB(silcclient, silc_client_init, [silc10client=yes], , $SILC_LIBS)
988 if test "x$silc10includes" = "xyes" -a "x$silc10client" = "xyes"; then
989 have_silc="yes"
990 fi
991 fi 961 fi
992 fi 962 fi
993 AC_SUBST(SILC_LIBS) 963 AC_SUBST(SILC_LIBS)
994 AC_SUBST(SILC_CFLAGS) 964 AC_SUBST(SILC_CFLAGS)
995 dnl SILC Toolkit >= 1.0.1 has a new MIME API 965 dnl SILC Toolkit >= 1.0.1 has a new MIME API
996 if test "x$silcclient" = "xyes"; then 966 if test "x$silcclient" = "xyes"; then
997 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])
998 elif test "x$silc10client" = "xyes"; then
999 CPPFLAGS_save="$CPPFLAGS"
1000 CPPFLAGS="$CPPFLAGS $SILC_CFLAGS"
1001 AC_MSG_CHECKING(for silcmime.h)
1002 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
1003 #include <silcincludes.h>
1004 #include <silcmime.h>
1005 ]], [[]])], [
1006 AC_MSG_RESULT(yes)
1007 AC_DEFINE(HAVE_SILCMIME_H, 1, [Define if we have silcmime.h])
1008 ], [
1009 AC_MSG_RESULT(no)
1010 ])
1011 CPPFLAGS="$CPPFLAGS_save"
1012 fi 968 fi
1013 969
1014 dnl ####################################################################### 970 dnl #######################################################################
1015 dnl # Check for Gadu-Gadu client includes and libraries 971 dnl # Check for Gadu-Gadu client includes and libraries
1016 dnl ####################################################################### 972 dnl #######################################################################
1121 fi 1077 fi
1122 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then 1078 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
1123 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` 1079 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
1124 fi 1080 fi
1125 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then 1081 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
1126 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc/silc10/'` 1082 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc//'`
1127 fi
1128 if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then
1129 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc10//'`
1130 fi 1083 fi
1131 AC_SUBST(STATIC_PRPLS) 1084 AC_SUBST(STATIC_PRPLS)
1132 STATIC_LINK_LIBS= 1085 STATIC_LINK_LIBS=
1133 extern_init= 1086 extern_init=
1134 load_proto= 1087 load_proto=
1148 load_proto="$load_proto purple_init_yahoo_plugin();" 1101 load_proto="$load_proto purple_init_yahoo_plugin();"
1149 load_proto="$load_proto purple_init_yahoojp_plugin();" 1102 load_proto="$load_proto purple_init_yahoojp_plugin();"
1150 else 1103 else
1151 if test "x$i" = "xsilc"; then 1104 if test "x$i" = "xsilc"; then
1152 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"
1153 elif test "x$i" = "xsilc10"; then
1154 STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
1155 else 1106 else
1156 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"
1157 fi 1108 fi
1158 extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" 1109 extern_init="$extern_init extern gboolean purple_init_${i}_plugin();"
1159 load_proto="$load_proto purple_init_${i}_plugin();" 1110 load_proto="$load_proto purple_init_${i}_plugin();"
1170 oscar) static_oscar=yes ;; 1121 oscar) static_oscar=yes ;;
1171 aim) static_oscar=yes ;; 1122 aim) static_oscar=yes ;;
1172 icq) static_oscar=yes ;; 1123 icq) static_oscar=yes ;;
1173 sametime) static_sametime=yes ;; 1124 sametime) static_sametime=yes ;;
1174 silc) static_silc=yes ;; 1125 silc) static_silc=yes ;;
1175 silc10) static_silc=yes ;;
1176 simple) static_simple=yes ;; 1126 simple) static_simple=yes ;;
1177 yahoo) static_yahoo=yes ;; 1127 yahoo) static_yahoo=yes ;;
1178 zephyr) static_zephyr=yes ;; 1128 zephyr) static_zephyr=yes ;;
1179 *) echo "Invalid static protocol $i!!" ; exit ;; 1129 *) echo "Invalid static protocol $i!!" ; exit ;;
1180 esac 1130 esac
1206 fi 1156 fi
1207 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then 1157 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
1208 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` 1158 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
1209 fi 1159 fi
1210 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then 1160 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
1211 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc/silc10/'` 1161 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc//'`
1212 fi
1213 if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then
1214 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc10//'`
1215 fi 1162 fi
1216 AC_SUBST(DYNAMIC_PRPLS) 1163 AC_SUBST(DYNAMIC_PRPLS)
1217 for i in $DYNAMIC_PRPLS ; do 1164 for i in $DYNAMIC_PRPLS ; do
1218 case $i in 1165 case $i in
1219 bonjour) dynamic_bonjour=yes ;; 1166 bonjour) dynamic_bonjour=yes ;;
1228 oscar) dynamic_oscar=yes ;; 1175 oscar) dynamic_oscar=yes ;;
1229 aim) dynamic_oscar=yes ;; 1176 aim) dynamic_oscar=yes ;;
1230 icq) dynamic_oscar=yes ;; 1177 icq) dynamic_oscar=yes ;;
1231 sametime) dynamic_sametime=yes ;; 1178 sametime) dynamic_sametime=yes ;;
1232 silc) dynamic_silc=yes ;; 1179 silc) dynamic_silc=yes ;;
1233 silc10) dynamic_silc=yes ;;
1234 simple) dynamic_simple=yes ;; 1180 simple) dynamic_simple=yes ;;
1235 yahoo) dynamic_yahoo=yes ;; 1181 yahoo) dynamic_yahoo=yes ;;
1236 zephyr) dynamic_zephyr=yes ;; 1182 zephyr) dynamic_zephyr=yes ;;
1237 *) echo "Invalid dynamic protocol $i!!" ; exit ;; 1183 *) echo "Invalid dynamic protocol $i!!" ; exit ;;
1238 esac 1184 esac
2573 libpurple/protocols/novell/Makefile 2519 libpurple/protocols/novell/Makefile
2574 libpurple/protocols/null/Makefile 2520 libpurple/protocols/null/Makefile
2575 libpurple/protocols/oscar/Makefile 2521 libpurple/protocols/oscar/Makefile
2576 libpurple/protocols/sametime/Makefile 2522 libpurple/protocols/sametime/Makefile
2577 libpurple/protocols/silc/Makefile 2523 libpurple/protocols/silc/Makefile
2578 libpurple/protocols/silc10/Makefile
2579 libpurple/protocols/simple/Makefile 2524 libpurple/protocols/simple/Makefile
2580 libpurple/protocols/yahoo/Makefile 2525 libpurple/protocols/yahoo/Makefile
2581 libpurple/protocols/zephyr/Makefile 2526 libpurple/protocols/zephyr/Makefile
2582 libpurple/tests/Makefile 2527 libpurple/tests/Makefile
2583 libpurple/purple.h 2528 libpurple/purple.h