From: <jpg...@us...> - 2008-02-29 17:27:57
|
Revision: 1360 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1360&view=rev Author: jpgrayson Date: 2008-02-29 09:28:01 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Change configure option "--with-video" to more conventional "--enable-video". Video can now be disabled with either of: --enable-video=no --disable-video Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:24:41 UTC (rev 1359) +++ trunk/configure.ac 2008-02-29 17:28:01 UTC (rev 1360) @@ -83,6 +83,11 @@ enable_debug_iax2=$enableval, enable_debug_iax2="no") +AC_ARG_ENABLE(video, + [AS_HELP_STRING([--enable-video], + [Enable video support [default=yes]])],, + [enable_video="yes"]) + AC_ARG_WITH(echo-can, [AS_HELP_STRING([--with-echo-can], [use echo can (span or speex) [default=speex]])], @@ -123,11 +128,6 @@ WISH="${with_wish}", with_wish="auto") -AC_ARG_WITH(video, - [AS_HELP_STRING([--without-video], - [Video support])],, - with_video="yes") - AC_ARG_WITH(ogg, [AS_HELP_STRING([--without-ogg], [OGG support])],, @@ -203,10 +203,10 @@ AM_PATH_GSM(has_gsm=yes, has_gsm=no) fi -if test x$with_video = xyes; then +if test x$enable_video = xyes; then AC_DEFINE(USE_VIDEO, 1, [Define to 1 to enable Video support]) fi -AM_CONDITIONAL(VIDEO, test x$with_video = xyes) +AM_CONDITIONAL(VIDEO, test x$enable_video = xyes) has_ogg=no if test ! x$with_ogg = xno; then @@ -404,7 +404,7 @@ fi fi - if test x$has_sdl = xyes && test x$with_video = xyes; then + if test x$has_sdl = xyes && test x$enable_video = xyes; then clients="$clients vtestcall" fi @@ -427,7 +427,7 @@ CLIENTS="$CLIENTS $client";; vtestcall) - if test ! x$has_sdl = xyes || test ! x$with_video = xyes ; then + if test ! x$has_sdl = xyes || test ! x$enable_video = xyes ; then AC_MSG_ERROR([vtestcall requires SDL and video]) fi CLIENTS="$CLIENTS $client";; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |