diff options
| author | bjh <bjh@13f79535-47bb-0310-9956-ffa450edef68> | 2002-02-23 12:04:42 +0000 |
|---|---|---|
| committer | bjh <bjh@13f79535-47bb-0310-9956-ffa450edef68> | 2002-02-23 12:04:42 +0000 |
| commit | 745eecd645ac92438b87af723c076d88e4b604ae (patch) | |
| tree | 96073fb546f80d7b950aeb22a309a89f1944dac5 /build/find_apr.m4 | |
| parent | f7bdffc1e431df1dbf64cf6f1c03479fc226f67c (diff) | |
| download | libapr-745eecd645ac92438b87af723c076d88e4b604ae.tar.gz | |
OS/2: Fix APR locating script to take into account that scripts don't pass
test -x on OS/2 as there's no x attribute to distinguish them from plain
text files.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63060 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/find_apr.m4')
| -rw-r--r-- | build/find_apr.m4 | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/build/find_apr.m4 b/build/find_apr.m4 index 17e6b80d4..ee3b175a9 100644 --- a/build/find_apr.m4 +++ b/build/find_apr.m4 @@ -38,6 +38,13 @@ dnl AC_DEFUN(APR_FIND_APR, [ apr_found="no" + if test "$ac_cv_emxos2" = "yes"; then + # Scripts don't pass test -x on OS/2 + TEST_X="test -f" + else + TEST_X="test -x" + fi + AC_MSG_CHECKING(for APR) AC_ARG_WITH(apr, [ --with-apr=DIR|FILE prefix for installed APR, path to APR build tree, @@ -47,13 +54,13 @@ AC_DEFUN(APR_FIND_APR, [ AC_MSG_ERROR([--with-apr requires a directory to be provided]) fi - if test -x "$withval/bin/apr-config"; then + if $TEST_X "$withval/bin/apr-config"; then apr_found="yes" apr_config="$withval/bin/apr-config" - elif test -x "$withval/apr-config"; then + elif $TEST_X "$withval/apr-config"; then apr_found="yes" apr_config="$withval/apr-config" - elif test -x "$withval" && $withval --help > /dev/null 2>&1 ; then + elif $TEST_X "$withval" && $withval --help > /dev/null 2>&1 ; then apr_found="yes" apr_config="$withval" fi @@ -71,7 +78,7 @@ build directory, or an apr-config file.]) else dnl look in some standard places (apparently not in builtin/default) for lookdir in /usr /usr/local /opt/apr ; do - if test -x "$lookdir/bin/apr-config"; then + if $TEST_X "$lookdir/bin/apr-config"; then apr_found="yes" apr_config="$lookdir/bin/apr-config" break |