[Scummvm-git-logs] scummvm master -> 4c260f1cd324b0af96afd99f4e72b102f3a37395

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3516f0587e CONFIGURE: Don't detect Apple's libedit as readline
4c260f1cd3 CONFIGURE: Run all readline tests with same parameters


Commit: 3516f0587e46b1a843ab0441ec9042354d309fcb
    https://github.com/scummvm/scummvm/commit/3516f0587e46b1a843ab0441ec9042354d309fcb
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-08-07T10:49:01+02:00

Commit Message:
CONFIGURE: Don't detect Apple's libedit as readline

Changed paths:
    configure


diff --git a/configure b/configure
index f75cf2056e..5e0bbff31b 100755
--- a/configure
+++ b/configure
@@ -5037,6 +5037,7 @@ if test "$_text_console" = yes ; then
 #include <readline/history.h>
 
 int main(void) {
+	rl_hook_func_t f; // not present in apple's libedit
 	char *x = readline("");
 }
 EOF


Commit: 4c260f1cd324b0af96afd99f4e72b102f3a37395
    https://github.com/scummvm/scummvm/commit/4c260f1cd324b0af96afd99f4e72b102f3a37395
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-08-07T10:49:01+02:00

Commit Message:
CONFIGURE: Run all readline tests with same parameters

Prevents a different include order being applied to the readline
function signature test than was applied to the detection test.
On Mac, this can cause the signature test to use Apple's libedit
instead of the path provided to --with-readline-prefix.

Changed paths:
    configure


diff --git a/configure b/configure
index 5e0bbff31b..d8b22ac6f5 100755
--- a/configure
+++ b/configure
@@ -5055,9 +5055,6 @@ else
 fi
 
 if test "$_readline" = yes ; then
-	append_var LIBS "$READLINE_LIBS $_READLINE_LIBS"
-	append_var INCLUDES "$READLINE_CFLAGS"
-
 	#
 	# Check the type of rl_completion_entry_function.
 	# It can be int(*)(const char *, int) or char *(*)(const char *, int).
@@ -5074,9 +5071,15 @@ int main(void) {
 	rl_completion_entry_function = &readline_completionFunction;
 }
 EOF
-	cc_check -c && add_line_to_config_h '#define USE_READLINE_INT_COMPLETION'
+	cc_check $READLINE_CFLAGS $READLINE_LIBS $_READLINE_LIBS -c && add_line_to_config_h '#define USE_READLINE_INT_COMPLETION'
 
 fi
+
+if test "$_readline" = yes ; then
+	append_var LIBS "$READLINE_LIBS $_READLINE_LIBS"
+	append_var INCLUDES "$READLINE_CFLAGS"
+fi
+
 define_in_config_h_if_yes "$_readline" 'USE_READLINE'
 
 define_in_config_h_if_yes "$_text_console" 'USE_TEXT_CONSOLE_FOR_DEBUGGER'