diff options
| author | foobar <sniper@php.net> | 2005-04-14 21:17:20 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-04-14 21:17:20 +0000 |
| commit | 172f3af8edd7e44f0f889bd8c2ffb54c324cb02b (patch) | |
| tree | c0805b64cd56e3db97dc555d47e6f391f87e09fa /ext/odbc | |
| parent | 4f3b12b3fdcb1074d1d61b30aa8b27e3b32c1681 (diff) | |
| download | php-git-172f3af8edd7e44f0f889bd8c2ffb54c324cb02b.tar.gz | |
- Add support for latest Birdstep
Diffstat (limited to 'ext/odbc')
| -rw-r--r-- | ext/odbc/config.m4 | 25 | ||||
| -rw-r--r-- | ext/odbc/php_odbc.h | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index fa27f056d1..a97cf5d0d2 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -347,10 +347,35 @@ AC_ARG_WITH(birdstep, ODBC_INCDIR=$withval/include ODBC_LIBDIR=$withval/$PHP_LIBDIR 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) diff --git a/ext/odbc/php_odbc.h b/ext/odbc/php_odbc.h index 3eefbe06f4..d9ef253e07 100644 --- a/ext/odbc/php_odbc.h +++ b/ext/odbc/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 |