API update to 2.42.2

Author: sundermann

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([soup-sharp], [2.40.3])
+AC_INIT([soup-sharp], [2.42.2])
 AC_CONFIG_SRCDIR([README])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE
@@ -15,7 +15,7 @@ ASSEMBLY_NAMESPACE="Soup"
 ASSEMBLY_PC="soup-sharp-2.4"
 ASSEMBLY_SHORTNAME="soup"
 ASSEMBLY_TITLE="Soup#"
-ASSEMBLY_VERSION="2.40.3"
+ASSEMBLY_VERSION="2.42.2"
 AC_SUBST([ACLOCAL_AMFLAGS], ["-I m4 \${ACLOCAL_FLAGS}"])
 
 AC_SUBST(ASSEMBLY_NAME)
@@ -77,7 +77,9 @@ PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-3.0)
 AC_SUBST(GTK_SHARP_CFLAGS)
 AC_SUBST(GTK_SHARP_LIBS)
 gtksharp_prefix=`pkg-config --variable=prefix gtk-sharp-3.0`
+GAPIXMLDIR=`pkg-config --variable=gapidir gtk-sharp-3.0`
 AC_SUBST(gtksharp_prefix)
+AC_SUBST(GAPIXMLDIR)
 
 dnl Check for gapi
 AC_PATH_PROG(GAPI_PARSER, gapi3-parser, no)
@@ -137,6 +139,8 @@ AC_SUBST(soup_prefix)
 AC_SUBST(SOUP_LIBS)
 AC_SUBST(SOUP_CFLAGS)
 
+dnl extra m4 calls
+CHECK_GLIBSHARP
 
 
 AC_CONFIG_FILES([

m4.custom

@@ -0,0 +1 @@
+GLIBSHARP

m4/glib.m4

@@ -0,0 +1,5 @@
+AC_DEFUN([CHECK_GLIBSHARP],
+[
+        PKG_CHECK_MODULES(GLIBSHARP, glib-sharp-3.0)
+        AC_SUBST(GLIBSHARP_LIBS)
+])

sources/Makefile.am

@@ -5,6 +5,9 @@ DLL = $(top_srcdir)/out/$(ASSEMBLY_NAME).dll
 DLLMAP = $(top_srcdir)/out/$(ASSEMBLY_NAME).dll.config
 GLUEDIR = $(srcdir)/glue
 
+gapidir = $(GAPIXMLDIR)
+gapi_DATA = $(API)
+
 # Add any extra source files you need here
 sources =
 
@@ -33,13 +36,13 @@ $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA)
 generated-stamp: $(API)
 	 $(GAPI_CODEGEN) --generate $(srcdir)/$(API) $(GTK_SHARP_CFLAGS) \
 		--outdir=generated \
-		--glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libsoupsharpglue-2.40.3.so \
-		--glue-includes=libsoup/soup.h,libsoup/soup-cache.h,libsoup/soup-requester.h,libsoup/soup-request-http.h,libsoup/soup-request-data.h,libsoup/soup-request-file.h \
+		--glue-filename=$(GLUEDIR)/generated.c --gluelib-name=libsoupsharpglue-2.42.2.so \
+		--glue-includes=libsoup/soup.h,libsoup/soup-cache.h,libsoup/soup-requester.h,libsoup/soup-request-http.h,libsoup/soup-request-data.h,libsoup/soup-request-file.h --gapidir=$(gapidir) \
 	 	--assembly-name=$(ASSEMBLY_NAME) && touch generated-stamp
 
 $(DLL): $(build_sources) generated-stamp
-	$(CSC) -nowarn:169 -unsafe -target:library $(GTK_SHARP_LIBS) \
-		$(build_sources)  generated/*.cs -out:$(DLL)
+	$(CSC) -nowarn:169 -unsafe -target:library \
+		$(build_sources)  $(GLIBSHARP_LIBS) generated/*.cs -out:$(DLL)
 
 install-data-local:
 	echo "$(GACUTIL) /i $(DLL) /f $(GACUTIL_FLAGS)";  \

sources/glue/Makefile.am

@@ -1,18 +1,18 @@
-lib_LTLIBRARIES = libsoupsharpglue-2.40.3.la
+lib_LTLIBRARIES = libsoupsharpglue-2.42.2.la
 
-libsoupsharpglue_2_40_3_la_SOURCES =
+libsoupsharpglue_2_42_2_la_SOURCES =
 
-nodist_libsoupsharpglue_2_40_3_la_SOURCES = generated.c
+nodist_libsoupsharpglue_2_42_2_la_SOURCES = generated.c
 
-libsoupsharpglue_2_40_3_la_LDFLAGS = -module -avoid-version -no-undefined
+libsoupsharpglue_2_42_2_la_LDFLAGS = -module -avoid-version -no-undefined
 
-libsoupsharpglue_2_40_3_la_LIBADD = $(SOUP_LIBS)
+libsoupsharpglue_2_42_2_la_LIBADD = $(SOUP_LIBS)
 
 INCLUDES = $(SOUP_CFLAGS) -I$(top_srcdir)
 
 CFLAGS = -DLIBSOUP_USE_UNSTABLE_REQUEST_API
 
-libsoupsharpglue.dll: $(libsoupsharpglue_2_40_3_la_OBJECTS) libsoupsharpglue.rc libsoupsharpglue.def
+libsoupsharpglue.dll: $(libsoupsharpglue_2_42_2_la_OBJECTS) libsoupsharpglue.rc libsoupsharpglue.def
 	./build-dll libsoupsharpglue $(VERSION)
 
 CLEANFILES = lib*.a lib*.dll