diff options
| author | Anatol Belski <ab@php.net> | 2014-09-20 21:37:19 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-20 21:37:19 +0200 |
| commit | fb17d6516d65c870cd47354598f0daf5d17f1df7 (patch) | |
| tree | 00a84c3085bac850cf1960ebbca2c82efca03ae4 /acinclude.m4 | |
| parent | b3aebda9eaf55706af2e21178f229a171725a168 (diff) | |
| parent | 2fc1a1dce557875d029f16d58bd3d4cd22af54fb (diff) | |
| download | php-git-fb17d6516d65c870cd47354598f0daf5d17f1df7.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fixed copying of the struct as it's not being modified
avoid strlen usage in loop
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ef1063c07f..c16919f70f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -844,7 +844,7 @@ AC_DEFUN([PHP_SHARED_MODULE],[ ;; *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, php5lib, , -L$(top_builddir)/netware -lphp5lib) $(translit(ifelse($1, php5lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)' + 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 |