~clint-fewbar/ubuntu/natty/squid/fix-upgrades-after-reload

« back to all changes in this revision

Viewing changes to helpers/basic_auth/MSNT/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short, Chuck Short
  • Date: 2010-07-02 13:43:09 UTC
  • mfrom: (1.1.18 upstream) (7.3.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100702134309-i8g2on09rm2blea1
Tags: 2.7.STABLE9-2ubuntu1
* Merge from debian unstable, remaining changes:
  + 99-ubuntu-ssl-cert-snakeoil:
    - src/cf.data.pre:
      * Add reference to snakeoil /etc/ssl
     - debian/control:
      + Add ssl-cert to Depends to brin in snakeoil certificates.
  + debian/logrotate: use sarg-reports rather than sarg-maint. (LP: #268816)
  + debian/patches/99-fix-storeurl-move-temp.dpatch: Fix bug with 302 response moved temporarily. 
    (LP: #503777)
  + debian/squid.upstart, debian/rules: Convert initscripts to upstart.
  + debian/patches/90-cf.data.ubuntu.dpatch: Add an example refresh pattern for debs
    (foundations-lucid-local-report spec)
  + debian/rules: Disable optimizations for arm. (LP: #543798)
  + Dropped:
    + debian/patches/99-squid-capability.dpatch: No longer needed.
    + debian/patches/08-CVE-2010-0308.dpatch: No longer needed.
    + debian/patches/09-CVE-2010-0639.dpatch: No longer needed.

 [Chuck Short]
 * debian/squid.upstart: Re-add maxfds. (LP: #580590)

Show diffs side-by-side

added added

removed removed

Lines of Context:
17
17
#
18
18
#  Makefile for the Squid Object Cache server
19
19
#
20
 
#  $Id: Makefile.in,v 1.47.2.1 2009/05/01 01:24:06 squidadm Exp $
 
20
#  $Id: Makefile.in,v 1.47.2.3 2010/03/14 20:27:09 squidadm Exp $
21
21
#
22
22
#  Uncomment and customize the following to suit your needs:
23
23
#
45
45
subdir = helpers/basic_auth/MSNT
46
46
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
47
47
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
48
 
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
49
 
        $(top_srcdir)/configure.in
 
48
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_socket_nsl.m4 \
 
49
        $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
50
50
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
51
51
        $(ACLOCAL_M4)
52
52
mkinstalldirs = $(install_sh) -d
133
133
LIBSASL = @LIBSASL@
134
134
LIB_DB = @LIB_DB@
135
135
LIB_EPOLL = @LIB_EPOLL@
136
 
LIB_LBER = @LIB_LBER@
137
136
LIB_LDAP = @LIB_LDAP@
138
137
LIB_MALLOC = @LIB_MALLOC@
139
138
LN = @LN@
145
144
MKDIR_P = @MKDIR_P@
146
145
MV = @MV@
147
146
NEGOTIATE_AUTH_HELPERS = @NEGOTIATE_AUTH_HELPERS@
 
147
NIS_LIBS = @NIS_LIBS@
148
148
NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@
149
149
OBJEXT = @OBJEXT@
150
150
OPT_DEFAULT_HOSTS = @OPT_DEFAULT_HOSTS@