Merge openembedded@openembedded.bkbits.net:packages

into linux.local:/home/kergoth/code/packages

2004/05/22 20:21:44-04:00 local!kergoth
Another pass of fixes for the ntop build.

BKrev: 40afeea1mH_KWODG4Kqw-nJacBq_Tw

diff --git a/nonworking/ntop/ntop-3.0/libtool-shut-up.patch b/nonworking/ntop/ntop-3.0/autotools.patch
similarity index 100%
rename from nonworking/ntop/ntop-3.0/libtool-shut-up.patch
rename to nonworking/ntop/ntop-3.0/autotools.patch

diff --git a/nonworking/ntop/ntop_3.0.oe b/nonworking/ntop/ntop_3.0.oe
index 8f37092..32e4e1b 100644 (file)
--- 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