bjh 02/02/23 04:04:42
Modified: build find_apr.m4
Log:
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.
Revision Changes Path
1.11 +11 -4 apr/build/find_apr.m4
Index: find_apr.m4
===================================================================
RCS file: /home/cvs/apr/build/find_apr.m4,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- find_apr.m4 15 Feb 2002 00:18:49 -0000 1.10
+++ find_apr.m4 23 Feb 2002 12:04:42 -0000 1.11
@@ -38,6 +38,13 @@
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_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 @@
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
