1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
Index: tork-0.08/configure.in.in
===================================================================
--- tork-0.08.orig/configure.in.in
+++ tork-0.08/configure.in.in
@@ -209,22 +209,3 @@ if test "$ac_cv_openssl_linker_option" !
LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS"
fi
-
-# - GeoIP
-
-GEOVERSION=1.4.0
-PACKAGE=GeoIP
-GEOIP_VERSION_INFO=`echo $GEOVERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
-AC_SUBST(GEOIP_VERSION_INFO)
-
-AC_ARG_WITH(city,
-[ --with-city=\"no\" Enable/disable support for GeoIP City Edition. (yes)])
-if test "$with_city" = "no" ; then
- echo Disabling GeoIP City Edition support
- WITH_CITY=1
-else
- echo Enabling GeoIP City Edition support
- WITH_CITY=0
-fi
-AC_SUBST(WITH_CITY)
-AM_CONDITIONAL(WITH_CITY, test "$with_city" != "no")
Index: tork-0.08/src/Makefile.am
===================================================================
--- tork-0.08.orig/src/Makefile.am
+++ tork-0.08/src/Makefile.am
@@ -4,7 +4,7 @@
# of the other Makefile.am variables
bin_PROGRAMS = tork
-SUBDIRS=icons about arkollon GeoIP-1.4.0 .
+SUBDIRS=icons about arkollon .
# set the include path for X, qt and KDE
INCLUDES = $(all_includes)
@@ -16,7 +16,7 @@ METASOURCES = AUTO
tork_LDFLAGS = $(KDE_RPATH) $(all_libraries)
# the libraries to link against.
-tork_LDADD = $(LIB_KFILE) $(LIB_KHTML) -L GeoIP-1.4.0/libGeoIP/libGeoIP.la
+tork_LDADD = $(LIB_KFILE) $(LIB_KHTML) -lGeoIP
# which sources should be compiled for tork
tork_SOURCES = torkconfig.kcfgc main.cpp tork.cpp torkview.cpp torkview_base.ui \
Index: tork-0.08/src/torkview.cpp
===================================================================
--- tork-0.08.orig/src/torkview.cpp
+++ tork-0.08/src/torkview.cpp
@@ -30,7 +30,7 @@
#include "portsandicons.h"
#include "torkconfig.h"
-#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
+#include "GeoIP.h"
#include "kdebug.h"
Index: tork-0.08/src/server.ui.h
===================================================================
--- tork-0.08.orig/src/server.ui.h
+++ tork-0.08/src/server.ui.h
@@ -16,7 +16,7 @@
#include <qpopupmenu.h>
#include <kiconloader.h>
-#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
+#include <GeoIP.h>
void MyServer::init()
{
Index: tork-0.08/src/torclient.cpp
===================================================================
--- tork-0.08.orig/src/torclient.cpp
+++ tork-0.08/src/torclient.cpp
@@ -21,7 +21,7 @@
#include <assert.h>
#include <qfile.h>
-#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
+#include <GeoIP.h>
Client::Client( const QString &host, Q_UINT16 port )
Index: tork-0.08/src/tork.cpp
===================================================================
--- tork-0.08.orig/src/tork.cpp
+++ tork-0.08/src/tork.cpp
@@ -78,7 +78,8 @@
#include <qhostaddress.h>
-#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
+
+#include <GeoIP.h>
tork *kmain = 0L;
Index: tork-0.08/src/torservers.ui.h
===================================================================
--- tork-0.08.orig/src/torservers.ui.h
+++ tork-0.08/src/torservers.ui.h
@@ -16,7 +16,7 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include "GeoIP-1.4.0/libGeoIP/GeoIP.h"
+#include <GeoIP.h>
typedef QMap<QString, QString> codemap;
QString ccode;
|
GitWeb