Patch sybase-configm4_updated.diff for Sybase-ct (ctlib) related Bug #45357

Patch version 2010-08-20 20:35 UTC

Obsoleted by patches:

• sybase-configm4_5.3.3.diff, revision 2010-08-23 14:14 UTC

Obsolete patches:

• sybase-configm4_updated.diff, revision 2010-08-20 17:58 UTC

• 2010-08-20 20:35 UTC [diff to current]
• 2010-08-20 17:58 UTC [diff to current]

Developer: royanee@yahoo.com

Index: ext/sybase_ct/config.m4
===================================================================
RCS file: /repository/php-src/ext/sybase_ct/config.m4,v
retrieving revision 1.15.4.1.2.1
diff -u -r1.15.4.1.2.1 config.m4
--- ext/sybase_ct/config.m4	1 Jul 2008 17:03:46 -0000	1.15.4.1.2.1
+++ ext/sybase_ct/config.m4	9 Nov 2008 13:11:09 -0000
@@ -34,6 +34,44 @@
   if test -f $SYBASE_CT_INCDIR/tds.h; then
     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+  elif test -f $SYBASE_CT_LIBDIR/libsybct64.so; then
+    CFLAGS="${CFLAGS} -DSYB_LP64"
+  
+    PHP_ADD_LIBRARY(sybcs64,, SYBASE_CT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(sybct64,, SYBASE_CT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(sybcomn64,, SYBASE_CT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(sybintl64,, SYBASE_CT_SHARED_LIBADD)
+  
+    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64"
+  
+    PHP_CHECK_LIBRARY(sybtcl64, netg_errstr, [
+      PHP_ADD_LIBRARY(sybtcl64,,SYBASE_CT_SHARED_LIBADD)
+    ],[ 
+      PHP_ADD_LIBRARY(sybtcl64,,SYBASE_CT_SHARED_LIBADD)
+    ],[ 
+      $SYBASE_CT_LIBS 
+    ])
+  
+    PHP_CHECK_LIBRARY(insck64, insck__getVdate, [PHP_ADD_LIBRARY(insck64,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
+    PHP_CHECK_LIBRARY(insck64, bsd_tcp,         [PHP_ADD_LIBRARY(insck64,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
+  elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then
+    PHP_ADD_LIBRARY(sybcs,, SYBASE_CT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(sybct,, SYBASE_CT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(sybcomn,, SYBASE_CT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(sybintl,, SYBASE_CT_SHARED_LIBADD)
+  
+    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl"
+  
+    PHP_CHECK_LIBRARY(sybtcl, netg_errstr, [
+      PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
+    ],[ 
+      PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
+    ],[ 
+      $SYBASE_CT_LIBS 
+    ])
+  
+    PHP_CHECK_LIBRARY(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
+    PHP_CHECK_LIBRARY(insck, bsd_tcp,         [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
   else
     PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)