aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2006-01-21 18:22:01 +0000
committerMax Horn2006-01-21 18:22:01 +0000
commit4a8c720252cb03e974f32dca5e1ee6d6ebab1353 (patch)
treedbb53380899be6e4faef6218b9607dc5d60866f7
parentc3f3615074f6818234d97869b3765139bf90a5c9 (diff)
downloadscummvm-rg350-4a8c720252cb03e974f32dca5e1ee6d6ebab1353.tar.gz
scummvm-rg350-4a8c720252cb03e974f32dca5e1ee6d6ebab1353.tar.bz2
scummvm-rg350-4a8c720252cb03e974f32dca5e1ee6d6ebab1353.zip
Fix --with-XYZ-prefix options, which would incorrectly overwrite _prefix (see also patch #1411577, but note that this fix is different)
svn-id: r20123
-rwxr-xr-xconfigure54
1 files changed, 27 insertions, 27 deletions
diff --git a/configure b/configure
index 6f1ab83a83..1f1d2d8da5 100755
--- a/configure
+++ b/configure
@@ -385,49 +385,49 @@ for ac_option in $@; do
--enable-mt32emu) _mt32emu=yes ;;
--disable-mt32emu) _mt32emu=no ;;
--with-fluidsynth-prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
- FLUIDSYNTH_CFLAGS="-I$_prefix/include"
- FLUIDSYNTH_LIBS="-L$_prefix/lib"
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ FLUIDSYNTH_CFLAGS="-I$arg/include"
+ FLUIDSYNTH_LIBS="-L$arg/lib"
;;
--with-mpeg2-prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
- MPEG2_CFLAGS="-I$_prefix/include"
- MPEG2_LIBS="-L$_prefix/lib"
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ MPEG2_CFLAGS="-I$arg/include"
+ MPEG2_LIBS="-L$arg/lib"
;;
--with-alsa-prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
- ALSA_CFLAGS="-I$_prefix/include"
- ALSA_LIBS="-L$_prefix/lib"
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ ALSA_CFLAGS="-I$arg/include"
+ ALSA_LIBS="-L$arg/lib"
;;
--with-ogg-prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
- OGG_CFLAGS="-I$_prefix/include"
- OGG_LIBS="-L$_prefix/lib"
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ OGG_CFLAGS="-I$arg/include"
+ OGG_LIBS="-L$arg/lib"
;;
--with-vorbis-prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
- VORBIS_CFLAGS="-I$_prefix/include"
- VORBIS_LIBS="-L$_prefix/lib"
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ VORBIS_CFLAGS="-I$arg/include"
+ VORBIS_LIBS="-L$arg/lib"
;;
--with-tremor-prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
- TREMOR_CFLAGS="-I$_prefix/include"
- TREMOR_LIBS="-L$_prefix/lib"
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ TREMOR_CFLAGS="-I$arg/include"
+ TREMOR_LIBS="-L$arg/lib"
;;
--with-flac-prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
- FLAC_CFLAGS="-I$_prefix/include"
- FLAC_LIBS="-L$_prefix/lib"
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ FLAC_CFLAGS="-I$arg/include"
+ FLAC_LIBS="-L$arg/lib"
;;
--with-mad-prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
- MAD_CFLAGS="-I$_prefix/include"
- MAD_LIBS="-L$_prefix/lib"
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ MAD_CFLAGS="-I$arg/include"
+ MAD_LIBS="-L$arg/lib"
;;
--with-zlib-prefix=*)
- _prefix=`echo $ac_option | cut -d '=' -f 2`
- ZLIB_CFLAGS="-I$_prefix/include"
- ZLIB_LIBS="-L$_prefix/lib"
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ ZLIB_CFLAGS="-I$arg/include"
+ ZLIB_LIBS="-L$arg/lib"
;;
--backend=*)
_backend=`echo $ac_option | cut -d '=' -f 2`