CVS update: php3

Date: Friday June 25, 1999 @ 19:33 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv19011 Modified Files: Makefile.in configure.in libphp3.module.in Log Message: final autoconf work on php3. let's look forward Index: php3/Makefile.in diff -u php3/Makefile.in:1.326 php3/Makefile.in:1.327 --- php3/Makefile.in:1.326 Fri Jun 25 17:22:52 1999 +++ php3/Makefile.in Fri Jun 25 19:33:54 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.326 1999/06/25 21:22:52 rasmus Exp $ +# $Id: Makefile.in,v 1.327 1999/06/25 23:33:54 sas Exp $ # prefix = @prefix@ @@ -38,7 +38,7 @@ AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ -INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @CPDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @IBASE_INCLUDE@ @INCLUDES@ +INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @CPDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @IBASE_INCLUDE@ @INCLUDES@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ @@ -104,7 +104,7 @@ FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) -LIBS = @RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @PCRE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @EXTRA_LIBS@ @LIBS@ +LIBS = @RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @PCRE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @EXTRA_LIBS@ @LIBS@ all: $(BINNAME) php: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@ Index: php3/configure.in diff -u php3/configure.in:1.406 php3/configure.in:1.407 --- php3/configure.in:1.406 Fri Jun 25 17:22:52 1999 +++ php3/configure.in Fri Jun 25 19:33:54 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.406 1999/06/25 21:22:52 rasmus Exp $ +dnl $Id: configure.in,v 1.407 1999/06/25 23:33:54 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -254,7 +254,7 @@ withval=apxs fi APXS="$withval" - APXS_LDFLAGS="@RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@ @PCRE_LIB@ @EXTRA_LIBS@" + APXS_LDFLAGS="@RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @DBM_LIB@ @DBASE_LIBS@ @PCRE_LIB@ @EXTRA_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so @@ -613,7 +613,8 @@ else IMAP_INC_DIR=$withval/include fi - if test ! -f $IMAP_INC_DIR/mail.h; then + + if test ! -f $IMAP_INC_DIR/mail.h; then AC_MSG_ERROR(could not find mail.h in $IMAP_INC_DIR !) fi if test ! -f $IMAP_INC_DIR/rfc822.h; then @@ -622,40 +623,19 @@ if test ! -f $IMAP_INC_DIR/linkage.h; then AC_MSG_ERROR(could not find linkage.h in $IMAP_INC_DIR !) fi - if test -n "$APXS"; then - if test -f $IMAP_DIR/lib/libimap.a; then - IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -limap" -# for FreeBSD - elif test -f $IMAP_DIR/lib/libc-client4.a; then - IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -lc-client4" - elif test ! -f $IMAP_DIR/lib/libc-client.a; then - if test ! -f $IMAP_DIR/lib/libc-client4.so; then - AC_MSG_ERROR(You need to copy or link $IMAP_DIR/lib/c-client.a to $IMAP_DIR/lib/libc-client.a) - else - IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -lc-client4" - fi - else - IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -lc-client" - fi + + if test -f "$IMAP_DIR/lib/libimap.a" ; then + AC_ADD_LIBRARY_WITH_PATH(imap, $IMAP_DIR/lib) + elif test -f "$IMAP_DIR/lib/libc-client4.a" || test -f "$IMAP_DIR/lib/libc-client4.so"; then + AC_ADD_LIBRARY_WITH_PATH(c-client4, $IMAP_DIR/lib) + elif test -f "$IMAP_DIR/lib/libc-client.a" || test -f "$IMAP_DIR/lib/libc-client.so"; then + AC_ADD_LIBRARY_WITH_PATH(c-client, $IMAP_DIR/lib) + elif test -f "$IMAP_DIR/lib/c-client.a" ; then + EXTRA_LIBS="$EXTRA_LIBS $IMAP_DIR/lib/c-client.a" else - if test -f $IMAP_DIR/lib/libimap.a; then - IMAP_LIBS="-L$IMAP_DIR/lib -limap" -# for FreeBSD - elif test -f $IMAP_DIR/lib/libc-client4.a; then - IMAP_LIBS="${apxs_runpath_switch}$IMAP_DIR/lib' -L$IMAP_DIR/lib -lc-client4" - elif test ! -f $IMAP_DIR/lib/c-client.a; then - if test ! -f $IMAP_DIR/lib/libc-client4.so; then - AC_MSG_ERROR(could not find c-client.a in $IMAP_DIR/lib !) - else - IMAP_LIBS="${ld_runpath_switch}$IMAP_DIR/lib -L$IMAP_DIR/lib -lc-client4" - fi - else - IMAP_LIBS="-L$IMAP_DIR/lib $IMAP_DIR/lib/c-client.a" - fi - fi - IMAP_INCLUDE="-I$IMAP_INC_DIR/" - AC_SUBST(IMAP_INCLUDE) - AC_SUBST(IMAP_LIBS) + AC_MSG_ERROR(Please copy or link $IMAP_DIR/lib/c-client.a to $IMAP_DIR/lib/libc-client.a) + fi + AC_ADD_INCLUDE($IMAP_INC_DIR) AC_DEFINE(HAVE_IMAP) AC_MSG_RESULT(yes) else @@ -954,11 +934,7 @@ # Oracle libs - nightmare :-) ORACLE_LIBDIR=lib - if test -n "$APXS"; then - ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${apxs_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR'" - else - ORACLE_LFLAGS="-L$ORACLEINST_TOP/$ORACLE_LIBDIR ${ld_runpath_switch}$ORACLEINST_TOP/$ORACLE_LIBDIR" - fi + AC_ADD_LIBPATH($ORACLEINST_TOP/$ORACLE_LIBDIR) if test -f "$ORACLEINST_TOP/rdbms/lib/sysliblist" then ORA_SYSLIB="cat $ORACLEINST_TOP/rdbms/lib/sysliblist" @@ -1495,13 +1471,8 @@ MCK_INCDIR=$withval/c-api MCK_LIBDIR=$withval/c-api/lib fi - MCK_INCLUDE=-I$MCK_INCDIR - if test -n "$APXS"; then - MCK_LFLAGS="-L$MCK_LIBDIR ${apxs_runpath_switch}$MCK_LIBDIR'" - else - MCK_LFLAGS="-L$MCK_LIBDIR ${ld_runpath_switch}$MCK_LIBDIR" - fi - MCK_LIBS="-lmckcrypto" + AC_ADD_LIBRARY_WITH_PATH(mckcrypto, $MCK_LIBDIR) + AC_ADD_INCLUDE($MCK_INCDIR) AC_DEFINE(HAVE_MCK) Index: php3/libphp3.module.in diff -u php3/libphp3.module.in:1.27 php3/libphp3.module.in:1.28 --- php3/libphp3.module.in:1.27 Sun Jun 20 14:14:53 1999 +++ php3/libphp3.module.in Fri Jun 25 19:33:55 1999 @@ -1,7 +1,7 @@ Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ - LIBS="@RPATHS@ @PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @VELOCIS_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @LIBS@ $LIBS @DBM_LIB@ @EXTRA_LIBS@" + LIBS="@RPATHS@ @PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @VELOCIS_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @LIBS@ $LIBS @DBM_LIB@ @EXTRA_LIBS@" RULE_HIDE=yes ConfigEnd