From 4cfeb1d83337328e8347d340b95c60f75e1c7f65 Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Fri, 15 Sep 2023 22:55:11 +0900 Subject: [PATCH] Minor fix --- configure | 16 +++++++++++----- configure.ac | 6 +++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 83cfdce0cc6bbf..490c3624191f55 100755 --- a/configure +++ b/configure @@ -23773,11 +23773,9 @@ else $as_nop fi - -if test "x$with_readline" = xreadline -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Function in readline/readline.h" >&5 +case $ac_sys_system/$ac_sys_release in #( + Darwin/*) : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Function in readline/readline.h" >&5 printf %s "checking for Function in readline/readline.h... " >&6; } ac_lib_var=`echo Function'_'readline/readline.h | sed 'y%./+-%__p_%'` if eval test \${ac_cv_lib_$ac_lib_var+y} @@ -23813,6 +23811,14 @@ printf "%s\n" "yes" >&6; } fi fi + ;; #( + *) : + + ;; +esac + +if test "x$with_readline" = xreadline +then : pkg_failed=no diff --git a/configure.ac b/configure.ac index 479d6deb6ec17b..2663c6f8e0430b 100644 --- a/configure.ac +++ b/configure.ac @@ -5831,9 +5831,13 @@ AC_ARG_WITH( [with_readline=readline] ) +dnl gh-105323: Need to handle the macOS editline as an alias of readline. +AS_CASE([$ac_sys_system/$ac_sys_release], + [Darwin/*], [AX_CHECK_TYPEDEF(Function, readline/readline.h, AC_DEFINE([WITH_APPLE_EDITLINE]))], + [] +) AS_VAR_IF([with_readline], [readline], [ - AX_CHECK_TYPEDEF(Function, readline/readline.h, [,AC_DEFINE([WITH_APPLE_EDITLINE]),]) PKG_CHECK_MODULES([LIBREADLINE], [readline], [ LIBREADLINE=readline READLINE_CFLAGS=$LIBREADLINE_CFLAGS