diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-12 17:30:41 +0000 |
| commit | a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc (patch) | |
| tree | b45a5d42d9d2ab47f9f06180e12ca973d289a3cc /acinclude.m4 | |
| parent | 6c0e1ca4fa31a860a363abecd6376d99edff8833 (diff) | |
| parent | 2104bea5d756dfa40b605a4a2765a3bc4637a76c (diff) | |
| download | php-git-a2bc7cf9ca74c051bfd287c1b3d54c76945f10cc.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3eb0f1e914..88c97961c7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -842,10 +842,6 @@ AC_DEFUN([PHP_SHARED_MODULE],[ suffix=so link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$3'/$1.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD) && mv -f '$3'/.libs/$1.so '$3'/$1.so' ;; - *netware*[)] - suffix=nlm - link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php7lib, , -L$(top_builddir)/netware -lphp7lib) $(translit(ifelse($1, php7lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)' - ;; *[)] suffix=la link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)' @@ -970,14 +966,7 @@ dnl ---------------------------------------------- Static module dnl ---------------------------------------------- Shared module [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=yes PHP_ADD_SOURCES_X($ext_dir,$2,$ac_extra,shared_objects_$1,yes) - case $host_alias in - *netware*[)] - PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6, $7) - ;; - *[)] - PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6, $7) - ;; - esac + PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6, $7) AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to build $1 as dynamic module) fi fi |