* keyserver.c (keyserver_typemap): Only map HTTP and FTP if libcurl has
authorDavid Shaw <dshaw@jabberwocky.com>
Fri, 24 Dec 2004 19:51:02 +0000 (19:51 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Fri, 24 Dec 2004 19:51:02 +0000 (19:51 +0000)
specifically been selected to handle them.

g10/ChangeLog
g10/keyserver.c

index 3fda46d..69559f4 100644 (file)
@@ -1,3 +1,8 @@
+2004-12-24  David Shaw  <dshaw@jabberwocky.com>
+
+       * keyserver.c (keyserver_typemap): Only map HTTP and FTP if
+       libcurl has specifically been selected to handle them.
+
 2004-12-22  David Shaw  <dshaw@jabberwocky.com>
 
        * options.h, keyserver.c (parse_keyserver_uri): Properly parse
index 815e784..f934398 100644 (file)
@@ -784,12 +784,14 @@ keyserver_typemap(const char *type)
 {
   if(strcmp(type,"ldaps")==0)
     return "ldap";
-#ifdef HAVE_LIBCURL
+#ifdef FTP_VIA_LIBCURL
   else if(strcmp(type,"ftp")==0)
     return "curl";
+#endif
+#ifdef HTTP_VIA_LIBCURL
   else if(strcmp(type,"http")==0)
     return "curl";
-#endif /* HAVE_LIBCURL */
+#endif
   else
     return type;
 }