From 8a33c1cacebbf7536d54b051c29a0f0c7b94077c Mon Sep 17 00:00:00 2001 From: Brian Bruns Date: Fri, 30 Nov 2001 22:12:31 +0000 Subject: [PATCH] Detect FreeTDS to work around different library sets --- ChangeLog | 4 ++++ ext/sybase_ct/config.m4 | 39 ++++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index dc29dc816f..a6da131b4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-11-29 Brian Bruns * ext/ldap/config.m4 diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4 index 81233ace39..4a025d649d 100644 --- 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 -- 2.50.1