diff options
| author | foobar <sniper@php.net> | 2007-06-03 20:27:16 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2007-06-03 20:27:16 +0000 |
| commit | 7bd41e0715c46bf63aae27a23d3fe3e7439a899a (patch) | |
| tree | 733f9dbf1611de156c6b24a9bef15dff19e95fab /sapi/thttpd | |
| parent | fd2e66bd05022b023379de86577e3498fded0e96 (diff) | |
| download | php-git-7bd41e0715c46bf63aae27a23d3fe3e7439a899a.tar.gz | |
MFH:- Fixed bug #41576 (misbehaviour when using --without-apxs)
Diffstat (limited to 'sapi/thttpd')
| -rw-r--r-- | sapi/thttpd/config.m4 | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/sapi/thttpd/config.m4 b/sapi/thttpd/config.m4 index ac5a2bfca2..f872aa4d2a 100644 --- a/sapi/thttpd/config.m4 +++ b/sapi/thttpd/config.m4 @@ -3,18 +3,25 @@ dnl $Id$ dnl AC_ARG_WITH(thttpd, -[ --with-thttpd=SRCDIR Build PHP as thttpd module],[ - if test ! -d $withval; then - AC_MSG_RESULT(thttpd directory does not exist ($withval)) +[ --with-thttpd=SRCDIR Build PHP as thttpd module], [ + PHP_THTTPD=$withval +],[ + PHP_THTTPD=no +]) + +AC_MSG_CHECKING(for thttpd) +if test "$PHP_THTTPD" != "no"; then + if test ! -d $PHP_THTTPD; then + AC_MSG_RESULT(thttpd directory does not exist ($PHP_THTTPD)) fi - PHP_EXPAND_PATH($withval, THTTPD) + PHP_EXPAND_PATH($PHP_THTTPD, THTTPD) - if grep thttpd.2.21b $withval/version.h >/dev/null; then + if grep thttpd.2.21b $PHP_THTTPD/version.h >/dev/null; then patch="test -f $THTTPD/php_patched || \ (cd $THTTPD && patch -p1 < $abs_srcdir/sapi/thttpd/thttpd_patch && touch php_patched)" - elif grep Premium $withval/version.h >/dev/null; then + elif grep Premium $PHP_THTTPD/version.h >/dev/null; then patch= else AC_MSG_ERROR([This version only supports thttpd-2.21b and Premium thttpd]) @@ -31,9 +38,5 @@ AC_ARG_WITH(thttpd, PHP_THTTPD="yes, using $THTTPD" PHP_ADD_INCLUDE($THTTPD) PHP_SELECT_SAPI(thttpd, static) -],[ - PHP_THTTPD=no -]) - -AC_MSG_CHECKING(for thttpd) +fi AC_MSG_RESULT($PHP_THTTPD) |