Detect FreeTDS to work around different library sets

diff --git a/ChangeLog b/ChangeLog
index dc29dc816f238c7db00dd83356eb5a2b504e2131..a6da131b4d87c9a46c58741ae72b377e076d0c5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-29  Brian Bruns        <camber@ais.org
+
+    * ext/sybase_ct/config.m4: detect FreeTDS and adjust libs accordingly
+
 2001-11-29  Stig Venaas  <venaas@uninett.no>
 
     * ext/ldap/config.m4

diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4
index 81233ace39e6f2aecfe23f5fe32a4e34d591c4d2..4a025d649d2e87d9edd26bd9fb36382abf39ad81 100644 (file)
--- a/ext/sybase_ct/config.m4
+++ b/ext/sybase_ct/config.m4
@@ -26,21 +26,26 @@ if test "$PHP_SYBASE_CT" != "no"; then
   fi
   
   PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
-  PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
-  PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
-  PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
-  PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
-
-  SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
-
-  PHP_CHECK_LIBRARY(tcl, netg_errstr, [
-    PHP_ADD_LIBRARY(tcl,,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])
+  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"
+  else
+    PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
+    PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
+  
+    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
+  
+    PHP_CHECK_LIBRARY(tcl, netg_errstr, [
+      PHP_ADD_LIBRARY(tcl,,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])
+  fi
 fi