MFH:- Fixed bug #48256 (Crash due to double-linking of history.o)

diff --git a/NEWS b/NEWS
index ce590dac447a8e3152c7c64afdcee650fc892fbf..0a52d7d61d73c1502edfd2b365ff9db50ae2b533 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ PHP                                                                        NEWS
 - Fixed segfault on invalid session.save_path. (Hannes)
 - Fixed leaks in imap when a mail_criteria is used. (Pierre)
 
+- Fixed bug #48256 (Crash due to double-linking of history.o).
+  (tstarling at wikimedia dot org)
 - Fixed bug #48248 (SIGSEGV when access to private property via &__get). 
   (Felipe)
 - Fixed bug #48240 (DBA Segmentation fault dba_nextkey). (Felipe)

diff --git a/ext/readline/config.m4 b/ext/readline/config.m4
index da1359ee9cde31e9a5d58b600ae7ae9cbd14579f..c4bb04bc77283467497af493ad75c12af023912c 100644 (file)
--- a/ext/readline/config.m4
+++ b/ext/readline/config.m4
@@ -50,15 +50,6 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
     -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   ])
 
-  PHP_CHECK_LIBRARY(history, add_history,
-  [
-    PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD)
-  ], [
-    AC_MSG_ERROR(history library required by readline not found)
-  ], [
-    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
-  ])
-
   AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
 
 elif test "$PHP_LIBEDIT" != "no"; then