Fix:Build:Correct handling of predefined environment variables

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3369 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/configure.in b/navit/configure.in
index 770aa21..dba06d6 100644 (file)
--- a/navit/configure.in
+++ b/navit/configure.in
@@ -266,7 +266,7 @@ AS_IF([test -n "$ac_x_libraries"], [X_LIBS="-L$ac_x_libraries"])
 
 # glib
 AC_ARG_ENABLE(glib, [  --disable-glib             don't build with external glib], glib=$enableval, glib=yes)
-if test x"${glib}" = "xyes"; then
+if test "x${glib}" = "xyes" -a "x${GLIB_CFLAGS}" = "x" -a "x${GLIB_LIBS}" = "x"; then
        PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0], [glib=yes],[glib=no])
 fi
 if test "x${glib}" = "xyes"; then
@@ -328,6 +328,7 @@ AM_CONDITIONAL(EVENT_GLIB, [test "x$glib" = "xyes"])
 AM_CONDITIONAL(SUPPORT_GLIB, [test "x$glib" = "xno"])
 AM_CONDITIONAL(SUPPORT_EZXML, [test "x$glib" = "xno"])
 
+if test "x${ZLIB_CFLAGS}" = "x" -a "x${ZLIB_LIBS}" = "x"; then
 AC_CHECK_HEADER(
        zlib.h,
        AC_DEFINE(
@@ -341,6 +342,9 @@ AC_CHECK_HEADER(
        ZLIB_LIBS="-L\$(top_builddir)/navit/support/zlib -lsupport_zlib"
        zlib=no
 )
+else
+       zlib=yes
+fi
 AM_CONDITIONAL(SUPPORT_ZLIB, [test "x$zlib" = "xno"])
 AC_SUBST(ZLIB_CFLAGS)
 AC_SUBST(ZLIB_LIBS)