Skip to content

Commit 269877f

Browse files
stigsbstigsb
committed
moved dbase into ext/
1 parent 6094128 commit 269877f

File tree

4 files changed

+16
-67
lines changed

4 files changed

+16
-67
lines changed

‎Makefile.in

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ OBJS = main.o internal_functions.o snprintf.o php3_sprintf.o \
6969
php_ini.o
7070

7171
FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.c \
72-
functions/crypt.c functions/db.c functions/dbase.c \
73-
functions/dl.c functions/filepro.c \
72+
functions/crypt.c functions/db.c functions/dl.c functions/filepro.c \
7473
functions/head.c functions/imap.c functions/mime.c \
7574
functions/msql.c functions/mysql.c \
7675
functions/oracle.c functions/oci8.c functions/pgsql.c \
@@ -84,7 +83,7 @@ FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.c \
8483

8584
FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
8685
PHPLIBS = -L@top_srcdir@/libzend -lzend -Lext -lphpext
87-
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@
86+
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@
8887

8988
all: $(BINNAME)
9089

@@ -97,12 +96,12 @@ all-recursive clean-recursive distclean-recursive:
9796
done && test -z "$$fail"
9897

9998
# CGI binary or fhttpd module
100-
php: all-recursive $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@
99+
php: all-recursive $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@
101100
$(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS)
102101

