| 657376c6 |
1 | Index: squid/configure.in |
| 2 | diff -c squid/configure.in:1.251.2.94 squid/configure.in:1.251.2.95 |
| 3 | *** squid/configure.in:1.251.2.94 Thu Aug 4 05:38:33 2005 |
| 4 | --- squid/configure.in Sat Sep 3 02:20:40 2005 |
| 5 | *************** |
| 6 | *** 822,827 **** |
| 7 | --- 822,843 ---- |
| 8 | CFLAGS="`getconf ${buildmodel}_CFLAGS` $CFLAGS" |
| 9 | LIBS="`getconf ${buildmodel}_LIBS` $LIBS" |
| 10 | LDFLAGS="`getconf ${buildmodel}_LDFLAGS` $LDFLAGS" |
| 11 | + dnl |
| 12 | + dnl On Solaris getconf returns for CFLAGS -Xa and -Usun options, but: |
| 13 | + dnl -Xa is supported only by Sun cc, so we need to remove it when using gcc |
| 14 | + dnl The 'sun' define is needed by ipfilter includes, so we must remove -Usun |
| 15 | + case "$host" in |
| 16 | + *-solaris*) |
| 17 | + if test "$GCC" = "yes"; then |
| 18 | + echo "Removing -Xa for gcc on $host" |
| 19 | + CFLAGS="`echo $CFLAGS | sed -e 's/-Xa//'`" |
| 20 | + fi |
| 21 | + echo "Removing -Usun for gcc on $host" |
| 22 | + CFLAGS="`echo $CFLAGS | sed -e 's/-Usun//'`" |
| 23 | + ;; |
| 24 | + *) |
| 25 | + ;; |
| 26 | + esac |
| 27 | fi |
| 28 | |
| 29 | AM_CONDITIONAL(MAKE_LEAKFINDER, false) |
| 30 | *************** |
| 31 | *** 1934,1939 **** |
| 32 | --- 1950,1966 ---- |
| 33 | echo "WARNING: Cannot find necessary IP-Filter header files" |
| 34 | echo " Transparent Proxy support WILL NOT be enabled" |
| 35 | sleep 10 |
| 36 | + elif test "$IPF_TRANSPARENT" = "yes" ; then |
| 37 | + dnl On Solaris Ipfilter includes expect that SOLARIS2 is defined with the |
| 38 | + dnl Solaris minor version (8, 9, 10, ...) |
| 39 | + case "$host" in |
| 40 | + *-solaris*) |
| 41 | + solrev=`uname -r | sh -c 'IFS=. read j n x; echo $n'` |
| 42 | + CFLAGS="-DSOLARIS2=$solrev $CFLAGS" |
| 43 | + ;; |
| 44 | + *) |
| 45 | + ;; |
| 46 | + esac |
| 47 | fi |
| 48 | |
| 49 | dnl PF support requires a header file. |
projects / packages / squid.git / blame