thekid Wed, 07 Jul 2010 10:16:48 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301037
Log:
- MFT: Added -DSYB_LP64 to CFLAGS on 64 bit platforms
- MFT: Added checks for 64 bit versions of sybase libraries
- MFT: Added checks for sybase libraries prefixed with "libsyb"
Changed paths:
U php/php-src/branches/PHP_5_2/ext/sybase_ct/config.m4
Modified: php/php-src/branches/PHP_5_2/ext/sybase_ct/config.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/sybase_ct/config.m4 2010-07-07
10:15:24 UTC (rev 301036)
+++ php/php-src/branches/PHP_5_2/ext/sybase_ct/config.m4 2010-07-07
10:16:48 UTC (rev 301037)
@@ -8,7 +8,7 @@
if test "$PHP_SYBASE_CT" != "no"; then
- if test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then
+ if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" =
"no"; then
AC_MSG_ERROR([You can not use both --with-sybase and --with-sybase-ct in
same build!])
fi
@@ -31,9 +31,50 @@
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 || test -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"
+ elif 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)
+
+ ac_solid_uname_s=`uname -s 2>/dev/null`
+ case $ac_solid_uname_s in
+ *OSF*) ;; # Tru64/DEC OSF does NOT use the
SYB_LP64 define
+ *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; #
+ esac
+ 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_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
