archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

improve lib name guessing for newer libtidy

Browse source 
FreeBSD calls it tidy5. Still, the check is not perfect, as both
old and new lib can coexist. ATM, the preference is to pick up the
old lib, still. In it's absense the new one will be looked up.
This commit is contained in:
Anatol Belski 2016-11-09 11:28:50 +01:00
parent 5445685591
commit ddbac6d70d
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ext/tidy/config.m4
View file

@ -37,13 +37,20 @@ if test "$PHP_TIDY" != "no"; then
TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
PHP_ADD_LIBRARY_WITH_PATH(tidy, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
PHP_ADD_INCLUDE($TIDY_INCDIR)
TIDY_LIB_NAME=tidy
PHP_CHECK_LIBRARY(tidy,tidyOptGetDoc,
[
AC_DEFINE(HAVE_TIDYOPTGETDOC,1,[ ])
],[],[])
AC_DEFINE(HAVE_TIDYOPTGETDOC,1,[ ])
],[
PHP_CHECK_LIBRARY(tidy5,tidyOptGetDoc,
[
TIDY_LIB_NAME=tidy5
AC_DEFINE(HAVE_TIDYOPTGETDOC,1,[ ])
], [], [])
],[])
PHP_ADD_LIBRARY_WITH_PATH($TIDY_LIB_NAME, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
PHP_ADD_INCLUDE($TIDY_INCDIR)
PHP_NEW_EXTENSION(tidy, tidy.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)