archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Tidy extension update to be able to either use tidy or tidyp at configure time

Browse source
This commit is contained in:
David Carlier 2018-01-15 22:07:10 +00:00 • committed by Anatol Belski
parent 93185218e1
commit e7da9685cf
3 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
ext/tidy/config.m4
View file

@ -14,13 +14,19 @@ if test "$PHP_TIDY" != "no"; then
fi fi
for i in $TIDY_SEARCH_DIRS; do for i in $TIDY_SEARCH_DIRS; do
if test -f $i/include/tidy/tidy.h; then for j in tidy tidyp; do
TIDY_DIR=$i if test -f $i/include/$j/$j.h; then
TIDY_INCDIR=$i/include/tidy TIDY_DIR=$i
elif test -f $i/include/tidy.h; then TIDY_INCDIR=$i/include/$j
TIDY_DIR=$i TIDY_LIB_NAME=$j
TIDY_INCDIR=$i/include break
fi elif test -f $i/include/$j.h; then
TIDY_DIR=$i
TIDY_INCDIR=$i/include
TIDY_LIB_NAME=$j
break
fi
done
done done
if test -z "$TIDY_DIR"; then if test -z "$TIDY_DIR"; then
@ -36,9 +42,14 @@ if test "$PHP_TIDY" != "no"; then
fi fi
TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
if test "$TIDY_LIB_NAME" == 'tidyp'; then
AC_DEFINE(HAVE_TIDYP_H,1,[defined if tidyp.h exists])
else
AC_DEFINE(HAVE_TIDY_H,1,[defined if tidy.h exists])
fi
TIDY_LIB_NAME=tidy
PHP_CHECK_LIBRARY(tidy,tidyOptGetDoc, PHP_CHECK_LIBRARY($TIDY_LIB_NAME,tidyOptGetDoc,
[ [
AC_DEFINE(HAVE_TIDYOPTGETDOC,1,[ ]) AC_DEFINE(HAVE_TIDYOPTGETDOC,1,[ ])
],[ ],[
@ -49,6 +60,11 @@ if test "$PHP_TIDY" != "no"; then
], [], []) ], [], [])
],[]) ],[])
PHP_CHECK_LIBRARY($TIDY_LIB_NAME,tidyReleaseDate,
[
AC_DEFINE(HAVE_TIDYRELEASEDATE,1,[ ])
], [], [])
PHP_ADD_LIBRARY_WITH_PATH($TIDY_LIB_NAME, $TIDY_LIBDIR, TIDY_SHARED_LIBADD) PHP_ADD_LIBRARY_WITH_PATH($TIDY_LIB_NAME, $TIDY_LIBDIR, TIDY_SHARED_LIBADD)
PHP_ADD_INCLUDE($TIDY_INCDIR) PHP_ADD_INCLUDE($TIDY_INCDIR)

1
ext/tidy/config.w32
View file

@ -17,6 +17,7 @@ if (PHP_TIDY != "no") {
EXTENSION("tidy", "tidy.c"); EXTENSION("tidy", "tidy.c");
AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library'); AC_DEFINE('HAVE_TIDY', 1, 'Have TIDY library');
AC_DEFINE('HAVE_TIDY_H', 1, "tidy include header")
ADD_FLAG('CFLAGS_TIDY', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1'); ADD_FLAG('CFLAGS_TIDY', '/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
if (!PHP_TIDY_SHARED) { if (!PHP_TIDY_SHARED) {
ADD_DEF_FILE("ext\\tidy\\php_tidy.def"); ADD_DEF_FILE("ext\\tidy\\php_tidy.def");

12
ext/tidy/tidy.c
View file

@ -30,7 +30,11 @@
#include "php_ini.h" #include "php_ini.h"
#include "ext/standard/info.h" #include "ext/standard/info.h"
#if HAVE_TIDY_H
#include "tidy.h" #include "tidy.h"
#elif HAVE_TIDYP_H
#include "tidyp.h"
#endif
#if HAVE_TIDYBUFFIO_H #if HAVE_TIDYBUFFIO_H
#include "tidybuffio.h" #include "tidybuffio.h"
@ -1073,8 +1077,12 @@ static PHP_MINFO_FUNCTION(tidy)
php_info_print_table_header(2, "Tidy support", "enabled"); php_info_print_table_header(2, "Tidy support", "enabled");
#if HAVE_TIDYBUFFIO_H #if HAVE_TIDYBUFFIO_H
php_info_print_table_row(2, "libTidy Version", (char *)tidyLibraryVersion()); php_info_print_table_row(2, "libTidy Version", (char *)tidyLibraryVersion());
#elif HAVE_TIDYP_H
php_info_print_table_row(2, "libTidy Version", (char *)tidyVersion());
#endif #endif
#if HAVE_TIDYRELEASEDATE
php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate()); php_info_print_table_row(2, "libTidy Release", (char *)tidyReleaseDate());
#endif
php_info_print_table_row(2, "Extension Version", PHP_TIDY_VERSION " ($Id$)"); php_info_print_table_row(2, "Extension Version", PHP_TIDY_VERSION " ($Id$)");
php_info_print_table_end(); php_info_print_table_end();
@ -1342,7 +1350,11 @@ static PHP_FUNCTION(tidy_get_release)
return; return;
} }
#if HAVE_TIDYRELEASEDATE
RETURN_STRING((char *)tidyReleaseDate()); RETURN_STRING((char *)tidyReleaseDate());
#else
RETURN_STRING((char *)"unknown");
#endif
} }
/* }}} */ /* }}} */