From: <jpg...@us...> - 2008-02-29 18:16:02
|
Revision: 1365 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1365&view=rev Author: jpgrayson Date: 2008-02-29 10:16:07 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Only demand vidcap, theora, ogg, and ffmpeg if video is enabled. Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 18:06:18 UTC (rev 1364) +++ trunk/configure.ac 2008-02-29 18:16:07 UTC (rev 1365) @@ -205,55 +205,58 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -if test x$with_ogg != xno; then - if test x$has_ogg = xyes; then - AC_DEFINE(USE_OGG, 1, [OGG]) - PKG_REQUIRES="$PKG_REQUIRES ogg" - elif test x$with_ogg != xauto ; then - AC_MSG_ERROR([ - libogg is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) +if test x$enable_video = xyes; then + + if test x$with_ogg != xno; then + if test x$has_ogg = xyes; then + AC_DEFINE(USE_OGG, 1, [OGG]) + PKG_REQUIRES="$PKG_REQUIRES ogg" + elif test x$with_ogg != xauto ; then + AC_MSG_ERROR([ + libogg is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi - -if test x$with_theora != xno; then - if test x$has_theora = xyes; then - AC_DEFINE(USE_THEORA, 1, [THEORA]) - PKG_REQUIRES="$PKG_REQUIRES theora" - elif test x$with_theora != xauto ; then - AC_MSG_ERROR([ - libtheora is required to build this package! - please see http://www.xiph.org/ for how to - obtain a copy. - ]) + + if test x$with_theora != xno; then + if test x$has_theora = xyes; then + AC_DEFINE(USE_THEORA, 1, [THEORA]) + PKG_REQUIRES="$PKG_REQUIRES theora" + elif test x$with_theora != xauto ; then + AC_MSG_ERROR([ + libtheora is required to build this package! + please see http://www.xiph.org/ for how to + obtain a copy. + ]) + fi fi -fi - -if test x$with_vidcap != xno; then - if test x$has_vidcap = xyes; then - AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) - PKG_REQUIRES="$PKG_REQUIRES vidcap" - elif test x$with_vidcap != xauto ; then - AC_MSG_ERROR([ - libvidcap is required to build this package! - please see http://libvidcap.sourceforge.net/ for how to - obtain a copy. - ]) + + if test x$with_vidcap != xno; then + if test x$has_vidcap = xyes; then + AC_DEFINE(USE_VIDCAP, 1, [VIDCAP]) + PKG_REQUIRES="$PKG_REQUIRES vidcap" + elif test x$with_vidcap != xauto ; then + AC_MSG_ERROR([ + libvidcap is required to build this package! + please see http://libvidcap.sourceforge.net/ for how to + obtain a copy. + ]) + fi fi -fi - -if test x$with_ffmpeg != xno; then - if test x$has_ffmpeg = xyes; then - AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) - PKG_REQUIRES="$PKG_REQUIRES ffmpeg" - elif test x$with_ffmpeg != xauto ; then - AC_MSG_ERROR([ - FFmpeg is required to build this package! - please see http://ffmpeg.mplayerhq.hu/ for how to - obtain a copy. - ]) + + if test x$with_ffmpeg != xno; then + if test x$has_ffmpeg = xyes; then + AC_DEFINE(USE_FFMPEG, 1, [FFMPEG]) + PKG_REQUIRES="$PKG_REQUIRES ffmpeg" + elif test x$with_ffmpeg != xauto ; then + AC_MSG_ERROR([ + FFmpeg is required to build this package! + please see http://ffmpeg.mplayerhq.hu/ for how to + obtain a copy. + ]) + fi fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |