← Back to branch summary

~ubuntu-branches/ubuntu/quantal/pidgin/quantal

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Ken VanDine
  • Date: 2012-04-04 17:02:58 UTC
  • Revision ID: package-import@ubuntu.com-20120404170258-m6yhyj8syg6m6fbc
Tags: 1:2.10.2-1ubuntu2
* debian/patches/70_farstream_rename.patch
  - updated patch from the upstream bug report
    http://developer.pidgin.im/ticket/14936

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
786
786
fi
787
787
 
788
788
dnl #######################################################################
789
 
dnl # Check for Farsight
 
789
dnl # Check for Farstream
790
790
dnl #######################################################################
791
 
AC_ARG_ENABLE(farsight,
792
 
        [AC_HELP_STRING([--disable-farsight], [compile without farsight support])],
793
 
        enable_farsight="$enableval", enable_farsight="yes")
794
 
if test "x$enable_farsight" != "xno"; then
795
 
        PKG_CHECK_MODULES(FARSIGHT, [farstream-0.1 >= 0.1.1], [
796
 
                AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video])
797
 
                AC_SUBST(FARSIGHT_CFLAGS)
798
 
                AC_SUBST(FARSIGHT_LIBS)
 
791
AC_ARG_ENABLE(farstream,
 
792
        [AC_HELP_STRING([--disable-farstream], [compile without farstream support])],
 
793
        enable_farstream="$enableval", enable_farstream="yes")
 
794
if test "x$enable_farstream" != "xno"; then
 
795
        PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
 
796
                AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video])
 
797
                AC_SUBST(FARSTREAM_CFLAGS)
 
798
                AC_SUBST(FARSTREAM_LIBS)
799
799
        ], [
800
 
                enable_farsight="no"
 
800
                enable_farstream="no"
801
801
        ])
802
802
fi
803
803
 
808
808
        [AC_HELP_STRING([--disable-vv], [compile without voice and video support])],
809
809
        enable_vv="$enableval", enable_vv="yes")
810
810
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
 
811
        if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then
812
812
                AC_DEFINE(USE_VV, 1, [Use voice and video])
813
813
        else
814
814
                enable_vv="no"
815
815
                if test "x$force_deps" = "xyes"; then
816
816
                        AC_MSG_ERROR([
817
817
Dependencies for voice/video were not met.
818
 
Install the necessary gstreamer and farsight packages first.
 
818
Install the necessary gstreamer and farstream packages first.
819
819
Or use --disable-vv if you do not need voice/video support.
820
820
                        ])
821
821
                fi
822
822
        fi
823
823
fi
824
 
AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno")
 
824
AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
825
825
 
826
826
dnl #######################################################################
827
827
dnl # Check for Internationalized Domain Name support