~kinkie/squid/refactor

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Francesco Chemolli
  • Date: 2016-02-10 09:54:52 UTC
  • mfrom: (14472.1.61 trunk)
  • Revision ID: kinkie@squid-cache.org-20160210095452-mkw9qljsldscdaol
MergedĀ fromĀ trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
## Please see the COPYING and CONTRIBUTORS files for details.
6
6
##
7
7
 
8
 
AC_INIT([Squid Web Proxy],[4.0.4-BZR],[http://bugs.squid-cache.org/],[squid])
 
8
AC_INIT([Squid Web Proxy],[4.0.5-BZR],[http://bugs.squid-cache.org/],[squid])
9
9
AC_PREREQ(2.61)
10
10
AC_CONFIG_HEADERS([include/autoconf.h])
11
11
AC_CONFIG_AUX_DIR(cfgaux)
1011
1011
if test "x$squid_opt_use_ecap" = "xyes";
1012
1012
then
1013
1013
    AC_DEFINE(USE_ECAP,1,[Enable eCAP support])
1014
 
    ECAP_LIBS="ecap/libsquid-ecap.la"
 
1014
    ECAP_LIBS="ecap/libecapsquid.la"
1015
1015
    squid_opt_use_adaptation=yes
1016
1016
else
1017
1017
    AC_DEFINE(USE_ECAP,0,[Disable eCAP support])
2446
2446
AC_MSG_NOTICE([Support for Ident lookups enabled: ${enable_ident_lookups:=yes}])
2447
2447
SQUID_DEFINE_BOOL(USE_IDENT,$enable_ident_lookups,[Support for Ident (RFC 931) lookups])
2448
2448
 
2449
 
AM_CONDITIONAL(USE_SSL_CRTD, false)
2450
 
AC_ARG_ENABLE(ssl-crtd,
2451
 
  AC_HELP_STRING([--enable-ssl-crtd],
2452
 
                 [Prevent Squid from directly generation of SSL private key and 
2453
 
                  certificate request and instead enables the ssl_crtd processes.]), [
2454
 
  SQUID_YESNO([$enableval],
2455
 
  [unrecogized argument to --enable-ssl-crtd: $enableval])
2456
 
])
2457
 
 
2458
 
if test "x$enable_ssl_crtd" = "xyes" -a "x$with_openssl" = "xno" ; then
2459
 
   AC_MSG_ERROR([You need to enable ssl gatewaying support to use ssl_crtd feature. Try to use --with-openssl. ])
2460
 
fi
2461
 
SQUID_DEFINE_BOOL(USE_SSL_CRTD, ${enable_ssl_crtd:=no},[Use ssl_crtd daemon])
2462
 
AM_CONDITIONAL(USE_SSL_CRTD, [test "x$enable_ssl_crtd" = "xyes"])
2463
 
 
2464
2449
dnl Select Default hosts file location
2465
2450
AC_ARG_ENABLE(default-hostsfile,
2466
2451
  AS_HELP_STRING([--enable-default-hostsfile=path],
2587
2572
m4_include([src/http/url_rewriters/helpers.m4])
2588
2573
 
2589
2574
dnl Select security helpers to build
2590
 
AC_ARG_ENABLE(security-cert-validator-helpers,
2591
 
  AS_HELP_STRING([--enable-security-cert-validator-helpers="list of helpers"],
 
2575
AC_ARG_ENABLE(security-cert-validators,
 
2576
  AS_HELP_STRING([--enable-security-cert-validators="list of helpers"],
2592
2577
                 [This option selects which security certificate validator
2593
2578
                  helpers to build and install as part of the normal build
2594
2579
                  process. The default is to attempt the build of all possible
2595
 
                  helpers. Use --disable-security-cert-validator-helpers to
 
2580
                  helpers. Use --disable-security-cert-validators to
2596
2581
                  build none. For a list of available helpers see the
2597
2582
                  src/security/cert_validators/ directory.]),[
2598
2583
])
2599
2584
m4_include([src/security/cert_validators/helpers.m4])
2600
2585
 
 
2586
AC_ARG_ENABLE(security-cert-generators,
 
2587
  AS_HELP_STRING([--enable-security-cert-generators="list of helpers"],
 
2588
                 [This option selects which security certificate validator
 
2589
                  helpers to build and install as part of the normal build
 
2590
                  process. The default is to attempt the build of all possible
 
2591
                  helpers. Use --disable-security-cert-genrators to
 
2592
                  build none. For a list of available helpers see the
 
2593
                  src/security/cert_generators/ directory.]),[
 
2594
])
 
2595
m4_include([src/security/cert_generators/helpers.m4])
 
2596
 
2601
2597
dnl Select storeid_rewrite helpers to build
2602
2598
AC_ARG_ENABLE(storeid-rewrite-helpers,
2603
2599
  AS_HELP_STRING([--enable-storeid-rewrite-helpers="list of helpers"],
3886
3882
        src/parser/Makefile
3887
3883
        src/repl/Makefile
3888
3884
        src/security/Makefile
 
3885
        src/security/cert_generators/Makefile
 
3886
        src/security/cert_generators/file/Makefile
3889
3887
        src/security/cert_validators/Makefile
3890
3888
        src/security/cert_validators/fake/Makefile
3891
3889
        src/servers/Makefile