Skip to content

Commit bcade7c

Browse files
author
foobar
committed
- Fixed header installing under phpize builds
1 parent 77e5a7e commit bcade7c

8 files changed

Lines changed: 53 additions & 27 deletions

File tree

‎Makefile.global‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ INSTALL_DATA = $(INSTALL) -m 644
55
DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main -I$(top_srcdir)
66
COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
77

8-
CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/
9-
INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS)
10-
118
all: $(all_targets)
129
@echo
1310
@echo "Build complete."
@@ -45,6 +42,31 @@ install-modules: build-modules
4542
@rm -f modules/*.la >/dev/null 2>&1
4643
@$(INSTALL) modules/* $(INSTALL_ROOT)$(EXTENSION_DIR)
4744

45+
install-headers:
46+
-@if test "$(INSTALL_HEADERS)"; then
47+
for i in $(INSTALL_HEADERS); do \
48+
i=`$(top_srcdir)/build/shtool path -d $$i`; \
49+
paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
50+
done; \
51+
$(mkinstalldirs) $$paths && \
52+
echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \
53+
for i in $(INSTALL_HEADERS); do \
54+
if test "$(PHP_PECL_EXTENSION)"; then \
55+
src=`echo $$i | $(SED) -e "s#ext/$(PHP_PECL_EXTENSION)/##g"`; \
56+
else \
57+
src=$$i; \
58+
fi; \
59+
if test -f "$(top_srcdir)/$$src"; then \
60+
$(INSTALL_DATA) $(top_srcdir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
61+
elif test -f "$(top_builddir)/$$src"; then \
62+
$(INSTALL_DATA) $(top_builddir)/$$src $(INSTALL_ROOT)$(phpincludedir)/$$i; \
63+
else \
64+
(cd $(top_srcdir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \
65+
cd $(top_builddir)/$$src && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
66+
fi \
67+
done; \
68+
fi
69+
4870
test: all
4971
-@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
5072
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \

‎acinclude.m4‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,13 @@ dnl ---------------------------------------------- CLI static module
971971
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
972972
fi
973973
PHP_ADD_BUILD_DIR($ext_builddir)
974+
975+
dnl Set for phpize builds only
976+
dnl ---------------------------
977+
if test "$ext_builddir" = "."; then
978+
PHP_PECL_EXTENSION=$1
979+
PHP_SUBST(PHP_PECL_EXTENSION)
980+
fi
974981
])
975982

976983
dnl
@@ -2375,15 +2382,15 @@ AC_DEFUN([PHP_INSTALL_HEADERS],[
23752382
ifelse([$2],[],[
23762383
for header_file in $1; do
23772384
PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [
2378-
INSTALL_EXT_HEADERS="$INSTALL_EXT_HEADERS $header_file"
2385+
INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
23792386
])
23802387
done
23812388
], [
23822389
header_path=$1
23832390
for header_file in $2; do
23842391
hp_hf="$header_path/$header_file"
23852392
PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
2386-
INSTALL_EXT_HEADERS="$INSTALL_EXT_HEADERS $hp_hf"
2393+
INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
23872394
])
23882395
done
23892396
])

‎configure.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@ PHP_SUBST(WARNING_LEVEL)
11881188
PHP_SUBST(PHP_FRAMEWORKS)
11891189
PHP_SUBST(PHP_FRAMEWORKPATH)
11901190
PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
1191-
PHP_SUBST(INSTALL_EXT_HEADERS)
1191+
PHP_SUBST(INSTALL_HEADERS)
11921192

11931193
old_CC=$CC
11941194

@@ -1257,6 +1257,8 @@ esac
12571257
PHP_SUBST(all_targets)
12581258
PHP_SUBST(install_targets)
12591259

1260+
PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/])
1261+
12601262
PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
12611263

12621264
PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \

‎ext/standard/config.m4‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,3 +492,6 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.
492492
filters.c proc_open.c sunfuncs.c streamsfuncs.c http.c)
493493

494494
PHP_ADD_MAKEFILE_FRAGMENT
495+
496+
PHP_INSTALL_HEADERS([ext/standard/])
497+

‎scripts/Makefile.frag‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,6 @@ install-build:
3131
$(INSTALL) $(BUILD_FILES_EXEC) $(INSTALL_ROOT)$(phpbuilddir) && \
3232
$(INSTALL_DATA) $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir))
3333

34-
install-headers:
35-
-@for i in $(INSTALL_HEADERS); do \
36-
i=`$(top_srcdir)/build/shtool path -d $$i`; \
37-
paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
38-
done; \
39-
$(mkinstalldirs) $$paths && \
40-
echo "Installing header files: $(INSTALL_ROOT)$(phpincludedir)/" && \
41-
for i in $(INSTALL_HEADERS); do \
42-
if test -f "$(top_srcdir)/$$i"; then \
43-
$(INSTALL_DATA) $(top_srcdir)/$$i $(INSTALL_ROOT)$(phpincludedir)/$$i; \
44-
elif test -f "$(top_builddir)/$$i"; then \
45-
$(INSTALL_DATA) $(top_builddir)/$$i $(INSTALL_ROOT)$(phpincludedir)/$$i; \
46-
else \
47-
(cd $(top_srcdir)/$$i && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i; \
48-
cd $(top_builddir)/$$i && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/$$i) 2>/dev/null || true; \
49-
fi \
50-
done; \
51-
cd $(top_srcdir)/sapi/embed && $(INSTALL_DATA) *.h $(INSTALL_ROOT)$(phpincludedir)/main
52-
5334
install-programs: $(builddir)/phpize $(builddir)/php-config
5435
@echo "Installing helper programs: $(INSTALL_ROOT)$(bindir)/"
5536
@for prog in $(bin_SCRIPTS); do \

‎scripts/man1/php-config.1.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ Extra libraries which PHP was compiled with
5151
Directory where extensions are searched by default
5252
.TP
5353
.PD 0
54+
.B \-\-include-dir
55+
Directory prefix where header files are installed by default
56+
.TP
57+
.PD 0
5458
.B \-\-php-binary
5559
Full path to php CLI/CGI binary
5660
.TP

‎scripts/php-config.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ case "$1" in
2424
echo $libs;;
2525
--extension-dir)
2626
echo $extension_dir;;
27+
--include-dir)
28+
echo $includedir;;
2729
--php-binary)
2830
echo $php_binary;;
2931
--version)
3032
echo $version;;
3133
*)
32-
echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--php-binary|--version]"
34+
echo "Usage: $0 [--prefix|--includes|--ldflags|--libs|--extension-dir|--include-dir|--php-binary|--version]"
3335
exit 1;;
3436
esac
3537

‎scripts/phpize.m4‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ AC_DEFUN([PHP_WITH_PHP_CONFIG],[
1616
])
1717
1818
prefix=`$PHP_CONFIG --prefix 2>/dev/null`
19+
phpincludedir=`$PHP_CONFIG --include-dir 2>/dev/null`
1920
INCLUDES=`$PHP_CONFIG --includes 2>/dev/null`
2021
EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
2122
PHP_EXECUTABLE=`$PHP_CONFIG --php-binary`
@@ -33,6 +34,8 @@ AC_DEFUN([PHP_WITH_PHP_CONFIG],[
3334
AC_MSG_RESULT($INCLUDES)
3435
AC_MSG_CHECKING(for PHP extension directory)
3536
AC_MSG_RESULT($EXTENSION_DIR)
37+
AC_MSG_CHECKING(for PHP installed headers prefix)
38+
AC_MSG_RESULT($phpincludedir)
3639
])
3740
dnl
3841
AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
@@ -74,7 +77,7 @@ enable_shared=yes
7477
AC_PROG_LIBTOOL
7578

7679
all_targets='$(PHP_MODULES)'
77-
install_targets=install-modules
80+
install_targets="install-modules install-headers"
7881
phplibdir="`pwd`/modules"
7982
CPPFLAGS="$CPPFLAGS -DHAVE_CONFIG_H"
8083
CFLAGS_CLEAN='$(CFLAGS)'
@@ -91,6 +94,7 @@ PHP_SUBST(exec_prefix)
9194
PHP_SUBST(libdir)
9295
PHP_SUBST(prefix)
9396
PHP_SUBST(phplibdir)
97+
PHP_SUBST(phpincludedir)
9498

9599
PHP_SUBST(CC)
96100
PHP_SUBST(CFLAGS)
@@ -109,6 +113,7 @@ PHP_SUBST(LDFLAGS)
109113
PHP_SUBST(SHARED_LIBTOOL)
110114
PHP_SUBST(LIBTOOL)
111115
PHP_SUBST(SHELL)
116+
PHP_SUBST(INSTALL_HEADERS)
112117

113118
PHP_GEN_BUILD_DIRS
114119
PHP_GEN_GLOBAL_MAKEFILE

0 commit comments

Comments
 (0)