summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorXavier Roche <xroche@users.noreply.github.com>2013-07-08 18:59:32 +0000
committerXavier Roche <xroche@users.noreply.github.com>2013-07-08 18:59:32 +0000
commitde1c1d80a96c54883d60f939594b678f0bb90504 (patch)
tree44da9858d7301a6000c7c5dc4c1f6c1bc12a40c3 /configure
parent538c049521fdcd735cb27449b76a4fbfeb3dabe1 (diff)
Cleaned up zlib madeness
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure17
1 files changed, 6 insertions, 11 deletions
diff --git a/configure b/configure
index db79cd4..c6dbb5a 100755
--- a/configure
+++ b/configure
@@ -15420,29 +15420,24 @@ if test "${with_zlib+set}" = set; then :
withval=$with_zlib; if test "$withval" != no ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- if test -d "$withval"
- then
- ZLIB_HOME="$withval"
- else
- { $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
+ ZLIB_HOME="$withval"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
-fi
-
+else
-# Added 'RX - totally fucked up script
-if test ! -f "${ZLIB_HOME}/include/zlib.h"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
ZLIB_HOME=/usr/local
if test ! -f "${ZLIB_HOME}/include/zlib.h"
then
ZLIB_HOME=/usr
fi
+
fi
+
#
# Locate zlib, if wanted
#