From 2685ca935fceb0dbb4cb61161c93444cec7eef2c Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 3 Nov 2004 14:32:52 +0000 Subject: Update extensions to use /path/to/$PHP_LIBDIR rather than /path/to/lib to support multi-ABI platforms. --- ext/readline/config.m4 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'ext/readline') diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 index 8ed89206e8..7bcfdca8e9 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -34,27 +34,27 @@ if test "$PHP_READLINE" != "no"; then PHP_CHECK_LIBRARY(readline, readline, [ - PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(readline, $READLINE_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ AC_MSG_ERROR(readline library not found) ], [ - -L$READLINE_DIR/lib $PHP_READLINE_LIBS + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) PHP_CHECK_LIBRARY(readline, rl_callback_read_char, [ AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) ],[],[ - -L$READLINE_DIR/lib $PHP_READLINE_LIBS + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) PHP_CHECK_LIBRARY(history, add_history, [ - PHP_ADD_LIBRARY_WITH_PATH(history, $READLINE_DIR/lib, READLINE_SHARED_LIBADD) + 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/lib $PHP_READLINE_LIBS + -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) @@ -85,11 +85,11 @@ elif test "$PHP_LIBEDIT" != "no"; then PHP_CHECK_LIBRARY(edit, readline, [ - PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/lib, READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(edit, $LIBEDIT_DIR/$PHP_LIBDIR, READLINE_SHARED_LIBADD) ], [ AC_MSG_ERROR(edit library required by readline not found) ], [ - -L$READLINE_DIR/lib + -L$READLINE_DIR/$PHP_LIBDIR ]) PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) -- cgit v1.2.1