moved dav, msql and oracle to ext/

Makefile.in

@@ -71,18 +71,16 @@ OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \
 FUNCTIONS_SOURCE = functions/apache.c functions/fhttpd.c \
        functions/crypt.c functions/db.c functions/dl.c \
        functions/head.c functions/imap.c functions/mime.c \
-       functions/msql.c \
-       functions/oracle.c functions/oci8.c functions/pgsql.c \
-       functions/post.c functions/sybase.c \
+       functions/pgsql.c functions/post.c functions/sybase.c \
        functions/sybase-ct.c @BCMATH_SRC@ functions/xml.c \
        functions/ldap.c functions/zlib.c functions/COM.c functions/ifx.c \
        functions/pdf.c functions/hw.c functions/hg_comm.c functions/dlist.c \
        functions/fdf.c functions/snmp.c functions/interbase.c \
-       functions/sysvsem.c functions/sysvshm.c functions/dav.c
+       functions/sysvsem.c functions/sysvshm.c
 
 FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
 PHPLIBS = -L@top_srcdir@/libzend -lzend -Lext -lphpext
-LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_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@ @MYSQL_LFLAGS@ @MYSQL_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@
 
 all: $(BINNAME)
 

acconfig.h.in

@@ -70,12 +70,6 @@
 /* Define if you have the crypt() function */
 #define HAVE_CRYPT 1
 
-/* Define if you have the Oracle database client libraries */
-#define HAVE_ORACLE 0
-
-/* Define if you have the Oracle version 8 database client libraries */
-#define HAVE_OCI8 0
-
 /* Define if you want the LDAP directory interface */
 #define HAVE_LDAP 0
 
@@ -124,10 +118,6 @@
 #define HAVE_SYBASE 0
 #define HAVE_SYBASE_CT 0
 
-#ifndef HAVE_MSQL
-#define HAVE_MSQL 0
-#endif
-
 #ifndef HAVE_PGSQL
 #define HAVE_PGSQL 0
 #endif
@@ -150,8 +140,6 @@
 #define HAVE_PQCMDTUPLES 0
 #endif
 
-#define MSQL1 0
-
 #ifndef DEBUG /* should be set to ZEND_DEBUG */
 #define DEBUG 0
 #endif
@@ -209,6 +197,3 @@
 
 /* Define if you have the fdftk library */
 #define HAVE_FDFLIB 0
-
-/* Define to compile with mod_dav support */
-#define HAVE_MOD_DAV 0

acinclude.m4

@@ -2,37 +2,6 @@ dnl $Id$
 dnl
 dnl This file contains local autoconf functions.
 
-AC_DEFUN(AC_ORACLE_VERSION,[
-  AC_MSG_CHECKING([Oracle version])
-  if test -f "$ORACLEINST_TOP/orainst/unix.rgs"
-  then
-	ORACLE_VERSION=`grep '"ocommon"' $ORACLEINST_TOP/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
-    test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
-  else
-    ORACLE_VERSION=8.0
-  fi
-  AC_MSG_RESULT($ORACLE_VERSION)
-])
-
-dnl
-dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined.
-dnl
-AC_DEFUN(AC_MSQL_VERSION,[
-  AC_MSG_CHECKING([mSQL version])
-  ac_php_oldcflags=$CFLAGS
-  CFLAGS="$MSQL_INCLUDE $CFLAGS";
-  AC_TRY_COMPILE([#include <sys/types.h>
-#include "msql.h"],[int i = IDX_TYPE],[
-    AC_DEFINE(MSQL1,0)
-    MSQL_VERSION="2.0 or newer"
-  ],[
-    AC_DEFINE(MSQL1,1)
-    MSQL_VERSION="1.0"
-  ])
-  CFLAGS=$ac_php_oldcflags
-  AC_MSG_RESULT($MSQL_VERSION)
-])
-
 dnl
 dnl See if we have broken header files like SunOS has.
 dnl

configure.in.in

@@ -315,7 +315,7 @@ AC_ARG_WITH(apxs,
         withval=apxs
     fi
     APXS="$withval"
-    APXS_LDFLAGS="@ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFTK_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@"
+    APXS_LDFLAGS="@ORACLE_LFLAGS@ @ORACLE_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFTK_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@"
     APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`"
     BINNAME=libphp3.so
     INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME"
@@ -871,158 +871,6 @@ dnl## AC_SUBST(IMAP_INCLUDE)
 ])
   
 
