Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:15789 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 36242 invoked by uid 1010); 4 Apr 2005 08:03:55 -0000 Delivered-To: ezmlm-scan-internals@lists.php.net Delivered-To: ezmlm-internals@lists.php.net Received: (qmail 36227 invoked from network); 4 Apr 2005 08:03:55 -0000 Received: from unknown (HELO ca.com) (127.0.0.1) by localhost with SMTP; 4 Apr 2005 08:03:55 -0000 X-Host-Fingerprint: 130.119.248.68 mail16.ca.com Windows 2000 SP4, XP SP1 Received: from ([130.119.248.68:42028] helo=mail16.ca.com) by pb1.pair.com (ecelerity HEAD r(5268)) with SMTP id AF/AA-19272-9E4F0524 for ; Mon, 04 Apr 2005 04:03:54 -0400 Received: from ukslms22.ca.com ([130.119.9.26]) by mail16.ca.com with Microsoft SMTPSVC(5.0.2195.6713); Mon, 4 Apr 2005 09:03:50 +0100 X-MimeOLE: Produced By Microsoft Exchange V6.0.6603.0 content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Date: Mon, 4 Apr 2005 09:03:50 +0100 Message-ID: <08237065FA027340B731E57099097854038881A2@ukslms22.ca.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH] Bug #30593, --with-ingres option generates broken Makefile Thread-Index: AcU47NZG7EXdFaZbRcSQFsNPJlrHKQ== To: X-OriginalArrivalTime: 04 Apr 2005 08:03:50.0497 (UTC) FILETIME=[D6138D10:01C538EC] Subject: [PATCH] Bug #30593, --with-ingres option generates broken Makefile From: Grant.Croker@ca.com ("Croker, Grant") The following patch should fix bug 30593. The original config.m4 uses Ingres' static libs which need libpthread.a to be linked in as well. Changing it to use Ingres's shared libs resolves this. This fix can be applied to both PHP 4 and 5. Index: ext/ingres_ii/config.m4 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /repository/php-src/ext/ingres_ii/config.m4,v retrieving revision 1.8.4.1 diff -u -b -w -B -d -r1.8.4.1 config.m4 --- ext/ingres_ii/config.m4 23 Jan 2003 05:33:17 -0000 1.8.4.1 +++ ext/ingres_ii/config.m4 21 Mar 2005 15:35:13 -0000 @@ -29,7 +29,9 @@ AC_MSG_ERROR(Cannot find libiiapi.a under $II_DIR/lib) fi - PHP_ADD_LIBRARY_WITH_PATH(iiapi, $II_LIB_DIR, II_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(ingres, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(iiapi.1, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(q.1, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(frame.1, $II_LIB_DIR, II_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(compat.1, $II_LIB_DIR, II_SHARED_LIBADD) PHP_ADD_INCLUDE($II_INC_DIR) fi