Switch downloads to be done asynchronously, use libsoup-2.4 instead of libcurl

[beifahrer] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bc361b0..d172235 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,18 +48,17 @@ beifahrer_VALASOURCES = \
 src/beifahrer.c: ${beifahrer_VALASOURCES}
        ${VALAC} -C ${beifahrer_VALASOURCES} ${beifahrer_VALAFLAGS}
 
-beifahrer_VALAFLAGS = --disable-dbus-transformation --vapidir ./vapi \
+beifahrer_VALAFLAGS = --disable-dbus-transformation --thread --vapidir ./vapi \
        --pkg config \
-        --pkg libcurl \
         --pkg libxml-2.0 \
         --pkg hildon-1 \
         --pkg libosso \
         --pkg dbus-glib-1 \
         --pkg libosso-abook-1.0 \
         --pkg libhildonmime \
-        --pkg liblocation
+        --pkg liblocation \
+       --pkg libsoup-2.4
 beifahrer_CFLAGS = -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
-       ${CURL_CFLAGS} \
        ${DBUS_CFLAGS} \
        ${GCONF_CFLAGS} \
        ${HILDON_CFLAGS} \
@@ -67,9 +66,9 @@ beifahrer_CFLAGS = -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
        ${MAEMO_LAUNCHER_CFLAGS} \
        ${OSSO_CFLAGS} \
        ${ABOOK_CFLAGS} \
+       ${SOUP_CFLAGS} \
        ${XML_CFLAGS}
 beifahrer_LDADD = \
-       ${CURL_LIBS} \
        ${DBUS_LIBS} \
        ${GCONF_LIBS} \
        ${HILDON_LIBS} \
@@ -77,6 +76,7 @@ beifahrer_LDADD = \
        ${MAEMO_LAUNCHER_LIBS} \
        ${OSSO_LIBS} \
        ${ABOOK_LIBS} \
+       ${SOUP_LIBS} \
        ${XML_LIBS}
 
 beifahrer_cli_VALASOURCES = src/beifahrer-cli.vala src/adac-mitfahrclub.vala
@@ -86,18 +86,16 @@ beifahrer_cli_SOURCES = src/beifahrer-cli.c src/adac-mitfahrclub.c
 src/beifahrer-cli.c: ${beifahrer_cli_VALASOURCES}
        ${VALAC} -C ${beifahrer_cli_VALASOURCES} ${beifahrer_cli_VALAFLAGS}
 
-beifahrer_cli_VALAFLAGS = --vapidir ./vapi \
-       --pkg libcurl \
+beifahrer_cli_VALAFLAGS = --thread --vapidir ./vapi \
+       --pkg libsoup-2.4 \
        --pkg libxml-2.0
 beifahrer_cli_CFLAGS = -DGETTEXT_PACKAGE=\"@GETTEXT_PACKAGE@\" \
-       ${CURL_CFLAGS} \
-       ${GLIB_CFLAGS} \
-       ${GOBJECT_CFLAGS} \
+       ${GIO_CFLAGS} \
+       ${SOUP_CFLAGS} \
        ${XML_CFLAGS}
 beifahrer_cli_LDADD = \
-       ${CURL_LIBS} \
-       ${GLIB_LIBS} \
-       ${GOBJECT_LIBS} \
+       ${GIO_LIBS} \
+       ${SOUP_LIBS} \
        ${XML_LIBS}
 
 CLEANFILES = \