File timidity-configure_cache_val_name.patch of Package timidity
Index: configure.in
===================================================================
--- configure.in.orig 2011-01-18 13:04:45.974292997 +0100
+++ configure.in 2011-01-18 18:09:16.868808540 +0100
@@ -116,7 +116,7 @@ AC_ARG_WITH(includes,
])
AC_ARG_WITH(libraries,
- AS_HELP_STRING([--with-libraries=DIR, [Specify library directories (colon separated)]),
+ AS_HELP_STRING([--with-libraries=DIR], [Specify library directories (colon separated)]),
[ j=' '
for i in `echo "$withval"|sed -e 's,:, ,g'`; do
j="${j}-L${i} "
@@ -128,7 +128,7 @@ AC_ARG_WITH(libraries,
dnl a bit hairly yet.(20020718:mput)
dnl CPPFLAGS="$CPPFLAGS \$(DEF_PKGDATADIR) \$(DEF_PKGLIBDIR) \$(DEF_DEFAULT_PATH)"
AC_ARG_WITH(default-path,
- AS_HELP_STRING([--with-default-path=DIR[, [Where timidity.cfg is (PREFIX/share/timidity)]),
+ AS_HELP_STRING([--with-default-path=DIR], [Where timidity.cfg is (PREFIX/share/timidity)]),
[pkgdatadir=$withval],
[
if test "x$prefix" != "xNONE"; then
@@ -704,28 +704,28 @@ AC_ARG_WITH(nas-includes,
AC_ARG_ENABLE(audio,
- AS_HELP_STRING([--enable-audio[=mode_list]], [Enable audio (Specify comma separated mode list):
- default: Automatically select audio device.
- oss: OSS /dev/dsp
- sun: SunOS /dev/audio
- hpux: HPUX /dev/audio
- irix: IRIX audio library
- mme: OSF/1 MME
- sb_dsp: BSD/OS 2.0 /dev/sb_dsp
- w32: Windows MMS
- darwin: Darwin CoreAudio
- alsa: ALSA pcm device
- alib: HPUX network audio (Alib)
- nas: NAS - Network Audio System
- arts: aRts
- esd: EsounD - Enlightened Sound Daemon
- portaudio: PortAudio
- jack: JACK
- ao: Libao
- vorbis: Ogg Vorbis
- flac: FLAC / OggFLAC
- speex: Ogg Speex
- gogo: MP3 GOGO (Only Windows is supported)]),
+ [ --enable-audio[=mode_list] Enable audio (Specify comma separated mode list):
+ default: Automatically select audio device.
+ oss: OSS /dev/dsp
+ sun: SunOS /dev/audio
+ hpux: HPUX /dev/audio
+ irix: IRIX audio library
+ mme: OSF/1 MME
+ sb_dsp: BSD/OS 2.0 /dev/sb_dsp
+ w32: Windows MMS
+ darwin: Darwin CoreAudio
+ alsa: ALSA pcm device
+ alib: HPUX network audio (Alib)
+ nas: NAS - Network Audio System
+ arts: aRts
+ esd: EsounD - Enlightened Sound Daemon
+ portaudio: PortAudio
+ jack: JACK
+ ao: Libao
+ vorbis: Ogg Vorbis
+ flac: FLAC / OggFLAC
+ speex: Ogg Speex
+ gogo: MP3 GOGO (Only Windows is supported)],
[ enable_audio=$enableval
have_audio_opt=yes ],
[ enable_audio=yes
@@ -1228,7 +1228,7 @@ fi
dnl ogg's speex
AC_MSG_CHECKING(enable_audio=speex)
if test "x$au_enable_speex" = xyes; then
- AC_CACHE_VAL(have_speex,
+ AC_CACHE_VAL(have_speex_cv_,
[AC_TRY_LINK([
#include <speex.h>
#include <ogg/ogg.h>
@@ -1236,9 +1236,9 @@ if test "x$au_enable_speex" = xyes; then
[
SpeexBits *dummy;
],
- [have_speex=yes], [have_speex=no])])
- AC_MSG_RESULT($have_speex)
- if test "x$have_speex" = xyes; then
+ [have_speex_cv_=yes], [have_speex_cv_=no])])
+ AC_MSG_RESULT($have_speex_cv_)
+ if test "x$have_speex_cv_" = xyes; then
SYSEXTRAS="$SYSEXTRAS speex_a.c"
EXTRALIBS="$EXTRALIBS -lspeex -logg"
EXTRADEFS="$EXTRADEFS -DAU_SPEEX"
@@ -1856,9 +1856,8 @@ AM_CONDITIONAL(ENABLE_SOUND_SPEC, test "
dnl Wave Spline Interpolations
AC_ARG_ENABLE(spline,
- AS_HELP_STRING([--enable-spline=[method], [Specify spline method.
- one of no,linear,cubic,lagrange,newton,gauss
- (default is linear)]),
+ AS_HELP_STRING([--enable-spline=[method]],
+ [Specify spline method. one of no,linear,cubic,lagrange,newton,gauss (default is linear)]),
[ case "x$enableval" in
xlinear)
AC_DEFINE(DEFAULT_RESAMPLATION,resample_linear,Define resampler.)