1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Autotools: Move PHP_ODBC_* defines to configuration header (#15708)

The PHP_ODBC_* defines are remains of the PHP 2 and 3 era where the ODBC
functionality was part of the PHP core and was later moved to an
extension. This moves these defines to a regular PHP configuration
header (php_config.h) as done in other extensions.
This commit is contained in:
Peter Kokot
2025-06-19 17:19:23 +02:00
committed by GitHub
parent 3ff6874658
commit 49dd61906a
3 changed files with 12 additions and 8 deletions

View File

@@ -52,6 +52,9 @@ PHP 8.5 INTERNALS UPGRADE NOTES
- Linux build system changes
. libdir is properly set when --libdir (ex: /usr/lib64) and --with-libdir (ex lib64)
configure options are used to ${libdir}/php (ex: /usr/lib64/php)
. PHP_ODBC_CFLAGS, PHP_ODBC_LFLAGS, PHP_ODBC_LIBS, PHP_ODBC_TYPE preprocessor
macros defined by ext/odbc are now defined in php_config.h instead of the
build-defs.h header.
========================
3. Module changes

View File

@@ -428,11 +428,16 @@ if test -n "$ODBC_TYPE"; then
AC_DEFINE([HAVE_UODBC], [1],
[Define to 1 if the PHP extension 'odbc' is available.])
AC_DEFINE_UNQUOTED([PHP_ODBC_CFLAGS], ["$ODBC_CFLAGS"],
[The compile options that PHP odbc extension was built with.])
AC_DEFINE_UNQUOTED([PHP_ODBC_LIBS], ["$ODBC_LIBS"],
[The libraries linker flags that PHP odbc extension was built with.])
AC_DEFINE_UNQUOTED([PHP_ODBC_LFLAGS], ["$ODBC_LFLAGS"],
[The linker flags that PHP odbc extension was built with.])
AC_DEFINE_UNQUOTED([PHP_ODBC_TYPE], ["$ODBC_TYPE"],
[The ODBC library used in the PHP odbc extension.])
PHP_SUBST([ODBC_SHARED_LIBADD])
AC_SUBST([ODBC_CFLAGS])
AC_SUBST([ODBC_LIBS])
AC_SUBST([ODBC_LFLAGS])
AC_SUBST([ODBC_TYPE])
PHP_NEW_EXTENSION([odbc],
[php_odbc.c odbc_utils.c],

View File

@@ -15,10 +15,6 @@
*/
#define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
#define PHP_ODBC_CFLAGS "@ODBC_CFLAGS@"
#define PHP_ODBC_LFLAGS "@ODBC_LFLAGS@"
#define PHP_ODBC_LIBS "@ODBC_LIBS@"
#define PHP_ODBC_TYPE "@ODBC_TYPE@"
#define PHP_PROG_SENDMAIL "@PROG_SENDMAIL@"
#define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@"
#define PHP_INCLUDE_PATH "@INCLUDE_PATH@"