[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] =?utf-8?q?svn:_/php/php-src/trunk/ext/sybase=5Fct/_config.m4?=
From:       Timm_Friebe <thekid () php ! net>
Date:       2010-06-28 13:35:06
Message-ID: svn-thekid-1277732106-300806-571463315 () svn ! php ! net
[Download RAW message or body]

thekid                                   Mon, 28 Jun 2010 13:35:06 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=300806

Log:
- Added test for tds_sysdep_public.h and link against -lct only then
- Added test for libsybct64 and libsybct
# The former is a fix for newer versions of FreeTDS which no longer
# provide the tds.h - we need to distinguish in what we link against
# between FreeTDS and the official Sybase libraries, and this seems
# to do the job.
# The latter is the patch from bug #49276 (finally, and sorry)

Bug: http://bugs.php.net/49276 (Assigned) Sybase 15 incorrect library name references
      
Changed paths:
    U   php/php-src/trunk/ext/sybase_ct/config.m4

Modified: php/php-src/trunk/ext/sybase_ct/config.m4
===================================================================
--- php/php-src/trunk/ext/sybase_ct/config.m4	2010-06-28 13:29:21 UTC (rev 300805)
+++ php/php-src/trunk/ext/sybase_ct/config.m4	2010-06-28 13:35:06 UTC (rev 300806)
@@ -31,9 +31,45 @@
   fi

   PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
-  if test -f $SYBASE_CT_INCDIR/tds.h; then
+  if test -f $SYBASE_CT_INCDIR/tds.h -o -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; \
then  PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
+  else if test -f $SYBASE_CT_INCDIR/libsybct64; then
+    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]) +  else if test -f \
$SYBASE_CT_INCDIR/libsybct; 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)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]