moved fdf, hyperwave, informix and some smaller files

Makefile.in

@@ -69,18 +69,16 @@ OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \
        php_ini.o
 
 FUNCTIONS_SOURCE = functions/fhttpd.c \
-       functions/crypt.c functions/dl.c \
-       functions/head.c functions/imap.c functions/mime.c \
+       functions/imap.c functions/mime.c \
        functions/pgsql.c functions/post.c functions/sybase.c \
        functions/sybase-ct.c functions/xml.c \
-       functions/ldap.c functions/zlib.c functions/ifx.c \
-       functions/pdf.c \
-       functions/fdf.c functions/snmp.c functions/interbase.c \
+       functions/ldap.c functions/zlib.c \
+       functions/pdf.c functions/snmp.c functions/interbase.c \
        functions/sysvsem.c functions/sysvshm.c
 
 FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
 PHPLIBS = -L@top_srcdir@/libzend -lzend -L@top_srcdir@/ext -lphpext
-LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@
+LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@
 
 all: $(BINNAME)
 
@@ -111,9 +109,6 @@ libphp3.so: $(srcdir)/mod_php3.c libmodphp3-so.a
 regex/libregex.a:
 	(cd regex; $(MAKE) lib)
 
-functions/ifx.c: functions/ifx.ec
-	(if test @INFORMIXDIR@; then esql -e @IFX_ESQL_FLAGS@ functions/ifx.ec; mv ifx.c functions; else touch functions/ifx.c; fi)
-
 configuration-parser.h configuration-parser.c:	$(srcdir)/configuration-parser.y
 	bison -p cfg -v -d $(srcdir)/configuration-parser.y -o configuration-parser.c
 

acconfig.h.in

@@ -182,6 +182,3 @@
 
 /* Define if you have the pdflib library */
 #define HAVE_PDFLIB 0
-
-/* Define if you have the fdftk library */
-#define HAVE_FDFLIB 0

configure.in.in

@@ -1008,78 +1008,6 @@ dnl## AC_SUBST(SNMP_INCLUDE)
 INCLUDES="$INCLUDES $SNMP_INCLUDE"
 
 
-AC_MSG_CHECKING(for Informix support)
-AC_ARG_WITH(informix,
-[  --with-informix[=DIR]   Include Informix support.  DIR is the Informix base
-                          install directory, defaults to ${INFORMIXDIR:-nothing}.],
-[
-	if test "$withval" != "no"; then
-		if test "$INFORMIXDIR" = ""; then
-			INFORMIX_WARNING="
-WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR
-	 environment value set up. Configuring and compiling Informix
-	 support to PHP3 is impossible and has been turned off. Please
-	 try again after setting up your environment."
-			AC_MSG_RESULT(no)
-		else
-			if test "$withval" = "yes"; then
-				IFX_INCDIR=$INFORMIXDIR/incl/esql
-				IFX_LIBDIR="-L$INFORMIXDIR/lib -L$INFORMIXDIR/lib/esql"
-			else
-				IFX_INCDIR=$withval/incl/esql
-				IFX_LIBDIR="-L$withval/lib -L$withval/lib/esql"
-				if test "$withval" != "$INFORMIXDIR"; then
-					INFORMIX_WARNING="
-WARNING: You specified Informix base install directory that is different
-	 than your \\\$INFORMIXDIR environment variable. You'd better know
-	 exactly what you are doing."
-				fi
-    		fi
-			IFX_INCLUDE=-I$IFX_INCDIR
-			IFX_LFLAGS=$IFX_LIBDIR
-			if test -z "$IFX_LIBS"; then
-				IFX_LIBS=`esql -libs | sed -e 's/-lm$//'`
-				dnl  -lm twice otherwise?
-				IFX_LIBS=`echo $IFX_LIBS | sed -e 's/Libraries to be used://g' -e 's/esql: error -55923: No source or object file\.//g'`
-				dnl Seems to get rid of newlines.
-				dnl According to Perls DBD-Informix, might contain these strings.
-			else
-				dnl Allow override to use static and/or threaded libs
-				IFX_LIBS="$IFX_LIBS"
-			fi
-			CFLAGS="$CFLAGS $IFX_INCLUDE"
-			LDFLAGS="$LDFLAGS $IFX_LFLAGS"
-
-		    if test "`uname -s 2>/dev/null`" = "AIX"; then
-				CFLAGS="$CFLAGS -D__H_LOCALEDEF"
-			fi
-			AC_DEFINE(HAVE_IFX)
-			AC_MSG_CHECKING([Informix version])
-			IFX_VERSION=[`esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'`]
-			if test $IFX_VERSION -ge "900"; then
-				AC_DEFINE(HAVE_IFX_IUS)
-				IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS"
-			else
-				IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
-			fi
-			AC_SUBST(IFX_ESQL_FLAGS)
-			AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION)
-			AC_MSG_RESULT(yes)
-		fi
-	else
-		INFORMIXDIR=
-		AC_MSG_RESULT(no)
-	fi
-],[
-  AC_MSG_RESULT(no)
-])
-AC_SUBST(IFX_LIBS)
-AC_SUBST(IFX_LFLAGS)
-AC_SUBST(INFORMIXDIR)
-dnl## AC_SUBST(IFX_INCLUDE)
-INCLUDES="$INCLUDES $IFX_INCLUDE"
-
-
 AC_MSG_CHECKING(for InterBase support)
 AC_ARG_WITH(interbase,
 [  --with-interbase[=DIR]  Include InterBase support.  DIR is the InterBase base
@@ -1197,40 +1125,6 @@ dnl## AC_SUBST(PDFLIB_INCLUDE)
 INCLUDES="$INCLUDES $PDFLIB_INCLUDE"
 
 
-AC_MSG_CHECKING(whether to include fdftk support)
-AC_ARG_WITH(fdftk,
-[  --with-fdftk[=DIR]      Include fdftk support.
-                          DIR is the fdftk lib install directory,
-                          defaults to /usr/local.],
-[
-  case "$withval" in
-    no)
-      AC_MSG_RESULT(no) ;;
-    yes)
-      AC_MSG_RESULT(yes)
-      AC_CHECK_LIB(FdfTk, FDFOpen, [AC_DEFINE(HAVE_FDFLIB) FDFLIB_LIBS="-lFdfTk"],
-        [AC_MSG_ERROR(fdftk module requires fdftk 2.0)]) ;;
-    *)
-      test -f $withval/include/Fdftk.h && FDFLIB_INCLUDE="-I$withval/include"
-      if test -n "$FDFLIB_INCLUDE" ; then
-        AC_MSG_RESULT(yes)
-        old_LIBS=$LIBS
-        LIBS="$LIBS -L$withval/lib"
-        AC_CHECK_LIB(FdfTk, FDFOpen, [AC_DEFINE(HAVE_FDFLIB) FDFLIB_LIBS="-L$withval/lib -lFdfTk"],
-          [AC_MSG_ERROR(fdftk module requires ftftk lib 2.0.)])
-        LIBS=$old_LIBS
-      else
-        AC_MSG_RESULT(no)
-      fi ;;
-  esac
-],[
-  AC_MSG_RESULT(no)
-])
-AC_SUBST(FDFLIB_LIBS)
-dnl## AC_SUBST(FDFLIB_INCLUDE)
-INCLUDES="$INCLUDES $FDFLIB_INCLUDE"
-
-
 AC_MSG_CHECKING(whether to enable System V semaphore support)
 AC_ARG_ENABLE(sysvsem,
 [  --enable-sysvsem        Enable System V semaphore support.],
@@ -1335,10 +1229,7 @@ if test "$BINNAME" = "php"; then
 		fi
 	fi
 fi
-dnl Warn if Informix support was requested but environment is not set up correctly.
-if test "$INFORMIX_WARNING" != ""; then
-		echo "$INFORMIX_WARNING"
-fi
+
 ])
 
 divert

