Skip to content

Commit

Permalink
configure: fix zlib and lz4 submodule checks
Browse files Browse the repository at this point in the history
Conditionals to skip the submodule checks were using the wrong
variable names, so the checks were always skipped. The correct
behavior is to perform the check unless given `ZLIB=<zlib>` or
`LZ4=<lz4>`, as applicable.
  • Loading branch information
LiberalArtist committed Feb 25, 2024
1 parent 57f92bb commit 59b7567
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -897,13 +897,13 @@ if [ ! -f "$srcdir"/nanopass/nanopass.ss ] ; then
submod_instructions 'Source in "nanopass" is missing'
fi

if [ "${zlibDep}" != "" ] ; then
if [ "${zlibLib}" = "" ] ; then
if [ ! -f "$srcdir"/zlib/configure ] ; then
submod_instructions 'Source in "zlib" is missing'
fi
fi

if [ "${LZ4Dep}" != "" ] ; then
if [ "${LZ4Lib}" = "" ] ; then
if [ ! -f "$srcdir"/lz4/lib/Makefile ] ; then
submod_instructions 'Source in "lz4" is missing'
fi
Expand Down Expand Up @@ -1083,7 +1083,7 @@ cp "$srcdir"/makefiles/buildmain.zuo main.zuo
# Some idea, but in the workarea, so it refers to "workarea.zuo" here:
cp "$srcdir"/makefiles/workmain.zuo $w/main.zuo

# The content of "$w/Makefile" records configuration decisions,
# The content of "$w/Mf-config" records configuration decisions,
# and the Zuo build script takes it from there
cat > $w/Mf-config << END
srcdir=$srcdir
Expand Down

0 comments on commit 59b7567

Please sign in to comment.