Separate Sybase-CT from Sybase, and fix build process for Sybase-CT

diff --git a/ChangeLog b/ChangeLog
index 596c30c2a1cd27d7bb7eebd87fd504171c27e00c..fedbdf822094b99d8e9abb632b78118157598bd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 97c3e06f8f2064222b86bbe0812c43cec469b21e..1f75a648f2afb04720ed8b7fc1c4e669fcd68dd0 100644 (file)
--- 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 15ce4496bcd7580c391704aca1b09bbc9d58a136..85202aa97daf4be225c69086b1487b4fe72df013 100644 (file)
--- 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 c8776040690e9ec203df097f473ef4e4e79e3f01..8de191127f6e20c928dcc786f7b271342ce6ffa8 100644 (file)
--- 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 (file)
index 0000000..7b32991
--- /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 (file)
index 0000000..7edaee4
--- /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 (file)
index 0000000..d2cde0d
--- /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
similarity index 99%
rename from ext/sybase/sybase-ct.c
rename to ext/sybase_ct/php_sybase_ct.c
index d5309e8a96e50686c89225d8190cfd09f379f5e0..4ea71533e635f68974976efe59a31eb8ae462931 100644 (file)
--- 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
similarity index 98%
rename from ext/sybase/php3_sybase-ct.h
rename to ext/sybase_ct/php_sybase_ct.h
index f02e7cf8009dc6e32a9e21422c52ba7fe24cecf0..d404aaf279e5c9da5c856f2921073d438b55ec56 100644 (file)
--- 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 (file)
index 0000000..8d549cd
--- /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.'