Skip to content

Commit fe8800d

Browse files
committed
implement @bukka's suggestion
1 parent 4cac241 commit fe8800d

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

build/php.m4

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,23 @@ AC_DEFUN([PHP_BUILD_SHARED],[
764764
php_lo=$shared_lo
765765
])
766766

767+
dnl
768+
dnl PHP_BUILD_SHARED_DYLIB
769+
dnl
770+
AC_DEFUN([PHP_BUILD_SHARED_DYLIB],[
771+
PHP_BUILD_PROGRAM
772+
OVERALL_TARGET=libphp.dylib
773+
php_sapi_module=shared
774+
775+
php_c_pre=$shared_c_pre
776+
php_c_meta=$shared_c_meta
777+
php_c_post=$shared_c_post
778+
php_cxx_pre=$shared_cxx_pre
779+
php_cxx_meta=$shared_cxx_meta
780+
php_cxx_post=$shared_cxx_post
781+
php_lo=$shared_lo
782+
])
783+
767784
dnl
768785
dnl PHP_BUILD_STATIC
769786
dnl
@@ -876,6 +893,7 @@ AC_DEFUN([PHP_SELECT_SAPI],[
876893
case "$2" in
877894
static[)] PHP_BUILD_STATIC;;
878895
shared[)] PHP_BUILD_SHARED;;
896+
shared-dylib[)] PHP_BUILD_SHARED_DYLIB;;
879897
bundle[)] PHP_BUILD_BUNDLE;;
880898
esac
881899
install_sapi="install-sapi"

sapi/embed/config.m4

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ if test "$PHP_EMBED" != "no"; then
1111
case "$PHP_EMBED" in
1212
yes|shared)
1313
LIBPHP_CFLAGS="-shared"
14-
PHP_EMBED_TYPE=shared
15-
AS_CASE(["$host_alias"], [*darwin*], [SAPI_SHARED="libs/libphp.dylib"], [])
14+
AS_CASE(["$host_alias"], [*darwin*], [
15+
SAPI_SHARED="libs/libphp.dylib"
16+
PHP_EMBED_TYPE=shared-dylib
17+
], [PHP_EMBED_TYPE=shared])
1618
INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib"
1719
;;
1820
static)
@@ -27,9 +29,6 @@ if test "$PHP_EMBED" != "no"; then
2729
if test "$PHP_EMBED_TYPE" != "no"; then
2830
PHP_SUBST(LIBPHP_CFLAGS)
2931
PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
30-
if test "$SAPI_SHARED" = "libs/libphp.dylib"; then
31-
OVERALL_TARGET=libphp.dylib
32-
fi
3332
PHP_INSTALL_HEADERS([sapi/embed/php_embed.h])
3433
fi
3534
AC_MSG_RESULT([$PHP_EMBED_TYPE])

0 commit comments

Comments
 (0)