X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure;h=a25e7c1ce5c1a435d9cebb760dc789acbb837ccb;hb=e4a2d86a03126ffb17992b71c1aec0888cb8ce76;hp=29b45e1fddd6ce35732806f038a8fae6b7be900f;hpb=d4bea61c8f1e5fb1a68c401610bd424c052ef636;p=picodrive.git diff --git a/configure b/configure index 29b45e1..a25e7c1 100755 --- a/configure +++ b/configure @@ -52,7 +52,7 @@ CC="${CC-${CROSS_COMPILE}gcc}" CXX="${CXX-${CROSS_COMPILE}g++}" AS="${AS-${CROSS_COMPILE}as}" STRIP="${STRIP-${CROSS_COMPILE}strip}" -SDL_CONFIG="`$CC --print-sysroot`/usr/bin/sdl-config" +test -n "$SDL_CONFIG" || SDL_CONFIG="`$CC --print-sysroot 2> /dev/null || true`/usr/bin/sdl-config" MAIN_LDLIBS="$LDLIBS -lm" config_mak="config.mak" @@ -241,7 +241,7 @@ check_zlib() #include int main(void) { uncompress(0, 0, 0, 0); } EOF - compile_binary + compile_binary "$@" } check_libpng() @@ -291,8 +291,8 @@ EOF compile_object "$@" } -#MAIN_LDLIBS="$MAIN_LDLIBS -lz" -#check_zlib || fail "please install zlib (libz-dev)" +MAIN_LDLIBS="$MAIN_LDLIBS -lz" +check_zlib -lz || fail "please install zlib (libz-dev)" MAIN_LDLIBS="-lpng $MAIN_LDLIBS" check_libpng || fail "please install libpng (libpng-dev)"