From e87d36ccf624d2bbb731a0187e0bcff94243d83d Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Wed, 26 Apr 2006 21:48:29 +0000
Subject: * Makefile.am: Don't build gpgkeys_http or gpgkeys_(old)hkp any
 longer as this is done via curl or fake-curl.

* ksutil.h, ksutil.c, gpgkeys_hkp.c, gpgkeys_curl.c: Minor #include tweaks
as FAKE_CURL is no longer meaningful.
---
 keyserver/gpgkeys_curl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'keyserver/gpgkeys_curl.c')

diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c
index bd26d7849..9e4b56729 100644
--- a/keyserver/gpgkeys_curl.c
+++ b/keyserver/gpgkeys_curl.c
@@ -1,5 +1,5 @@
 /* gpgkeys_curl.c - fetch a key via libcurl
- * Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -28,10 +28,10 @@
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
-#ifdef FAKE_CURL
-#include "curl-shim.h"
-#else
+#ifdef HAVE_LIBCURL
 #include <curl/curl.h>
+#else
+#include "curl-shim.h"
 #endif
 #include "keyserver.h"
 #include "ksutil.h"
-- 
cgit v1.2.3