cvs: embed /php-irssi Makefile.am config.m4 php-core.c

wez		Mon Mar 31 10:15:10 2003 EDT

  Modified files:              
    /embed/php-irssi	Makefile.am config.m4 php-core.c 
  Log:
  Two build fixes.
  php-core.c: is C, not C++, so move the variable declarations to the right
  place....
  
  
  
Index: embed/php-irssi/Makefile.am
diff -u embed/php-irssi/Makefile.am:1.5 embed/php-irssi/Makefile.am:1.6
--- embed/php-irssi/Makefile.am:1.5	Sat Feb  1 22:27:16 2003
+++ embed/php-irssi/Makefile.am	Mon Mar 31 10:15:09 2003
@@ -6,7 +6,7 @@
 module_LTLIBRARIES = libphp_core.la
 
 libphp_core_la_LDFLAGS = -avoid-version -Wl,--rpath -Wl,$(LIBPHP_PREFIX)/lib -L$(LIBPHP_PREFIX)/lib
-libphp_core_la_LIBADD = -lphp4 $(LIBPHP_LIBS) $(LIBPHP_LDFLAGS)
+libphp_core_la_LIBADD = -lphp5 $(LIBPHP_LIBS) $(LIBPHP_LDFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/src \
Index: embed/php-irssi/config.m4
diff -u embed/php-irssi/config.m4:1.2 embed/php-irssi/config.m4:1.3
--- embed/php-irssi/config.m4:1.2	Wed Jan 29 16:10:53 2003
+++ embed/php-irssi/config.m4	Mon Mar 31 10:15:09 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.2 2003/01/29 21:10:53 wez Exp $
+dnl $Id: config.m4,v 1.3 2003/03/31 15:15:09 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.
 
@@ -24,4 +24,4 @@
 AC_SUBST(LIBPHP_LDFLAGS)
 AC_SUBST(PHPCONFIG)
 
-AM_CONDITIONAL(HAVE_PHP, test "$want_php" != "no")
+AM_CONDITIONAL(HAVE_PHP, test "$want_php" = "yes")
Index: embed/php-irssi/php-core.c
diff -u embed/php-irssi/php-core.c:1.17 embed/php-irssi/php-core.c:1.18
--- embed/php-irssi/php-core.c:1.17	Fri Mar 28 08:31:45 2003
+++ embed/php-irssi/php-core.c	Mon Mar 31 10:15:10 2003
@@ -15,7 +15,7 @@
   | Authors: Wez Furlong <[email protected]>                                   |
   |          Tal Peer <[email protected]>                                      | 
   +----------------------------------------------------------------------+
-  $Id: php-core.c,v 1.17 2003/03/28 13:31:45 tal Exp $
+  $Id: php-core.c,v 1.18 2003/03/31 15:15:10 wez Exp $
 */
 #define MODULE_NAME "php/core"
 #include "common.h"
@@ -177,12 +177,12 @@
 /* Handler for "/php set" command */
 static void cmd_php_set(const char *data)
 {	
+	char *val;
+	char *entry;
+
 	if (strcmp(data, "") == 0) {
 		return;
 	}
-
-	char *val;
-	char *entry;
 	
 	entry = estrdup(data);
 	entry = strtok(entry, " ");