Commit 4bc44022 authored by Shane Snyder's avatar Shane Snyder

Merge branch 'gkl/fix-bz2-ac' into 'master'

fix --with-bzlib=DIR ignoring DIR

See merge request !13
parents d24220d0 d19e0e47
...@@ -3525,6 +3525,7 @@ if test "${with_bzlib+set}" = set; then : ...@@ -3525,6 +3525,7 @@ if test "${with_bzlib+set}" = set; then :
then then
BZLIB_HOME="$withval" BZLIB_HOME="$withval"
else 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:${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;} $as_echo "$as_me: WARNING: Sorry, $withval does not exist, checking usual places" >&2;}
fi fi
...@@ -3536,17 +3537,16 @@ fi ...@@ -3536,17 +3537,16 @@ fi
fi fi
BZLIB_HOME=/usr/local
if test ! -f "${BZLIB_HOME}/include/bzlib.h"
then
BZLIB_HOME=/usr
fi
# #
# Locate bzlib, if wanted # Locate bzlib, if wanted
# #
if test -z "${DISABLE_BZLIB}" if test -z "${DISABLE_BZLIB}"
then 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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
BZLIB_OLD_LDFLAGS=$LDFLAGS BZLIB_OLD_LDFLAGS=$LDFLAGS
......
...@@ -37,6 +37,7 @@ AC_ARG_WITH(bzlib, ...@@ -37,6 +37,7 @@ AC_ARG_WITH(bzlib,
then then
BZLIB_HOME="$withval" BZLIB_HOME="$withval"
else else
BZLIB_HOME=/usr/local
AC_MSG_WARN([Sorry, $withval does not exist, checking usual places]) AC_MSG_WARN([Sorry, $withval does not exist, checking usual places])
fi fi
else else
...@@ -44,17 +45,16 @@ else ...@@ -44,17 +45,16 @@ else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi]) fi])
BZLIB_HOME=/usr/local
if test ! -f "${BZLIB_HOME}/include/bzlib.h"
then
BZLIB_HOME=/usr
fi
# #
# Locate bzlib, if wanted # Locate bzlib, if wanted
# #
if test -z "${DISABLE_BZLIB}" if test -z "${DISABLE_BZLIB}"
then then
if test ! -f "${BZLIB_HOME}/include/bzlib.h"
then
BZLIB_HOME=/usr
fi
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
BZLIB_OLD_LDFLAGS=$LDFLAGS BZLIB_OLD_LDFLAGS=$LDFLAGS
BZLIB_OLD_CPPFLAGS=$CPPFLAGS 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