Improve Session::run()

[m6w6/ext-ircclient] / config.m4

diff --git a/config.m4 b/config.m4
index f39ea427bbb564bb480badd220106c4f372615fe..c8940daae46c74abe80513a078bf19a7835619c0 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -16,12 +16,22 @@ if test "$PHP_IRCCLIENT" != "no"; then
        if test "x$IRCCLIENT_DIR" = "x"; then
                AC_MSG_ERROR([not found])
        fi
-       PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH=`$EGREP "define LIBIRC_VERSION_HIGH" $IRCCLIENT_DIR/include/libircclient/libirc_params.h | $SED -e 's/[[^0-9\x]]//g'`
-       PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW=`$EGREP "define LIBIRC_VERSION_LOW" $IRCCLIENT_DIR/include/libircclient/libirc_params.h | $SED -e 's/[[^0-9\x]]//g'`
+       if test -f "$IRCCLIENT_DIR/include/libircclient/libirc_params.h"; then
+               PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH=`$EGREP "define LIBIRC_VERSION_HIGH" $IRCCLIENT_DIR/include/libircclient/libirc_params.h | $SED -e 's/[[^0-9\x]]//g'`
+               PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW=`$EGREP "define LIBIRC_VERSION_LOW" $IRCCLIENT_DIR/include/libircclient/libirc_params.h | $SED -e 's/[[^0-9\x]]//g'`
+       else
+               PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_HIGH=0
+               PHP_IRCCLIENT_LIBIRCCLIENT_VERSION_LOW=0
+       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], [ ])
        
        PHP_ADD_INCLUDE($IRCCLIENT_DIR/include)
+       AC_CHECK_MEMBER([irc_callbacks_t.event_channel_notice], [
+               AC_DEFINE(HAVE_LIBIRCCLIENT_EVENT_CHANNEL_NOTICE, 1, [ ])
+       ], [], [
+               [#include <libircclient/libircclient.h>]
+       ])
        PHP_CHECK_LIBRARY(ircclient, irc_create_session,
        [
                PHP_ADD_LIBRARY_WITH_PATH(ircclient, $IRCCLIENT_DIR/lib, IRCCLIENT_SHARED_LIBADD)