diff options
| author | foobar <sniper@php.net> | 2003-10-01 02:53:23 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-10-01 02:53:23 +0000 |
| commit | dc080a5db6f31c5d174dc0cc097da509c2533142 (patch) | |
| tree | 39482ab88773c67f3b569e6e34bdfc02f818aec2 /ext/readline/config.m4 | |
| parent | 5b17050a79fff705bc446446d35525d776b78de7 (diff) | |
| download | php-git-dc080a5db6f31c5d174dc0cc097da509c2533142.tar.gz | |
- Always look into /usr/local before /usr
- Added breaks to make sure the preferred value is used.
Diffstat (limited to 'ext/readline/config.m4')
| -rw-r--r-- | ext/readline/config.m4 | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/ext/readline/config.m4 b/ext/readline/config.m4 index e5c2a057a0..7df38b247a 100644 --- a/ext/readline/config.m4 +++ b/ext/readline/config.m4 @@ -10,9 +10,7 @@ PHP_ARG_WITH(readline,for readline support, if test "$PHP_READLINE" != "no"; then for i in $PHP_READLINE /usr/local /usr; do - if test -f $i/include/readline/readline.h; then - READLINE_DIR=$i - fi + test -f $i/include/readline/readline.h && READLINE_DIR=$i && break done if test -z "$READLINE_DIR"; then @@ -49,17 +47,14 @@ if test "$PHP_READLINE" != "no"; then -L$READLINE_DIR/lib ]) + PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) PHP_SUBST(READLINE_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBREADLINE, 1, [ ]) - PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) elif test "$PHP_LIBEDIT" != "no"; then for i in $PHP_LIBEDIT /usr/local /usr; do - if test -f $i/include/readline/readline.h; then - LIBEDIT_DIR=$i - fi + test -f $i/include/readline/readline.h && LIBEDIT_DIR=$i && break done if test -z "$LIBEDIT_DIR"; then @@ -87,8 +82,7 @@ elif test "$PHP_LIBEDIT" != "no"; then -L$READLINE_DIR/lib ]) + PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) PHP_SUBST(READLINE_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBEDIT, 1, [ ]) - PHP_NEW_EXTENSION(readline, readline.c, $ext_shared, cli) fi |