diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ext/sybase/Makefile.am | 2 | ||||
| -rw-r--r-- | ext/sybase/config.h.stub | 2 | ||||
| -rw-r--r-- | ext/sybase/config.m4 | 42 | ||||
| -rw-r--r-- | ext/sybase_ct/Makefile.am | 6 | ||||
| -rw-r--r-- | ext/sybase_ct/config.h.stub | 4 | ||||
| -rw-r--r-- | ext/sybase_ct/config.m4 | 42 | ||||
| -rw-r--r-- | ext/sybase_ct/php_sybase_ct.c (renamed from ext/sybase/sybase-ct.c) | 2 | ||||
| -rw-r--r-- | ext/sybase_ct/php_sybase_ct.h (renamed from ext/sybase/php3_sybase-ct.h) | 2 | ||||
| -rw-r--r-- | ext/sybase_ct/setup.stub | 6 |
10 files changed, 65 insertions, 46 deletions
@@ -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) diff --git a/ext/sybase/Makefile.am b/ext/sybase/Makefile.am index 97c3e06f8f..1f75a648f2 100644 --- a/ext/sybase/Makefile.am +++ b/ext/sybase/Makefile.am @@ -2,5 +2,5 @@ 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 diff --git a/ext/sybase/config.h.stub b/ext/sybase/config.h.stub index 15ce4496bc..85202aa97d 100644 --- a/ext/sybase/config.h.stub +++ b/ext/sybase/config.h.stub @@ -2,5 +2,3 @@ #define HAVE_LIBDNET_STUB 0 #define HAVE_SYBASE 0 - -#define HAVE_SYBASE_CT 0 diff --git a/ext/sybase/config.m4 b/ext/sybase/config.m4 index c877604069..8de191127f 100644 --- a/ext/sybase/config.m4 +++ b/ext/sybase/config.m4 @@ -29,45 +29,3 @@ AC_ARG_WITH(sybase, ],[ 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 -],[ - AC_MSG_RESULT(no) -]) diff --git a/ext/sybase_ct/Makefile.am b/ext/sybase_ct/Makefile.am new file mode 100644 index 0000000000..7b32991c10 --- /dev/null +++ b/ext/sybase_ct/Makefile.am @@ -0,0 +1,6 @@ +# $Id$ + +INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend +noinst_LIBRARIES=libphpext_sybase_ct.a +libphpext_sybase_ct_a_SOURCES=php_sybase_ct.c + diff --git a/ext/sybase_ct/config.h.stub b/ext/sybase_ct/config.h.stub new file mode 100644 index 0000000000..7edaee454c --- /dev/null +++ b/ext/sybase_ct/config.h.stub @@ -0,0 +1,4 @@ +/* Define if you have libdnet_stub (used for Sybase support) */ +#define HAVE_LIBDNET_STUB 0 + +#define HAVE_SYBASE_CT 0 diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4 new file mode 100644 index 0000000000..d2cde0d9ca --- /dev/null +++ b/ext/sybase_ct/config.m4 @@ -0,0 +1,42 @@ +dnl $Id$ + +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_ct) + 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 +],[ + AC_MSG_RESULT(no) +]) diff --git a/ext/sybase/sybase-ct.c b/ext/sybase_ct/php_sybase_ct.c index d5309e8a96..4ea71533e6 100644 --- a/ext/sybase/sybase-ct.c +++ b/ext/sybase_ct/php_sybase_ct.c @@ -21,7 +21,7 @@ #include "php.h" -#include "php3_sybase-ct.h" +#include "php_sybase_ct.h" #include "ext/standard/php3_standard.h" #include "php_globals.h" diff --git a/ext/sybase/php3_sybase-ct.h b/ext/sybase_ct/php_sybase_ct.h index f02e7cf800..d404aaf279 100644 --- a/ext/sybase/php3_sybase-ct.h +++ b/ext/sybase_ct/php_sybase_ct.h @@ -120,4 +120,6 @@ extern sybct_module php3_sybct_module; #endif +#define phpext_sybase_ct_ptr sybct_module_ptr + #endif /* _PHP3_SYBASE_CT_H */ diff --git a/ext/sybase_ct/setup.stub b/ext/sybase_ct/setup.stub new file mode 100644 index 0000000000..8d549cdd29 --- /dev/null +++ b/ext/sybase_ct/setup.stub @@ -0,0 +1,6 @@ +# $Source$ +# $Id$ + +define_option with-sybase-ct 'Sybase-CT support?' yesnodir \ + 'no /home/sybase Sybase-CT install' \ +' Whether to build PHP with Sybase-CT support.' |