Skip to content

require quick JS config file #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
john-peterson wants to merge 1 commit into
base: master
Choose a base branch
from
Open

require quick JS config file #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion autogen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh

set -e
echo aclocal...
aclocal -I config/m4

Expand Down
24 changes: 8 additions & 16 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,15 +709,13 @@ case "$with_quickjs" in
esac

if test "x$CONFIG_QUICKJS" = x; then
AC_MSG_CHECKING([for QuickJS])
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[
#include <quickjs/quickjs.h>
]], [])],
[CONFIG_QUICKJS=yes
AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([not found])]
)
AC_MSG_CHECKING([for Quick JS config])
if $PKG_CONFIG $pkg_config_static --cflags --libs quickjs > /dev/null 2>&AS_MESSAGE_LOG_FD; then
CONFIG_QUICKJS=yes
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([quickjs.pc not found use john-peterson/quickjs@shared or @rope])
fi

if test "x$CONFIG_QUICKJS" = xyes; then
DB_LOCALSTORAGE_LIBS="$($PKG_CONFIG $pkg_config_static --libs sqlite3)"
Expand All @@ -726,14 +724,8 @@ if test "x$CONFIG_QUICKJS" = x; then
CURL_CFLAGS="$($PKG_CONFIG $pkg_config_static --cflags libcurl)"

CFLAGS="$CFLAGS $DB_LOCALSTORAGE_CFLAGS $XMLPLUSPLUS_CFLAGS $CURL_CFLAGS"
QUICKJS_LIB="/usr/local/lib/quickjs/libquickjs.a"
QUICKJS_LIB="$($PKG_CONFIG $pkg_config_static --libs quickjs)"

for p in $(echo "$LIBRARY_PATH" | tr ':' '\n'); do
if test -f "$p/quickjs/libquickjs.a" ; then
QUICKJS_LIB="$p/quickjs/libquickjs.a"
break
fi
done
LIBS="$LIBS $DB_LOCALSTORAGE_LIBS $XMLPLUSPLUS_LIBS $QUICKJS_LIB $CURL_LIBS"
CONFIG_LIBCURL=yes
else
Expand Down