From 8ede2c87437a2403a6308152af45797211090c32 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 9 Oct 2011 22:16:54 +0000 Subject: Search for libraries in the path where Cygwin installs MinGW zlib as well --- infrastructure/mingw/configure.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'infrastructure/mingw') diff --git a/infrastructure/mingw/configure.sh b/infrastructure/mingw/configure.sh index 9a0aa363..60981946 100755 --- a/infrastructure/mingw/configure.sh +++ b/infrastructure/mingw/configure.sh @@ -16,7 +16,9 @@ if [ ! -r "$DEP_PATH/lib/libpcreposix.a" \ exit 2 fi -if [ ! -r "$DEP_PATH/sys-root/mingw/lib/libz.dll.a" ]; then +LIBZ_PATH="${DEP_PATH}/sys-root/mingw/lib" + +if [ ! -r "$LIBZ_PATH/libz.dll.a" ]; then echo "Error: upgrade your Cygwin mingw-zlib-devel package" >&2 exit 2 fi @@ -32,7 +34,7 @@ if ! ./configure "$@" --target=i686-pc-mingw32 \ CFLAGS="-mno-cygwin -mthreads" \ CPPFLAGS="-mno-cygwin" \ CXXFLAGS="-mno-cygwin -mthreads" \ - LDFLAGS="-mno-cygwin -mthreads -L${DEP_PATH}/lib" \ + LDFLAGS="-mno-cygwin -mthreads -L${DEP_PATH}/lib -L${LIBZ_PATH}" \ LIBS="-lcrypto -lws2_32 -lgdi32" then echo "Error: configure failed, aborting." >&2 -- cgit v1.2.3