trigger mirror

[m6w6/ext-ircclient] / config.m4

diff --git a/config.m4 b/config.m4
index d238bbe098f169209c56e19602d4295d1233e8a8..9b8d3f6b0654c461c9558e04a25a01550879c87c 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -2,8 +2,8 @@ PHP_ARG_WITH(ircclient, for ircclient support,
        [  --with-ircclient[=LIBIRCCLIENTDIR]   Include ircclient support])
 
 if test "$PHP_IRCCLIENT" != "no"; then
-       AC_PROG_EGREP
-       AC_PROG_SED
+       AC_PATH_PROG(GREP, grep, no)
+       AC_PATH_PROG(SED, sed, no)
        
        AC_MSG_CHECKING([for libircclient.h])
        for d in $PHP_IRCCLIENT /usr /usr/local /opt; do
@@ -11,22 +11,27 @@ if test "$PHP_IRCCLIENT" != "no"; then
                        IRCCLIENT_INCDIR=$d/include
                        IRCCLIENT_LIBDIR=$d/$PHP_LIBDIR
                        AC_MSG_RESULT([found in $d])
+                       break
                elif test -f $d/include/libircclient/libircclient.h; then
                        AC_MSG_RESULT([found in $d])
                        IRCCLIENT_INCDIR=$d/include/libircclient
                        IRCCLIENT_LIBDIR=$d/$PHP_LIBDIR
+                       AC_MSG_RESULT([found in $d])
                        break
                fi
        done
        if test "x$IRCCLIENT_INCDIR" = "x"; then
                AC_MSG_ERROR([not found])
        fi
-       if test -f "$IRCCLIENT_INCDIR/libirc_params.h"; then
-               PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH=`$EGREP "define LIBIRC_VERSION_HIGH" $IRCCLIENT_INCDIR/libirc_params.h | $SED -e 's/[[^0-9\x]]//g'`
-               PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW=`$EGREP "define LIBIRC_VERSION_LOW" $IRCCLIENT_INCDIR/libirc_params.h | $SED -e 's/[[^0-9\x]]//g'`
+       AC_MSG_CHECKING([libircclient version])
+       if test -x $GREP && test -x $SED && test -f "$IRCCLIENT_INCDIR/libirc_params.h"; then
+               PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH=`$GREP "define LIBIRC_VERSION_HIGH" $IRCCLIENT_INCDIR/libirc_params.h | $SED -e 's/[[^0-9\x]]//g'`
+               PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW=`$GREP "define LIBIRC_VERSION_LOW" $IRCCLIENT_INCDIR/libirc_params.h | $SED -e 's/[[^0-9\x]]//g'`
+               AC_MSG_RESULT([$PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH $PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW])
        else
                PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH=0
                PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW=0
+               AC_MSG_RESULT([unkown])
        fi
        AC_DEFINE_UNQUOTED([PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH], [$PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH], [ ])
        AC_DEFINE_UNQUOTED([PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW], [$PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW], [ ])