diff options
| -rw-r--r-- | ext/fribidi/config.m4 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ext/fribidi/config.m4 b/ext/fribidi/config.m4 index b3bd80c162..5594252fc7 100644 --- a/ext/fribidi/config.m4 +++ b/ext/fribidi/config.m4 @@ -8,18 +8,19 @@ PHP_ARG_WITH(fribidi, for FriBidi support, if test "$PHP_FRIBIDI" != "no"; then if test "$PHP_FRIBIDI" = "yes"; then - PHP_FRIBIDI=/usr/local + AC_PATH_PROG(FRIBIDI_CONFIG,fribidi-config,,[/usr/local/bin:$PATH]) + else + FRIBIDI_CONFIG="$PHP_FRIBIDI/bin/fribidi-config" fi dnl check for fribidi version AC_MSG_CHECKING([for FriBidi version]) - FRIBIDI_CONFIG=$PHP_FRIBIDI/bin/fribidi-config - if test -x "$FRIBIDI_CONFIG"; then - fribidi_version_full=`$FRIBIDI_CONFIG --version` - else + + if test ! -x "$FRIBIDI_CONFIG"; then AC_MSG_ERROR([fribidi-config not found.]) fi + fribidi_version_full=`$FRIBIDI_CONFIG --version` fribidi_version=`echo ${fribidi_version_full} | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` if test "$fribidi_version" -ge 10004; then |