Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:15826
Return-Path: <jhiggins@birdstep.com>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 44657 invoked by uid 1010); 5 Apr 2005 21:45:35 -0000
Delivered-To: ezmlm-scan-internals@lists.php.net
Delivered-To: ezmlm-internals@lists.php.net
Received: (qmail 44640 invoked by uid 1007); 5 Apr 2005 21:45:35 -0000
Message-ID: <20050405214535.44619.qmail@lists.php.net>
To: internals@lists.php.net
Date: Tue, 5 Apr 2005 14:48:37 -0700
Lines: 75
X-Priority: 3
X-MSMail-Priority: Normal
X-Newsreader: Microsoft Outlook Express 6.00.2900.2180
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2180
X-RFC2646: Format=Flowed; Original
X-Posted-By: 67.139.146.250
Subject: PHP Patch submission 
From: jhiggins@birdstep.com ("John Higgins")

Hi all,
    I would like to submit a patch for PHP 4 as well as PHP 5.  The patch 
will update PHP's UODBC
module to work with more recent versions of Birdstep Technology's RDM Server 
product.  The files
affected are ext/odbc/config.m4 & ext/odbc/php_odbc.h.  Below is the diff 
output for the two files
based on the PHP 4 version, but the changes are the same for PHP 4 & PHP 5. 
If you have any
suggestions or feedback I would love to hear them, as I am new to 
automake/m4 etc...  I would also
like to know what to expect from here...  Will somebody take these changes 
and commit them?  Do I
need to do more before they'll be committed?  If they are committed, when 
will they find their way to
the public?

Thanks!

diff for config.m4

298c298,312
<
---
>   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
310c324,328
< 
    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 -lCrdbc32 -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 -lCrdbc -lCrm -lCsql -lCdict -lCrdm 
>  -lCrpc -lutil"
>     fi
312d329
<
506,508c523,527
<     ext_shared=$shared
<     PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
<     AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ])
---
>       ext_shared=$shared
>       PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
>     if test "$ODBC_TYPE" != "birdstep"; then
>       AC_DEFINE(HAVE_SQLDATASOURCES,1,[ ])
>     fi


diff for php_odbc.h
36c36
< #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)