* configure.ac: Make the check for funopen fail with just a

warning.

* assuan-handler.c (assuan_get_data_fp): Fail with ENOSYS if we
can't implement this.

diff --git a/ChangeLog b/ChangeLog
index 30f87496c4860412c19d2ef0795fd56d57f34e1e..021a2dfc303c3c7b5da02e2f6206986b1ba196d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-18  Werner Koch  <wk@gnupg.org>
+
+       * configure.ac: Make the check for funopen fail with just a
+       warning.
+
 2004-02-11  Werner Koch  <wk@gnupg.org>
 
        * autogen.sh (check_version): Removed bashism and simplified.

diff --git a/assuan/ChangeLog b/assuan/ChangeLog
index 8a25927e3833d0bde0a2326c8c581a3e893dbe37..fc1a18cb2bfce6fd87ab4ce9acedfa0673160b07 100644 (file)
--- a/assuan/ChangeLog
+++ b/assuan/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-18  Werner Koch  <wk@gnupg.org>
+
+       * assuan-handler.c (assuan_get_data_fp): Fail with ENOSYS if we
+       can't implement this.
+
 2004-02-13  Werner Koch  <wk@gnupg.org>
 
        * assuan-domain-connect.c: Removed the unneeded alloca.h

diff --git a/assuan/assuan-handler.c b/assuan/assuan-handler.c
index f8b85dbbd6beafd1467cf828e884832c4ce14aea..da519d546d6428b3b420e42766d369d59bddf5fe 100644 (file)
--- a/assuan/assuan-handler.c
+++ b/assuan/assuan-handler.c
@@ -605,6 +605,7 @@ assuan_get_active_fds (ASSUAN_CONTEXT ctx, int what,
 FILE *
 assuan_get_data_fp (ASSUAN_CONTEXT ctx)
 {
+#if defined (HAVE_FOPENCOOKIE) || defined (HAVE_FUNOPEN)
   if (ctx->outbound.data.fp)
     return ctx->outbound.data.fp;
   
@@ -614,6 +615,10 @@ assuan_get_data_fp (ASSUAN_CONTEXT ctx)
                                   0, _assuan_cookie_write_flush);
   ctx->outbound.data.error = 0;
   return ctx->outbound.data.fp;
+#else
+  errno = ENOSYS;
+  return NULL;
+#endif
 }
 
 

diff --git a/configure.ac b/configure.ac
index 1755a30f38d6f48cd8e301253816d08428558197..163fa4ac2a212b485d6e2746c7261c1a0825459d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -277,23 +277,28 @@ AM_CONDITIONAL(RUN_GPGSM_TESTS,
 # FIXME: Only build if supported.
 AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no")
 
-if test "$GPGSM" != "no"; then
-  AC_CHECK_FUNCS(funopen)
-  if test $ac_cv_func_funopen != yes; then
+
+# The assuan code uses funopen but it will also build without it.  So
+# test for it.  Frankly, this is not required in gpgme, but thats the
+# way we handle it in libassuan.
+AC_CHECK_FUNCS(funopen)
+if test $ac_cv_func_funopen != yes; then
     # No funopen but we can implement that in terms of fopencookie.
     AC_CHECK_FUNCS(fopencookie)
     if test $ac_cv_func_fopencookie = yes; then
         AC_LIBOBJ([funopen])
     else
-        AC_MSG_ERROR([No implementation of fopencookie or funopen available])
+        AC_MSG_WARN([
+***
+*** No implementation of fopencookie or funopen available
+***])
     fi
-  fi
-
-  AC_REPLACE_FUNCS(isascii)
-  AC_REPLACE_FUNCS(putc_unlocked)
-  AC_REPLACE_FUNCS(memrchr)
 fi
 
+AC_REPLACE_FUNCS(isascii)
+AC_REPLACE_FUNCS(putc_unlocked)
+AC_REPLACE_FUNCS(memrchr)
+
 
 AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+")