* readline.m4: Check for completion functionality.

* ldap.m4: Comments.

m4/ChangeLog

@@ -1,3 +1,9 @@
+2005-03-21  David Shaw  <dshaw@jabberwocky.com>
+
+	* readline.m4: Check for completion functionality.
+
+	* ldap.m4: Comments.
+
 2005-03-16  David Shaw  <dshaw@jabberwocky.com>
 
 	* ldap.m4: New.  Moved from configure.ac.

m4/ldap.m4

@@ -7,19 +7,16 @@ dnl Public License, this file may be distributed as part of a program
 dnl that contains a configuration script generated by Autoconf, under
 dnl the same distribution terms as the rest of that program.
 dnl
-dnl Defines HAVE_LIBUSB to 1 if a working libusb setup is found, and sets
-dnl @LIBUSB@ to the necessary libraries.  HAVE_USB_GET_BUSSES is set if
-dnl usb_get_busses() exists.
+dnl Defines @GPGKEYS_LDAP@ to a executable name if a working ldap
+dnl setup is found, and sets @LDAPLIBS@ to the necessary libraries.
 
 AC_DEFUN([GNUPG_CHECK_LDAP],
 [
 # Try and link a LDAP test program to weed out unusable LDAP
 # libraries.  -lldap [-llber [-lresolv]] is for older OpenLDAPs.
 # OpenLDAP, circa 1999, was terrible with creating weird dependencies.
-# This seems to have all been resolved, so I'm simplifying this code
-# significantly.  If all else fails, the user can play
-# guess-the-dependency by using something like ./configure
-# LDAPLIBS="-Lfoo -lbar"
+# If all else fails, the user can play guess-the-dependency by using
+# something like ./configure LDAPLIBS="-Lfoo -lbar"
 
   AC_ARG_WITH(ldap,
      AC_HELP_STRING([--with-ldap=DIR],[look for the LDAP library in DIR]),

m4/readline.m4

@@ -37,6 +37,8 @@ AC_DEFUN([GNUPG_CHECK_READLINE],
 ],[
 add_history("foobar");
 rl_catch_signals=0;
+rl_inhibit_completion=0;
+rl_attempted_completion_function=NULL;
 ]),_found_readline=yes,_found_readline=no)
 
         AC_MSG_RESULT([$_found_readline])