From: serassio <>
Date: Mon, 15 Aug 2005 02:44:28 +0000 (+0000)
Subject: Bug #1374: Solaris 10 SPARC transparent proxy build problem with ipfilter
X-Git-Tag: SQUID_3_0_PRE4~687
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f6ca20d6660a608f2e4c7713183c755d24aa409;p=thirdparty%2Fsquid.git

Bug #1374: Solaris 10 SPARC transparent proxy build problem with ipfilter

On Solaris (and may be that on other platforms could be something similar to
this, we should verify), Ipfilter include files use a SOLARIS2 define defined
only in the ipfilter makefile at ipfilter build time.
This patch adds the SOLARIS2 definition into configure.
---

diff --git a/configure.in b/configure.in
index 379e656812..cee3f5fa21 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.382 2005/08/07 12:16:50 serassio Exp $
+dnl  $Id: configure.in,v 1.383 2005/08/14 20:44:28 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.382 $)dnl
+AC_REVISION($Revision: 1.383 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -2386,6 +2386,17 @@ if test "$IPF_TRANSPARENT" = "no" ; then
     echo "WARNING: Cannot find necessary IP-Filter header files"
     echo "         Transparent Proxy support WILL NOT be enabled"
     sleep 10
+elif test "$IPF_TRANSPARENT" = "yes" ; then
+dnl On Solaris Ipfilter includes expect that SOLARIS2 is defined with the
+dnl Solaris minor version (8, 9, 10, ...)
+    case "$host" in
+	*-solaris*)
+	    solrev=`uname -r | sh -c 'IFS=. read j n x; echo $n'`
+	    CFLAGS="-DSOLARIS2=$solrev $CFLAGS" 
+	    ;;
+	*)
+	    ;;
+    esac
 fi
 
 dnl PF support requires a header file.