moved dbase into ext/

4 files changed, 16 insertions, 67 deletions

diff --git a/Makefile.in b/Makefile.in
index 07f8078bea..526b8cd2cf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,8 +69,7 @@ OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \
        php_ini.o
 
 FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.c \
-       functions/crypt.c functions/db.c functions/dbase.c \
-       functions/dl.c functions/filepro.c \
+       functions/crypt.c functions/db.c functions/dl.c functions/filepro.c \
        functions/head.c functions/imap.c functions/mime.c \
        functions/msql.c functions/mysql.c \
        functions/oracle.c functions/oci8.c functions/pgsql.c \
@@ -84,7 +83,7 @@ FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.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@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_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@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_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)
 
@@ -97,12 +96,12 @@ all-recursive clean-recursive distclean-recursive:
 	done && test -z "$$fail"
 
 # CGI binary or fhttpd module
-php: all-recursive $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@
+php: all-recursive $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@
 	$(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS)
 
 # Apache modules
 libphp3.a libmodphp3.a libmodphp3-so.a: all-recursive $(OBJS) $(FUNCTIONS)
-	$(AR) $@.tmp $(OBJS) $(FUNCTIONS) @DBASE_LIB@
+	$(AR) $@.tmp $(OBJS) $(FUNCTIONS)
 	$(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a
 	@rm -f $@.tmp
 	$(RANLIB) $(BINNAME)
@@ -114,9 +113,6 @@ libphp3.so: $(srcdir)/mod_php3.c libmodphp3-so.a
 regex/libregex.a:
 	(cd regex; $(MAKE) lib)
 
-dbase/libdbf.a:
-	(cd dbase; $(MAKE))
-
 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)
 
@@ -134,7 +130,6 @@ clean: clean-recursive
 	-rm -f $(FUNCTIONS) functions/ifx.c
 	-rm -f test/php.desc test/php.in test/php.out test/php.test
 	-rm -f test/a.tmp test/b.tmp test/test.dbm*
-	(cd dbase; $(MAKE) clean)
 
 distclean: clean distclean-recursive
 	-rm -f *-parser.[ch] *-scanner.c *.output
