Skip to content

Commit

Permalink
Simplify ext/mbstring/libmbfl/config.h creation
Browse files Browse the repository at this point in the history
- The config.h.in is part of the standalone libmbfl library and it is
  forked and bundled.
  • Loading branch information
petk committed May 11, 2019
1 parent ab257ed commit 3a4df95
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 68 deletions.
22 changes: 6 additions & 16 deletions ext/mbstring/config.m4
Expand Up @@ -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"
])
Expand All @@ -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])
])
Expand Down Expand Up @@ -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
Expand Down
52 changes: 0 additions & 52 deletions ext/mbstring/libmbfl/config.h.in

This file was deleted.

0 comments on commit 3a4df95

Please sign in to comment.