CVS update: php3

Date: Sunday February 7, 1999 @ 3:01 Author: rasmus Update of /repository/php3 In directory asf:/home/rasmus/php3 Modified Files: Makefile.in configure.in Log Message: More apxs work Index: php3/Makefile.in diff -c php3/Makefile.in:1.289 php3/Makefile.in:1.290 *** php3/Makefile.in:1.289 Sun Feb 7 01:13:14 1999 --- php3/Makefile.in Sun Feb 7 03:00:14 1999 *************** *** 24,30 **** # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.289 1999/02/07 06:13:14 rasmus Exp $ # prefix = @prefix@ --- 24,30 ---- # +----------------------------------------------------------------------+ # ! # $Id: Makefile.in,v 1.290 1999/02/07 08:00:14 rasmus Exp $ # prefix = @prefix@ *************** *** 50,56 **** YACC = @YACC@ MAINT = @MAINT@ APXS = @APXS@ ! APXS_LDFLAGS = @PHP_LIBS@ @APXS_LDFLAGS@ WARNING_LEVEL = @WARNING_LEVEL@ SOURCE = language-parser.tab.c language-scanner.c main.c php3_hash.c operators.c \ --- 50,56 ---- YACC = @YACC@ MAINT = @MAINT@ APXS = @APXS@ ! APXS_LDFLAGS = @PHP_LIBS@ @APXS_LDFLAGS@ @LIBS@ WARNING_LEVEL = @WARNING_LEVEL@ SOURCE = language-parser.tab.c language-scanner.c main.c php3_hash.c operators.c \ Index: php3/configure.in diff -c php3/configure.in:1.312 php3/configure.in:1.313 *** php3/configure.in:1.312 Sun Feb 7 01:13:32 1999 --- php3/configure.in Sun Feb 7 03:00:32 1999 *************** *** 1,4 **** ! dnl $Id: configure.in,v 1.312 1999/02/07 06:13:32 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.313 1999/02/07 08:00:32 rasmus Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) *************** *** 224,230 **** withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @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_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @REGEX_LIB@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so --- 224,230 ---- withval=apxs fi APXS="$withval" ! APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @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_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LIBS@ @DBM_LIB@ @IMAP_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so *************** *** 527,564 **** AC_ARG_WITH(imap, [ --with-imap[=DIR] Include IMAP support (DIR is IMAP's include dir and c-client.a dir).], [ ! if test "$withval" != "no"; then ! if test "$withval" = "yes"; then ! IMAP_DIR=/usr/local ! else ! IMAP_DIR=$withval ! fi ! if test ! -f $IMAP_DIR/include/mail.h; then ! AC_MSG_ERROR(could not find mail.h in $IMAP_DIR/include !) ! fi ! if test ! -f $IMAP_DIR/include/rfc822.h; then ! AC_MSG_ERROR(could not find rfc822.h in $IMAP_DIR/include !) ! fi ! if test ! -f $IMAP_DIR/include/linkage.h; then ! AC_MSG_ERROR(could not find linkage.h in $IMAP_DIR/include !) ! fi ! if 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 !) ! fi ! fi ! IMAP_INCLUDE="-I$IMAP_DIR/include/" ! IMAP_LIBS="$IMAP_DIR/lib/c-client.a" ! if test -f $IMAP_DIR/lib/libc-client4.so; then ! IMAP_LIBS=" -lc-client4 " ! fi AC_SUBST(IMAP_INCLUDE) AC_SUBST(IMAP_LIBS) AC_DEFINE(HAVE_IMAP) AC_MSG_RESULT(yes) else ! AC_MSG_ERROR(could not find imap library!) ! fi ],[ AC_MSG_RESULT(no) ]) --- 527,576 ---- AC_ARG_WITH(imap, [ --with-imap[=DIR] Include IMAP support (DIR is IMAP's include dir and c-client.a dir).], [ ! if test "$withval" != "no"; then ! if test "$withval" = "yes"; then ! IMAP_DIR=/usr/local ! else ! IMAP_DIR=$withval ! fi ! if test ! -f $IMAP_DIR/include/mail.h; then ! AC_MSG_ERROR(could not find mail.h in $IMAP_DIR/include !) ! fi ! if test ! -f $IMAP_DIR/include/rfc822.h; then ! AC_MSG_ERROR(could not find rfc822.h in $IMAP_DIR/include !) ! fi ! if test ! -f $IMAP_DIR/include/linkage.h; then ! AC_MSG_ERROR(could not find linkage.h in $IMAP_DIR/include !) ! fi ! if($APXS); then ! if 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 rename $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 ! else ! if 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_DIR/include/" AC_SUBST(IMAP_INCLUDE) AC_SUBST(IMAP_LIBS) AC_DEFINE(HAVE_IMAP) AC_MSG_RESULT(yes) else ! AC_MSG_RESULT(no) ! fi ],[ AC_MSG_RESULT(no) ]) -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net