[geocode-glib] Drop all geoip code
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geocode-glib] Drop all geoip code
- Date: Thu, 15 Aug 2013 16:07:26 +0000 (UTC)
commit 4d78c0ecc8c0a6a92cd29da0d0a55fc546e5463d
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date: Thu Aug 15 18:25:47 2013 +0300
Drop all geoip code
All this code has been moved to geoclue, where it belongs.
configure.ac | 17 -
geocode-glib/Makefile.am | 9 +-
geocode-glib/data/freegeoip-results.json | 1 -
geocode-glib/data/gglib-ip-server-results.json | 1 -
geocode-glib/geocode-glib.h | 1 -
.../geocode-ip-server/API-Documentation.txt | 86 ----
geocode-glib/geocode-ip-server/Makefile.am | 29 --
geocode-glib/geocode-ip-server/geoip-lookup.c | 469 ------------------
geocode-glib/geocode-ip-server/geoip-server.h | 14 -
geocode-glib/geocode-ip-server/geoip-update.c | 230 ---------
geocode-glib/geocode-ip-server/test-geoipformat.c | 144 ------
.../geocode-ip-server/tests/launch-web-server.sh | 181 -------
geocode-glib/geocode-ipclient.c | 515 --------------------
geocode-glib/geocode-ipclient.h | 84 ----
geocode-glib/test-geoip.c | 163 ------
15 files changed, 1 insertions(+), 1943 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1690a03..6942be6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,31 +59,15 @@ AM_GLIB_DEFINE_LOCALEDIR(GEOCODE_GLIB_LOCALEDIR)
dnl gtk-doc checks
GTK_DOC_CHECK([1.13],[--flavour no-tmpl])
-AC_CHECK_LIB([m],[sin])
-
dnl Requires for the library
PKG_CHECK_MODULES(GEOCODE,
gio-2.0 >= 2.34
json-glib-1.0 >= 0.14
libsoup-2.4)
-# Requires for the server
-PKG_CHECK_MODULES(GEOCODE_SERVER,
- gio-2.0 >= 2.34
- json-glib-1.0 >= 0.14
- libsoup-2.4
- geoip)
-
-# Requires for the database update
-PKG_CHECK_MODULES(GEOCODE_DBUPDATE,
- gio-2.0 >= 2.34)
-
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
-GEOIP_DATABASE_PATH=`$PKG_CONFIG --variable=databasedir geoip`
-AC_SUBST(GEOIP_DATABASE_PATH)
-
GOBJECT_INTROSPECTION_CHECK([0.6.3])
GNOME_DEBUG_CHECK
@@ -111,7 +95,6 @@ AC_CONFIG_FILES([
docs/version.xml
geocode-glib/Makefile
po/Makefile.in
- geocode-glib/geocode-ip-server/Makefile
])
AC_OUTPUT
diff --git a/geocode-glib/Makefile.am b/geocode-glib/Makefile.am
index 6e8009f..571896e 100644
--- a/geocode-glib/Makefile.am
+++ b/geocode-glib/Makefile.am
@@ -1,7 +1,5 @@
include $(top_srcdir)/Makefile.decl
-SUBDIRS = geocode-ip-server
-
EXTRA_DIST = geocode-glib.symbols
BUILT_GIRSOURCES =
@@ -14,7 +12,6 @@ libgeocode_glib_la_PUBLICSOURCES = \
geocode-reverse.c \
geocode-glib.c \
geocode-error.c \
- geocode-ipclient.c \
geocode-enum-types.c \
geocode-place.c
@@ -36,7 +33,6 @@ GCGLIB_HEADER_FILES = \
geocode-forward.h \
geocode-reverse.h \
geocode-error.h \
- geocode-ipclient.h \
geocode-place.h
gcglibdir = $(includedir)/$(PACKAGE)-$(GCLIB_API_VERSION)/$(PACKAGE)
@@ -99,17 +95,14 @@ CLEANFILES += $(gir_DATA) $(typelib_DATA)
endif # HAVE_INTROSPECTION
-TEST_PROGS += test-gcglib test-geoip
+TEST_PROGS += test-gcglib
noinst_PROGRAMS = $(TEST_PROGS)
test_gcglib_LDADD = libgeocode-glib.la $(GEOCODE_LIBS)
-test_geoip_LDADD = libgeocode-glib.la $(GEOCODE_LIBS)
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST += \
- data/freegeoip-results.json \
- data/gglib-ip-server-results.json \
data/nominatim-rio.json \
data/nominatim-area.json \
data/nominatim-no-results.json
diff --git a/geocode-glib/geocode-glib.h b/geocode-glib/geocode-glib.h
index 6d506cc..7b7a5e8 100644
--- a/geocode-glib/geocode-glib.h
+++ b/geocode-glib/geocode-glib.h
@@ -29,7 +29,6 @@
#include <geocode-glib/geocode-place.h>
#include <geocode-glib/geocode-forward.h>
#include <geocode-glib/geocode-reverse.h>
-#include <geocode-glib/geocode-ipclient.h>
#include <geocode-glib/geocode-error.h>
#include <geocode-glib/geocode-enum-types.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]