diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 41 |
1 files changed, 31 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 36ad1e7..9b425b1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.61) -AC_INIT([libproxy],[0.2.2],[nathaniel@natemccallum.com]) +AC_INIT([libproxy],[0.2.3],[nathaniel@natemccallum.com]) AC_CONFIG_SRCDIR([src/lib/proxy_factory.c]) AM_INIT_AUTOMAKE @@ -11,16 +11,14 @@ AC_PROG_LIBTOOL AC_PROG_LN_S AC_PROG_MAKE_SET -### Check for pthread -AC_CHECK_HEADERS(pthread.h) -AC_CHECK_FUNCS(pthread_mutex_init) - ### Checks for libraries for plugins. PKG_CHECK_MODULES(x11, x11, have_x11=yes, have_x11=no) PKG_CHECK_MODULES(xmu, xmu, have_xmu=yes, have_xmu=no) PKG_CHECK_MODULES(gconf, gconf-2.0, have_gconf=yes, have_gconf=no) +PKG_CHECK_MODULES(webkit, webkit-1.0, have_webkit=yes, have_webkit=no) PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, - [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes, have_mozjs=no)]) + [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes, + [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])]) PKG_CHECK_MODULES(NetworkManager, NetworkManager, have_networkmanager=yes, have_networkmanager=no) @@ -88,6 +86,27 @@ else fi AM_CONDITIONAL([WITH_KDE], [test x$with_kde = xyes]) +# WebKit Javascript +AC_ARG_WITH([webkit], + [AS_HELP_STRING([--with-webkit], + [build WebKit JavaScriptCore PAC runner plugin @<:@automatic@:>@])], + [], + [test x$have_webkit == xyes && with_webkit=yes]) +if test x$with_webkit = xyes; then + if test x$have_webkit == xyes; then + WEBKIT_CFLAGS="$webkit_CFLAGS" + WEBKIT_LIBS="$webkit_LIBS" + AC_SUBST(WEBKIT_CFLAGS) + AC_SUBST(WEBKIT_LIBS) + else + echo "WebKit JavaScriptCore plugin requires: WebKit!" + exit 1 + fi +else + with_webkit=no +fi +AM_CONDITIONAL([WITH_WEBKIT], [test x$with_webkit = xyes]) + # Mozilla Javascript AC_ARG_WITH([mozjs], [AS_HELP_STRING([--with-mozjs], @@ -157,15 +176,16 @@ AC_C_CONST AC_TYPE_SIZE_T PLUGINDIR=$libdir/$PACKAGE_NAME/$PACKAGE_VERSION/plugins AC_SUBST(PLUGINDIR) -CFLAGS="-std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1" +CFLAGS="-g -std=c99 $CFLAGS -DPLUGINDIR=\\\"$PLUGINDIR\\\" -DSYSCONFDIR=\\\"$sysconfdir\\\" -D_POSIX_C_SOURCE=1" ### Checks for library functions. AC_FUNC_MALLOC #AC_CHECK_FUNCS([gethostbyname gethostname memset socket strdup strstr]) -AC_CONFIG_FILES([Makefile src/Makefile src/lib/Makefile src/plugins/Makefile - src/bin/Makefile src/bindings/Makefile src/bindings/python/Makefile - src/bindings/java/Makefile src/bindings/dotnet/Makefile]) +AC_CONFIG_FILES([libproxy-1.0.pc Makefile src/Makefile src/lib/Makefile + src/plugins/Makefile src/bin/Makefile src/bindings/Makefile + src/bindings/python/Makefile src/bindings/java/Makefile + src/bindings/dotnet/Makefile]) AC_OUTPUT ### Print build summary @@ -176,6 +196,7 @@ echo -e "\t\tenvvar : $with_envvar" echo -e "\t\tfile : $with_file" echo -e "\t\tgnome : $with_gnome" echo -e "\t\tkde : $with_kde" +echo -e "\t\twebkit : $with_webkit" echo -e "\t\tmozjs : $with_mozjs" echo -e "\t\tnetworkmanager : $with_networkmanager" echo |