--- configure.in 2009-09-06 02:05:29.000000000 +0100 +++ configure.in.new 2009-09-08 00:39:23.000000000 +0100 @@ -69,7 +69,7 @@ ac_includedir="" ac_libdir="" case $sys in - Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then + Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then ac_libdir=$enableval/lib ac_includedir=$enableval/include else @@ -101,7 +101,7 @@ fi fi ;; - *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then + *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then ac_libdir=$enableval/lib ac_includedir=$enableval/include CPPFLAGS="$CPPFLAGS -I$ac_includedir" @@ -142,7 +142,7 @@ ac_includedir="" ac_libdir="" case $sys in - Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then + Linux) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then ac_libdir=$enableval/lib ac_includedir=$enableval/include else @@ -179,7 +179,7 @@ fi fi ;; - *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" ; then + *) if test "x$enableval" != "xyes" -a "x$enableval" != "x" -a "x$enableval" != "xno" ; then ac_libdir=$enableval/lib ac_includedir=$enableval/include CPPFLAGS="$CPPFLAGS -I$ac_includedir" @@ -424,8 +424,12 @@ [ squid_dir=$withval ] ) +if test "x$exec_prefix" != xNONE; then eval ac_p_include=$includedir CPPFLAGS="$CPPFLAGS -I$ac_p_include -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir" +else +CPPFLAGS="$CPPFLAGS -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir" +fi AC_CACHE_CHECK([for SQUID at '$squid_dir' ],ac_cv_have_squid,[ AC_TRY_RUN([ #include @@ -439,8 +443,12 @@ ac_cv_have_squid=yes, ac_cv_have_squid=no) ]) +if test "x$exec_prefix" != xNONE; then eval ac_p_lib=$libdir LDFLAGS="$LDFLAGS -L../../../lib -L$ac_p_lib $w_flag$ac_p_lib$w_flag_2" +else +LDFLAGS="$LDFLAGS -L../../../lib" +fi if test "x$ac_cv_have_squid" = "xyes"; then AC_DEFINE(HAVE_SQUID,1, [Define to 1 if you have SQUID]) AC_CHECK_HEADERS(getaddrinfo.h getnameinfo.h util.h)