diff options
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | libsoup/Makefile.am | 12 | ||||
| -rw-r--r-- | libsoup/libsoup-2.4.sym | 2 | ||||
| -rw-r--r-- | libsoup/libsoup-gnome-2.4.sym | 2 | ||||
| -rw-r--r-- | packaging/libsoup.spec | 5 |
5 files changed, 14 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 509e156f..dc2313d1 100644 --- a/configure.ac +++ b/configure.ac @@ -132,11 +132,11 @@ dnl ************************* dnl *** SQL Lite support independently of gnome for Tizen *** dnl ************************* -AC_ARG_ENABLE(sqllite, - AS_HELP_STRING([--enable-sqllite], [Enable SQL lite support ]), , - enable_sqllite=no) +AC_ARG_ENABLE(sqlite, + AS_HELP_STRING([--enable-sqlite], [Enable SQL lite support ]), , + enable_sqlite=no) -if test "$enable_sqllite" != "no"; then +if test "$enable_sqlite" != "no"; then PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl [Could not find sqlite3 devel files: diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am index daa2c63b..f1a037ac 100644 --- a/libsoup/Makefile.am +++ b/libsoup/Makefile.am @@ -74,6 +74,10 @@ if SQLLITE_SUPPORT soup_headers += \ soup-cookie-jar-sqlite.h endif +if BUILD_LIBSOUP_GNOME +soup_headers += \ + soup-cookie-jar-sqlite.h +endif libsoupinclude_HEADERS = \ $(soup_headers) \ @@ -97,10 +101,8 @@ libsoup_2_4_la_LIBADD = \ $(XML_LIBS) \ $(SQLITE_LIBS) -if SQLLITE_SUPPORT libsoup_2_4_la_LIBADD += \ $(SQLITE_LIBS) -endif libsoup_2_4_la_SOURCES = \ soup-address.c \ @@ -202,10 +204,9 @@ TLD_DATA_FILE=$(top_srcdir)/data/effective_tld_names.dat tld_data.inc: tld-parser.py $(TLD_DATA_FILE) $(srcdir)/tld-parser.py $(TLD_DATA_FILE) tld_data.inc -if SQLLITE_SUPPORT + libsoup_2_4_la_SOURCES += \ - soup-cookie-jar-sqlite.c -endif + soup-cookie-jar-sqlite.c if BUILD_LIBSOUP_GNOME @@ -230,7 +231,6 @@ libsoup_gnome_2_4_la_LIBADD = \ $(GLIB_LIBS) libsoup_gnome_2_4_la_SOURCES = \ - soup-cookie-jar-sqlite.c \ soup-gnome-features.c \ soup-proxy-resolver-gnome.h \ soup-proxy-resolver-gnome.c \ diff --git a/libsoup/libsoup-2.4.sym b/libsoup/libsoup-2.4.sym index be4cd7f4..22994042 100644 --- a/libsoup/libsoup-2.4.sym +++ b/libsoup/libsoup-2.4.sym @@ -485,6 +485,8 @@ soup_xmlrpc_parse_method_response soup_xmlrpc_request_new soup_xmlrpc_set_fault soup_xmlrpc_set_response +soup_cookie_jar_sqlite_new +soup_cookie_jar_sqlite_get_type _SOUP_METHOD_CONNECT _SOUP_METHOD_COPY _SOUP_METHOD_DELETE diff --git a/libsoup/libsoup-gnome-2.4.sym b/libsoup/libsoup-gnome-2.4.sym index 67f62dec..8e12248c 100644 --- a/libsoup/libsoup-gnome-2.4.sym +++ b/libsoup/libsoup-gnome-2.4.sym @@ -1,5 +1,3 @@ -soup_cookie_jar_sqlite_get_type -soup_cookie_jar_sqlite_new soup_gnome_features_2_26_get_type soup_password_manager_gnome_get_type soup_proxy_resolver_gnome_get_type diff --git a/packaging/libsoup.spec b/packaging/libsoup.spec index 6ac91ffb..539ebab2 100644 --- a/packaging/libsoup.spec +++ b/packaging/libsoup.spec @@ -9,7 +9,6 @@ Url: http://www.gnome.org Group: Development/Libraries/GNOME Source: http://download.gnome.org/sources/libsoup/2.40/%{name}-%{version}.tar.xz Source99: baselibs.conf -# Patches auto-generated by git-buildpackage: BuildRequires: gettext-tools BuildRequires: glib-networking %if %{with gnome} @@ -76,7 +75,7 @@ Features: --enable-introspection \ %else --without-gnome \ - --enable-sqllite=yes \ + --enable-sqlite=yes \ --disable-tls-check \ %endif --disable-static @@ -98,9 +97,9 @@ make %{?_smp_mflags} %license COPYING %{_libdir}/*.so.* +%if %{with gnome} %files -n typelib-Soup %defattr(-,root,root) -%if %{with gnome} %{_libdir}/girepository-1.0/Soup-2.4.typelib %{_libdir}/girepository-1.0/SoupGNOME-2.4.typelib %endif |