[svn] GnuPG - r4186 - in branches/GNUPG-1-9-BRANCH: . m4

[svn author wk]

Author: wk
Date: 2006-06-30 15:19:49 +0200 (Fri, 30 Jun 2006)
New Revision: 4186

Added:
   branches/GNUPG-1-9-BRANCH/keyserver/
   branches/GNUPG-1-9-BRANCH/m4/ldap.m4
Modified:
   branches/GNUPG-1-9-BRANCH/ChangeLog
   branches/GNUPG-1-9-BRANCH/Makefile.am
   branches/GNUPG-1-9-BRANCH/configure.ac
   branches/GNUPG-1-9-BRANCH/m4/ChangeLog
   branches/GNUPG-1-9-BRANCH/m4/Makefile.am
Log:
Added keyserver directory from trunk


Modified: branches/GNUPG-1-9-BRANCH/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/ChangeLog	2006-06-30 09:42:08 UTC (rev 4185)
+++ branches/GNUPG-1-9-BRANCH/ChangeLog	2006-06-30 13:19:49 UTC (rev 4186)
@@ -1,3 +1,10 @@
+2006-06-30  Werner Koch  <wk at g10code.com>
+
+	* keyserver/: New.  Taken from 1.4.4
+	* Makefile.am (SUBDIRS): Include keyserver/.
+	* configure.ac: Include keyserver/.
+	(FAKE_CURL, GPGKEYS_CURL): New.
+	
 2006-06-20  Werner Koch  <wk at g10code.com>
 
 	Released 1.9.21.

Modified: branches/GNUPG-1-9-BRANCH/Makefile.am
===================================================================
--- branches/GNUPG-1-9-BRANCH/Makefile.am	2006-06-30 09:42:08 UTC (rev 4185)
+++ branches/GNUPG-1-9-BRANCH/Makefile.am	2006-06-30 13:19:49 UTC (rev 4186)
@@ -35,8 +35,11 @@
 
 if BUILD_GPG
 gpg = g10
+# fixme: Noy yet ready for a build
+keyserver = 
 else
 gpg =
+keyserver = 
 endif
 if BUILD_GPGSM
 sm = sm
@@ -61,7 +64,7 @@
 endif
 
 SUBDIRS = m4 intl gl jnlib common ${kbx} \
- ${gpg} ${sm} ${agent} ${scd} tools po doc ${tests}
+ ${gpg} ${keyserver} ${sm} ${agent} ${scd} tools po doc ${tests}
 
 dist-hook:
 	@set -e; \

Modified: branches/GNUPG-1-9-BRANCH/configure.ac
===================================================================
--- branches/GNUPG-1-9-BRANCH/configure.ac	2006-06-30 09:42:08 UTC (rev 4185)
+++ branches/GNUPG-1-9-BRANCH/configure.ac	2006-06-30 13:19:49 UTC (rev 4186)
@@ -716,6 +716,20 @@
 AC_SUBST(GPGKEYS_LDAP)
 AC_SUBST(LDAPLIBS)
 
+
+# Check for curl.  We fake the curl API if libcurl isn't installed.
+
+# fixme: need to add this
+#LIBCURL_CHECK_CONFIG([yes],,,[fake_curl=yes])
+#AM_CONDITIONAL(FAKE_CURL,test x"$fake_curl" = xyes)
+AM_CONDITIONAL(FAKE_CURL,1)
+
+# Generic, for us, means curl
+
+if test x"$try_generic" = xyes ; then
+   AC_SUBST(GPGKEYS_CURL,"gpgkeys_curl$EXEEXT")
+fi
+
 dnl This isn't necessarily sendmail itself, but anything that gives a
 dnl sendmail-ish interface to the outside world.  That includes qmail,
 dnl postfix, etc.  Basically, anything that can handle "sendmail -t".
@@ -1231,6 +1245,7 @@
 common/Makefile
 kbx/Makefile
 g10/Makefile
+keyserver/Makefile
 sm/Makefile
 agent/Makefile
 scd/Makefile

Copied: branches/GNUPG-1-9-BRANCH/keyserver (from rev 4172, trunk/keyserver)

Modified: branches/GNUPG-1-9-BRANCH/m4/ChangeLog
===================================================================
--- branches/GNUPG-1-9-BRANCH/m4/ChangeLog	2006-06-30 09:42:08 UTC (rev 4185)
+++ branches/GNUPG-1-9-BRANCH/m4/ChangeLog	2006-06-30 13:19:49 UTC (rev 4186)
@@ -1,3 +1,8 @@
+2006-06-30  Werner Koch  <wk at g10code.com>
+
+	* ldap.m4: New.  Taken from gnupg 1.4.4
+	* Makefile.am (EXTRA_DIST): Add ldap.me
+
 2004-09-30  Werner Koch  <wk at g10code.com>
 
 	* gpg-error.m4, libassuan.m4, libgcrypt.m4: Updated.

Modified: branches/GNUPG-1-9-BRANCH/m4/Makefile.am
===================================================================
--- branches/GNUPG-1-9-BRANCH/m4/Makefile.am	2006-06-30 09:42:08 UTC (rev 4185)
+++ branches/GNUPG-1-9-BRANCH/m4/Makefile.am	2006-06-30 13:19:49 UTC (rev 4186)
@@ -1,3 +1,5 @@
 EXTRA_DIST = intmax.m4 longdouble.m4 longlong.m4 printf-posix.m4 signed.m4 size_max.m4 wchar_t.m4 wint_t.m4 xsize.m4  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4
 
+EXTRA_DIST += ldap.m4
+
 EXTRA_DIST += gpg-error.m4 libgcrypt.m4 libassuan.m4 ksba.m4

Copied: branches/GNUPG-1-9-BRANCH/m4/ldap.m4 (from rev 4172, trunk/m4/ldap.m4)