Commit d19e0e47 authored by Glenn K. Lockwood's avatar Glenn K. Lockwood

fix --with-bzlib=DIR ignoring DIR

parent 1a7661d8
......@@ -3525,6 +3525,7 @@ if test "${with_bzlib+set}" = set; then :
then
BZLIB_HOME="$withval"
else
BZLIB_HOME=/usr/local
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sorry, $withval does not exist, checking usual places" >&5
$as_echo "$as_me: WARNING: Sorry, $withval does not exist, checking usual places" >&2;}
fi
......@@ -3536,17 +3537,16 @@ fi
fi
BZLIB_HOME=/usr/local
if test ! -f "${BZLIB_HOME}/include/bzlib.h"
then
BZLIB_HOME=/usr
fi
#
# Locate bzlib, if wanted
#
if test -z "${DISABLE_BZLIB}"
then
if test ! -f "${BZLIB_HOME}/include/bzlib.h"
then
BZLIB_HOME=/usr
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
BZLIB_OLD_LDFLAGS=$LDFLAGS
......
......@@ -37,6 +37,7 @@ AC_ARG_WITH(bzlib,
then
BZLIB_HOME="$withval"
else
BZLIB_HOME=/usr/local
AC_MSG_WARN([Sorry, $withval does not exist, checking usual places])
fi
else
......@@ -44,17 +45,16 @@ else
AC_MSG_RESULT(no)
fi])
BZLIB_HOME=/usr/local
if test ! -f "${BZLIB_HOME}/include/bzlib.h"
then
BZLIB_HOME=/usr
fi
#
# Locate bzlib, if wanted
#
if test -z "${DISABLE_BZLIB}"
then
if test ! -f "${BZLIB_HOME}/include/bzlib.h"
then
BZLIB_HOME=/usr
fi
AC_MSG_RESULT(yes)
BZLIB_OLD_LDFLAGS=$LDFLAGS
BZLIB_OLD_CPPFLAGS=$CPPFLAGS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment