-fixed configure.in.in to use genif.sh instead of genif.pl

-fixed genif.sh
-updated php3_mysql.h to have phpext_mysql_ptr

diff --git a/configure.in.in b/configure.in.in
index c0c08ad2992092b1e2b510e95cd9011ba5b9c154..9ea289df70ce558738d867dba325160d7d7b51c7 100644 (file)
--- a/configure.in.in
+++ b/configure.in.in
@@ -876,7 +876,7 @@ chmod +x scripts/mkextlib
 echo "creating internal_functions.c"
 extensions=\`grep '^s.@EXT_SUBDIRS@' \$0|sed -e 's/^.*@% *//' -e 's/%.*$//'\`
 mv -f internal_functions.c internal_functions.c.old 2>/dev/null
-perl $srcdir/genif.pl $srcdir/internal_functions.c.in \$srcdir \$extensions > internal_functions.c
+sh $srcdir/genif.sh $srcdir/internal_functions.c.in \$srcdir \$extensions > internal_functions.c
 if cmp internal_functions.c.old internal_functions.c > /dev/null 2>&1; then
     echo "internal_functions.c is unchanged"
     mv internal_functions.c.old internal_functions.c

diff --git a/ext/mysql/php3_mysql.h b/ext/mysql/php3_mysql.h
index 0769edf5cbb3848a55799ed6b4e3fc2fe3685642..748ad70a67569df570ccf203cabec1c65fa84878 100644 (file)
--- a/ext/mysql/php3_mysql.h
+++ b/ext/mysql/php3_mysql.h
@@ -116,4 +116,6 @@ extern ZEND_API php_mysql_globals mysql_globals;
 
 #endif
 
+#define phpext_mysql_ptr mysql_module_ptr
+
 #endif /* _PHP3_MYSQL_H */

diff --git a/genif.sh b/genif.sh
index d30c37e581d64c94dd67b6bce2f9da45cddadfd6..571e2b9a885f310cf8213b61998007cd4ce5c7f0 100644 (file)
--- a/genif.sh
+++ b/genif.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $Id: genif.sh,v 1.1 1999-05-06 20:52:19 sas Exp $
+# $Id: genif.sh,v 1.2 1999-05-08 18:16:29 andrey Exp $
 # replacement for genif.pl
 
 infile="$1"
@@ -16,8 +16,7 @@ fi
 cmd1='echo $data | grep @EXT_INCLUDE_CODE@ > /dev/null 2>&1'
 cmd2='echo $data | grep @EXT_MODULE_PTRS@ > /dev/null 2>&1'
 
-while read ; do
-       data="$REPLY"
+while read data; do
        if eval $cmd1 ; then
                for ext in $* ; do
                        for pre in php3 php php4 zend; do