Expanded checking for pcre.h and libpcre.a.

diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4
index 9592bc0e2bc3e3ef58116b931931b280b6c30cb9..32eb634a8a439ef4554dde3d43ecf59afeee1e17 100644 (file)
--- a/ext/pcre/config.m4
+++ b/ext/pcre/config.m4
@@ -24,14 +24,21 @@ AC_ARG_WITH(pcre-regex,
                        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_ARG_WITH(pcre-regex,
                                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

diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 9592bc0e2bc3e3ef58116b931931b280b6c30cb9..32eb634a8a439ef4554dde3d43ecf59afeee1e17 100644 (file)
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -24,14 +24,21 @@ AC_ARG_WITH(pcre-regex,
                        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_ARG_WITH(pcre-regex,
                                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