From c55fab5599836f9a921cd437d34aa6485e23bb5e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Jan 2014 15:15:54 +0100 Subject: [PATCH] missing in previous --- config.m4 | 5 +++++ php_ircclient.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/config.m4 b/config.m4 index d238bbe..8b5953b 100644 --- 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], [ ]) diff --git a/php_ircclient.c b/php_ircclient.c index 022d298..0145dfd 100644 --- a/php_ircclient.c +++ b/php_ircclient.c @@ -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 */ -- 2.30.2