Mercurial > pidgin

comparison configure.ac @ 21806:41959f031322

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Bonjour prpl to support multiple presence records for the same buddy. Eliminate the Howl backend to avoid having to maintain yet another set of code. References #4187 (more to come to fix the rest of the ticket).
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 10 Dec 2007 03:50:58 +0000
parents 73aab5bdd830
children a0b0d20ba15a
comparison
equal deleted inserted replaced
21804:fb73a6ed8197 21806:41959f031322
720 AC_CHECK_LIB(avahi-client, avahi_client_new, [avahilibs=yes], [avahilibs=no], $AVAHI_LIBS) 720 AC_CHECK_LIB(avahi-client, avahi_client_new, [avahilibs=yes], [avahilibs=no], $AVAHI_LIBS)
721 721
722 AC_SUBST(AVAHI_CFLAGS) 722 AC_SUBST(AVAHI_CFLAGS)
723 AC_SUBST(AVAHI_LIBS) 723 AC_SUBST(AVAHI_LIBS)
724 724
725 AM_CONDITIONAL(MDNS_AVAHI, test "x$avahiincludes" = "xyes" -a "x$avahilibs" = "xyes")
726
727 dnl #######################################################################
728 dnl # Check for Howl headers (for Bonjour)
729 dnl #######################################################################
730 AC_ARG_WITH(howl-includes, [AC_HELP_STRING([--with-howl-includes=DIR], [compile the Bonjour plugin against the Howl includes in DIR])], [ac_howl_includes="$withval"], [ac_howl_includes="no"])
731 AC_ARG_WITH(howl-libs, [AC_HELP_STRING([--with-howl-libs=DIR], [compile the Bonjour plugin against the Howl libs in DIR])], [ac_howl_libs="$withval"], [ac_howl_libs="no"])
732 HOWL_CFLAGS=""
733 HOWL_LIBS=""
734
735 dnl Attempt to autodetect avahi-compat-howl
736 dnl TODO: (This should be removed when the native avahi stuff is stable)
737 PKG_CHECK_MODULES(HOWL, avahi-compat-howl, [
738 howlincludes="yes"
739 howllibs="yes"
740 ], [
741 AC_MSG_RESULT(no)
742 howlincludes="no"
743 howllibs="no"
744 ])
745
746 dnl Attempt to autodetect Howl
747 if test "x$howlincludes" = "xno"; then
748 PKG_CHECK_MODULES(HOWL, howl, [
749 howlincludes="yes"
750 howllibs="yes"
751 ], [
752 AC_MSG_RESULT(no)
753 howlincludes="no"
754 howllibs="no"
755 ])
756 fi
757
758 dnl Override HOWL_CFLAGS if the user specified an include dir
759 if test "$ac_howl_includes" != "no"; then
760 HOWL_CFLAGS="-I$ac_howl_includes"
761 fi
762 CPPFLAGS_save="$CPPFLAGS"
763 CPPFLAGS="$CPPFLAGS $HOWL_CFLAGS"
764 AC_CHECK_HEADER(howl.h, [howlincludes=yes], [howlincludes=no])
765 CPPFLAGS="$CPPFLAGS_save"
766
767 dnl Override HOWL_LIBS if the user specified a libs dir
768 if test "$ac_howl_libs" != "no"; then
769 HOWL_LIBS="-L$ac_howl_libs -lhowl"
770 fi
771 AC_CHECK_LIB(howl, sw_discovery_init, [howllibs=yes], [howllibs=no], $HOWL_LIBS)
772
773 AC_SUBST(HOWL_CFLAGS)
774 AC_SUBST(HOWL_LIBS)
775
776 AM_CONDITIONAL(MDNS_HOWL, test "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes")
777
778 725
779 dnl ####################################################################### 726 dnl #######################################################################
780 dnl # Check for SILC client includes and libraries 727 dnl # Check for SILC client includes and libraries
781 dnl ####################################################################### 728 dnl #######################################################################
782 AC_ARG_WITH(silc-includes, [AC_HELP_STRING([--with-silc-includes=DIR], [compile the SILC plugin against includes in DIR])], [ac_silc_includes="$withval"], [ac_silc_includes="no"]) 729 AC_ARG_WITH(silc-includes, [AC_HELP_STRING([--with-silc-includes=DIR], [compile the SILC plugin against includes in DIR])], [ac_silc_includes="$withval"], [ac_silc_includes="no"])
958 fi 905 fi
959 if test "x$have_meanwhile" != "xyes" ; then 906 if test "x$have_meanwhile" != "xyes" ; then
960 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` 907 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
961 fi 908 fi
962 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then 909 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
963 if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then 910 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
964 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
965 fi
966 fi 911 fi
967 if test "x$enable_msnp14" != "xyes" ; then 912 if test "x$enable_msnp14" != "xyes" ; then
968 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/msn/msnp9/'` 913 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/msn/msnp9/'`
969 fi 914 fi
970 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then 915 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
1047 fi 992 fi
1048 if test "x$have_meanwhile" != "xyes"; then 993 if test "x$have_meanwhile" != "xyes"; then
1049 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` 994 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
1050 fi 995 fi
1051 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then 996 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
1052 if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then 997 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
1053 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
1054 fi
1055 fi 998 fi
1056 if test "x$enable_msnp14" != "xyes" ; then 999 if test "x$enable_msnp14" != "xyes" ; then
1057 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/msn/msnp9/'` 1000 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/msn/msnp9/'`
1058 fi 1001 fi
1059 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then 1002 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
1085 yahoo) dynamic_yahoo=yes ;; 1028 yahoo) dynamic_yahoo=yes ;;
1086 zephyr) dynamic_zephyr=yes ;; 1029 zephyr) dynamic_zephyr=yes ;;
1087 *) echo "Invalid dynamic protocol $i!!" ; exit ;; 1030 *) echo "Invalid dynamic protocol $i!!" ; exit ;;
1088 esac 1031 esac
1089 done 1032 done
1090 AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes" -a [ [ "x$avahiincludes" = "xyes" -a "x$avahilibs " = "xyes" ] -o [ "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes" ] ] ) 1033 AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes" -a [ "x$avahiincludes" = "xyes" -a "x$avahilibs " = "xyes" ] )
1091 AM_CONDITIONAL(DYNAMIC_GG, test "x$dynamic_gg" = "xyes") 1034 AM_CONDITIONAL(DYNAMIC_GG, test "x$dynamic_gg" = "xyes")
1092 AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes") 1035 AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes")
1093 AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes") 1036 AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes")
1094 AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes") 1037 AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes")
1095 AM_CONDITIONAL(DYNAMIC_MYSPACE, test "x$dynamic_myspace" = "xyes") 1038 AM_CONDITIONAL(DYNAMIC_MYSPACE, test "x$dynamic_myspace" = "xyes")