cvs: embed /php-irssi config.m4 irssi.diff

wez Wed Jan 29 15:34:58 2003 EDT Added files: /embed/php-irssi config.m4 Modified files: /embed/php-irssi irssi.diff Log: Tweak the configure stuff so that you can specify the path to php-config --with-php=/usr/local/php5/bin/php-config Updated the irssi patch to include config.m4 fragment from here, so that future amendments to the configure will be less painful. # You will need to revert the original irssi.diff if you applied it already, # then apply this one. Index: embed/php-irssi/irssi.diff diff -u embed/php-irssi/irssi.diff:1.1.1.1 embed/php-irssi/irssi.diff:1.2 --- embed/php-irssi/irssi.diff:1.1.1.1 Wed Jan 29 13:42:34 2003 +++ embed/php-irssi/irssi.diff Wed Jan 29 15:34:57 2003 @@ -4,33 +4,18 @@ retrieving revision 1.238 diff -u -p -r1.238 configure.in --- configure.in 25 Jan 2003 03:19:40 -0000 1.238 -+++ configure.in 29 Jan 2003 18:27:03 -0000 -@@ -196,6 +196,16 @@ AC_ARG_WITH(perl, ++++ configure.in 29 Jan 2003 20:30:02 -0000 +@@ -196,6 +196,9 @@ AC_ARG_WITH(perl, fi, want_perl=static) -+dnl This requires PHP 4.3.1 or higher -+AC_ARG_WITH(php, -+[ --with-php Build with PHP support as a module], -+ want_php=yes -+ LIBPHP_LDFLAGS="-Lphp-config --prefix/lib php-config --libs php-config --ldflags" -+ PHP_CFLAGS=php-config --includes -+ ) -+AC_SUBST(LIBPHP_LDFLAGS) -+AC_SUBST(PHP_CFLAGS) ++dnl Pull in the PHP stuff ++sinclude(src/php-irssi/config.m4) + AC_ARG_WITH(file-offset-size, [ --with-file-offset-size=BITS Set size of file offsets. Usually 32 or 64. (default: 64 if available)], -@@ -811,6 +821,7 @@ AM_CONDITIONAL(BUILD_IRSSIBOT, test "$wa - AM_CONDITIONAL(BUILD_IRSSIPROXY, test "$want_irssiproxy" = "yes") - AM_CONDITIONAL(BUILD_PLUGINS, test "$want_plugins" = "yes") - AM_CONDITIONAL(HAVE_PERL, test "$want_perl" != "no") -+AM_CONDITIONAL(HAVE_PHP, test "$want_php" != "no") - AM_CONDITIONAL(HAVE_STATIC_PERL, test "$want_perl" = "static") - AM_CONDITIONAL(NEED_TPARM, test "$need_tparm" = "yes") - AM_CONDITIONAL(USE_CURSES, test "$want_terminfo" != "yes" -a "$want_termcap" != "yes") -@@ -946,6 +957,7 @@ src/perl/common/Makefile.PL +@@ -946,6 +949,7 @@ src/perl/common/Makefile.PL src/perl/irc/Makefile.PL src/perl/ui/Makefile.PL src/perl/textui/Makefile.PL @@ -38,7 +23,7 @@ scripts/Makefile scripts/examples/Makefile docs/Makefile -@@ -1039,6 +1051,7 @@ echo "Install prefix ................... +@@ -1039,6 +1043,7 @@ echo "Install prefix ................... echo echo "Building with IPv6 support ....... : $want_ipv6" @@ -52,7 +37,7 @@ retrieving revision 1.13 diff -u -p -r1.13 Makefile.am --- src/Makefile.am 17 May 2001 20:13:57 -0000 1.13 -+++ src/Makefile.am 29 Jan 2003 18:27:03 -0000 ++++ src/Makefile.am 29 Jan 2003 20:30:02 -0000 @@ -10,7 +10,11 @@ if HAVE_PERL PERLDIR=perl endif @@ -72,7 +57,7 @@ retrieving revision 1.43 diff -u -p -r1.43 misc.c --- src/core/misc.c 8 Jan 2003 20:54:36 -0000 1.43 -+++ src/core/misc.c 29 Jan 2003 18:27:04 -0000 ++++ src/core/misc.c 29 Jan 2003 20:30:02 -0000 @@ -173,6 +173,7 @@ int strarray_find(char **array, const ch return -1; } @@ -95,7 +80,7 @@ retrieving revision 1.19 diff -u -p -r1.19 misc.h --- src/core/misc.h 28 Dec 2002 17:54:13 -0000 1.19 -+++ src/core/misc.h 29 Jan 2003 18:27:04 -0000 ++++ src/core/misc.h 29 Jan 2003 20:30:02 -0000 @@ -21,7 +21,9 @@ int strarray_length(char **array); /* return index of item' in array' or -1 if not found */ int strarray_find(char **array, const char *item); Index: embed/php-irssi/config.m4 +++ embed/php-irssi/config.m4 dnl $Id: config.m4,v 1.1 2003/01/29 20:34:57 wez Exp $ dnl A Fragment only for now, but could be expanded so php-irssi can dnl be built independently from the irssi source tree. dnl This requires PHP 4.3.1 or higher AC_ARG_WITH(php, [ --with-php=[php-config path] Build with PHP support as a module], PHPCONFIG=$withval if ! test -x $PHPCONFIG ; then PHPCONFIG=php-config fi want_php=yes LIBPHP_LDFLAGS="-L$PHPCONFIG --prefix/lib $PHPCONFIG --libs $PHPCONFIG --ldflags" PHP_CFLAGS=$PHPCONFIG --includes ) AC_SUBST(LIBPHP_LDFLAGS) AC_SUBST(PHP_CFLAGS) AM_CONDITIONAL(HAVE_PHP, test "$want_php" != "no")