From c63f58975ecc38b102bc416ebf4bc95c886043c8 Mon Sep 17 00:00:00 2001 From: Richard Russon Date: Fri, 9 Sep 2016 10:03:51 +0100 Subject: [PATCH] fix configure check for fmemopen To use fmemopen you now need the presence of fmemopen() and open_memstream() AND you have to pass --enable-fmemopen to configure. Note: fmemopen is still DISABLED due to an unresolved bug. --- configure.ac | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 4add6a3f3..fb656a620 100644 --- a/configure.ac +++ b/configure.ac @@ -1397,12 +1397,20 @@ if test $mutt_cv_langinfo_yesexpr = yes; then AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have and nl_langinfo(YESEXPR). ]) fi -AC_CHECK_FUNCS(fmemopen open_memstream, [ - AC_ARG_ENABLE(fmemopen, AS_HELP_STRING([--disable-fmemopen],[Do NOT use fmemopen]), - [], - # Temporarily disable fmemopen, due to a bug - [AC_DEFINE(USE_FMEMOPEN, 0, [Use fmemopen])]) -]) +# Only enable fmemopen if both fmemopen() and open_memstream() +# AND --enable-fmemopen is given. +have_fmemopen=yes +AC_CHECK_FUNCS(fmemopen open_memstream, [], [have_fmemopen=no]) + +AC_ARG_ENABLE(fmemopen, AS_HELP_STRING([--enable-fmemopen],[Use fmemopen]), + [use_fmemopen=$enableval], [use_fmemopen=no] +) + +AS_IF([test $have_fmemopen = "yes" && test $use_fmemopen = "yes"], + # Temporarily disable fmemopen, due to a bug + [AC_DEFINE(USE_FMEMOPEN, 0, [Use fmemopen])], + [use_fmemopen=no] +) dnl Documentation tools have_openjade="no" -- 2.40.0