cvs: /php4/ext/pcre config.m4

andrei Tue Mar 7 08:13:05 2000 EDT Modified files: /php4/ext/pcre config.m4 Log: Expanded checking for pcre.h and libpcre.a. Index: php4/ext/pcre/config.m4 diff -u php4/ext/pcre/config.m4:1.17 php4/ext/pcre/config.m4:1.18 --- php4/ext/pcre/config.m4:1.17 Wed Dec 29 20:07:36 1999 +++ php4/ext/pcre/config.m4 Tue Mar 7 08:12:35 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.17 1999/12/30 04:07:36 sas Exp $ +dnl $Id: config.m4,v 1.18 2000/03/07 16:12:35 andrei Exp $ dnl config.m4 for extension pcre dnl By default we'll compile and link against the bundled PCRE library @@ -24,14 +24,21 @@ PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) ;; *) - if test -f $withval/pcre.h ; then + test -f $withval/pcre.h && PCRE_INCDIR="$withval" + test -f $withval/include/pcre.h && PCRE_INCDIR="$withval/include" + + if test -n "$PCRE_INCDIR" ; then changequote({,}) - pcre_major=grep PCRE_MAJOR $withval/pcre.h | sed -e 's/[^0-9]//g' - pcre_minor=grep PCRE_MINOR $withval/pcre.h | sed -e 's/[^0-9]//g' + pcre_major=grep PCRE_MAJOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g' + pcre_minor=grep PCRE_MINOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g' changequote([,]) + pcre_minor_length=echo "$pcre_minor" | wc -c | sed -e 's/[^0-9]//g' + if test "$pcre_minor_length" -eq 2 ; then + pcre_minor="$pcre_minor"0 + fi pcre_version=$pcre_major$pcre_minor if test "$pcre_version" -ge 208; then - AC_ADD_INCLUDE($withval) + AC_ADD_INCLUDE($PCRE_INCDIR) else AC_MSG_ERROR(PCRE extension requires PCRE library version >= 2.08) fi @@ -39,8 +46,10 @@ AC_MSG_ERROR(Could not find pcre.h in $withval) fi - if test -f $withval/libpcre.a ; then - AC_ADD_LIBRARY_WITH_PATH(pcre, $withval) + test -f $withval/libpcre.a && PCRE_LIBDIR="$withval" + test -f $withval/lib/libpcre.a && PCRE_LIBDIR="$withval/lib" + if test -n "$PCRE_LIBDIR" ; then + AC_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR) else AC_MSG_ERROR(Could not find libpcre.a in $withval) fi