com php-src: Simplify ext/mbstring/libmbfl/config.h creation: ext/mbstring/config.m4 ext/mbstring/libmbfl/config.h.in
| From: | Peter Kokot | Date: | Sat, 11 May 2019 17:44:40 +0000 |
| Subject: | com php-src: Simplify ext/mbstring/libmbfl/config.h creation: ext/mbstring/config.m4 ext/mbstring/libmbfl/config.h.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-106127@lists.php.net to get a copy of this message | ||
Commit: 3a4df957937575eb4c8d0ae30f0126c4ed30055c
Author: Peter Kokot <peterkokot@gmail.com> Sat, 11 May 2019 02:26:29 +0200
Parents: ab257ed3201b8be0680b21cd9e3fc2c3e0c96ea2
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3a4df957937575eb4c8d0ae30f0126c4ed30055c
Log:
Simplify ext/mbstring/libmbfl/config.h creation
- The config.h.in is part of the standalone libmbfl library and it is
forked and bundled.
Changed paths:
M ext/mbstring/config.m4
D ext/mbstring/libmbfl/config.h.in
Diff:
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 0cc9c2f..893f75b 100644
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -16,10 +16,6 @@ AC_DEFUN([PHP_MBSTRING_ADD_INCLUDE], [
PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES $1"
])
-AC_DEFUN([PHP_MBSTRING_ADD_CONFIG_HEADER], [
- PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS $1"
-])
-
AC_DEFUN([PHP_MBSTRING_ADD_CFLAG], [
PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS $1"
])
@@ -41,21 +37,16 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
PHP_ADD_INCLUDE([$ext_builddir/$dir])
done
- if test "$ext_shared" = "no"; then
- out="php_config.h"
- else
- if test -f "$ext_builddir/config.h.in"; then
- out="$abs_builddir/config.h"
- else
- out="php_config.h"
- fi
+ out="php_config..h"
+
+ if test "$ext_shared" != "no" && test -f
"$ext_builddir/config.h.in"; then
+ out="$abs_builddir/config.h"
fi
- for cfg in $PHP_MBSTRING_EXTRA_CONFIG_HEADERS; do
- cat > $ext_builddir/$cfg <<EOF
+ cat > $ext_builddir/libmbfl/config.h <<EOF
#include "$out"
EOF
- done
+
PHP_MBSTRING_ADD_INSTALL_HEADERS([mbstring.h])
PHP_INSTALL_HEADERS([ext/mbstring], [$PHP_MBSTRING_INSTALL_HEADERS])
])
@@ -101,7 +92,6 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
PHP_MBSTRING_ADD_BUILD_DIR([libmbfl/nls])
PHP_MBSTRING_ADD_INCLUDE([libmbfl])
PHP_MBSTRING_ADD_INCLUDE([libmbfl/mbfl])
- PHP_MBSTRING_ADD_CONFIG_HEADER([libmbfl/config.h])
PHP_MBSTRING_ADD_SOURCES([
libmbfl/filters/html_entities.c
diff --git a/ext/mbstring/libmbfl/config.h.in b/ext/mbstring/libmbfl/config.h.in
deleted file mode 100644
index 0dcad47..0000000
--- a/ext/mbstring/libmbfl/config.h.in
+++ /dev/null
@@ -1,52 +0,0 @@
-/* config.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
- to 0 otherwise. */
-#undef HAVE_MALLOC
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
- and to 0 otherwise. */
-#undef HAVE_REALLOC
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
-/* Define to rpl_realloc if the replacement function should be used. */
-#undef realloc
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t