comparison configure.ac @ 32766:fd1b4bbefc6b

Port to Farstream Farstream is the new name of Farsight. The changes to support Farstream are from ocrete. rlaager modified the patch to retain the Farsight code using #ifdef HAVE_FARSIGHT. committer: Richard Laager <rlaager@wiktel.com>
author olivier.crete@collabora.com
date Thu, 05 Apr 2012 03:18:40 +0000
parents b87d880acab3
children d9d55a03ec7b 9350878c0b38
comparison
equal deleted inserted replaced
32765:60bd913072f7 32766:fd1b4bbefc6b
784 else 784 else
785 enable_gstinterfaces="no" 785 enable_gstinterfaces="no"
786 fi 786 fi
787 787
788 dnl ####################################################################### 788 dnl #######################################################################
789 dnl # Check for Farsight 789 dnl # Check for Farstream
790 dnl ####################################################################### 790 dnl #######################################################################
791 AC_ARG_ENABLE(farsight, 791 AC_ARG_ENABLE(farstream,
792 [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], 792 [AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
793 enable_farsight="$enableval", enable_farsight="yes") 793 enable_farstream="$enableval", enable_farstream="yes")
794 if test "x$enable_farsight" != "xno"; then 794 if test "x$enable_farstream" != "xno"; then
795 PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [ 795 PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
796 AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video]) 796 AC_SUBST(FARSTREAM_CFLAGS)
797 AC_SUBST(FARSIGHT_CFLAGS) 797 AC_SUBST(FARSTREAM_LIBS)
798 AC_SUBST(FARSIGHT_LIBS) 798 ], [
799 ], [ 799 # Try farsight.
800 enable_farsight="no" 800 PKG_CHECK_MODULES(FARSTREAM, [farsight2-0.10 >= 0.0.9], [
801 ]) 801 AC_DEFINE(HAVE_FARSIGHT, 1, [Use Farsight instead of Farstream])
802 fi 802 AC_SUBST(FARSTREAM_CFLAGS)
803 AC_SUBST(FARSTREAM_LIBS)
804 ], [
805 enable_farstream="no"
806 ])
807 ])
808 fi
803 809
804 dnl ####################################################################### 810 dnl #######################################################################
805 dnl # Check for Voice and Video support 811 dnl # Check for Voice and Video support
806 dnl ####################################################################### 812 dnl #######################################################################
807 AC_ARG_ENABLE(vv, 813 AC_ARG_ENABLE(vv,
808 [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], 814 [AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
809 enable_vv="$enableval", enable_vv="yes") 815 enable_vv="$enableval", enable_vv="yes")
810 if test "x$enable_vv" != "xno"; then 816 if test "x$enable_vv" != "xno"; then
811 if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then 817 if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
812 AC_DEFINE(USE_VV, 1, [Use voice and video]) 818 AC_DEFINE(USE_VV, 1, [Use voice and video])
813 else 819 else
814 enable_vv="no" 820 enable_vv="no"
815 if test "x$force_deps" = "xyes"; then 821 if test "x$force_deps" = "xyes"; then
816 AC_MSG_ERROR([ 822 AC_MSG_ERROR([
817 Dependencies for voice/video were not met. 823 Dependencies for voice/video were not met.
818 Install the necessary gstreamer and farsight packages first. 824 Install the necessary gstreamer and farstream packages first.
819 Or use --disable-vv if you do not need voice/video support. 825 Or use --disable-vv if you do not need voice/video support.
820 ]) 826 ])
821 fi 827 fi
822 fi 828 fi
823 fi 829 fi
824 AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") 830 AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
825 831
826 dnl ####################################################################### 832 dnl #######################################################################
827 dnl # Check for Internationalized Domain Name support 833 dnl # Check for Internationalized Domain Name support
828 dnl ####################################################################### 834 dnl #######################################################################
829 835