Search
j0ke.net Open Build Service
>
Projects
>
server:monitoring
>
ntop
> ntop-3.3.99.1-geoip.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File ntop-3.3.99.1-geoip.patch of Package ntop (Revision 58)
Currently displaying revision
58
,
show latest
--- Makefile.am.orig 2009-01-11 21:25:20.000000000 +0100 +++ Makefile.am 2009-01-11 21:25:30.000000000 +0100 @@ -270,8 +270,6 @@ install: install-recursive - cd @GEO_DIR@; make install - @mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR) @echo "" --- configure.in.orig 2009-05-06 16:55:22.000000000 +0200 +++ configure.in 2009-05-23 11:06:17.000000000 +0200 @@ -1652,20 +1652,7 @@ dnl> dnl> Lua - http://www.lua.org dnl> -LUA_VERSION=lua-5.1.4 -if test -f "$LUA_VERSION.tar.gz"; then - echo "Lua already present on this machine" -else - wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz -fi - -tar xvfz $LUA_VERSION.tar.gz -cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp -cat /tmp/lua.temp > $LUA_VERSION/src/Makefile -#rm -f /tmp/lua.temp -cd $LUA_VERSION; make posix; cd .. - -LUA_LIB_DIR=$PWD/$LUA_VERSION"/src" +LUA_LIB_DIR="/usr/include" LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} " INCS="${INCS} -I${LUA_LIB_DIR}" AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported]) @@ -1963,20 +1950,6 @@ fi dnl> GeoIP (http://www.maxmind.com/) -if test -f "GeoIP.tar.gz"; then - echo "GeoIP already present on this machine" -else - wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz -fi -tar xvfz GeoIP.tar.gz -GEO_DIR=`find $PWD -type d -name "GeoIP-*"` -cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd .. -# OSX Fix -GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib" -if test -f $GEO_DYLIB; then - ln -s $GEO_DYLIB . -fi - if test -f "GeoLiteCity.dat"; then echo "GeoLiteCity.dat already present" else @@ -1992,10 +1965,9 @@ fi -GEO_DIR=`find $PWD -type d -name "GeoIP-*"` -GEO_IP="$GEO_DIR/libGeoIP/" +GEO_IP="/usr/include" CFLAGS="$CFLAGS -I$GEO_IP" -LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS" +LDFLAGS="$LDFLAGS -L$LIBDIR -lGeoIP" dnl> NTOPCONFIGDEBUG_SETTINGS([precet])