]>
Commit | Line | Data |
---|---|---|
212b9ffa ER |
1 | --- php-5.6.0RC4/sapi/milter/config.m4~ 2014-08-14 03:54:13.000000000 +0300 |
2 | +++ php-5.6.0RC4/sapi/milter/config.m4 2014-08-21 19:57:21.584244904 +0300 | |
3 | @@ -6,18 +6,13 @@ | |
4 | [ --with-milter[=DIR] Build PHP as Milter application], no, no) | |
5 | ||
6 | if test "$PHP_MILTER" != "no"; then | |
7 | - if test "$PHP_MILTER" = "yes"; then | |
8 | - if test -f /usr/lib/libmilter.a ; then | |
9 | - MILTERPATH=/usr/lib | |
10 | - else | |
11 | - if test -f /usr/lib/libmilter/libmilter.a ; then | |
12 | - MILTERPATH=/usr/lib/libmilter | |
13 | - else | |
14 | - AC_MSG_ERROR([Unable to find libmilter.a]) | |
15 | - fi | |
16 | - fi | |
17 | - else | |
18 | - MILTERPATH=$PHP_MILTER | |
19 | + for i in $PHP_MILTER /usr/lib/libmilter /usr/local /usr; do | |
20 | + test -f $i/$PHP_LIBDIR/libmilter.a && MILTERPATH=$i/$PHP_LIBDIR && break | |
21 | + test -f $i/libmilter.a && MILTERPATH=$i && break | |
22 | + done | |
23 | + | |
24 | + if test -z "$MILTERPATH"; then | |
25 | + AC_MSG_ERROR([Unable to find libmilter.a]) | |
26 | fi | |
27 | ||
28 | SAPI_MILTER_PATH=sapi/milter/php-milter |