cvs: php-src /ext/readline config.m4
| From: | Jani Taskinen | Date: | Thu, 14 May 2009 13:40:37 +0000 |
| Subject: | cvs: php-src /ext/readline config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-57810@lists.php.net to get a copy of this message | ||
jani Thu May 14 13:40:37 2009 UTC
Modified files:
/php-src/ext/readline config.m4
Log:
- Fixed bug #48256 (Crash due to double-linking of history.o)
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/config.m4?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/readline/config.m4
diff -u php-src/ext/readline/config.m4:1.28 php-src/ext/readline/config.m4:1.29
--- php-src/ext/readline/config.m4:1.28 Mon Nov 28 23:03:49 2005
+++ php-src/ext/readline/config.m4 Thu May 14 13:40:37 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.28 2005/11/28 23:03:49 sniper Exp $
+dnl $Id: config.m4,v 1.29 2009/05/14 13:40:37 jani Exp $
dnl
PHP_ARG_WITH(libedit,for libedit readline replacement,
@@ -50,15 +50,6 @@
-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