Fix build errors in squid_kerb_auth

Some autoconf environments re-define macros and cause build errors.
This resolves all known issues with configure in the current package
interactions.

TODO: at least one syntax error in squid_kerb_auth basic code still
      remains to be fixed.

diff --git a/helpers/negotiate_auth/squid_kerb_auth/configure.in b/helpers/negotiate_auth/squid_kerb_auth/configure.in
index 0d71005e5e9bfb84fc5f749384ebbf125ad55655..49e61cd0aa84631d011f44927af50b8951b8c2fc 100644 (file)
--- a/helpers/negotiate_auth/squid_kerb_auth/configure.in
+++ b/helpers/negotiate_auth/squid_kerb_auth/configure.in
@@ -431,7 +431,7 @@ AC_ARG_WITH([squid],
 )
 
 eval ac_p_include=$includedir
-CPPFLAGS="$CPPFLAGS -I$ac_p_include -I../../../ -I$squid_dir/include -I$squid_dir/src "
+CPPFLAGS="$CPPFLAGS -I$ac_p_include -I../../../ -I../../../include/ -I$squid_dir/include -I$squid_dir/src "
 AC_CACHE_CHECK([for SQUID at '$squid_dir' ],ac_cv_have_squid,[
 AC_TRY_RUN([
 #include <config.h>
@@ -466,7 +466,15 @@ AH_TOP([ /* This is building inside Squid. We need their config as well. */
 
 #if HAVE_SQUID
 #include "config.h"
-#endif
+ /* We want the Squid type and library definitions without the package ones */
+#undef VERSION
+#undef PACKAGE
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+#endif /* HAVE_SQUID */
 ])
 AH_BOTTOM([
 /* Squid provides a few compat libraries */