cvs: php4 / ChangeLog /ext/sybase_ct config.m4

camber Fri Nov 30 17:12:31 2001 EDT Modified files: /php4 ChangeLog /php4/ext/sybase_ct config.m4 Log: Detect FreeTDS to work around different library sets Index: php4/ChangeLog diff -u php4/ChangeLog:1.874 php4/ChangeLog:1.875 --- php4/ChangeLog:1.874 Thu Nov 29 20:10:33 2001 +++ php4/ChangeLog Fri Nov 30 17:12:30 2001 @@ -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 Index: php4/ext/sybase_ct/config.m4 diff -u php4/ext/sybase_ct/config.m4:1.9 php4/ext/sybase_ct/config.m4:1.10 --- php4/ext/sybase_ct/config.m4:1.9 Fri Nov 30 13:59:59 2001 +++ php4/ext/sybase_ct/config.m4 Fri Nov 30 17:12:31 2001 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.9 2001/11/30 18:59:59 sniper Exp $ +dnl $Id: config.m4,v 1.10 2001/11/30 22:12:31 camber Exp $ dnl PHP_ARG_WITH(sybase-ct, for Sybase-CT support, @@ -26,21 +26,26 @@ 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