summaryrefslogtreecommitdiff
path: root/acinclude.m4
Commit message (Collapse)AuthorAgeFilesLines
* Fix bug #74905Peter Kokot2017-10-031-15/+15
|
* Fix configure errorPeter Kokot2017-06-221-1/+1
| | | | | | | | | | | | | This patch fixes configure error on some systems such as Alpine. ``` line 3472: test: =: unary operator expected ``` One of the fixes has been suggested also here already: https://bugs.php.net/bug.php?id=39835 Thank you for considering merging this.
* Add OpenSSL 1.1.0 support to PHP 7.0Jakub Zelenka2017-04-071-4/+2
|
* report about OpenSSL 1.1 not supported during configureRemi Collet2017-02-221-2/+4
|
* Prevent fd leak in readdir_r that causes false negative on readdir_r ↵Ondřej Surý2017-01-101-1/+4
| | | | implementation when compiled with AddressSanitizer
* fix build broken by #2124Joe Watkins2017-01-061-0/+3
|
* Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2016-11-261-1/+1
|\ | | | | | | | | | | * PHP-5.6: acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS. Add more mbfl string size checks (bug #73505)
| * acinclude.m4: fix krb5-config detection and usage in PHP_SETUP_KERBEROS.Michael Orlitzky2016-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When building with kerberos support (--with-kerberos), a few libraries and flags need to be added to various parts of the build system. The most reliable way to get those flags is through the krb5-config program that ships with both major implementations of kerberos. The PHP_SETUP_KERBEROS macro in acinclude.m4 attempts to detect krb5-config, and use it. However, there's a bug in that macro. The --with-kerberos parameter accepts a directory where the kerberos libraries can be found. When a directory is given, it is stored in the PHP_KERBEROS variable. The following test, if test "$PHP_KERBEROS" = "yes" && test -x "$KRB5_CONFIG"; then thus fails whenever a directory is passed to --with-kerberos, since it compares a directory name against the string "yes". This causes krb5-config to go unused, and some unreliable fallback logic is attempted instead. One consequence of this is that the Heimdal kerberos implementation cannot be substituted for the MIT one, at least when a directory is passed to --with-kerberos. This commit reverses the logic and checks for "$PHP_KERBEROS" != "no". To confirm that this fixes the issue, one can inspect the "-l" library flags that get appended to the command-line. On a machine with Heimdal and the unmodified acinclude.m4, running ./configure --with-openssl --with-kerberos=/usr will log (for example) to config.log, configure:18082: checking for krb5-config configure:18101: found /usr/bin/krb5-config configure:18114: result: /usr/bin/krb5-config configure:18450: checking for RAND_egd configure:18450: cc ... conftest.c ... -lgssapi_krb5 -lkrb5 ... which are the library names for the MIT implementation. After patching acinclude.m4 to negate the logic, the same command on the same machine outputs (to config.log): configure:18450: cc ... conftest.c -lgssapi -lheimntlm ... These are the correct library names for the Heimdal implementation. PHP-Bug: 73214
* | Fix #73219 (fix acinclude when / is present)Joe Watkins2016-11-201-1/+1
| |
* | improve 7132fe19c29c512d00a3afe101212ba15fa1f99eJoe Watkins2016-05-131-13/+6
| |
* | fix 1bb8a7b0b895af4a9e6b24101fe8fab5af64f86cJoe Watkins2016-05-131-2/+2
| |
* | fix #72180 (Env variables incorrectly pretty printed in config.nice, phpinfo)Joe Watkins2016-05-131-0/+12
| |
* | Fixed bug #71006 (symbol referencing errors on Sparc/Solaris)Dmitry Stogov2015-12-031-0/+54
| |
* | Require at least OpenSSL version 0.9.8Jakub Zelenka2015-09-201-5/+5
| |
* | Remove assumption that extensions are in ext/ext-nameBob Weinand2015-08-211-9/+10
| | | | | | | | Fixes also a weird ln (symlink) hack for phpdbg
* | Fixed PHP_CHECK_BUILTIN_EXPECT settingDmitry Stogov2015-03-231-1/+1
| |
* | Move check for __builtin_expect to configureLevi Morrison2015-03-221-0/+18
| | | | | | | | This allows __builtin_expect to be used more accurately
* | Look for PDO include files in the right folderMaxime BESSON2015-02-061-2/+2
| | | | | | | | | | | | Configure scripts for extensions look for PDO include files in $prefix/include/php. This change makes them look into $phpincludedir instead, which may be different from $prefix/include/php.
* | remove some remains from the old patchAnatol Belski2014-09-251-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-09-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-201-1/+1
| |/
* | native tls initial patchkrakjoe2014-09-201-1/+1
|/
* Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-08-171-1/+1
|\ | | | | | | | | * PHP-5.5: typofixes
| * Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-08-171-1/+1
| |\ | | | | | | | | | | | | * PHP-5.4: typofixes
| | * typofixesVeres Lajos2014-08-171-1/+1
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Remi Collet2014-06-061-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.5: NEWS NEWS Fix bug #67390 insecure temporary file use in the configure script
| * | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2014-06-061-1/+1
| |\ \ | | |/ | | | | | | | | | | | | * PHP-5.4: NEWS Fix bug #67390 insecure temporary file use in the configure script
| | * Fix bug #67390 insecure temporary file use in the configure scriptRemi Collet2014-06-061-1/+1
| | |
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-161-4/+38
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
| * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-161-4/+38
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris and Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/
| | * With --enable-dtrace, the correct PIC/non-PIC .o files on Solaris andChristopher Jones2013-08-161-4/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Linux are now used. DTrace is part of Oracle Linux. See https://oss.oracle.com/projects/DTrace/ This patch does not change DTrace linking for non-Solaris/Linux platforms. For SystemTap users on Linux, this patch removes the compilation warning: Warning: Linking the shared library libphp5.la against the non-libtool objects Zend/zend_dtrace.d.o is not portable!
* | | unify stdint type usageMichael Wallner2013-08-061-0/+19
| | | | | | | | | | | | if you need C99 stdint types, just include "php_stdint.h"
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-051-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install. Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file Enable dtrace probes on linux as they are compatible with systemtap Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
| * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-051-1/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
| | * NEWS for recent DTrace merges.Christopher Jones2013-08-051-1/+1
| | | | | | | | | | | | Remove redundant 'cp' during DTrace install.
| | * Fixed bug #62691 (solaris sed has no -i switch)Christopher Jones2013-08-051-1/+1
| | | | | | | | | | | | Make 'make distclean' remove generated DTrace .h file
| | * Enable dtrace probes on linux as they are compatible with systemtapDavid Soria Parra2013-08-051-0/+3
| | | | | | | | | | | | | | | You can build php with dtrace probes enabled on linux if you have systemtap with uprobes.
| | * Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17Remi Collet2013-08-051-2/+2
| | |
* | | Merge branch 'PHP-5.5'Christopher Jones2013-08-051-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-5.5: Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268) Merge branch 'PHP-5.4'
| * | Merge branch 'PHP-5.4' into PHP-5.5Christopher Jones2013-08-051-0/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | * PHP-5.4: Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268) Merge branch 'PHP-5.4' Conflicts: ext/mysqlnd/mysqlnd.c
| | * Add an empty make command for DTrace .d files to stop an implicitChristopher Jones2013-08-051-0/+4
| | | | | | | | | | | | | | | circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
* | | fix generating config.niceMichael Wallner2013-08-021-4/+4
|/ / | | | | | | | | | | | | | | | | Configure runs like: $./configure -C CFLAGS="-ggdb" --enable-debug --prefix=$(pwd)/usr did result in an empty config.nice * allow single dash flags like -C, -s etc. * allow passing evnironment variables as arguments
* | Fixed bug #62691 (solaris sed has no -i switch)Christopher Jones2013-07-311-1/+1
| | | | | | | | Make 'make distclean' remove generated DTrace .h file
* | Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2013-06-231-3/+3
|\ \ | |/ | | | | | | * PHP-5.4: Fix bug #65088 (Generated configure script is malformed on OpenBSD).
| * Fix bug #65088 (Generated configure script is malformed on OpenBSD).Adam Harvey2013-06-231-3/+3
| | | | | | | | | | | | | | | | We fell foul of a "common urban legend"[0], which resulted in us backslash escaping double quotes that we didn't need to in acinclude.m4. This worked fine on most shells, but OpenBSD's ksh implementation really didn't like it. [0] http://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.69/html_node/Shell-Substitutions.html
| * Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-101-1/+1
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | Merge branch 'PHP-5.4' into PHP-5.5Remi Collet2013-03-281-1/+3
|\ \ | |/ | | | | | | * PHP-5.4: With pkgconfig < 0.28 output is a single space With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars
| * With pkgconfig < 0.28 output is a single spaceRemi Collet2013-03-281-1/+3
| | | | | | | | | | | | | | | | | | With pkgconfig = 0.28 output is an empty string, This breaks the test on the 2 vars Need to split when LIB set (ex -lssl -lcrypto) INC empty (because /usr/include used)
* | Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17Remi Collet2012-12-161-2/+2
| |