summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nonworking/ntop/ntop-3.0/autotools.patch (renamed from nonworking/ntop/ntop-3.0/libtool-shut-up.patch)0
-rw-r--r--nonworking/ntop/ntop_3.0.oe29
2 files changed, 19 insertions, 10 deletions
diff --git a/nonworking/ntop/ntop-3.0/libtool-shut-up.patch b/nonworking/ntop/ntop-3.0/autotools.patch
index e69de29bb2..e69de29bb2 100644
--- a/nonworking/ntop/ntop-3.0/libtool-shut-up.patch
+++ b/nonworking/ntop/ntop-3.0/autotools.patch
diff --git a/nonworking/ntop/ntop_3.0.oe b/nonworking/ntop/ntop_3.0.oe
index 8f37092507..32e4e1b08c 100644
--- a/nonworking/ntop/ntop_3.0.oe
+++ b/nonworking/ntop/ntop_3.0.oe
@@ -1,19 +1,28 @@
DESCRIPTION = "ntop is network top"
SECTION = "network"
PRIORITY = "optional"
+DEPENDS = "gdbm zlib libpcap libpng gd"
SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tgz \
- file://${FILESDIR}/libtool-shut-up.patch;patch=1"
+ file://${FILESDIR}/autotools.patch;patch=1"
inherit autotools
-do_configure_prepend() {
- find . -name "acinclude.m4"|xargs rm -f
- find . -name "aclocal.m4" |xargs rm -f
- find . -name "config.h.in"|xargs rm -f
- find . -name "Makefile.in"|xargs rm -f
- find . -name "configure"|xargs rm -f
+EXTRA_OECONF += " --without-ssl \
+ --with-gd-lib=${STAGING_LIBDIR} \
+ --with-gd-include=${STAGING_INCDIR} \
+ --with-zlib-lib=${STAGING_LIBDIR} \
+ --with-zlib-include=${STAGING_INCDIR} \
+ --with-pcap-lib=${STAGING_LIBDIR} \
+ --with-pcap-include=${STAGING_INCDIR} \
+ --with-libpng-lib=${STAGING_LIBDIR} \
+ --with-libpng-include=${STAGING_INCDIR} \
+ --with-gdbm-lib=${STAGING_LIBDIR} \
+ --with-gdbm-include=${STAGING_INCDIR}"
+
+do_configure () {
+ if [ ! -e acinclude.m4 ]; then
+ mv acinclude.m4.ntop acinclude.m4
+ fi
+ autotools_do_configure
}
-
-export NTOPAUTOREBUILD=yes
-export NTOPCONFIGDEBUG=yes