I have committed a little bit modified version of this
patch in all branches. Basically I just replaced your two
'uname' calls by using $host_alias and used $SHLIB_SUFFIX_NAME
instead of .so / .sl.
--Jani
On Mon, 11 Apr 2005, John Higgins wrote:
I would like to submit an update for the UODBC module in PHP 4 & 5. The
changes update PHP's UODBC module to work with the latest versions of
Birdstep's RDM Server DBMS, while maintaining compatibility with previously
supported versions. The update was necessary due to a change in Birdstep's
library names as well as new functionality in RDM Server. The changes
affect two files, and are detailed in the diff output below. As I would
like to update the latest versions of PHP 4 as well as PHP 5, I have pasted
the diff output for version 5 into this post, and will reply to this post
with the diff for PHP 4. Please let me know if I can do anything to make
this easier...
- John
PHP 5 diff
**********************************************************
Index: ext/odbc/config.m4
===================================================================
RCS file: /repository/php-src/ext/odbc/config.m4,v
retrieving revision 1.72
diff -u -r1.72 config.m4
--- ext/odbc/config.m4 10 Apr 2005 19:23:59 -0000 1.72
+++ ext/odbc/config.m4 11 Apr 2005 17:47:11 -0000
@@ -339,6 +339,22 @@
[
PHP_WITH_SHARED
+ ac_birdstep_uname_s=uname -s 2>/dev/null
+ ac_birdstep_uname_p=uname -p 2>/dev/null
+ case $ac_birdstep_uname_s in
+ AIX) AC_DEFINE(AIX,1,[ ]);;
+ HP-UX) AC_DEFINE(HPUX,1,[ ]);;
+ Linux) AC_DEFINE(LINUX,1,[ ]);;
+ QNX) AC_DEFINE(NEUTRINO,1,[ ]);;
+ SunOS)
+ if test "$ac_birdstep_uname_p" == "i386"; then
+ AC_DEFINE(ISOLARIS,1,[ ])
+ elif test "$ac_birdstep_uname_p" == "sparc"; then
+ AC_DEFINE(SOLARIS,1,[ ])
+ fi;;
+ UnixWare) AC_DEFINE(UNIXWARE,1,[ ]);;
+ esac
+
if test "$withval" != "no"; then
if test "$withval" = "yes"; then
ODBC_INCDIR=/usr/local/birdstep/include
@@ -350,7 +366,12 @@
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.so" -o -e
"$ODBC_LIBDIR/libCrdbc32.sl"; then
+
ODBC_LIBS="-lCrdbc32 -lCadm32 -lCncp32 -lCrm32 -lCsql32 -lCdict32 -lCrdm32
-lCrpc32 -lutil"
+ elif test -e "$ODBC_LIBDIR/libCrdbc.so" -o -e
"$ODBC_LIBDIR/libCrdbc.sl"; then
+
ODBC_LIBS="-lCrdbc -lCadm -lCncp -lCrm -lCsql -lCdict -lCrdm -lCrpc -lutil"
+ fi
+
AC_DEFINE(HAVE_BIRDSTEP,1,[ ])
AC_MSG_RESULT(yes)
Index: ext/odbc/php_odbc.h
===================================================================
RCS file: /repository/php-src/ext/odbc/php_odbc.h,v
retrieving revision 1.58
diff -u -r1.58 php_odbc.h
--- ext/odbc/php_odbc.h 8 Jan 2004 17:32:34 -0000 1.58
+++ ext/odbc/php_odbc.h 11 Apr 2005 17:47:11 -0000
@@ -33,8 +33,8 @@
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)
-# define PHP_ODBC_HAVE_FETCH_HASH 1
+#if defined(HAVE_DBMAKER) || defined(PHP_WIN32) || defined(HAVE_IBMDB2) ||
defined(HAVE_UNIXODBC) || defined(HAVE_BIRDSTEP)
+#define PHP_ODBC_HAVE_FETCH_HASH 1
#endif
/* user functions */