diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-01-10 16:16:56 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-01-10 16:16:56 +0100 |
| commit | 4ea720dc01b6a9fa588a70657226cd479078378f (patch) | |
| tree | 33382e1b0e1493eccbd1a55b51148b2f762b749d /ircclient-upstream.patch | |
| parent | 291104d308867c9ee012dfdc2f5e2d01a0f7f159 (diff) | |
php-pecl-ircclient: fix EL-5 build
Diffstat (limited to 'ircclient-upstream.patch')
| -rw-r--r-- | ircclient-upstream.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/ircclient-upstream.patch b/ircclient-upstream.patch index edf5096..92a8128 100644 --- a/ircclient-upstream.patch +++ b/ircclient-upstream.patch @@ -322,3 +322,43 @@ index 0145dfd..bf17d5e 100644 -- 1.8.3.1 +From c8042b1f4a6678d02111985f1e429b5e163b3694 Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Fri, 10 Jan 2014 16:13:08 +0100 +Subject: [PATCH] Fix with old autotools (RHEL-5) + +--- + config.m4 | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/config.m4 b/config.m4 +index 8b5953b..9b8d3f6 100644 +--- 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 +@@ -24,9 +24,9 @@ if test "$PHP_IRCCLIENT" != "no"; 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'` ++ 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 +-- +1.8.3.1 + |