103102
# Apache modules
104103
libphp3.a libmodphp3.a libmodphp3-so.a: all-recursive $(OBJS) $(FUNCTIONS)
105-
$(AR) $@.tmp $(OBJS) $(FUNCTIONS) @DBASE_LIB@
104+
$(AR) $@.tmp $(OBJS) $(FUNCTIONS)
106105
$(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a
107106
@rm -f $@.tmp
108107
$(RANLIB) $(BINNAME)
@@ -114,9 +113,6 @@ libphp3.so: $(srcdir)/mod_php3.c libmodphp3-so.a
114113
regex/libregex.a:
115114
(cd regex; $(MAKE) lib)
116115

117-
dbase/libdbf.a:
118-
(cd dbase; $(MAKE))
119-
120116
functions/ifx.c: functions/ifx.ec
121117
(if test @INFORMIXDIR@; then esql -e @IFX_ESQL_FLAGS@ functions/ifx.ec; mv ifx.c functions; else touch functions/ifx.c; fi)
122118

@@ -134,18 +130,16 @@ clean: clean-recursive
134130
-rm -f $(FUNCTIONS) functions/ifx.c
135131
-rm -f test/php.desc test/php.in test/php.out test/php.test
136132
-rm -f test/a.tmp test/b.tmp test/test.dbm*
137-
(cd dbase; $(MAKE) clean)
138133

139134
distclean: clean distclean-recursive
140135
-rm -f *-parser.[ch] *-scanner.c *.output
141136
-rm -f config.status config.cache config.log
142137
-rm -f Makefile Makefile.depend config.h build-defs.h
143138
-rm -f libphp3.module stamp-h
144139
-rm -f regex/*.o regex/*.a regex/*.ih
145-
-rm -f dbase/*.o dbase/*.a
146140
-rm -f doc/checkdoc doc/funcparse doc/version.ent
147141
-rm -f do-conf test/test.log extra/gd/bdf2gdfont
148-
-rm -f doc/Makefile regex/Makefile dbase/Makefile
142+
-rm -f doc/Makefile regex/Makefile
149143

150144
bench: $(BINNAME)
151145
./$(BINNAME) -c. tests/bench.phtml

‎configure.in.in

Lines changed: 10 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ AC_ARG_WITH(apxs,
315315
withval=apxs
316316
fi
317317
APXS="$withval"
318-
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@"
318+
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@"
319319
APACHE_INCLUDE="-I`$APXS -q INCLUDEDIR`"
320320
BINNAME=libphp3.so
321321
INSTALL_IT="\$(APXS) -i -a -n php3 $BINNAME"
@@ -414,13 +414,8 @@ AC_ARG_WITH(apache,
414414
APACHE_INCLUDE=-I$withval/src
415415
APACHE_TARGET=$withval/src
416416
BINNAME=libphp3.a
417-
if test "$with_dbase" = "yes"; then
418-
INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES dbase/libdbf.a $APACHE_TARGET"
419-
PHP_LIBS="-L. -lphp3 -ldbf"
420-
else
421-
INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET"
422-
PHP_LIBS="-L. -lphp3"
423-
fi
417+
INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET"
418+
PHP_LIBS="-L. -lphp3"
424419
AC_DEFINE(APACHE)
425420
AC_MSG_RESULT(yes - Apache 1.2.x)
426421
STRONGHOLD=
@@ -435,13 +430,8 @@ AC_ARG_WITH(apache,
435430
mkdir $APACHE_TARGET
436431
fi
437432
BINNAME=libmodphp3.a
438-
if test "$with_dbase" = "yes"; then
439-
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"
440-
PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 -ldbf"
441-
else
442-
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"
443-
PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
444-
fi
433+
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"
434+
PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
445435
AC_DEFINE(APACHE)
446436
AC_MSG_RESULT(yes - Apache 1.3.x)
447437
STRONGHOLD=
@@ -466,13 +456,8 @@ AC_ARG_WITH(apache,
466456
mkdir $APACHE_TARGET
467457
fi
468458
BINNAME=libmodphp3.a
469-
if test "$with_dbase" = "yes"; then
470-
PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 -ldbf"
471-
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"
472-
else
473-
PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
474-
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"
475-
fi
459+
PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
460+
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"
476461
AC_DEFINE(APACHE)
477462
AC_MSG_RESULT(yes - Apache 1.3.x)
478463
STRONGHOLD=
@@ -494,13 +479,8 @@ AC_ARG_WITH(apache,
494479
APACHE_INCLUDE=-"I$withval/apache -I$withval/ssl/include"
495480
APACHE_TARGET=$withval/apache
496481
BINNAME=libmodphp3.a
497-
if test "$with_dbase" = "yes"; then
498-
PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3 -ldbf"
499-
INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES dbase/libdbf.a $APACHE_TARGET"
500-
else
501-
PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
502-
INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET"
503-
fi
482+
PHP_LIBS="-Lmodules/php3 -L../modules/php3 -L../../modules/php3 -lmodphp3"
483+
INSTALL_IT="mkdir -p $APACHE_TARGET; cp $BINNAME $APACHE_INSTALL_FILES $APACHE_TARGET"
504484
STRONGHOLD=-DSTRONGHOLD=1
505485
AC_DEFINE(APACHE)
506486
AC_MSG_RESULT(yes - StrongHold)
@@ -1783,27 +1763,6 @@ dnl## AC_SUBST(FDFLIB_INCLUDE)
17831763
INCLUDES="$INCLUDES $FDFLIB_INCLUDE"
17841764
17851765
1786-
AC_MSG_CHECKING(whether to include the bundled dbase library)
1787-
AC_ARG_WITH(dbase,
1788-
[ --with-dbase Include the bundled dbase library],
1789-
[
1790-
if test "$withval" = "yes"; then
1791-
AC_MSG_RESULT(yes)
1792-
AC_DEFINE(DBASE,1)
1793-
DBASE_LIB=dbase/libdbf.a
1794-
else
1795-
AC_MSG_RESULT(no)
1796-
AC_DEFINE(DBASE,0)
1797-
DBASE_LIB=
1798-
fi
1799-
],[
1800-
AC_MSG_RESULT(no)
1801-
AC_DEFINE(DBASE,0)
1802-
DBASE_LIB=
1803-
])
1804-
AC_SUBST(DBASE_LIB)
1805-
1806-
18071766
AC_MSG_CHECKING(whether to include the bundled filePro support)
18081767
AC_ARG_WITH(filepro,
18091768
[ --with-filepro Include the bundled read-only filePro support],[
@@ -1970,8 +1929,7 @@ PHP_OS=`uname`
19701929
AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS")
19711930
19721931
AC_OUTPUT(Makefile build-defs.h libphp3.module
1973-
scripts/mkextlib ext/Makefile
1974-
regex/Makefile dbase/Makefile
1932+
scripts/mkextlib regex/Makefile ext/Makefile
19751933
@@EXT_MAKEFILES@@, [
19761934
chmod +x scripts/mkextlib
19771935
], [

‎internal_functions.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
#include "ext/standard/php3_standard.h"
4444
#include "ext/gd/php3_gd.h"
45+
#include "ext/dbase/dbase.h"
4546

4647
#include "functions/php3_ifx.h"
4748
#include "functions/php3_ldap.h"
@@ -60,7 +61,6 @@
6061
#include "functions/post.h"
6162
#include "functions/php3_solid.h"
6263
#include "functions/adabasd.h"
63-
#include "functions/dbase.h"
6464
#include "functions/hw.h"
6565
#include "functions/filepro.h"
6666
#include "functions/db.h"

‎setup

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,6 @@ define_option enable-unified-odbc 'Enable unified ODBC support?' yesno yes \
357357
instead.'
358358
fi
359359

360-
define_option with-dbase 'dBase support? ' yesno no \
361-
' Whether to use the bundled dbase library.'
362-
363360
define_option with-filepro 'filePro support? ' yesno no \
364361
' Whether to use the bundled filePro library. Read-access only.'
365362

0 commit comments

Comments
 (0)