← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/squid3/jaunty

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Luigi Gangitano
  • Date: 2008-06-01 05:48:22 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080601054822-okaglok79te8qmln
Tags: 3.0.STABLE6-2
* debian/control
  - Fixed suggestion on squidlcient package

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
5
5
dnl
6
6
dnl
7
7
dnl
8
 
AC_INIT(Squid Web Proxy, 3.0.STABLE4, http://www.squid-cache.org/bugs/, squid)
 
8
AC_INIT(Squid Web Proxy, 3.0.STABLE6, http://www.squid-cache.org/bugs/, squid)
9
9
AC_PREREQ(2.52)
10
10
AM_CONFIG_HEADER(include/autoconf.h)
11
11
AC_CONFIG_AUX_DIR(cfgaux)
1165
1165
])
1166
1166
 
1167
1167
if test $needlargefiles && test -z "$buildmodel"; then
1168
 
        for model in POSIX_V6_ILP32_OFFBIG XBS5_ILP32_OFFBIG POSIX_V6_LP64_OFF64 XBS5_LP64_OFF64 POSIX_V6_LPBIG_OFFBIG XBS5_LPBIG_OFFBIG; do
 
1168
        for model in POSIX_V6_LPBIG_OFFBIG XBS5_LPBIG_OFFBIG POSIX_V6_LP64_OFF64 XBS5_LP64_OFF64 POSIX_V6_ILP32_OFFBIG XBS5_ILP32_OFFBIG; do
1169
1169
                if test "`getconf _$model 2>/dev/null || true`" = 1 || test "`getconf $model 2>/dev/null || true`" ; then
1170
1170
                        buildmodel=$model
1171
1171
                        break
1745
1745
  SQUID_CPPUNIT_LA=''
1746
1746
  SQUID_CPPUNIT_INC="`$CPPUNITCONFIG --cflags`"
1747
1747
else
1748
 
  echo "cppunit does not apear to be installed. squid does not require this, but code testing with 'make check' will fail."
 
1748
  echo "cppunit does not appear to be installed. squid does not require this, but code testing with 'make check' will fail."
1749
1749
  SQUID_CPPUNIT_LA='' 
1750
1750
  SQUID_CPPUNIT_LIBS=''
1751
1751
  SQUID_CPPUNIT_INC=''
1862
1862
        math.h \
1863
1863
        memory.h \
1864
1864
        mount.h \
1865
 
        net/if.h \
1866
 
        net/pfvar.h \
1867
1865
        netdb.h \
1868
1866
        netinet/in.h \
1869
1867
        netinet/ip_fil_compat.h \
1933
1931
#endif
1934
1932
)
1935
1933
 
1936
 
AC_CHECK_HEADERS(net/if.h \
 
1934
dnl *BSD dont include the depenencies for all their net/ and netinet/ files
 
1935
dnl We must include a few basic type headers for them to work.
 
1936
AC_CHECK_HEADERS( \
 
1937
        net/if.h \
 
1938
        net/pfvar.h \
1937
1939
        netinet/if_ether.h\
 
1940
        netinet/ip.h\
1938
1941
        netinet/ip_compat.h\
1939
1942
        netinet/ip_fil.h\
 
1943
        netinet/ip_icmp.h\
1940
1944
        netinet/ip_nat.h\
1941
1945
        netinet/ipl.h \
1942
1946
        sys/mount.h\
2666
2670
  AC_DEFINE(HAVE_SETRESUID,1,[Yay! Another Linux brokenness.  Its not good enough to know that setresuid() exists, because RedHat 5.0 declare setresuid() but doesn't implement it.])
2667
2671
fi
2668
2672
 
 
2673
dnl Yay!  This one is  a MacOSX brokenness.  Its not good enough
 
2674
dnl to know that strnstr() exists, because MacOSX 10.4 have a bad
 
2675
dnl copy that crashes with a buffer over-run!
 
2676
dnl
 
2677
AC_CACHE_CHECK(if strnstr is well implemented, ac_cv_func_strnstr,
 
2678
  AC_TRY_RUN([
 
2679
#include <stdlib.h>
 
2680
#include <stdio.h>
 
2681
#include <string.h>
 
2682
    // we expect this to succeed, or crash on over-run.
 
2683
    // if it passes otherwise we may need a better check.
 
2684
int main(int argc, char **argv)
 
2685
{
 
2686
    int size = 20;
 
2687
    char *str = malloc(size);
 
2688
    memset(str, 'x', size);
 
2689
    strnstr(str, "fubar", size);
 
2690
    return 0;
 
2691
}
 
2692
  ],ac_cv_func_strnstr="yes",ac_cv_func_strnstr="no")
 
2693
)
 
2694
if test "$ac_cv_func_strnstr" = "yes" ; then
 
2695
  AC_DEFINE(HAVE_STRNSTR,1,[Yay! We have a working strnstr!])
 
2696
else
 
2697
  AC_DEFINE(HAVE_STRNSTR,0,[Yay! A MacOS X brokenness. Its not good enough to know that strnstr() exists, because MacOSX 10.4 and earlier may have a buffer overrun.])
 
2698
fi
 
2699
 
 
2700
 
2669
2701
AM_CONDITIONAL(NEED_OWN_STRSEP, false)
2670
2702
if test "$ac_cv_func_strsep" = "no" ; then
2671
2703
  AM_CONDITIONAL(NEED_OWN_STRSEP, true)
2926
2958
    if (getrlimit(RLIMIT_NOFILE, &rl) < 0) {
2927
2959
        perror("getrlimit: RLIMIT_NOFILE");
2928
2960
    } else {
 
2961
#if defined(__APPLE__)
 
2962
        /* asking for more than OPEN_MAX fails on Leopard */
 
2963
        rl.rlim_cur = (OPEN_MAX < rl.rlim_max ? OPEN_MAX : rl.rlim_max);
 
2964
#else
2929
2965
        rl.rlim_cur = rl.rlim_max;      /* set it to the max */
 
2966
#endif
2930
2967
        if (setrlimit(RLIMIT_NOFILE, &rl) < 0) {
2931
2968
            perror("setrlimit: RLIMIT_NOFILE");
2932
2969
        }
3302
3339
        helpers/external_acl/session/Makefile \
3303
3340
        helpers/external_acl/unix_group/Makefile \
3304
3341
        helpers/external_acl/wbinfo_group/Makefile \
 
3342
        helpers/external_acl/mswin_ad_group/Makefile \
3305
3343
        helpers/external_acl/mswin_lm_group/Makefile \
3306
3344
        tools/Makefile
3307
3345
])