blob: 0838552b2646add5ce3b8c9780b3bdb8caadee2c [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001Upstream-Status: Inappropriate [configuration]
Patrick Williamsc0f7c042017-02-23 20:41:17 -06002From 5d61ac822fd9a3871cd5089389c210606232ecdc Mon Sep 17 00:00:00 2001
3From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
4Date: Thu, 26 May 2016 15:34:45 -0500
5Subject: [PATCH] Upstream-Status: Inappropriate [configuration]
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
Patrick Williamsc124f4f2015-09-15 14:41:29 -05009
Patrick Williamsc0f7c042017-02-23 20:41:17 -060010Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Patrick Williamsc124f4f2015-09-15 14:41:29 -050011---
Patrick Williamsc0f7c042017-02-23 20:41:17 -060012 configure.ac | 7 -------
13 methods/makefile | 7 -------
14 2 files changed, 14 deletions(-)
Patrick Williamsc124f4f2015-09-15 14:41:29 -050015
Patrick Williamsc0f7c042017-02-23 20:41:17 -060016diff --git a/configure.ac b/configure.ac
17index e47f459..cd24264 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050018--- a/configure.ac
19+++ b/configure.ac
Patrick Williamsc0f7c042017-02-23 20:41:17 -060020@@ -83,13 +83,6 @@ AC_CHECK_HEADER(db.h,
Patrick Williamsc124f4f2015-09-15 14:41:29 -050021
22 LIBS="$saveLIBS"
23
24-AC_CHECK_LIB(curl, curl_easy_init,
25- [AC_CHECK_HEADER(curl/curl.h,
26- curl_ok=yes,
27- curl_ok=no)],
28- AC_MSG_ERROR([failed: I need CURL due https support]),
29-)
Patrick Williamsc0f7c042017-02-23 20:41:17 -060030-
Patrick Williamsc124f4f2015-09-15 14:41:29 -050031 AC_SUBST(BDBLIB)
32
Patrick Williamsc0f7c042017-02-23 20:41:17 -060033 HAVE_ZLIB=no
34diff --git a/methods/makefile b/methods/makefile
35index 3274e92..255086b 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -050036--- a/methods/makefile
37+++ b/methods/makefile
38@@ -51,13 +51,6 @@ LIB_MAKES = apt-pkg/makefile
39 SOURCE = http.cc http_main.cc rfc2553emu.cc connect.cc server.cc
40 include $(PROGRAM_H)
41
42-# The https method
43-PROGRAM=https
Patrick Williamsc0f7c042017-02-23 20:41:17 -060044-SLIBS = -lapt-pkg -lcurl $(INTLLIBS) -lresolv
Patrick Williamsc124f4f2015-09-15 14:41:29 -050045-LIB_MAKES = apt-pkg/makefile
46-SOURCE = https.cc server.cc
47-include $(PROGRAM_H)
48-
49 # The ftp method
50 PROGRAM=ftp
Patrick Williamsc0f7c042017-02-23 20:41:17 -060051 SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS) -lresolv
52--
532.1.4
54