Various changes

common/ChangeLog

@@ -1,3 +1,14 @@
+2006-10-08  Werner Koch  <wk@g10code.com>
+
+	* gpgrlhelp.c: Trun all functions into dummies if readline is not
+	available.
+
+2006-10-06  Werner Koch  <wk@g10code.com>
+
+	* Makefile.am (AM_CFLAGS): Use PTH version of libassuan.
+
+	* util.h (GNUPG_GCC_A_SENTINEL): Defined for gcc >= 4.
+
 2006-10-04  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgrlhelp.c: readline requires stdio.h.

common/Makefile.am

@@ -26,7 +26,7 @@ TESTS = $(module_tests)
 
 AM_CPPFLAGS = -I$(top_srcdir)/gl
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(KSBA_CFLAGS) \
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(KSBA_CFLAGS) \
             $(PTH_CFLAGS)
 
 libcommon_a_SOURCES = \

common/gpgrlhelp.c

@@ -40,6 +40,7 @@
 #include "common-defs.h"
 
 
+#ifdef HAVE_LIBREADLINE
 static void
 set_completer (rl_completion_func_t *completer)
 {
@@ -68,12 +69,15 @@ init_stream (FILE *fp)
   rl_inhibit_completion = 1;
 }
 
+#endif /*HAVE_LIBREADLINE*/
+
 
 /* Initialize our readline code.  This should be called as early as
    possible as it is actually a constructur.  */
 void
 gnupg_rl_initialize (void)
 {
+#ifdef HAVE_LIBREADLINE
   tty_private_set_rl_hooks (init_stream,
                             set_completer,
                             inhibit_completion,
@@ -81,7 +85,7 @@ gnupg_rl_initialize (void)
                             readline,
                             add_history);
   rl_readline_name = "GnuPG";
-
+#endif
 }
 
 

common/util.h

@@ -43,6 +43,13 @@
 #include "../jnlib/dotlock.h"
 #include "../jnlib/utf8conv.h"
 
+#if __GNUC__ >= 4 
+# define GNUPG_GCC_A_SENTINEL(a) __attribute__ ((sentinel(a)))
+#else
+# define GNUPG_GCC_A_SENTINEL(a) 
+#endif
+
+
 /* We need this type even if we are not using libreadline and or we
    did not include libreadline in the current file. */
 #ifndef GNUPG_LIBREADLINE_H_INCLUDED