summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2008-11-24 20:02:37 +0000
committerDan Winship <danw@src.gnome.org>2008-11-24 20:02:37 +0000
commit6c9e4efd2aa236ece6549455e423eb46af937ba9 (patch)
tree387b1ec1ab116fec5baf480d34a3fef2d6735fad
parentbb1bf3dca5eab492a015c12beb89f706c68bb0de (diff)
downloadlibsoup-6c9e4efd2aa236ece6549455e423eb46af937ba9.tar.gz
* configure.in: 2.24.2 * NEWS: update svn path=/branches/gnome-2-24/; revision=1209
-rw-r--r--ChangeLog6
-rw-r--r--NEWS9
-rw-r--r--configure.in2
-rw-r--r--gtk-doc.make18
4 files changed, 25 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index ab46489e..261c7055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-11-24 Dan Winship <danw@gnome.org>
+ * configure.in: 2.24.2
+
+ * NEWS: update
+
+2008-11-24 Dan Winship <danw@gnome.org>
+
* libsoup/soup-logger.c: clarify exactly when stuff gets logged
(and in particular, that SoupSession::authenticate gets emitted
before the response it is authenticating gets logged).
diff --git a/NEWS b/NEWS
index 21ce7c8c..c799d067 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Changes in libsoup from 2.24.1 to 2.24.2:
+
+ * Fixed two bugs and a memory leak in cookie handling
+
+ * Added G_BEGIN_DECLS/G_END_DECLS to those public headers that
+ were missing them
+
+ * Minor updates to gtk-docs
+
Changes in libsoup from 2.24.0.1 to 2.24.1:
* Fixed a crash when unreffing the session from a
diff --git a/configure.in b/configure.in
index 081db6df..f83c59f9 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl *** Initialize automake and set version ***
dnl *******************************************
AC_PREREQ(2.53)
-AC_INIT(libsoup, 2.24.1)
+AC_INIT(libsoup, 2.24.2)
AC_CONFIG_SRCDIR(libsoup.pc.in)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
diff --git a/gtk-doc.make b/gtk-doc.make
index 6a30ea1d..354ffb7c 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -5,11 +5,11 @@
####################################
if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
+GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
endif
# We set GPATH here; this gives us semantics for GNU make
@@ -128,7 +128,7 @@ maintainer-clean-local: clean
cd $(srcdir) && rm -rf xml html
install-data-local:
- installfiles=`echo $(srcdir)/html/*`; \
+ -installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
@@ -139,8 +139,8 @@ install-data-local:
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
- (which gtkdoc-rebase >& /dev/null && \
- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR)) || : ; \
+ which gtkdoc-rebase >/dev/null && \
+ gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \
fi
@@ -165,8 +165,8 @@ dist-hook: dist-check-gtkdoc dist-hook-local
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
cp $(srcdir)/html/* $(distdir)/html
- cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
- cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
cd $(distdir) && rm -f $(DISTCLEANFILES)
-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html