CVS update: php3
| From: | sas | Date: | Thu, 24 Jun 1999 13:18:51 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-7521@lists.php.net to get a copy of this message | ||
Date: Thursday June 24, 1999 @ 9:18
Author: sas
Update of /repository/php3
In directory php:/tmp/cvs-serv31264
Modified Files:
Makefile.in configure.in
Log Message:
fix for #1215
Index: php3/Makefile.in
diff -u php3/Makefile.in:1.324 php3/Makefile.in:1.325
--- php3/Makefile.in:1.324 Wed Jun 23 17:39:46 1999
+++ php3/Makefile.in Thu Jun 24 09:18:51 1999
@@ -24,7 +24,7 @@
# +----------------------------------------------------------------------+
#
-# $Id: Makefile.in,v 1.324 1999/06/23 21:39:46 sas Exp $
+# $Id: Makefile.in,v 1.325 1999/06/24 13:18:51 sas Exp $
#
prefix = @prefix@
@@ -53,6 +53,7 @@
APXS = @APXS@
APXS_LDFLAGS = @PHP_LIBS@ @APXS_LDFLAGS@ @LIBS@
WARNING_LEVEL = @WARNING_LEVEL@
+DBF_OBJS=dbase/dbf_head.o dbase/dbf_rec.o dbase/dbf_misc.o dbase/dbf_ndx.o
SOURCE = language-parser.tab.c language-scanner.c main.c php3_hash.c operators.c \
variables.c token_cache.c stack.c internal_functions.c \
@@ -108,15 +109,15 @@
php: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@
$(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(FUNCTIONS) $(LIBS)
-libphp3.a: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @DBASE_OBJS@
+libphp3.a: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @DBASE_LIB@
$(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_OBJS@
$(RANLIB) $(BINNAME)
-libmodphp3.a: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @DBASE_OBJS@
+libmodphp3.a: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @DBASE_LIB@
$(AR) $(BINNAME) $(OBJS) $(FUNCTIONS) @DBASE_OBJS@
$(RANLIB) $(BINNAME)
-libmodphp3-so.a: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @DBASE_OBJS@
+libmodphp3-so.a: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @DBASE_LIB@
$(AR) libmodphp3-so.a $(OBJS) $(FUNCTIONS) @DBASE_OBJS@
$(RANLIB) libmodphp3-so.a
Index: php3/configure.in
diff -u php3/configure.in:1.404 php3/configure.in:1.405
--- php3/configure.in:1.404 Tue Jun 22 22:45:50 1999
+++ php3/configure.in Thu Jun 24 09:18:51 1999
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.404 1999/06/23 02:45:50 jah Exp $
+dnl $Id: configure.in,v 1.405 1999/06/24 13:18:51 sas Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
@@ -1989,7 +1989,7 @@
AC_DEFINE(DBASE,1)
DBASE_LIB=dbase/libdbf.a
DBASE_LIBS="-L./dbase -ldbf"
- DBASE_OBJS="dbase/libdbf.a"
+ DBASE_OBJS="\$(DBF_OBJS)"
else
AC_MSG_RESULT(no)
AC_DEFINE(DBASE,0)