Ticket #23236: configure.in.rej

File configure.in.rej, 1.5 KB (added by sck-nogas (Scott C. Kennedy), 14 years ago)

configure.in.rej

Line 
1***************
2*** 1883,1921 ****
3  fi
4 
5  dnl> GeoIP (http://www.maxmind.com/)
6- if test -f "GeoIP.tar.gz"; then
7-    echo "GeoIP already present on this machine"
8- else
9-    wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
10-    tar xvfz GeoIP.tar.gz
11-    GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
12-    cd $GEO_DIR; ./configure; make; cd ..
13-    # OSX Fix
14-    GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
15-    if test -f $GEO_DYLIB; then
16-       ln -s $GEO_DYLIB .
17-    fi
18- fi
19-
20- if test -f "GeoLiteCity.dat"; then
21-    echo "GeoLiteCity.dat already present"
22- else
23-    wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
24-    gunzip GeoLiteCity.dat.gz
25- fi
26-
27- if test -f "GeoIPASNum.dat"; then
28-    echo "GeoIPASNum.dat already present"
29- else
30-    wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
31-    gunzip GeoIPASNum.dat.gz
32- fi
33-
34-
35- GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
36- GEO_IP="$GEO_DIR/libGeoIP/"
37- CFLAGS="$CFLAGS -I$GEO_IP"
38- LDFLAGS="$LDFLAGS -L$GEO_IP.libs/ -lGeoIP"
39 
40  dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
41 
42--- 1883,1889 ----
43  fi
44 
45  dnl> GeoIP (http://www.maxmind.com/)
46+ LDFLAGS="$LDFLAGS -lGeoIP"
47 
48  dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
49 
50***************
51*** 2080,2086 ****
52  AC_SUBST(SO_VERSION_PATCH)
53  AC_SUBST(RRD_LIB)
54  AC_SUBST(RRD_INC)
55- AC_SUBST(GEO_DIR)
56 
57  AC_CONFIG_FILES([Makefile])
58 
59--- 2048,2053 ----
60  AC_SUBST(SO_VERSION_PATCH)
61  AC_SUBST(RRD_LIB)
62  AC_SUBST(RRD_INC)
63 
64  AC_CONFIG_FILES([Makefile])
65