[Opalvoip-svn] SF.net SVN: opalvoip:[20733] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
From: <ms3...@us...> - 2008-08-25 18:13:21
|
Revision: 20733 http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20733&view=rev Author: ms30002000 Date: 2008-08-25 18:13:25 +0000 (Mon, 25 Aug 2008) Log Message: ----------- Fix audio device compilation when compiling without plugins. Modified Paths: -------------- ptlib/trunk/configure ptlib/trunk/configure.ac Modified: ptlib/trunk/configure =================================================================== --- ptlib/trunk/configure 2008-08-24 09:56:55 UTC (rev 20732) +++ ptlib/trunk/configure 2008-08-25 18:13:25 UTC (rev 20733) @@ -6710,7 +6710,7 @@ HAS_SERIAL= HAS_POP3SMTP= HAS_AUDIO=1 - HAS_VIDEO=! + HAS_VIDEO=1 HAS_URL=1 HAS_HTTP=1 HAS_HTTPFORMS= @@ -14037,7 +14037,7 @@ HAS_ALSA= HAS_OSS= -if test "$enable_audio" = "yes" ; then +if test "x${HAS_AUDIO}" = "x1" ; then # Check whether --enable-alsa was given. if test "${enable_alsa+set}" = set; then @@ -14050,7 +14050,7 @@ fi - if test "$enable_plugins" = "no" ; then + if test "x${HAS_PLUGINS}" = "x" ; then if test "${enable_alsa}z" = "z" ; then enable_alsa=$default_alsa Modified: ptlib/trunk/configure.ac =================================================================== --- ptlib/trunk/configure.ac 2008-08-24 09:56:55 UTC (rev 20732) +++ ptlib/trunk/configure.ac 2008-08-25 18:13:25 UTC (rev 20733) @@ -589,7 +589,7 @@ HAS_SERIAL= HAS_POP3SMTP= HAS_AUDIO=1 - HAS_VIDEO=! + HAS_VIDEO=1 HAS_URL=1 HAS_HTTP=1 HAS_HTTPFORMS= @@ -1596,13 +1596,13 @@ HAS_ALSA= HAS_OSS= -if test "$enable_audio" = "yes" ; then +if test "x${HAS_AUDIO}" = "x1" ; then dnl these are needed to pass through to the plugin configure program AC_ARG_ENABLE(alsa, [ --enable-alsa enable ALSA audio support],enable_alsa=$enableval) AC_ARG_ENABLE(oss, [ --enable-oss enable OSS audio support],enable_oss=$enableval) - if test "$enable_plugins" = "no" ; then + if test "x${HAS_PLUGINS}" = "x" ; then if test "${enable_alsa}z" = "z" ; then enable_alsa=$default_alsa This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |