aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-01-03 14:57:44 -05:00
Code

[configure.ac] Added htmlcxx

Browse Source
This commit is contained in:
Witold Filipczyk 2021-04-20 21:19:23 +02:00
parent 1fa5504570
commit c45c98438f
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.config.in
View File

@ -135,6 +135,7 @@ CONFIG_GNUTLS_OPENSSL_COMPAT = @CONFIG_GNUTLS_OPENSSL_COMPAT@
CONFIG_GOPHER = @CONFIG_GOPHER@ CONFIG_GOPHER = @CONFIG_GOPHER@
CONFIG_GPM = @CONFIG_GPM@ CONFIG_GPM = @CONFIG_GPM@
CONFIG_GZIP = @CONFIG_GZIP@ CONFIG_GZIP = @CONFIG_GZIP@
CONFIG_HTMLCXX = @CONFIG_HTMLCXX@
CONFIG_HTML_HIGHLIGHT = @CONFIG_HTML_HIGHLIGHT@ CONFIG_HTML_HIGHLIGHT = @CONFIG_HTML_HIGHLIGHT@
CONFIG_IDN = @CONFIG_IDN@ CONFIG_IDN = @CONFIG_IDN@
CONFIG_INTERLINK = @CONFIG_INTERLINK@ CONFIG_INTERLINK = @CONFIG_INTERLINK@

12
configure.ac
View File

@ -643,6 +643,7 @@ AC_ARG_WITH([spidermonkey],
# when we know for sure whether we're going to use SpiderMonkey or not. # when we know for sure whether we're going to use SpiderMonkey or not.
# (features.conf is not supposed to define it.) # (features.conf is not supposed to define it.)
CONFIG_SPIDERMONKEY= CONFIG_SPIDERMONKEY=
CONFIG_HTMLCXX=
EL_SAVE_FLAGS EL_SAVE_FLAGS
case "$with_spidermonkey" in case "$with_spidermonkey" in
@ -667,9 +668,14 @@ for package in mozjs-52; do
AC_MSG_CHECKING([for SpiderMonkey (mozjs-52) in pkg-config $package]) AC_MSG_CHECKING([for SpiderMonkey (mozjs-52) in pkg-config $package])
if $PKG_CONFIG $pkg_config_static --cflags --libs $package > /dev/null 2>&AS_MESSAGE_LOG_FD; then if $PKG_CONFIG $pkg_config_static --cflags --libs $package > /dev/null 2>&AS_MESSAGE_LOG_FD; then
DB_LOCALSTORAGE_LIBS="$($PKG_CONFIG $pkg_config_static --libs sqlite3)" DB_LOCALSTORAGE_LIBS="$($PKG_CONFIG $pkg_config_static --libs sqlite3)"
SPIDERMONKEY_LIBS="$($PKG_CONFIG $pkg_config_static --libs $package) $DB_LOCALSTORAGE_LIBS" HTMLCXX_LIBS="$($PKG_CONFIG $pkg_config_static --libs htmlcxx)"
if test -n "$HTMLCXX_LIBS"; then
CONFIG_HTMLCXX=yes
fi
SPIDERMONKEY_LIBS="$($PKG_CONFIG $pkg_config_static --libs $package) $DB_LOCALSTORAGE_LIBS $HTMLCXX_LIBS"
DB_LOCALSTORAGE_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags sqlite3)" DB_LOCALSTORAGE_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags sqlite3)"
SPIDERMONKEY_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags $package) $DB_LOCALSTORAGE_CFLAGS" HTMLCXX_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags htmlcxx)"
SPIDERMONKEY_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags $package) $DB_LOCALSTORAGE_CFLAGS $HTMLCXX_CFLAGS"
LIBS="$SPIDERMONKEY_LIBS $LIBS_X" LIBS="$SPIDERMONKEY_LIBS $LIBS_X"
CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS" CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS"
CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS" CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS"
@ -697,6 +703,7 @@ done
if test -z "$CONFIG_SPIDERMONKEY"; then if test -z "$CONFIG_SPIDERMONKEY"; then
# Didn't find SpiderMonkey anywhere. # Didn't find SpiderMonkey anywhere.
CONFIG_SPIDERMONKEY=no CONFIG_SPIDERMONKEY=no
CONFIG_HTMLCXX=no
fi fi
EL_RESTORE_FLAGS EL_RESTORE_FLAGS
@ -709,6 +716,7 @@ fi
EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_ECMASCRIPT_SMJS], [ECMAScript (JavaScript)]) EL_CONFIG_DEPENDS(CONFIG_ECMASCRIPT, [CONFIG_ECMASCRIPT_SMJS], [ECMAScript (JavaScript)])
AC_SUBST(CONFIG_ECMASCRIPT_SMJS) AC_SUBST(CONFIG_ECMASCRIPT_SMJS)
EL_CONFIG(CONFIG_HTMLCXX, [HTMLcxx])
if test "x$CONFIG_ECMASCRIPT_SMJS" = xyes && if test "x$CONFIG_ECMASCRIPT_SMJS" = xyes &&
test "x$HAVE_JS_TRIGGEROPERATIONCALLBACK" = xyes && test "x$HAVE_JS_TRIGGEROPERATIONCALLBACK" = xyes &&

1
src/document/Makefile
View File

@ -3,6 +3,7 @@ include $(top_builddir)/Makefile.config
SUBDIRS-$(CONFIG_CSS) += css SUBDIRS-$(CONFIG_CSS) += css
SUBDIRS-$(CONFIG_DOM) += dom SUBDIRS-$(CONFIG_DOM) += dom
SUBDIRS-$(CONFIG_HTMLCXX) += htmlcxx
SUBDIRS-$(CONFIG_LIBDOM) += libdom SUBDIRS-$(CONFIG_LIBDOM) += libdom
SUBDIRS = html plain SUBDIRS = html plain

8
src/document/htmlcxx/Makefile Normal file
View File

@ -0,0 +1,8 @@
top_builddir=../../..
include $(top_builddir)/Makefile.config
INCLUDES += $(HTMLCXX_CFLAGS)
OBJS = renderer.o
include $(top_srcdir)/Makefile.lib