[PATCH] Bug #30593, --with-ingres option generates broken Makefile
| From: | Croker, Grant | Date: | Mon, 04 Apr 2005 08:03:50 +0000 |
| Subject: | [PATCH] Bug #30593, --with-ingres option generates broken Makefile | ||
| Groups: | php.internals | ||
| Request: | Send a blank email to internals+get-15789@lists.php.net to get a copy of this message | ||
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
===================================================================
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