@@ -142,10 +137,9 @@ distclean: clean distclean-recursive
 	-rm -f Makefile Makefile.depend config.h build-defs.h
 	-rm -f libphp3.module stamp-h
 	-rm -f regex/*.o regex/*.a regex/*.ih
-	-rm -f dbase/*.o dbase/*.a
 	-rm -f doc/checkdoc doc/funcparse doc/version.ent
 	-rm -f do-conf test/test.log extra/gd/bdf2gdfont
-	-rm -f doc/Makefile regex/Makefile dbase/Makefile
+	-rm -f doc/Makefile regex/Makefile
 
 bench: $(BINNAME)
 	./$(BINNAME) -c. tests/bench.phtml
diff --git a/configure.in.in b/configure.in.in
index 46c9ef2abf..af10ae83c4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -315,7 +315,7 @@ AC_ARG_WITH(apxs,
         withval=apxs
     fi
     APXS="$withval"
-    APXS_LDFLAGS="@DBASE_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_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@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_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@"
     APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`"
     BINNAME=libphp3.so
     INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME"
@@ -414,13 +414,8 @@ AC_ARG_WITH(apache,
 	    APACHE_INCLUDE=-I$withval/src
 	    APACHE_TARGET=$withval/src
 	    BINNAME=libphp3.a
-	    if test "$with_dbase" = "yes"; then
-	      INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES dbase/libdbf.a $APACHE_TARGET"
-	      PHP_LIBS="-L. -lphp3 -ldbf"
-	    else
-	      INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET"
-	      PHP_LIBS="-L. -lphp3"
-	    fi
+	    INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET"
+	    PHP_LIBS="-L. -lphp3"
 	    AC_DEFINE(APACHE)
 	    AC_MSG_RESULT(yes - Apache 1.2.x)
 		STRONGHOLD=
@@ -435,13 +430,8 @@ AC_ARG_WITH(apache,
 			mkdir $APACHE_TARGET
 		fi
 	    BINNAME=libmodphp3.a
-	    if test "$with_dbase" = "yes"; then
-	      INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES dbase/libdbf.a $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-	      PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 -ldbf"
-	    else
-	      INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-	      PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
-		fi
+	    INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+	    PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
 	    AC_DEFINE(APACHE)
 	    AC_MSG_RESULT(yes - Apache 1.3.x)
 		STRONGHOLD=
@@ -466,13 +456,8 @@ AC_ARG_WITH(apache,
 			mkdir $APACHE_TARGET
 		fi
 	    BINNAME=libmodphp3.a
-	    if test "$with_dbase" = "yes"; then
-	      PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 -ldbf"
-	      INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES dbase/libdbf.a $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-	    else
-	      PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
-	      INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
-	    fi
+	    PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
+	    INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
 	    AC_DEFINE(APACHE)
 	    AC_MSG_RESULT(yes - Apache 1.3.x)
 		STRONGHOLD=
@@ -494,13 +479,8 @@ AC_ARG_WITH(apache,
 	    APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
 	    APACHE_TARGET=$withval/apache
 	    BINNAME=libmodphp3.a
-	    if test "$with_dbase" = "yes"; then
-	      PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 -ldbf"
-	      INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES dbase/libdbf.a $APACHE_TARGET"
-	    else
-	      PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
-	      INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET"
-	    fi
+	    PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
+	    INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET"
 		STRONGHOLD=-DSTRONGHOLD=1
 	    AC_DEFINE(APACHE)
 		AC_MSG_RESULT(yes - StrongHold)
@@ -1783,27 +1763,6 @@ dnl## AC_SUBST(FDFLIB_INCLUDE)
 INCLUDES="$INCLUDES $FDFLIB_INCLUDE"
 
 
-AC_MSG_CHECKING(whether to include the bundled dbase library)
-AC_ARG_WITH(dbase,
-[  --with-dbase            Include the bundled dbase library],
-[
-  if test "$withval" = "yes"; then
-	AC_MSG_RESULT(yes)
-	AC_DEFINE(DBASE,1)
-	DBASE_LIB=dbase/libdbf.a
-  else
-	AC_MSG_RESULT(no)
-	AC_DEFINE(DBASE,0)
-	DBASE_LIB=
-  fi
-],[
-  AC_MSG_RESULT(no)
-  AC_DEFINE(DBASE,0)
-  DBASE_LIB=
-])
-AC_SUBST(DBASE_LIB)
-
-
 AC_MSG_CHECKING(whether to include the bundled filePro support)
 AC_ARG_WITH(filepro,
 [  --with-filepro          Include the bundled read-only filePro support],[
@@ -1970,8 +1929,7 @@ PHP_OS=`uname`
 AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS")
 
 AC_OUTPUT(Makefile build-defs.h libphp3.module
-          scripts/mkextlib ext/Makefile
-          regex/Makefile dbase/Makefile
+          scripts/mkextlib regex/Makefile ext/Makefile
           @@EXT_MAKEFILES@@, [
 chmod +x scripts/mkextlib
 ], [
diff --git a/internal_functions.c b/internal_functions.c
index 09d78e57d1..bfdaad1d98 100644
--- a/internal_functions.c
+++ b/internal_functions.c
@@ -42,6 +42,7 @@
 
 #include "ext/standard/php3_standard.h"
 #include "ext/gd/php3_gd.h"
+#include "ext/dbase/dbase.h"
 
 #include "functions/php3_ifx.h"
 #include "functions/php3_ldap.h"
@@ -60,7 +61,6 @@
 #include "functions/post.h"
 #include "functions/php3_solid.h"
 #include "functions/adabasd.h"
-#include "functions/dbase.h"
 #include "functions/hw.h"
 #include "functions/filepro.h"
 #include "functions/db.h"
diff --git a/setup b/setup
index 0a9b30dffd..0d6bab48e3 100644
--- a/setup
+++ b/setup
@@ -357,9 +357,6 @@ define_option enable-unified-odbc 'Enable unified ODBC support?' yesno yes \
     instead.'
 fi
 
-define_option with-dbase 'dBase support? ' yesno no \
-'    Whether to use the bundled dbase library.'
-
 define_option with-filepro 'filePro support? ' yesno no \
 '    Whether to use the bundled filePro library.  Read-access only.'