ext/apache/apache.c

@@ -34,7 +34,7 @@
 #include "tls.h"
 #endif
 #include "php.h"
-#include "functions/head.h"
+#include "ext/standard/head.h"
 #include "php_globals.h"
 #include "php_ini.h"
 #include "mod_php3.h"

ext/fdf/Makefile.am

@@ -0,0 +1,6 @@
+# $Id$
+
+INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
+noinst_LIBRARIES=libphpext_fdf.a
+libphpext_fdf_a_SOURCES=fdf.c
+

ext/fdf/config.h.stub

@@ -0,0 +1,2 @@
+/* Define if you have the fdftk library */
+#define HAVE_FDFLIB 0

ext/fdf/config.m4

@@ -0,0 +1,39 @@
+dnl $Id$
+
+AC_MSG_CHECKING(whether to include fdftk support)
+AC_ARG_WITH(fdftk,
+[  --with-fdftk[=DIR]      Include fdftk support.
+                          DIR is the fdftk lib install directory,
+                          defaults to /usr/local.],
+[
+  case "$withval" in
+    no)
+      AC_MSG_RESULT(no) ;;
+    yes)
+      AC_MSG_RESULT(yes)
+      PHP_EXTENSION(fdf)
+      AC_CHECK_LIB(FdfTk, FDFOpen, [
+        AC_DEFINE(HAVE_FDFLIB)
+        EXTRA_LIBS="$EXTRA_LIBS -lFdfTk"
+      ],[AC_MSG_ERROR(fdftk module requires fdftk 2.0)])
+      ;;
+    *)
+      test -f $withval/include/Fdftk.h && FDFLIB_INCLUDE="-I$withval/include"
+      if test -n "$FDFLIB_INCLUDE" ; then
+        AC_MSG_RESULT(yes)
+        PHP_EXTENSION(fdf)
+        old_LIBS=$LIBS
+        LIBS="$LIBS -L$withval/lib"
+        AC_CHECK_LIB(FdfTk, FDFOpen, [
+          AC_DEFINE(HAVE_FDFLIB)
+          EXTRA_LIBS="$EXTRA_LIBS -L$withval/lib -lFdfTk"
+        ],[AC_MSG_ERROR(fdftk module requires ftftk lib 2.0.)])
+        LIBS=$old_LIBS
+        INCLUDES="$INCLUDES $FDFLIB_INCLUDE"
+      else
+        AC_MSG_RESULT(no)
+      fi ;;
+  esac
+],[
+  AC_MSG_RESULT(no)
+])