missing in previous
authorRemi Collet <fedora@famillecollet.com>
Fri, 10 Jan 2014 14:15:54 +0000 (15:15 +0100)
committerRemi Collet <fedora@famillecollet.com>
Fri, 10 Jan 2014 14:15:54 +0000 (15:15 +0100)
config.m4
php_ircclient.c

index d238bbe098f169209c56e19602d4295d1233e8a8..8b5953bd7432bd17691b2e937ff9c741b79ca632 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -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
+       AC_MSG_CHECKING([libircclient version])
        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_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], [ ])
index 022d2981a9384a48428a7dcebe671b026fd88e25..0145dfdf2a6b05fcf6f5627817427ca23756343a 100644 (file)
@@ -1421,7 +1421,7 @@ PHP_MINFO_FUNCTION(ircclient)
 
        irc_get_version(&high, &low);
        spprintf(&version[1], 0, "%u.%u", high, low);
-#if PHP_IPHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH
+#if PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH
        spprintf(&version[0], 0, "%u.%u", PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH, PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW);
 #else
        /* version <= 1.6 doesn't exposed its version */