From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Tue, 8 Sep 2009 21:04:04 +0000 (+0200)
Subject: Author: Markus Moeller <huaraz@moeller.plus.com>
X-Git-Tag: SQUID_3_1_0_14~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6500554dddfbebd296189d72577649579ab41370;p=thirdparty%2Fsquid.git

Author: Markus Moeller <huaraz@moeller.plus.com>
Correct squid_kerb_auth compile/link flags to avoid bad runpath settings etc
---

diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.in b/helpers/negotiate_auth/squid_kerb_auth/configure.in
index c92cc120ed..dd772a26db 100644
--- a/helpers/negotiate_auth/squid_kerb_auth/configure.in
+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.in
@@ -69,7 +69,7 @@ check_mit() {
        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 @@ check_mit() {
                          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 @@ check_heimdal(){
        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 @@ check_heimdal(){
                          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,7 @@ AC_ARG_WITH([squid],
   [ squid_dir=$withval ]
 )
 
-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"
+CPPFLAGS="$CPPFLAGS -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src -I$squid_dir"
 AC_CACHE_CHECK([for SQUID at '$squid_dir' ],ac_cv_have_squid,[
 AC_TRY_RUN([
 #include <config.h>
@@ -439,8 +438,7 @@ return 1;
   ac_cv_have_squid=yes,
   ac_cv_have_squid=no)
 ])
-eval ac_p_lib=$libdir
-LDFLAGS="$LDFLAGS -L../../../lib -L$ac_p_lib $w_flag$ac_p_lib$w_flag_2"
+LDFLAGS="$LDFLAGS -L../../../lib"
 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)