build: remove some cruft

Remove accumulated cruft, mostly from things we used to depend on but
don't any more.

Also a few minor drive-by configure cleanups

diff --git a/configure.ac b/configure.ac
index d6c97ee..68293d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -63,12 +63,6 @@ fi
 
 AC_SUBST(SOUP_DEBUG_FLAGS)
 
-# Set the maintainer flags
-#if test -d .git; then
-#      SOUP_MAINTAINER_FLAGS="-DG_DISABLE_DEPRECATED"
-#fi
-AC_SUBST(SOUP_MAINTAINER_FLAGS)
-
 dnl ***************************
 dnl *** Checks for programs ***
 dnl ***************************
@@ -130,7 +124,6 @@ dnl *******************
 dnl *** Misc checks ***
 dnl *******************
 AC_CHECK_FUNCS(gmtime_r)
-AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
 
 dnl *********************
 dnl *** GNOME support ***
@@ -165,7 +158,7 @@ save_LIBS="$LIBS"
 CFLAGS="$CFLAGS $GLIB_CFLAGS"
 LIBS="$LIBS $GLIB_LIBS"
 AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <gio/gio.h>],
-                              [g_type_init (); return !g_tls_backend_supports_tls (g_tls_backend_get_default ());])],
+                              [return !g_tls_backend_supports_tls (g_tls_backend_get_default ());])],
              [have_glib_networking=yes],
              [have_glib_networking=no],
              [have_glib_networking="unknown (cross-compiling)"])
@@ -310,12 +303,15 @@ else
     MISSING_REGRESSION_TEST_PACKAGES="$MISSING_REGRESSION_TEST_PACKAGES curl"
 fi
 
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
-
 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 **********************************************************

diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index d2e2cde..e99c8e6 100644 (file)
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -4,21 +4,15 @@ EXTRA_DIST =
 
 include $(GLIB_MAKEFILE)
 
-if OS_WIN32
-LIBWS2_32 = -lws2_32
-endif
-
 INCLUDES =                             \
        -DG_LOG_DOMAIN=\"libsoup\"      \
        -DLOCALEDIR=\"$(localedir)\"    \
        -I$(top_srcdir)                 \
        -I$(top_builddir)               \
        $(SOUP_DEBUG_FLAGS)             \
-       $(SOUP_MAINTAINER_FLAGS)        \
        $(GLIB_CFLAGS)                  \
        $(XML_CFLAGS)                   \
-       $(SQLITE_CFLAGS)                \
-       $(GNOME_KEYRING_CFLAGS)
+       $(SQLITE_CFLAGS)
 
 libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
 
@@ -90,9 +84,7 @@ EXTRA_DIST += libsoup-2.4.sym
 libsoup_2_4_la_LIBADD =                        \
        $(GLIB_LIBS)                    \
        $(XML_LIBS)                     \
-       $(SQLITE_LIBS)                  \
-       -lz                             \
-       $(LIBWS2_32)
+       $(SQLITE_LIBS)
 
 libsoup_2_4_la_SOURCES =               \
        soup-address.c                  \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 55dd327..5bbcba8 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,13 +2,10 @@ INCLUDES =            \
        -I$(top_srcdir) \
        -DSRCDIR=\""$(abs_srcdir)"\" \
        -DBUILDDIR=\""$(builddir)"\" \
-       $(SOUP_MAINTAINER_FLAGS) \
-       $(XML_CFLAGS)   \
        $(GLIB_CFLAGS)
 
 LIBS =                 \
        $(top_builddir)/libsoup/libsoup-2.4.la \
-       $(LIBGNUTLS_LIBS) \
        $(GLIB_LIBS)
 
 TESTS =                                \