Mercurial > pidgin.yaz

comparison configure.ac @ 18805:1244b5f43661

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Here is a native avahi implementation of the bonjour prpl that I whipped up. Someone more autofoo savvy will probably want to review what I've done to that stuff. Fixes #326.
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 06 Aug 2007 00:00:45 +0000
parents 5cbf21d5d86f
children eeaf5afc8940 c8f9584e3221 536ee8e459ef
comparison
equal deleted inserted replaced
18803:abb9aac69507 18805:1244b5f43661
591 ]) 591 ])
592 AC_SUBST(MEANWHILE_CFLAGS) 592 AC_SUBST(MEANWHILE_CFLAGS)
593 AC_SUBST(MEANWHILE_LIBS) 593 AC_SUBST(MEANWHILE_LIBS)
594 594
595 dnl ####################################################################### 595 dnl #######################################################################
596 dnl # Check for Native Avahi headers (for Bonjour)
597 dnl #######################################################################
598 AC_ARG_WITH(avahi-client-includes, [AC_HELP_STRING([--with-avahi-client-includes=DIR], [compile the Bonjour plugin against the Avahi Client includes in DIR])], [ac_avahi_client_includes="$withval"], [ac_avahi_client_includes="no"])
599 AC_ARG_WITH(avahi-client-libs, [AC_HELP_STRING([--with-avahi-client-libs=DIR], [compile the Bonjour plugin against the Avahi Client libs in DIR])], [ac_avahi_client_libs="$withval"], [ac_avahi_client_libs="no"])
600 AVAHI_CFLAGS=""
601 AVAHI_LIBS=""
602
603 dnl Attempt to autodetect Avahi
604 PKG_CHECK_MODULES(AVAHI, [avahi-client avahi-glib], [
605 avahiincludes="yes"
606 avahilibs="yes"
607 ], [
608 AC_MSG_RESULT(no)
609 avahiincludes="no"
610 avahilibs="no"
611 ])
612
613 dnl Override AVAHI_CFLAGS if the user specified an include dir
614 if test "$ac_avahi_client_includes" != "no"; then
615 AVAHI_CFLAGS="-I$ac_avahi_client_includes"
616 fi
617 CPPFLAGS_save="$CPPFLAGS"
618 CPPFLAGS="$CPPFLAGS $AVAHI_CFLAGS"
619 AC_CHECK_HEADER(avahi-client/client.h, [avahiincludes=yes], [avahiincludes=no])
620 CPPFLAGS="$CPPFLAGS $AVAHI_CFLAGS $GLIB_CFLAGS"
621 AC_CHECK_HEADER(avahi-glib/glib-malloc.h, [avahiincludes=yes], [avahiincludes=no])
622 CPPFLAGS="$CPPFLAGS_save"
623
624 dnl Override AVAHI_LIBS if the user specified a libs dir
625 if test "$ac_avahi_client_libs" != "no"; then
626 AVAHI_LIBS="-L$ac_avahi_client_libs -lavahi-common -lavahi-client -lavahi-glib "
627 fi
628 AC_CHECK_LIB(avahi-client, avahi_client_new, [avahilibs=yes], [avahilibs=no], $AVAHI_LIBS)
629
630 AC_SUBST(AVAHI_CFLAGS)
631 AC_SUBST(AVAHI_LIBS)
632
633 AM_CONDITIONAL(MDNS_AVAHI, test "x$avahiincludes" = "xyes" -a "x$avahilibs" = "xyes")
634
635 dnl #######################################################################
596 dnl # Check for Howl headers (for Bonjour) 636 dnl # Check for Howl headers (for Bonjour)
597 dnl ####################################################################### 637 dnl #######################################################################
598 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"]) 638 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"])
599 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"]) 639 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"])
600 HOWL_CFLAGS="" 640 HOWL_CFLAGS=""
601 HOWL_LIBS="" 641 HOWL_LIBS=""
602 642
603 dnl Attempt to autodetect avahi-compat-howl 643 dnl Attempt to autodetect avahi-compat-howl
644 dnl TODO: (This should be removed when the native avahi stuff is stable)
604 PKG_CHECK_MODULES(HOWL, avahi-compat-howl, [ 645 PKG_CHECK_MODULES(HOWL, avahi-compat-howl, [
605 howlincludes="yes" 646 howlincludes="yes"
606 howllibs="yes" 647 howllibs="yes"
607 ], [ 648 ], [
608 AC_MSG_RESULT(no) 649 AC_MSG_RESULT(no)
637 fi 678 fi
638 AC_CHECK_LIB(howl, sw_discovery_init, [howllibs=yes], [howllibs=no], $HOWL_LIBS) 679 AC_CHECK_LIB(howl, sw_discovery_init, [howllibs=yes], [howllibs=no], $HOWL_LIBS)
639 680
640 AC_SUBST(HOWL_CFLAGS) 681 AC_SUBST(HOWL_CFLAGS)
641 AC_SUBST(HOWL_LIBS) 682 AC_SUBST(HOWL_LIBS)
683
684 AM_CONDITIONAL(MDNS_HOWL, test "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes")
685
642 686
643 dnl ####################################################################### 687 dnl #######################################################################
644 dnl # Check for SILC client includes and libraries 688 dnl # Check for SILC client includes and libraries
645 dnl ####################################################################### 689 dnl #######################################################################
646 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"]) 690 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"])
817 STATIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr" 861 STATIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
818 fi 862 fi
819 if test "x$have_meanwhile" != "xyes" ; then 863 if test "x$have_meanwhile" != "xyes" ; then
820 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` 864 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
821 fi 865 fi
822 if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then 866 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
823 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` 867 if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then
868 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
869 fi
824 fi 870 fi
825 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then 871 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
826 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc/silc10/'` 872 STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc/silc10/'`
827 fi 873 fi
828 if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then 874 if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then
871 yahoo) static_yahoo=yes ;; 917 yahoo) static_yahoo=yes ;;
872 zephyr) static_zephyr=yes ;; 918 zephyr) static_zephyr=yes ;;
873 *) echo "Invalid static protocol $i!!" ; exit ;; 919 *) echo "Invalid static protocol $i!!" ; exit ;;
874 esac 920 esac
875 done 921 done
876 AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes" -a "x$howlincludes" = "xyes" -a "x$howllibs" = "xyes") 922 AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes")
877 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") 923 AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes")
878 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") 924 AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes")
879 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") 925 AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
880 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") 926 AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
881 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") 927 AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
896 DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr" 942 DYNAMIC_PRPLS="bonjour gg irc jabber msn novell oscar qq sametime silc simple yahoo zephyr"
897 fi 943 fi
898 if test "x$have_meanwhile" != "xyes"; then 944 if test "x$have_meanwhile" != "xyes"; then
899 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` 945 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
900 fi 946 fi
901 if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then 947 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
902 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` 948 if test "x$howlincludes" != "xyes" -o "x$howllibs" != "xyes"; then
949 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
950 fi
903 fi 951 fi
904 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then 952 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
905 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc/silc10/'` 953 DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc/silc10/'`
906 fi 954 fi
907 if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then 955 if test "x$silc10includes" != "xyes" -o "x$silc10client" != "xyes"; then
928 yahoo) dynamic_yahoo=yes ;; 976 yahoo) dynamic_yahoo=yes ;;
929 zephyr) dynamic_zephyr=yes ;; 977 zephyr) dynamic_zephyr=yes ;;
930 *) echo "Invalid dynamic protocol $i!!" ; exit ;; 978 *) echo "Invalid dynamic protocol $i!!" ; exit ;;
931 esac 979 esac
932 done 980 done
933 AM_CONDITIONAL(DYNAMIC_BONJOUR, test "x$dynamic_bonjour" = "xyes" -a "x$bonjourincludes" = "xyes" -a "x$bonjourclient" = "xyes") 981 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" ] ] )
934 AM_CONDITIONAL(DYNAMIC_GG, test "x$dynamic_gg" = "xyes") 982 AM_CONDITIONAL(DYNAMIC_GG, test "x$dynamic_gg" = "xyes")
935 AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes") 983 AM_CONDITIONAL(DYNAMIC_IRC, test "x$dynamic_irc" = "xyes")
936 AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes") 984 AM_CONDITIONAL(DYNAMIC_JABBER, test "x$dynamic_jabber" = "xyes")
937 AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes") 985 AM_CONDITIONAL(DYNAMIC_MSN, test "x$dynamic_msn" = "xyes")
938 AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes") 986 AM_CONDITIONAL(DYNAMIC_NOVELL, test "x$dynamic_novell" = "xyes")