cvs: php-gtk / php_gtk.m4 /build2 genext.sh /ext Makefile.in /ext/scintilla php_scintilla.c

andrei Tue Aug 14 17:04:18 2001 EDT Modified files: /php-gtk php_gtk.m4 /php-gtk/build2 genext.sh /php-gtk/ext Makefile.in /php-gtk/ext/scintilla php_scintilla.c Log: - Remove erroneous glade_init() call from php_scintilla.c. - Fix comparison test in genext.sh. - Make sure that ext/gtk+ always comes first in compilation. Index: php-gtk/php_gtk.m4 diff -u php-gtk/php_gtk.m4:1.2 php-gtk/php_gtk.m4:1.3 --- php-gtk/php_gtk.m4:1.2 Tue Jul 10 14:27:45 2001 +++ php-gtk/php_gtk.m4 Tue Aug 14 17:04:17 2001 @@ -6,7 +6,9 @@ dnl "extname" is the name of the ext/ subdir where the extension resides dnl AC_DEFUN(PHP_GTK_EXTENSION,[ - PHP_GTK_EXT_SUBDIRS="$PHP_GTK_EXT_SUBDIRS $1" + if test "$1" != "gtk+"; then + PHP_GTK_EXT_SUBDIRS="$PHP_GTK_EXT_SUBDIRS $1" + fi php_gtk_ext_builddir=ext/$1 php_gtk_ext_srcdir=$abs_srcdir/ext/$1 Index: php-gtk/build2/genext.sh diff -u php-gtk/build2/genext.sh:1.2 php-gtk/build2/genext.sh:1.3 --- php-gtk/build2/genext.sh:1.2 Sat Aug 11 01:42:40 2001 +++ php-gtk/build2/genext.sh Tue Aug 14 17:04:17 2001 @@ -1,6 +1,6 @@ #! /bin/sh -# $Id: genext.sh,v 1.2 2001/08/11 05:42:40 andrei Exp $ +# $Id: genext.sh,v 1.3 2001/08/14 21:04:17 andrei Exp $ # replacement for genif.pl infile="$1" @@ -23,7 +23,7 @@ cd $srcdir for ext in ${1+"$@"} ; do - if test "$ext" == "gtk+"; then + if test "$ext" = "gtk+"; then continue fi ext_canonical=echo ${ext} | sed -e 's![^a-zA-Z0-9_]!_!' Index: php-gtk/ext/Makefile.in diff -u php-gtk/ext/Makefile.in:1.2 php-gtk/ext/Makefile.in:1.3 --- php-gtk/ext/Makefile.in:1.2 Tue Jul 10 14:27:47 2001 +++ php-gtk/ext/Makefile.in Tue Aug 14 17:04:18 2001 @@ -1,3 +1,3 @@ -SUBDIRS = $(PHP_GTK_EXT_SUBDIRS) +SUBDIRS = gtk+ $(PHP_GTK_EXT_SUBDIRS) include $(top_srcdir)/build/rules.mk Index: php-gtk/ext/scintilla/php_scintilla.c diff -u php-gtk/ext/scintilla/php_scintilla.c:1.1 php-gtk/ext/scintilla/php_scintilla.c:1.2 --- php-gtk/ext/scintilla/php_scintilla.c:1.1 Sat Aug 11 01:42:40 2001 +++ php-gtk/ext/scintilla/php_scintilla.c Tue Aug 14 17:04:18 2001 @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -/* $Id: php_scintilla.c,v 1.1 2001/08/11 05:42:40 andrei Exp $: */ +/* $Id: php_scintilla.c,v 1.2 2001/08/14 21:04:18 andrei Exp $: */ #include "php_gtk.h" @@ -26,7 +26,6 @@ PHP_GTK_XINIT_FUNCTION(scintilla) { - glade_init(); php_scintilla_register_constants(module_number TSRMLS_CC); php_scintilla_register_classes();