-AC_MSG_CHECKING(for Oracle support)
-AC_ARG_WITH(oracle,
-[  --with-oracle[=DIR]     Include Oracle database support.  DIR is Oracle's
-                          home directory, defaults to \$ORACLE_HOME.],
-[
- case "$withval" in
-    yes)
-      ORACLEINST_TOP=$ORACLE_HOME
-      AC_MSG_RESULT(yes)
-      ;;
-    no)
-      ORACLEINST_TOP=
-      AC_MSG_RESULT(no)
-      ;;
-    *)
-      AC_MSG_RESULT(yes)
-      ORACLEINST_TOP=$withval
-      ;;
-  esac
-
-  if test "$ORACLEINST_TOP" != ""
-  then
-
-    # Oracle include files
-
-    if test -f "$ORACLEINST_TOP/rdbms/public/ocidfn.h"
-    then
-      # V8.0.5
-      ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/rdbms/public"
-	elif test -f "$ORACLEINST_TOP/rdbms/demo/ocidfn.h"
-    then
-      # V7.[0123]
-      ORACLE_INCLUDE=-I$ORACLEINST_TOP/rdbms/demo
-    fi
-
-    if test -d "$ORACLEINST_TOP/network/public"
-    then
-      # V8
-      ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/network/public"
-    fi
-
-    if test -d "$ORACLEINST_TOP/plsql/public"
-    then
-      # V8
-      ORACLE_INCLUDE="$ORACLE_INCLUDE -I$ORACLEINST_TOP/plsql/public"
-    fi
-
-    # Need to know the version, otherwhise we will mixup nlsrtl
-    AC_ORACLE_VERSION($ORACLEINST_TOP)
-
-    # Oracle libs - nightmare :-)
-
-    ORACLE_LIBDIR=lib
-    ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${ld_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR"
-    if test -f "$ORACLEINST_TOP/rdbms/lib/sysliblist"
-    then
-      ORA_SYSLIB="`cat $ORACLEINST_TOP/rdbms/lib/sysliblist`"
-    else
-      ORA_SYSLIB="-lm"
-    fi
-
-    # Oracle Static libs
-    case $ORACLE_VERSION in
-      7.0|7.1)
-  	ORACLE_STLIBS="-locic $ORACLEINST_TOP/$ORACLE_LIBDIR/osntab.o \
-            -lsqlnet -lora -lsqlnet -lnlsrtl -lcv6 -lcore -lnlsrtl -lcv6 \
-            -lcore $ORA_SYSLIB -lcore $ORA_SYSLIB"
-    if test "`uname -s 2>/dev/null`" = "AIX"; then
-      ORACLE_STLIBS="$ORACLE_STLIBS -bI:$ORACLE_HOME/lib/mili.exp"
-    fi
-  	;;
-      7.2)
-  	ORACLE_STLIBS="-locic $ORACLEINST_TOP/$ORACLE_LIBDIR/osntab.o \
-            -lsqlnet -lora -lsqlnet -lora -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 \
-            -lcore3 $ORA_SYSLIB -lcore3 $ORA_SYSLIB"
-  	;;
-      7.3)
-  	ORACLE_STLIBS="-lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon \
-  	    -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric \
-            -lepc -lnlsrtl3 -lc3v6 -lcore3 -lnlsrtl3 -lcore3 -lnlsrtl3 \
-            $ORA_SYSLIB -lcore3 $ORA_SYSLIB"
-  	;;
-      8.0)
-  	ORACLE_STLIBS="-lclient -lsqlnet -lncr -lsqlnet -lclient -lcommon \
-  	    -lgeneric -lsqlnet -lncr -lsqlnet -lclient -lcommon -lgeneric \
-            -lepc -lnlsrtl3 -lc3v6 -lcore4 -lnlsrtl3 -lcore4 -lnlsrtl3 \
-            $ORA_SYSLIB -lcore3 $ORA_SYSLIB"
-	;;
-      *)
-  	ORACLE_STLIBS=
-  	;;
-    esac
-  
-    # Oracle shared libs
-    case $ORACLE_VERSION in
-      7.0)
-  	# shared libs not supported
-  	ORACLE_SHLIBS="$ORACLE_STLIBS"
-  	;;
-      7.1)
-  	if test -f $ORACLEINST_TOP/$ORACLE_LIBDIR/liboracle.s?
-  	then
-  	  ORACLE_SHLIBS="-loracle $ORA_SYSLIB"
-  	else
-  	  ORACLE_SHLIBS="$ORACLE_STLIBS"
-  	fi
-  	;;
-      7.2|7.3)
-    	if test -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.s?
-    	then
-    	  ORACLE_SHLIBS="-lclntsh $ORA_SYSLIB"
-    	else
-    	  ORACLE_SHLIBS="$ORACLE_STLIBS"
-    	fi
-    	;;
-      8.0)
-	if test -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.s? -o \
-	        -f $ORACLEINST_TOP/$ORACLE_LIBDIR/libclntsh.a # AIX
-    	then
-	  if test "$CC" = "gcc" -a "`uname -sv`" = "AIX 4"; then
-	    # for Oracle 8 on AIX 4
-	    ORA_SYSLIB="$ORA_SYSLIB -nostdlib /lib/crt0_r.o /usr/lib/libpthreads.a /usr/lib/libc_r.a -lgcc"
-	  fi
-    	  ORACLE_SHLIBS="-lclntsh -lpsa -lcore4 -lnlsrtl3 -lclntsh $ORA_SYSLIB"
-    	else
-    	  ORACLE_SHLIBS="$ORACLE_STLIBS"
-    	fi
-        AC_DEFINE(HAVE_OCI8)
-    	;;
-      *)
-  	ORACLE_SHLIBS=
-  	;;
-    esac
-  
-    # only using shared libs right now
-    ORACLE_LIBS=$ORACLE_SHLIBS
-
-    AC_DEFINE(HAVE_ORACLE)
-
-  fi
-
-],[AC_MSG_RESULT(no)])
-AC_SUBST(ORACLE_SHLIBS)
-AC_SUBST(ORACLE_STLIBS)
-AC_SUBST(ORACLE_LIBS)
-AC_SUBST(ORACLE_LFLAGS)
-dnl## AC_SUBST(ORACLE_INCLUDE)
-INCLUDES="$INCLUDES $ORACLE_INCLUDE"
-AC_SUBST(ORACLE_HOME)
-AC_SUBST(ORACLE_VERSION)
-
-
 AC_MSG_CHECKING(for Sybase support)
 AC_ARG_WITH(sybase,
 [  --with-sybase[=DIR]     Include Sybase-DB support.  DIR is the Sybase home
@@ -1095,37 +943,6 @@ dnl## AC_SUBST(SYBASE_CT_INCLUDE)
 INCLUDES="$INCLUDES $SYBASE_CT_INCLUDE"
 
 
-AC_MSG_CHECKING(for mSQL support)
-AC_ARG_WITH(msql,
-[  --with-msql[=DIR]       Include mSQL support.  DIR is the mSQL base
-                          install directory, defaults to /usr/local/Hughes.],
-[
-  if test "$withval" != "no"; then
-  	if test "$withval" = "yes"; then
-      MSQL_INCDIR=/usr/local/Hughes/include
-      MSQL_LIBDIR=/usr/local/Hughes/lib
-   	else
-      MSQL_INCDIR=$withval/include
-      MSQL_LIBDIR=$withval/lib
-   	fi
-    MSQL_INCLUDE=-I$MSQL_INCDIR
-    MSQL_LFLAGS=-L$MSQL_LIBDIR
-    MSQL_LIBS=-lmsql
-
-    AC_DEFINE(HAVE_MSQL)
-    AC_MSG_RESULT(yes)
-    AC_MSQL_VERSION
-  else
-  	AC_MSG_RESULT(no)
-  fi
-],[
-  AC_MSG_RESULT(no)
-])
-AC_SUBST(MSQL_LIBS)
-AC_SUBST(MSQL_LFLAGS)
-dnl## AC_SUBST(MSQL_INCLUDE)
-INCLUDES="$INCLUDES $MSQL_INCLUDE"
-
 AC_MSG_CHECKING(for PostgresSQL support)
 AC_ARG_WITH(pgsql,
 [  --with-pgsql[=DIR]      Include PostgresSQL support.  DIR is the PostgresSQL
@@ -1471,32 +1288,6 @@ dnl## AC_SUBST(FDFLIB_INCLUDE)
 INCLUDES="$INCLUDES $FDFLIB_INCLUDE"
 
 
-AC_MSG_CHECKING(whether to enable DAV support through mod_dav)
-AC_ARG_WITH(mod-dav,
-[  --with-mod-dav=DIR      Include DAV support through Apache's mod_dav,
-                          DIR is mod_dav's installation directory (Apache
-                          module version only!)],
-[
-  if test "$withval" = "yes"; then
-    AC_MSG_ERROR(Must give parameter to --with-mod-dav!)
-  else
-    if test "$withval" != "no"; then
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_MOD_DAV, 1)
-      MOD_DAV_CFLAGS="-DHAVE_MOD_DAV -I$withval"
-      INCLUDES="$INCLUDES -I$withval"
-    else
-      AC_MSG_RESULT(no)
-      AC_DEFINE(HAVE_MOD_DAV, 0)
-    fi
-  fi
-],[
-  AC_MSG_RESULT(no)
-  AC_DEFINE(HAVE_MOD_DAV, 0)
-])
-AC_SUBST(MOD_DAV_CFLAGS)
-
-
 AC_MSG_CHECKING(whether to enable System V semaphore support)
 AC_ARG_ENABLE(sysvsem,
 [  --enable-sysvsem        Enable System V semaphore support.],

ext/dav/Makefile.am

@@ -0,0 +1,6 @@
+# $Id$
+
+INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
+noinst_LIBRARIES=libphpext_dav.a
+libphpext_dav_a_SOURCES=dav.c
+

ext/dav/config.h.stub

@@ -0,0 +1,2 @@
+/* Define to compile with mod_dav support */
+#define HAVE_MOD_DAV 0

ext/dav/config.m4

@@ -0,0 +1,29 @@
+dnl $Id$
+dnl config.m4 for extension dav
+dnl don't forget to call PHP_EXTENSION(dav)
+
+AC_MSG_CHECKING(whether to enable DAV support through mod_dav)
+AC_ARG_WITH(mod-dav,
+[  --with-mod-dav=DIR      Include DAV support through Apache's mod_dav,
+                          DIR is mod_dav's installation directory (Apache
+                          module version only!)],
+[
+  if test "$withval" = "yes"; then
+    AC_MSG_ERROR(Must give parameter to --with-mod-dav!)
+  else
+    if test "$withval" != "no"; then
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_MOD_DAV, 1)
+      CFLAGS="$CFLAGS -DHAVE_MOD_DAV -I$withval"
+      INCLUDES="$INCLUDES -I$withval"
+      PHP_EXTENSION(dav)
+    else
+      AC_MSG_RESULT(no)
+      AC_DEFINE(HAVE_MOD_DAV, 0)
+    fi
+  fi
+],[
+  AC_MSG_RESULT(no)
+  AC_DEFINE(HAVE_MOD_DAV, 0)
+])
+