libsoup r1193 - in trunk: . docs/reference libsoup tests

[danw svn gnome org]

Author: danw
Date: Fri Oct 31 17:55:32 2008
New Revision: 1193
URL: http://svn.gnome.org/viewvc/libsoup?rev=1193&view=rev

Log:
	* libsoup-2.4.pc.in: rename from libsoup.pc.in; the attempt to
	keep the source tree API-version-generic wasn't really working,
	and we're probably not ever going to change the API version again
	anyway.

	* Makefile.am (pkgconfig_DATA): install the .pc file the normal
	way rather than using an install-data-local rule to rename the .pc
	file as we install it

	* libsoup/Makefile.am (libsoupincludedir):
	* tests/Makefile.am (LIBS):
	* docs/reference/Makefile.am (GTKDOC_LIBS): Say "2.4" everywhere,
	instead of 2.4 in some places and $(SOUP_API_VERSION) in others.

	* configure.in: updates for .pc renaming. Also, use
	AS_HELP_STRING() in AC_ARG_ENABLE() and AC_ARG_WITH() rules


Added:
   trunk/libsoup-2.4.pc.in
Removed:
   trunk/libsoup.pc.in
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/docs/reference/Makefile.am
   trunk/libsoup/Makefile.am
   trunk/libsoup/soup-message-queue.h
   trunk/tests/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Oct 31 17:55:32 2008
@@ -3,15 +3,14 @@
 
 SUBDIRS = libsoup tests docs
 
-EXTRA_DIST = libsoup.pc.in gtk-doc.make libsoup-zip.in
+EXTRA_DIST =			\
+	libsoup-2.4.pc.in	\
+	gtk-doc.make		\
+	libsoup-zip.in
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-	$(INSTALL) -m 644 libsoup.pc $(DESTDIR)$(pkgconfigdir)/libsoup-$(SOUP_API_VERSION).pc
+pkgconfig_DATA = libsoup-2.4.pc
 
-uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/libsoup-$(SOUP_API_VERSION).pc

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Oct 31 17:55:32 2008
@@ -4,7 +4,7 @@
 
 AC_PREREQ(2.53)
 AC_INIT(libsoup, 2.25.0)
