]>
Commit | Line | Data |
---|---|---|
c665953a JB |
1 | --- php-4.2.2/ext/mysql/config.m4.orig Fri Aug 9 23:49:00 2002 |
2 | +++ php-4.2.2/ext/mysql/config.m4 Sat Aug 10 00:05:40 2002 | |
3 | @@ -49,6 +49,7 @@ | |
4 | [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory. | |
5 | If unspecified, the bundled MySQL library will be used.], yes) | |
6 | ||
7 | +PHP_REQUIRE_CXX | |
8 | if test "$PHP_MYSQL" != "no"; then | |
9 | AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) | |
10 | if test "$PHP_SAFE_MODE" = "yes"; then | |
62c5b34f ER |
11 | --- php-4.4.0/configure.in~ 2005-07-25 00:22:36.000000000 +0300 |
12 | +++ php-4.4.0/configure.in 2005-07-25 01:05:09.000000000 +0300 | |
13 | @@ -844,6 +844,9 @@ | |
14 | dnl ------------------------------------------------------------------------- | |
15 | ||
16 | if test "$PHP_VERSIONING" = "yes"; then | |
17 | + if test -n "$PHP_MODULES"; then | |
18 | + AC_MSG_ERROR([--enable-versioning cannot be used with shared modules]) | |
19 | + fi | |
20 | test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym" | |
21 | if test -f "$PHP_SYM_FILE"; then | |
22 | EXTRA_LDFLAGS="-export-symbols $PHP_SYM_FILE $EXTRA_LDFLAGS" |