cvs: php-src(PHP_4_3) /ext/odbc config.m4 php_odbc.h

sniper Thu Apr 14 17:17:49 2005 EDT Modified files: (Branch: PHP_4_3) /php-src/ext/odbc config.m4 php_odbc.h Log: MFH: - Add support for latest Birdstep http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.55.2.10&r2=1.55.2.11&ty=u Index: php-src/ext/odbc/config.m4 diff -u php-src/ext/odbc/config.m4:1.55.2.10 php-src/ext/odbc/config.m4:1.55.2.11 --- php-src/ext/odbc/config.m4:1.55.2.10 Tue Jan 18 16:21:16 2005 +++ php-src/ext/odbc/config.m4 Thu Apr 14 17:17:49 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.55.2.10 2005/01/18 21:21:16 tony2001 Exp $ +dnl $Id: config.m4,v 1.55.2.11 2005/04/14 21:17:49 sniper Exp $ dnl dnl @@ -223,7 +223,7 @@ AC_ARG_WITH(empress, [ --with-empress[=DIR] Include Empress support. DIR is the Empress base install directory, defaults to \$EMPRESSPATH. - From PHP4, this option only supports Empress Version + From PHP 4, this option only supports Empress Version 8.60 and above], [ PHP_WITH_SHARED @@ -255,7 +255,7 @@ [ --with-empress-bcs[=DIR] Include Empress Local Access support. DIR is the Empress base install directory, defaults to - \$EMPRESSPATH. From PHP4, this option only supports + \$EMPRESSPATH. From PHP 4, this option only supports Empress Version 8.60 and above.], [ PHP_WITH_SHARED @@ -313,10 +313,35 @@ ODBC_INCDIR=$withval/include ODBC_LIBDIR=$withval/lib fi + + case $host_alias in + *aix*[)] + AC_DEFINE(AIX,1,[ ]);; + *hpux*[)] + AC_DEFINE(HPUX,1,[ ]);; + *linux*[)] + AC_DEFINE(LINUX,1,[ ]);; + *qnx*[)] + AC_DEFINE(NEUTRINO,1,[ ]);; + i?86-*-solaris*[)] + AC_DEFINE(ISOLARIS,1,[ ]);; + sparc-*-solaris*[)] + AC_DEFINE(SOLARIS,1,[ ]);; + *unixware*[)] + AC_DEFINE(UNIXWARE,1,[ ]);; + esac + ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_TYPE=birdstep ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_LIBS="-lCadm -lCdict -lCenc -lCrdm -lCrpc -lCrdbc -lCrm -lCuapi -lutil" + + if test -e "$ODBC_LIBDIR/libCrdbc32.$SHLIB_SUFFIX_NAME"; then + ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32 -lCrpc32 -lutil" + elif test -e "$ODBC_LIBDIR/libCrdbc.$SHLIB_SUFFIX_NAME"; then + ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil" + fi + AC_DEFINE(HAVE_BIRDSTEP,1,[ ]) AC_MSG_RESULT(yes) http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.h?r1=1.48.4.5&r2=1.48.4.6&ty=u Index: php-src/ext/odbc/php_odbc.h diff -u php-src/ext/odbc/php_odbc.h:1.48.4.5 php-src/ext/odbc/php_odbc.h:1.48.4.6 --- php-src/ext/odbc/php_odbc.h:1.48.4.5 Mon Jul 14 12:13:30 2003 +++ php-src/ext/odbc/php_odbc.h Thu Apr 14 17:17:49 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.h,v 1.48.4.5 2003/07/14 16:13:30 sniper Exp $ */ +/* $Id: php_odbc.h,v 1.48.4.6 2005/04/14 21:17:49 sniper Exp $ */ #ifndef PHP_ODBC_H #define PHP_ODBC_H @@ -33,7 +33,7 @@ extern zend_module_entry odbc_module_entry; #define odbc_module_ptr &odbc_module_entry -#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) || defined(HAVE_IBMDB2) || defined(HAVE_UNIXODBC) +#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) || defined(HAVE_IBMDB2) || defined(HAVE_UNIXODBC) || defined(HAVE_BIRDSTEP) # define PHP_ODBC_HAVE_FETCH_HASH 1 #endif