diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-08-29 17:43:48 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-09-06 14:35:39 +0200 |
commit | 34f4ad61dcbbb2b936b7a8c5a93210285e6d480f (patch) | |
tree | b6a30d7bce9e01f0d7ee3bfc3aa0e749270cc9a4 /ext/ldap/config.m4 | |
parent | e81751ceacf79e2e21b48a12dcbe38c16f98b7da (diff) | |
download | php-git-34f4ad61dcbbb2b936b7a8c5a93210285e6d480f.tar.gz |
Fix detection of gmp on clang
Split the default and custom path case. If the default is used,
assume that the library must be on the default include and lib path.
Only check that the version is appropriate.
Something similar is needed for ldap, but the checking code is much
more complex there, so I'm only adding a workaround for now.
Diffstat (limited to 'ext/ldap/config.m4')
-rw-r--r-- | ext/ldap/config.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index fff818b8f4..085455490c 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -79,7 +79,8 @@ if test "$PHP_LDAP" != "no"; then LDAP_PTHREAD= fi - MACHINE_INCLUDES=$($CC -dumpmachine) + dnl -pc removal is a hack for clang + MACHINE_INCLUDES=$($CC -dumpmachine | $SED 's/-pc//') if test -f $LDAP_LIBDIR/liblber.a || test -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.a || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/liblber.$SHLIB_SUFFIX_NAME; then PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD) |