~ubuntu-branches/ubuntu/saucy/curl/saucy-security

« back to all changes in this revision

Viewing changes to packages/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2012-05-22 14:53:29 UTC
  • mfrom: (3.4.28 sid)
  • Revision ID: package-import@ubuntu.com-20120522145329-hbf1n3zr7qh08qab
Tags: 7.25.0-1ubuntu1
* Merge from Debian testing (LP: #1003049).  Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
  - Also closes (LP: #855291)
* debian/patches/CVE-2012-0036.patch: Dropped. CVE resolved upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
47
47
        $(top_srcdir)/m4/curl-system.m4 $(top_srcdir)/m4/libtool.m4 \
48
48
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
49
49
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
50
 
        $(top_srcdir)/m4/xc-translit.m4 $(top_srcdir)/acinclude.m4 \
 
50
        $(top_srcdir)/m4/xc-translit.m4 \
 
51
        $(top_srcdir)/m4/zz50-xc-ovr.m4 $(top_srcdir)/acinclude.m4 \
51
52
        $(top_srcdir)/configure.ac
52
53
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
53
54
        $(ACLOCAL_M4)
200
201
USE_EMBEDDED_ARES_FALSE = @USE_EMBEDDED_ARES_FALSE@
201
202
USE_EMBEDDED_ARES_TRUE = @USE_EMBEDDED_ARES_TRUE@
202
203
USE_GNUTLS = @USE_GNUTLS@
 
204
USE_GNUTLS_NETTLE = @USE_GNUTLS_NETTLE@
203
205
USE_LIBRTMP = @USE_LIBRTMP@
204
206
USE_LIBSSH2 = @USE_LIBSSH2@
205
207
USE_MANUAL_FALSE = @USE_MANUAL_FALSE@
210
212
USE_SSLEAY = @USE_SSLEAY@
211
213
USE_WINDOWS_SSPI = @USE_WINDOWS_SSPI@
212
214
VERSION = @VERSION@
 
215
VERSIONED_FLAVOUR = @VERSIONED_FLAVOUR@
 
216
VERSIONED_SYMBOLS_FALSE = @VERSIONED_SYMBOLS_FALSE@
 
217
VERSIONED_SYMBOLS_TRUE = @VERSIONED_SYMBOLS_TRUE@
213
218
VERSIONNUM = @VERSIONNUM@
214
219
ac_ct_AR = @ac_ct_AR@
215
220
ac_ct_CC = @ac_ct_CC@
301
306
              exit 1;; \
302
307
          esac; \
303
308
        done; \
304
 
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  packages/Makefile'; \
 
309
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  packages/Makefile'; \
305
310
        cd $(top_srcdir) && \
306
 
          $(AUTOMAKE) --gnu  packages/Makefile
 
311
          $(AUTOMAKE) --foreign  packages/Makefile
307
312
.PRECIOUS: Makefile
308
313
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
309
314
        @case '$?' in \