diff options
| author | Cameron Cawley | 2019-03-20 18:26:38 +0000 |
|---|---|---|
| committer | Matan Bareket | 2019-04-02 11:59:31 -0400 |
| commit | 364fb12e83f5a2a6c2d1596d3f374b47f6b20146 (patch) | |
| tree | 5a31c2a8d9ca60510b9fc1e475c4d8970029e8eb /configure | |
| parent | 93b9ae2e60bef24b1ed45890dfce083172f2c6a4 (diff) | |
| download | scummvm-rg350-364fb12e83f5a2a6c2d1596d3f374b47f6b20146.tar.gz scummvm-rg350-364fb12e83f5a2a6c2d1596d3f374b47f6b20146.tar.bz2 scummvm-rg350-364fb12e83f5a2a6c2d1596d3f374b47f6b20146.zip | |
BUILD: Convert the NEWS.md file if pandoc is installed
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 32 |
1 files changed, 12 insertions, 20 deletions
@@ -228,7 +228,6 @@ NASM="" _tainted_build=no PANDOC="" _pandocpath="$PATH" -_pandocoutput="README" _pandocformat="plain" # The following variables are automatically detected, and should not # be modified otherwise. Consider them read-only. @@ -1095,8 +1094,7 @@ Optional Libraries: --with-nasm-prefix=DIR prefix where nasm executable is installed (optional) --disable-nasm disable assembly language optimizations [autodetect] - --with-pandoc-output=FILE filename to convert README.md to (optional) - --with-pandoc-format=FORMAT pandoc format to use during the conversion (optional) + --with-pandoc-format=FORMAT pandoc format to use during the conversion (optional) --with-readline-prefix=DIR prefix where readline is installed (optional) --disable-readline disable readline support in text console [autodetect] @@ -1399,11 +1397,6 @@ for ac_option in $@; do arg=`echo $ac_option | cut -d '=' -f 2` _nasmpath="$arg:$arg/bin" ;; - --with-pandoc-output=*) - arg=`echo $ac_option | cut -d '=' -f 2` - _pandocoutput="$arg" - _pandoc=yes - ;; --with-pandoc-format=*) arg=`echo $ac_option | cut -d '=' -f 2` _pandocformat="$arg" @@ -5111,22 +5104,22 @@ define_in_config_if_yes $_nasm 'USE_NASM' # Check for pandoc # if test "$_pandoc" = yes ; then - echocheck "pandoc" + echocheck "pandoc" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$SEPARATOR + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$SEPARATOR - for path_dir in $_pandocpath; do - if test -x "$path_dir/pandoc$NATIVEEXEEXT" ; then - PANDOC="$path_dir/pandoc$NATIVEEXEEXT" - break - fi - done + for path_dir in $_pandocpath; do + if test -x "$path_dir/pandoc$NATIVEEXEEXT" ; then + PANDOC="$path_dir/pandoc$NATIVEEXEEXT" + break + fi + done IFS="$ac_save_ifs" - if ! test "$PANDOC" ; then - _pandoc = no - fi + if ! test "$PANDOC" ; then + _pandoc = no + fi echo $_pandoc fi @@ -5610,7 +5603,6 @@ EXEEXT := $HOSTEXEEXT NASM := $NASM NASMFLAGS := $NASMFLAGS PANDOC := $PANDOC -PANDOCOUTPUT := $_pandocoutput PANDOCFORMAT := $_pandocformat ZLIB_LIBS := $ZLIB_LIBS ZLIB_CFLAGS := $ZLIB_CFLAGS |