From: <jpg...@us...> - 2008-02-29 17:54:33
|
Revision: 1362 http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1362&view=rev Author: jpgrayson Date: 2008-02-29 09:54:33 -0800 (Fri, 29 Feb 2008) Log Message: ----------- Move all of the client configuration business to the same place. Only build stresstest if video is enabled (since it depends on it). Modified Paths: -------------- trunk/configure.ac Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2008-02-29 17:37:47 UTC (rev 1361) +++ trunk/configure.ac 2008-02-29 17:54:33 UTC (rev 1362) @@ -148,23 +148,6 @@ AC_MSG_ERROR([bad value ${with_ilbc} for --with-ilbc]) ;; esac -if test ! "x$enable_clients" = "xauto"; then - for client in ${enable_clients}; do - case "$client" in - iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx) - clients="$clients $client" ;; - all | yes) - clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx" - break ;; - none | no) - clients="" - break ;; - *) - AC_MSG_ERROR(bad value ${client} for --enable-clients) ;; - esac - done -fi - case $host_os in *mingw32*|*cygwin* ) OSTYPE=WIN32 @@ -385,10 +368,25 @@ AM_CONDITIONAL(MACOSX, test x$OSTYPE = xMACOSX) # Autodetect clients -if test "x$enable_clients" = "xauto"; then +if test "x$enable_clients" != "xauto"; then + for client in ${enable_clients}; do + case "$client" in + iaxcomm | iaxphone | stresstest | testcall | tkphone | vtestcall | WinIAX | wx) + clients="$clients $client" ;; + all | yes) + clients="iaxcomm iaxphone stresstest testcall tkphone vtestcall WinIAX wx" + break ;; + none | no) + clients="" + break ;; + *) + AC_MSG_ERROR(bad value ${client} for --enable-clients) ;; + esac + done +else clients="$clients testcall" - if test x$has_oggz = xyes && test x$has_theora = xyes; then + if test x$enable_video = xyes && test x$has_oggz = xyes && test x$has_theora = xyes; then clients="$clients stresstest" fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |