dnl *******************************************
m4_define([soup_major_version], [2])
-m4_define([soup_minor_version], [41])
-m4_define([soup_micro_version], [90])
+m4_define([soup_minor_version], [62])
+m4_define([soup_micro_version], [2])
AC_PREREQ(2.63)
AC_INIT([libsoup],[soup_major_version.soup_minor_version.soup_micro_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup])
AC_CONFIG_SRCDIR([libsoup-2.4.pc.in])
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz -Wno-portability])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
AC_SUBST(SOUP_API_VERSION)
# Increment on interface addition. Reset on removal.
-SOUP_AGE=5
+SOUP_AGE=8
# Increment on interface add, remove, or change.
-SOUP_CURRENT=6
+SOUP_CURRENT=9
# Increment on source change. Reset when CURRENT changes.
SOUP_REVISION=0
debug_default=minimum
# Declare --enable-* args and collect ac_help strings
-AC_ARG_ENABLE(debug,
+AC_ARG_ENABLE(debug,
AS_HELP_STRING([--enable-debug=[no/minimum/yes]],
[turn on debugging (default=$debug_default)]),,
enable_debug=$debug_default)
dnl *** Checks for glib ***
dnl ***********************
-GLIB_REQUIRED=2.35.0
+GLIB_REQUIRED=2.38.0
AM_PATH_GLIB_2_0($GLIB_REQUIRED,,,gobject gio)
if test "$GLIB_LIBS" = ""; then
AC_MSG_ERROR(GLIB $GLIB_REQUIRED or later is required to build libsoup)
fi
-GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36"
+GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
GLIB_MAKEFILE='$(top_srcdir)/Makefile.glib'
AC_SUBST(GLIB_MAKEFILE)
+GLIB_TESTS
+
PKG_CHECK_MODULES(XML, libxml-2.0)
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
case "$host" in
*-*-mingw*)
os_win32=yes
+ os_linux=yes
CFLAGS="$CFLAGS -D_REENTRANT"
;;
+ *-*-linux*)
+ os_win32=no
+ os_linux=yes
+ ;;
*)
os_win32=no
+ os_linux=no
;;
esac
AC_MSG_RESULT([$os_win32])
AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+AM_CONDITIONAL(OS_LINUX, [test $os_linux = yes])
dnl ************************
dnl *** gettext/intltool ***
dnl ***************
dnl *** gtk-doc ***
dnl ***************
-GTK_DOC_CHECK([1.10])
+dnl GTK_DOC_CHECK([1.10])
+# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
+# it on it's own line.
+m4_ifdef([GTK_DOC_CHECK], [
+GTK_DOC_CHECK([1.20], [--flavour no-tmpl])
+],[])
dnl *****************************
dnl *** gobject-introspection ***
dnl *****************************
GOBJECT_INTROSPECTION_CHECK([0.9.5])
+if test "$found_introspection" != "yes" -a "$enable_vala" = ""; then
+ enable_vala=no
+fi
+VAPIGEN_CHECK()
+
AC_MSG_CHECKING([for glib-networking (glib TLS implementation)])
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
dnl *** Stuff for regression tests
dnl ******************************
AC_MSG_NOTICE([checking for programs needed for regression tests])
-MISSING_REGRESSION_TEST_PACKAGES=""
-
-if test "$have_glib_networking" = "no"; then
- MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES glib-networking"
-fi
AC_ARG_WITH(apache-httpd,
AS_HELP_STRING([--with-apache-httpd], [Path to apache httpd (for tests)]),
AC_MSG_CHECKING([Apache version])
apache_version=`$APACHE_HTTPD -v 2>/dev/null | sed -ne 's/Server version: Apache\///p'`
case $apache_version in
- 2.2.*)
- AC_MSG_RESULT([$apache_version (ok)])
- apache_version=2.2
- ;;
2.4.*)
AC_MSG_RESULT([$apache_version (ok)])
- apache_version=2.4
;;
*)
AC_MSG_RESULT([$apache_version (ignoring)])
APACHE_SSL_MODULE_DIR="$dir"
IF_HAVE_APACHE_SSL=""
fi
- if test -f $dir/mod_php5.so; then
- APACHE_PHP_MODULE_DIR="$dir"
- APACHE_PHP_MODULE=mod_php5.so
- fi
- if test -f $dir/libphp5.so; then
+ if test -f $dir/libphp7.so; then
APACHE_PHP_MODULE_DIR="$dir"
- APACHE_PHP_MODULE=libphp5.so
fi
done
AC_MSG_RESULT($APACHE_MODULE_DIR)
AC_SUBST(APACHE_MODULE_DIR)
AC_SUBST(APACHE_SSL_MODULE_DIR)
AC_SUBST(APACHE_PHP_MODULE_DIR)
- AC_SUBST(APACHE_PHP_MODULE)
fi
if test "$APACHE_HTTPD" != "no" -a -n "$APACHE_MODULE_DIR" -a -n "$APACHE_SSL_MODULE_DIR"; then
AC_DEFINE(HAVE_APACHE, 1, [Whether or not apache can be used for tests])
- if test $apache_version = 2.2; then
- AC_DEFINE(HAVE_APACHE_2_2, 1, [Apache is 2.2.x])
- else
- AC_DEFINE(HAVE_APACHE_2_4, 1, [Apache is 2.4.x])
- fi
have_apache=1
- if test -z "$APACHE_PHP_MODULE_DIR"; then
- MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES mod_php5"
- fi
else
have_apache=0
- if test "$APACHE_HTTPD" = "no" -o -z "$APACHE_MODULE_DIR"; then
- MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES apache"
- else
- MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES mod_ssl"
- fi
fi
AM_CONDITIONAL(HAVE_APACHE, test "$have_apache" = 1)
-AM_CONDITIONAL(HAVE_APACHE_2_2, test "$apache_version" = 2.2)
-AM_CONDITIONAL(HAVE_APACHE_2_4, test "$apache_version" = 2.4)
if test "$have_apache" = 1; then
- AC_CHECK_PROGS(PHP, php php5)
+ AC_CHECK_PROGS(PHP, php)
AC_MSG_CHECKING([for Apache PHP module])
- if test -f $APACHE_PHP_MODULE_DIR/$APACHE_PHP_MODULE; then
- have_php=yes
+ if test -d "$APACHE_PHP_MODULE_DIR"; then
+ have_php="yes"
IF_HAVE_PHP=""
else
- have_php=no
- IF_HAVE_PHP="\#"
- MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES php5"
+ have_php="no"
+ IF_HAVE_PHP="#"
fi
AC_MSG_RESULT($have_php)
AC_SUBST(IF_HAVE_PHP)
AC_MSG_CHECKING([for php-xmlrpc])
if $PHP --rf xmlrpc_server_create | grep -q "does not exist"; then
have_php_xmlrpc=no
- MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES php-xmlrpc"
else
have_php_xmlrpc=yes
AC_DEFINE(HAVE_PHP_XMLRPC, 1, [Have php-xmlrpc])
fi
AC_MSG_RESULT($have_php_xmlrpc)
fi
+
+ if test -f "$APACHE_MODULE_DIR/mod_unixd.so"; then
+ IF_HAVE_MOD_UNIXD=""
+ else
+ IF_HAVE_MOD_UNIXD="#"
+ fi
+ AC_SUBST(IF_HAVE_MOD_UNIXD)
fi
AC_PATH_PROG(CURL, curl, no)
if test "$CURL" != no; then
AC_DEFINE(HAVE_CURL, 1, [Whether or not curl can be used for tests])
-else
- MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES curl"
fi
-AC_SUBST(MISSING_REGRESSION_TEST_PACKAGES)
-AM_CONDITIONAL(MISSING_REGRESSION_TEST_PACKAGES, test -n "$MISSING_REGRESSION_TEST_PACKAGES")
-
-dnl *********************
-dnl *** resource compiler
-dnl *********************
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
-
dnl **********************************************************
dnl *** path of NTLM single-sign-on helper ntlm_auth
dnl **********************************************************
AC_SUBST(ntlm_auth)
AC_DEFINE_UNQUOTED(NTLM_AUTH, "$ntlm_auth", [Samba's 'winbind' daemon helper 'ntlm_auth' which can be used for NTLM single-sign-on])
+AX_CODE_COVERAGE
+
+dnl **********************
+dnl *** GSSAPI support ***
+dnl **********************
+AC_ARG_WITH(gssapi,
+ AS_HELP_STRING([--with-gssapi],
+ [Build with GSSAPI support [default=auto]]))
+
+if test "$with_gssapi" != "no"; then
+ AC_ARG_WITH(krb5-config,
+ AS_HELP_STRING([--with-krb5-config=PATH],[Where to look for krb5-config, path points to krb5-config installation (default: /usr/kerberos/bin/)]),
+ KRB5_CONFIG="$withval",
+ [AC_PATH_PROGS(KRB5_CONFIG, krb5-config, no, ${PATH}:/usr/kerberos/bin)])
+
+ if test "$KRB5_CONFIG" != "no"; then
+ KRB5_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+ KRB5_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+ if test "$KRB5_CONFIG" != none; then
+ AC_DEFINE(LIBSOUP_HAVE_GSSAPI, 1, [Whether or not GSSAPI libs are available])
+ fi
+ else
+ if test "$with_gssapi" = "yes"; then
+ AC_MSG_ERROR([GSSAPI support requested but failed to found krb5-config. Try to set KRB5_CONFIG.])
+ fi
+ fi
+fi
+
dnl ****************************************************
dnl *** Warnings to show if using GCC ***
dnl *** (do this last so -Werror won't mess up tests ***
-Wall -Wstrict-prototypes -Werror=missing-prototypes \
-Werror=implicit-function-declaration \
-Werror=pointer-arith -Werror=init-self -Werror=format=2 \
+ -Wno-format-zero-length \
-Werror=missing-include-dirs -Werror=aggregate-return \
-Werror=declaration-after-statement"
fi
+##################################################
+# Visibility handling
+##################################################
+
+SOUP_HIDDEN_VISIBILITY_CFLAGS=""
+case "$host" in
+ *-*-mingw*)
+ dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
+ AC_DEFINE([_SOUP_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern],
+ [defines how to decorate public symbols while building])
+ SOUP_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
+ ;;
+ *)
+ dnl on other compilers, check if we can do -fvisibility=hidden
+ SAVED_CFLAGS="${CFLAGS}"
+ CFLAGS="-fvisibility=hidden"
+ AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
+ AC_TRY_COMPILE([], [return 0],
+ AC_MSG_RESULT(yes)
+ enable_fvisibility_hidden=yes,
+ AC_MSG_RESULT(no)
+ enable_fvisibility_hidden=no)
+ CFLAGS="${SAVED_CFLAGS}"
+
+ AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [
+ AC_DEFINE([_SOUP_EXTERN], [__attribute__((visibility("default"))) extern],
+ [defines how to decorate public symbols while building])
+ SOUP_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
+ ])
+ ;;
+esac
+AC_SUBST(SOUP_HIDDEN_VISIBILITY_CFLAGS)
+
+dnl ****************************************************
+dnl *** Check whether MSVC toolset is explicitly set ***
+dnl ****************************************************
+AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
+AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
+
+
dnl *************************
dnl *** Output Everything ***
dnl *************************
po/Makefile.in
po/Makefile
tests/Makefile
+ tests/httpd.conf
+ examples/Makefile
docs/Makefile
docs/reference/Makefile
libsoup/soup-version.h
+ config.h.win32
+ win32/Makefile
+ win32/vs9/Makefile
+ win32/vs9/soup-version-paths.vsprops
+ win32/vs10/Makefile
+ win32/vs10/soup-version-paths.props
+ win32/vs11/Makefile
+ win32/vs12/Makefile
+ win32/vs14/Makefile
+ win32/vs15/Makefile
])
AC_OUTPUT
-
-if test -n "$MISSING_REGRESSION_TEST_PACKAGES"; then
- echo ""
- echo Some regression tests will not be run due to missing packages:
- echo $MISSING_REGRESSION_TEST_PACKAGES
- echo ""
-fi
projects / platform / upstream / libsoup.git / blobdiff