[PHP-DEV] CVS update: php3 From: amitay (php-dev <email protected>)
Date: 04/23/98

Date: Thursday April 23, 1998 @ 18:02
Author: amitay

Update of /repository/php3
In directory asf:/tmp/cvs-serv19138

Modified Files:
        configure.in
Log Message:
Fix the problem of dbase library when compiling with apache. Dbase
library needs to be copied separately to the apache src directory since
adding it to libphp itself does not work. (Not too sure how to fix it
for PHP with APACI)

We might need to something similar for libregex also ! Can someone check
on that ?

Index: php3/configure.in
diff -c php3/configure.in:1.190 php3/configure.in:1.191
*** php3/configure.in:1.190 Tue Apr 21 18:19:57 1998
--- php3/configure.in Thu Apr 23 18:02:53 1998
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.190 1998/04/21 22:19:57 rasmus Exp $
  dnl Process this file with autoconf to produce a configure script.
  
  AC_INIT(main.c)
--- 1,4 ----
! dnl $Id: configure.in,v 1.191 1998/04/23 22:02:53 amitay Exp $
  dnl Process this file with autoconf to produce a configure script.
  
  AC_INIT(main.c)
***************
*** 217,223 ****
              APACHE_TARGET=$withval/src
              BINNAME=libphp3.a
                  PHP_LIBS="-L. -lphp3"
! INSTALL_IT="cp $BINNAME mod_php3.* libphp3.module $APACHE_TARGET"
              AC_DEFINE(APACHE)
              AC_MSG_RESULT(yes - Apache 1.2.x)
                  STRONGHOLD=
--- 217,227 ----
              APACHE_TARGET=$withval/src
              BINNAME=libphp3.a
                  PHP_LIBS="-L. -lphp3"
! if test "$with_dbase" != ""; then
! INSTALL_IT="cp $BINNAME mod_php3.* libphp3.module dbase/libdbf.a $APACHE_TARGET"
! else
! INSTALL_IT="cp $BINNAME mod_php3.* libphp3.module $APACHE_TARGET"
! fi
              AC_DEFINE(APACHE)
              AC_MSG_RESULT(yes - Apache 1.2.x)
                  STRONGHOLD=
***************
*** 233,239 ****
                  fi
              BINNAME=libmodphp3.a
                  PHP_LIBS="-Lmodules/php3 -L../modules/php3 -lmodphp3"
! INSTALL_IT="cp $BINNAME mod_php3.* libphp3.module $APACHE_TARGET; cp apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
              AC_DEFINE(APACHE)
              AC_MSG_RESULT(yes - Apache 1.3.x)
                  STRONGHOLD=
--- 237,247 ----
                  fi
              BINNAME=libmodphp3.a
                  PHP_LIBS="-Lmodules/php3 -L../modules/php3 -lmodphp3"
! if test "$with_dbase" != ""; then
! INSTALL_IT="cp $BINNAME mod_php3.* libphp3.module dbase/libdbf.a $APACHE_TARGET; cp apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
! else
! INSTALL_IT="cp $BINNAME mod_php3.* libphp3.module $APACHE_TARGET; cp apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
! fi
              AC_DEFINE(APACHE)
              AC_MSG_RESULT(yes - Apache 1.3.x)
                  STRONGHOLD=