Mercurial > pidgin
comparison configure.ac @ 32769:d9d55a03ec7b
propagate from branch 'im.pidgin.pidgin.2.x.y' (head c67a060046437347c5cc4f58bdff008d7b8c4496)
to branch 'im.pidgin.pidgin' (head 40617c1e9cdf903724dbeee455fccc8d64ace22f)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 06 Apr 2012 04:30:06 +0000 |
parents | f01d6c9f3492 fd1b4bbefc6b |
children | fa666e7f747e |
comparison
equal
deleted
inserted
replaced
32768:f01d6c9f3492 | 32769:d9d55a03ec7b |
---|---|
819 else | 819 else |
820 enable_gstinterfaces="no" | 820 enable_gstinterfaces="no" |
821 fi | 821 fi |
822 | 822 |
823 dnl ####################################################################### | 823 dnl ####################################################################### |
824 dnl # Check for Farsight | 824 dnl # Check for Farstream |
825 dnl ####################################################################### | 825 dnl ####################################################################### |
826 AC_ARG_ENABLE(farsight, | 826 AC_ARG_ENABLE(farstream, |
827 [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], | 827 [AC_HELP_STRING([--disable-farstream], [compile without farstream support])], |
828 enable_farsight="$enableval", enable_farsight="yes") | 828 enable_farstream="$enableval", enable_farstream="yes") |
829 if test "x$enable_farsight" != "xno"; then | 829 if test "x$enable_farstream" != "xno"; then |
830 PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [ | 830 PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [ |
831 AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video]) | 831 AC_SUBST(FARSTREAM_CFLAGS) |
832 AC_SUBST(FARSIGHT_CFLAGS) | 832 AC_SUBST(FARSTREAM_LIBS) |
833 AC_SUBST(FARSIGHT_LIBS) | 833 ], [ |
834 ], [ | 834 # Try farsight. |
835 enable_farsight="no" | 835 PKG_CHECK_MODULES(FARSTREAM, [farsight2-0.10 >= 0.0.9], [ |
836 ]) | 836 AC_DEFINE(HAVE_FARSIGHT, 1, [Use Farsight instead of Farstream]) |
837 fi | 837 AC_SUBST(FARSTREAM_CFLAGS) |
838 AC_SUBST(FARSTREAM_LIBS) | |
839 ], [ | |
840 enable_farstream="no" | |
841 ]) | |
842 ]) | |
843 fi | |
838 | 844 |
839 dnl ####################################################################### | 845 dnl ####################################################################### |
840 dnl # Check for Voice and Video support | 846 dnl # Check for Voice and Video support |
841 dnl ####################################################################### | 847 dnl ####################################################################### |
842 AC_ARG_ENABLE(vv, | 848 AC_ARG_ENABLE(vv, |
843 [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], | 849 [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], |
844 enable_vv="$enableval", enable_vv="yes") | 850 enable_vv="$enableval", enable_vv="yes") |
845 if test "x$enable_vv" != "xno"; then | 851 if test "x$enable_vv" != "xno"; then |
846 if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then | 852 if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then |
847 AC_DEFINE(USE_VV, 1, [Use voice and video]) | 853 AC_DEFINE(USE_VV, 1, [Use voice and video]) |
848 else | 854 else |
849 enable_vv="no" | 855 enable_vv="no" |
850 if test "x$force_deps" = "xyes"; then | 856 if test "x$force_deps" = "xyes"; then |
851 AC_MSG_ERROR([ | 857 AC_MSG_ERROR([ |
852 Dependencies for voice/video were not met. | 858 Dependencies for voice/video were not met. |
853 Install the necessary gstreamer and farsight packages first. | 859 Install the necessary gstreamer and farstream packages first. |
854 Or use --disable-vv if you do not need voice/video support. | 860 Or use --disable-vv if you do not need voice/video support. |
855 ]) | 861 ]) |
856 fi | 862 fi |
857 fi | 863 fi |
858 fi | 864 fi |
859 AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") | 865 AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno") |
860 | 866 |
861 dnl ####################################################################### | 867 dnl ####################################################################### |
862 dnl # Check for Internationalized Domain Name support | 868 dnl # Check for Internationalized Domain Name support |
863 dnl ####################################################################### | 869 dnl ####################################################################### |
864 | 870 |