cvs: /php4/ext/sybase_ct Makefile.am config.h.stub config.m4 php_sybase_ct.c php_sybase_ct.h setup.stub /php4/ext/sybase php3_sybase-ct.h sybase-ct.c
/php4 ChangeLog /php4/ext/sybase Makefile.am config.h.stub config.m4

zeev Thu Aug 12 20:14:16 1999 EDT Added files: /php4/ext/sybase_ct Makefile.am config.h.stub config.m4 php_sybase_ct.c php_sybase_ct.h setup.stub Removed files: /php4/ext/sybase php3_sybase-ct.h sybase-ct.c Modified files: /php4 ChangeLog /php4/ext/sybase Makefile.am config.h.stub config.m4 Log: Separate Sybase-CT from Sybase, and fix build process for Sybase-CT Index: php4/ChangeLog diff -u php4/ChangeLog:1.48 php4/ChangeLog:1.49 --- php4/ChangeLog:1.48 Mon Aug 9 14:33:22 1999 +++ php4/ChangeLog Thu Aug 12 20:14:15 1999 @@ -1,6 +1,9 @@ PHP 4.0 CHANGE LOG ChangeLog ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| +?? ?? 1999, Version 4.0 Beta 3 +- Fixed Sybase CT build process (Zeev) + August 9 1999, Version 4.0 Beta 2 - Fixed a problem when sending HTTP/1.x header lines using header() (Zeev) - Win32 builds now include the ODBC module built-in (Zeev) Index: php4/ext/sybase/Makefile.am diff -u php4/ext/sybase/Makefile.am:1.1 php4/ext/sybase/Makefile.am:1.2 --- php4/ext/sybase/Makefile.am:1.1 Wed Apr 21 22:48:26 1999 +++ php4/ext/sybase/Makefile.am Thu Aug 12 20:14:15 1999 @@ -1,6 +1,6 @@ -# $Id: Makefile.am,v 1.1 1999/04/22 02:48:26 ssb Exp $ +# $Id: Makefile.am,v 1.2 1999/08/13 00:14:15 zeev Exp $ INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend noinst_LIBRARIES=libphpext_sybase.a -libphpext_sybase_a_SOURCES=sybase.c sybase-ct.c +libphpext_sybase_a_SOURCES=sybase.c Index: php4/ext/sybase/config.h.stub diff -u php4/ext/sybase/config.h.stub:1.1 php4/ext/sybase/config.h.stub:1.2 --- php4/ext/sybase/config.h.stub:1.1 Wed Apr 21 22:48:26 1999 +++ php4/ext/sybase/config.h.stub Thu Aug 12 20:14:16 1999 @@ -2,5 +2,3 @@ #define HAVE_LIBDNET_STUB 0 #define HAVE_SYBASE 0 - -#define HAVE_SYBASE_CT 0 Index: php4/ext/sybase/config.m4 diff -u php4/ext/sybase/config.m4:1.2 php4/ext/sybase/config.m4:1.3 --- php4/ext/sybase/config.m4:1.2 Thu Jul 1 11:48:54 1999 +++ php4/ext/sybase/config.m4 Thu Aug 12 20:14:16 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.2 1999/07/01 15:48:54 sas Exp $ +dnl $Id: config.m4,v 1.3 1999/08/13 00:14:16 zeev Exp $ AC_MSG_CHECKING(for Sybase support) AC_ARG_WITH(sybase, @@ -23,48 +23,6 @@ AC_DEFINE(HAVE_LIBDNET_STUB) ]) AC_DEFINE(HAVE_SYBASE) - else - AC_MSG_RESULT(no) - fi -],[ - AC_MSG_RESULT(no) -]) - - -AC_MSG_CHECKING(for Sybase-CT support) -AC_ARG_WITH(sybase-ct, -[ --with-sybase-ct[=DIR] Include Sybase-CT support. DIR is the Sybase home - directory, defaults to /home/sybase.], -[ - if test "$withval" != "no"; then - AC_MSG_RESULT(yes) - if test -z "$SYBASE_LIBS"; then - PHP_EXTENSION(sybase) - fi - AC_DEFINE(HAVE_SYBASE_CT) - if test "$withval" = "yes"; then - SYBASE_CT_INCDIR=/home/sybase/include - SYBASE_CT_LIBDIR=/home/sybase/lib - else - SYBASE_CT_INCDIR=$withval/include - SYBASE_CT_LIBDIR=$withval/lib - fi - AC_ADD_INCLUDE($SYBASE_CT_INCDIR) - AC_ADD_LIBPATH($SYBASE_CT_LIBDIR) - AC_ADD_LIBRARY(cs) - AC_ADD_LIBRARY(ct) - AC_ADD_LIBRARY(comn) - AC_ADD_LIBRARY(intl) - SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl" - old_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR" - AC_CHECK_LIB(tcl, netg_errstr, - [ AC_ADD_LIBRARY(tcl) ], - [ AC_ADD_LIBRARY(sybtcl) ], - [ $SYBASE_CT_LIBS ]) - AC_CHECK_LIB(insck, insck__getVdate, - [ AC_ADD_LIBRARY(insck) ]) - LDFLAGS=$old_LDFLAGS else AC_MSG_RESULT(no) fi