-AC_CONFIG_SRCDIR(libsoup.pc.in)
+AC_CONFIG_SRCDIR(libsoup-2.4.pc.in)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AM_CONFIG_HEADER(config.h)
@@ -35,7 +35,8 @@
 
 # Declare --enable-* args and collect ac_help strings
 AC_ARG_ENABLE(debug, 
-	      [  --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,
+	      AS_HELP_STRING([--enable-debug=[no/minimum/yes]],
+			     [turn on debugging (default=$debug_default)]),,
 	      enable_debug=$debug_default)
 
 # Set the debug flags
@@ -142,7 +143,7 @@
 dnl Allow autogening even without AM_PATH_LIBGCRYPT available
 m4_ifdef([AM_PATH_LIBGCRYPT],,[m4_define(AM_PATH_LIBGCRYPT,)])
 AC_ARG_ENABLE(ssl, 
-	      [  --enable-ssl             Turn on Secure Sockets Layer support [default=yes]],,
+	      AS_HELP_STRING([--enable-ssl], [Turn on Secure Sockets Layer support (default=yes)]),,
 	      enable_ssl=auto)
 
 if test "$enable_ssl" != "no"; then
@@ -179,7 +180,7 @@
 dnl *************************************
 
 AC_ARG_ENABLE(more-warnings,
-	      [  --disable-more-warnings  Inhibit compiler warnings],
+	      AS_HELP_STRING([--disable-more-warnings], [Inhibit compiler warnings]),
 	      set_more_warnings=no)
 
 if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
@@ -200,7 +201,7 @@
 MISSING_REGRESSION_TEST_PACKAGES=""
 
 AC_ARG_WITH(apache-httpd,
-	    [  --with-apache-httpd      Path to apache httpd (for tests)],
+	    AS_HELP_STRING([--with-apache-httpd], [Path to apache httpd (for tests)]),
 	    APACHE_HTTPD="$withval",
 	    [AC_PATH_PROGS(APACHE_HTTPD, httpd2 httpd, no, ${PATH}:/usr/sbin)])
 if test "$APACHE_HTTPD" != "no"; then
@@ -222,7 +223,7 @@
 if test "$APACHE_HTTPD" != "no"; then
     AC_MSG_CHECKING([for Apache module directory])
     AC_ARG_WITH(apache-module-dir,
-		[  --with-apache-module-dir Apache modules dirs (for tests)],
+		AS_HELP_STRING([--with-apache-module-dir], [Apache modules dirs (for tests)]),
 		apache_module_dirs="$withval",
 		[apache_prefix=`dirname \`dirname $APACHE_HTTPD\``
 		mpm=`$APACHE_HTTPD -V | sed -ne 's/^Server MPM: */-/p' | tr 'A-Z' 'a-z'`
@@ -316,7 +317,7 @@
 dnl *************************
 
 AC_OUTPUT([
-	libsoup.pc
+	libsoup-2.4.pc
 	Makefile
 	libsoup-zip
 	libsoup/Makefile

Modified: trunk/docs/reference/Makefile.am
==============================================================================
--- trunk/docs/reference/Makefile.am	(original)
+++ trunk/docs/reference/Makefile.am	Fri Oct 31 17:55:32 2008
@@ -55,7 +55,7 @@
 	$(XML_CFLAGS)			\
 	$(GNUTLS_CFLAGS)
 
-GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la $(GLIB_LIBS)
+GTKDOC_LIBS = $(top_builddir)/libsoup/libsoup-2.4.la $(GLIB_LIBS)
 
 # include common portion ...
 include $(top_srcdir)/gtk-doc.make

Added: trunk/libsoup-2.4.pc.in
==============================================================================
--- (empty file)
+++ trunk/libsoup-2.4.pc.in	Fri Oct 31 17:55:32 2008
@@ -0,0 +1,12 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: libsoup
+Description: a glib-based HTTP library
+Version: @VERSION@
+Requires: glib-2.0 gobject-2.0 gio-2.0
+Requires.private: libxml-2.0 @SSL_REQUIREMENT@
+Libs: -L${libdir} -lsoup-2.4
+Cflags: -I${includedir}/libsoup-2.4

Modified: trunk/libsoup/Makefile.am
==============================================================================
--- trunk/libsoup/Makefile.am	(original)
+++ trunk/libsoup/Makefile.am	Fri Oct 31 17:55:32 2008
@@ -43,7 +43,7 @@
 
 CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
 
-libsoupincludedir = $(includedir)/libsoup-$(SOUP_API_VERSION)/libsoup
+libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
 
 soup_headers =			\
 	soup.h			\

Modified: trunk/libsoup/soup-message-queue.h
==============================================================================
--- trunk/libsoup/soup-message-queue.h	(original)
+++ trunk/libsoup/soup-message-queue.h	Fri Oct 31 17:55:32 2008
@@ -30,10 +30,11 @@
 
 	guint resolving_msg_addr   : 1;
 	guint resolving_proxy_addr : 1;
+	guint resolved_proxy_addr  : 1;
 
 	/*< private >*/
 	guint removed              : 1;
-	guint ref_count            : 29;
+	guint ref_count            : 28;
 	SoupMessageQueueItem *prev, *next;
 };
 

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Fri Oct 31 17:55:32 2008
@@ -8,7 +8,7 @@
 	$(LIBGNUTLS_CFLAGS)
 
 LIBS =			\
-	$(top_builddir)/libsoup/libsoup-$(SOUP_API_VERSION).la \
+	$(top_builddir)/libsoup/libsoup-2.4.la \
 	$(GLIB_LIBS)
 
 noinst_PROGRAMS =	\