GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
warning.

* assuan-handler.c (assuan_get_data_fp): Fail with ENOSYS if we
can't implement this.
This commit is contained in:
Werner Koch 2004-02-18 18:05:38 +00:00
parent 91d3e5aa57
commit fd8f4ac9f0
4 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2004-02-11 Werner Koch <wk@gnupg.org>
* autogen.sh (check_version): Removed bashism and simplified. * autogen.sh (check_version): Removed bashism and simplified.

5
assuan/ChangeLog
View File

@ -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> 2004-02-13 Werner Koch <wk@gnupg.org>
* assuan-domain-connect.c: Removed the unneeded alloca.h * assuan-domain-connect.c: Removed the unneeded alloca.h

5
assuan/assuan-handler.c
View File

@ -605,6 +605,7 @@ assuan_get_active_fds (ASSUAN_CONTEXT ctx, int what,
FILE * FILE *
assuan_get_data_fp (ASSUAN_CONTEXT ctx) assuan_get_data_fp (ASSUAN_CONTEXT ctx)
{ {
#if defined (HAVE_FOPENCOOKIE) || defined (HAVE_FUNOPEN)
if (ctx->outbound.data.fp) if (ctx->outbound.data.fp)
return 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); 0, _assuan_cookie_write_flush);
ctx->outbound.data.error = 0; ctx->outbound.data.error = 0;
return ctx->outbound.data.fp; return ctx->outbound.data.fp;
#else
errno = ENOSYS;
return NULL;
#endif
} }

23
configure.ac
View File

@ -277,23 +277,28 @@ AM_CONDITIONAL(RUN_GPGSM_TESTS,
# FIXME: Only build if supported. # FIXME: Only build if supported.
AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no") AM_CONDITIONAL(BUILD_ASSUAN, test "$GPGSM" != "no")
if test "$GPGSM" != "no"; then
AC_CHECK_FUNCS(funopen) # The assuan code uses funopen but it will also build without it. So
if test $ac_cv_func_funopen != yes; then # 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. # No funopen but we can implement that in terms of fopencookie.
AC_CHECK_FUNCS(fopencookie) AC_CHECK_FUNCS(fopencookie)
if test $ac_cv_func_fopencookie = yes; then if test $ac_cv_func_fopencookie = yes; then
AC_LIBOBJ([funopen]) AC_LIBOBJ([funopen])
else else
AC_MSG_ERROR([No implementation of fopencookie or funopen available]) AC_MSG_WARN([
***
*** No implementation of fopencookie or funopen available
***])
fi fi
fi
AC_REPLACE_FUNCS(isascii)
AC_REPLACE_FUNCS(putc_unlocked)
AC_REPLACE_FUNCS(memrchr)
fi fi
AC_REPLACE_FUNCS(isascii)
AC_REPLACE_FUNCS(putc_unlocked)
AC_REPLACE_FUNCS(memrchr)
AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+") AM_CONDITIONAL(BUILD_COMPLUS, test "$component_system" = "COM+")