From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- recipes/ntop/ntop-3.0/autotools.patch | 536 ++++++++++++++++++++++++++++++++++ recipes/ntop/ntop-3.0/plugins.patch | 20 ++ recipes/ntop/ntop_3.0.bb | 38 +++ 3 files changed, 594 insertions(+) create mode 100644 recipes/ntop/ntop-3.0/autotools.patch create mode 100644 recipes/ntop/ntop-3.0/plugins.patch create mode 100644 recipes/ntop/ntop_3.0.bb (limited to 'recipes/ntop') diff --git a/recipes/ntop/ntop-3.0/autotools.patch b/recipes/ntop/ntop-3.0/autotools.patch new file mode 100644 index 0000000000..07ed6afd62 --- /dev/null +++ b/recipes/ntop/ntop-3.0/autotools.patch @@ -0,0 +1,536 @@ +--- ntop-3.0/acinclude.m4 2007/03/15 23:08:29 1.1 ++++ ntop-3.0/acinclude.m4 2007/03/15 23:08:43 +@@ -34,6 +34,9 @@ + dnl> #undef HAVE_ + dnl> + ++LIBTOOL='$host_alias-libtool' ++AC_SUBST(LIBTOOL)dnl ++ + AC_DEFUN([AC_CHECK_TYPEDEF],[dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_MSG_CHECKING(for typedef $1) +@@ -205,433 +208,3 @@ + fi + # Finished expansion of NTOPCONFIGDEBUG_SETTINGS() + ]) +-## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- +-## Copyright (C) 1996-1999 Free Software Foundation, Inc. +-## Originally by Gordon Matzigkeit , 1996 +-## +-## This program is free software; you can redistribute it and/or modify +-## it under the terms of the GNU General Public License as published by +-## the Free Software Foundation; either version 2 of the License, or +-## (at your option) any later version. +-## +-## This program is distributed in the hope that it will be useful, but +-## WITHOUT ANY WARRANTY; without even the implied warranty of +-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-## General Public License for more details. +-## +-## You should have received a copy of the GNU General Public License +-## along with this program; if not, write to the Free Software +-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +-## +-## As a special exception to the GNU General Public License, if you +-## distribute this file as part of a program that contains a +-## configuration script generated by Autoconf, you may include it under +-## the same distribution terms that you use for the rest of that program. +- +-## 1.4.2 modified by BMSIII - Mar2004 - to eliminate 1.5.2 whines about +-## underquoted AC _ DEFUN 's +- +-# serial 40 AC_PROG_LIBTOOL +-AC_DEFUN([AC_PROG_LIBTOOL], +-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +- +-# Save cache, so that ltconfig can load it +-AC_CACHE_SAVE +- +-# Actually configure libtool. ac_aux_dir is where install-sh is found. +-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ +-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ +-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ +-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ +-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ +-|| AC_MSG_ERROR([libtool configure failed]) +- +-# Reload cache, that may have been modified by ltconfig +-AC_CACHE_LOAD +- +-# This can be used to rebuild libtool when needed +-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" +- +-# Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-AC_SUBST(LIBTOOL)dnl +- +-# Redirect the config.log output again, so that the ltconfig log is not +-# clobbered by the next message. +-exec 5>>./config.log +-]) +- +-AC_DEFUN([AC_LIBTOOL_SETUP], +-[AC_PREREQ(2.13)dnl +-AC_REQUIRE([AC_ENABLE_SHARED])dnl +-AC_REQUIRE([AC_ENABLE_STATIC])dnl +-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-AC_REQUIRE([AC_PROG_RANLIB])dnl +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_PROG_LD])dnl +-AC_REQUIRE([AC_PROG_NM])dnl +-AC_REQUIRE([AC_PROG_LN_S])dnl +-dnl +- +-# Check for any special flags to pass to ltconfig. +-libtool_flags="--cache-file=$cache_file" +-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" +-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" +-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" +-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" +-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" +-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], +-[libtool_flags="$libtool_flags --enable-dlopen"]) +-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +-[libtool_flags="$libtool_flags --enable-win32-dll"]) +-AC_ARG_ENABLE(libtool-lock, +- [ --disable-libtool-lock avoid locking (might break parallel builds)]) +-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" +-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" +- +-# Some flags need to be propagated to the compiler or linker for good +-# libtool support. +-case "$host" in +-*-*-irix6*) +- # Find out which ABI we are using. +- echo '[#]line __oline__ "configure"' > conftest.$ac_ext +- if AC_TRY_EVAL(ac_compile); then +- case "`/usr/bin/file conftest.o`" in +- *32-bit*) +- LD="${LD-ld} -32" +- ;; +- *N32*) +- LD="${LD-ld} -n32" +- ;; +- *64-bit*) +- LD="${LD-ld} -64" +- ;; +- esac +- fi +- rm -rf conftest* +- ;; +- +-*-*-sco3.2v5*) +- # On SCO OpenServer 5, we need -belf to get full-featured binaries. +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -belf" +- AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, +- [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])]) +- if test x"$lt_cv_cc_needs_belf" != x"yes"; then +- # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf +- CFLAGS="$SAVE_CFLAGS" +- fi +- ;; +- +-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], +-[*-*-cygwin* | *-*-mingw*) +- AC_CHECK_TOOL(DLLTOOL, dlltool, false) +- AC_CHECK_TOOL(AS, as, false) +- AC_CHECK_TOOL(OBJDUMP, objdump, false) +- ;; +-]) +-esac +-]) +- +-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support +-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) +- +-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's +-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) +- +-# AC_ENABLE_SHARED - implement the --enable-shared flag +-# Usage: AC_ENABLE_SHARED[(DEFAULT)] +-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to +-# `yes'. +-AC_DEFUN([AC_ENABLE_SHARED], [dnl +-define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE(shared, +-changequote(<<, >>)dnl +-<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], +-changequote([, ])dnl +-[p=${PACKAGE-default} +-case "$enableval" in +-yes) enable_shared=yes ;; +-no) enable_shared=no ;; +-*) +- enable_shared=no +- # Look at the argument we got. We use all the common list separators. +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," +- for pkg in $enableval; do +- if test "X$pkg" = "X$p"; then +- enable_shared=yes +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac], +-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl +-]) +- +-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared +-AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_SHARED(no)]) +- +-# AC_ENABLE_STATIC - implement the --enable-static flag +-# Usage: AC_ENABLE_STATIC[(DEFAULT)] +-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to +-# `yes'. +-AC_DEFUN([AC_ENABLE_STATIC], [dnl +-define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE(static, +-changequote(<<, >>)dnl +-<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], +-changequote([, ])dnl +-[p=${PACKAGE-default} +-case "$enableval" in +-yes) enable_static=yes ;; +-no) enable_static=no ;; +-*) +- enable_static=no +- # Look at the argument we got. We use all the common list separators. +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," +- for pkg in $enableval; do +- if test "X$pkg" = "X$p"; then +- enable_static=yes +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac], +-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl +-]) +- +-# AC_DISABLE_STATIC - set the default static flag to --disable-static +-AC_DEFUN([AC_DISABLE_STATIC], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_STATIC(no)]) +- +- +-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag +-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] +-# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to +-# `yes'. +-AC_DEFUN([AC_ENABLE_FAST_INSTALL], [dnl +-define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl +-AC_ARG_ENABLE(fast-install, +-changequote(<<, >>)dnl +-<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], +-changequote([, ])dnl +-[p=${PACKAGE-default} +-case "$enableval" in +-yes) enable_fast_install=yes ;; +-no) enable_fast_install=no ;; +-*) +- enable_fast_install=no +- # Look at the argument we got. We use all the common list separators. +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," +- for pkg in $enableval; do +- if test "X$pkg" = "X$p"; then +- enable_fast_install=yes +- fi +- done +- IFS="$ac_save_ifs" +- ;; +-esac], +-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl +-]) +- +-# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install +-AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +-AC_ENABLE_FAST_INSTALL(no)]) +- +-# AC_PROG_LD - find the path to the GNU or non-GNU linker +-AC_DEFUN([AC_PROG_LD], +-[AC_ARG_WITH(gnu-ld, +-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], +-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) +-AC_REQUIRE([AC_PROG_CC])dnl +-AC_REQUIRE([AC_CANONICAL_HOST])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl +-ac_prog=ld +-if test "$ac_cv_prog_gcc" = yes; then +- # Check if gcc -print-prog-name=ld gives a path. +- AC_MSG_CHECKING([for ld used by GCC]) +- ac_prog=`($CC -print-prog-name=ld) 2>&5` +- case "$ac_prog" in +- # Accept absolute paths. +-changequote(,)dnl +- [\\/]* | [A-Za-z]:[\\/]*) +- re_direlt='/[^/][^/]*/\.\./' +-changequote([,])dnl +- # Canonicalize the path of ld +- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` +- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do +- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` +- done +- test -z "$LD" && LD="$ac_prog" +- ;; +- "") +- # If it fails, then pretend we aren't using GCC. +- ac_prog=ld +- ;; +- *) +- # If it is relative, then search for the first ld in PATH. +- with_gnu_ld=unknown +- ;; +- esac +-elif test "$with_gnu_ld" = yes; then +- AC_MSG_CHECKING([for GNU ld]) +-else +- AC_MSG_CHECKING([for non-GNU ld]) +-fi +-AC_CACHE_VAL(ac_cv_path_LD, +-[if test -z "$LD"; then +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" +- for ac_dir in $PATH; do +- test -z "$ac_dir" && ac_dir=. +- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then +- ac_cv_path_LD="$ac_dir/$ac_prog" +- # Check to see if the program is GNU ld. I'd rather use --version, +- # but apparently some GNU ld's only accept -v. +- # Break only if it was the GNU/non-GNU ld that we prefer. +- if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then +- test "$with_gnu_ld" != no && break +- else +- test "$with_gnu_ld" != yes && break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-else +- ac_cv_path_LD="$LD" # Let the user override the test with a path. +-fi]) +-LD="$ac_cv_path_LD" +-if test -n "$LD"; then +- AC_MSG_RESULT($LD) +-else +- AC_MSG_RESULT(no) +-fi +-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +-AC_SUBST(LD) +-AC_PROG_LD_GNU +-]) +- +-AC_DEFUN([AC_PROG_LD_GNU], +-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, +-[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +-if $LD -v 2>&1 &5; then +- ac_cv_prog_gnu_ld=yes +-else +- ac_cv_prog_gnu_ld=no +-fi]) +-]) +- +-# AC_PROG_NM - find the path to a BSD-compatible name lister +-AC_DEFUN([AC_PROG_NM], +-[AC_MSG_CHECKING([for BSD-compatible nm]) +-AC_CACHE_VAL(ac_cv_path_NM, +-[if test -n "$NM"; then +- # Let the user override the test. +- ac_cv_path_NM="$NM" +-else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" +- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then +- # Check to see if the nm accepts a BSD-compat flag. +- # Adding the `sed 1q' prevents false positives on HP-UX, which says: +- # nm: unknown option "B" ignored +- if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then +- ac_cv_path_NM="$ac_dir/nm -B" +- break +- elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then +- ac_cv_path_NM="$ac_dir/nm -p" +- break +- else +- ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but +- continue # so that we can try to find one that supports BSD flags +- fi +- fi +- done +- IFS="$ac_save_ifs" +- test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm +-fi]) +-NM="$ac_cv_path_NM" +-AC_MSG_RESULT([$NM]) +-AC_SUBST(NM) +-]) +- +-# AC_CHECK_LIBM - check for math library +-AC_DEFUN([AC_CHECK_LIBM], +-[AC_REQUIRE([AC_CANONICAL_HOST])dnl +-LIBM= +-case "$host" in +-*-*-beos* | *-*-cygwin*) +- # These system don't have libm +- ;; +-*-ncr-sysv4.3*) +- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") +- AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") +- ;; +-*) +- AC_CHECK_LIB(m, main, LIBM="-lm") +- ;; +-esac +-]) +- +-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for +-# the libltdl convenience library, adds --enable-ltdl-convenience to +-# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor +-# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed +-# to be `${top_builddir}/libltdl'. Make sure you start DIR with +-# '${top_builddir}/' (note the single quotes!) if your package is not +-# flat, and, if you're not using automake, define top_builddir as +-# appropriate in the Makefiles. +-AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- case "$enable_ltdl_convenience" in +- no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; +- "") enable_ltdl_convenience=yes +- ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; +- esac +- LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la +- INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) +-]) +- +-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for +-# the libltdl installable library, and adds --enable-ltdl-install to +-# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor +-# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed +-# to be `${top_builddir}/libltdl'. Make sure you start DIR with +-# '${top_builddir}/' (note the single quotes!) if your package is not +-# flat, and, if you're not using automake, define top_builddir as +-# appropriate in the Makefiles. +-# In the future, this macro may have to be called after AC_PROG_LIBTOOL. +-AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +- AC_CHECK_LIB(ltdl, main, +- [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], +- [if test x"$enable_ltdl_install" = xno; then +- AC_MSG_WARN([libltdl not installed, but installation disabled]) +- else +- enable_ltdl_install=yes +- fi +- ]) +- if test x"$enable_ltdl_install" = x"yes"; then +- ac_configure_args="$ac_configure_args --enable-ltdl-install" +- LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la +- INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl']) +- else +- ac_configure_args="$ac_configure_args --enable-ltdl-install=no" +- LIBLTDL="-lltdl" +- INCLTDL= +- fi +-]) +- +-dnl old names +-AC_DEFUN([AM_PROG_LIBTOOL], [indir([AC_PROG_LIBTOOL])])dnl +-AC_DEFUN([AM_ENABLE_SHARED], [indir([AC_ENABLE_SHARED], $@)])dnl +-AC_DEFUN([AM_ENABLE_STATIC], [indir([AC_ENABLE_STATIC], $@)])dnl +-AC_DEFUN([AM_DISABLE_SHARED], [indir([AC_DISABLE_SHARED], $@)])dnl +-AC_DEFUN([AM_DISABLE_STATIC], [indir([AC_DISABLE_STATIC], $@)])dnl +-AC_DEFUN([AM_PROG_LD], [indir([AC_PROG_LD])])dnl +-AC_DEFUN([AM_PROG_NM], [indir([AC_PROG_NM])])dnl +- +-dnl This is just to silence aclocal about the macro not being used +-ifelse([AC_DISABLE_FAST_INSTALL])dnl +--- ntop-3.0/configure.in 2007/03/15 23:08:29 1.1 ++++ ntop-3.0/configure.in 2007/03/15 23:08:34 +@@ -190,7 +190,6 @@ + AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_MAKE_SET +-AC_PROG_RANLIB + + NTOPCONFIGDEBUG_SETTINGS([After ac stuff]) + +@@ -223,7 +222,6 @@ + AC_MSG_CHECKING([for libtool]) + AC_MSG_RESULT([]) + +-dnl> Fix to: library used but `LIBTOOL' not defined in `configure.in' + AC_PROG_LIBTOOL + + dnl> Apple, just to be difficult, calls the gnu version glibtool... +@@ -231,9 +229,6 @@ + *-*-darwin*:* ) + AC_CHECK_TOOL(LIBTOOL, glibtool) + ;; +- * ) +- AC_CHECK_TOOL(LIBTOOL, libtool) +- ;; + esac + + dnl> Test before we use it, below +@@ -798,20 +793,22 @@ + [ +----------------------------------------------------------------------------+]) + + +-AC_MSG_CHECKING([for aclocal.m4]) +-AC_CHECK_FILE(aclocal.m4, , [ +- echo "" +- echo "Invoking aclocal to create aclocal.m4..." +- $ACLOCAL +- echo "" +-]) +-AC_CHECK_FILE(depcomp, , [ +- echo "" +- echo "depcomp missing... will install it in this ntop directory." +- echo " Invoking automake to copy depcomp..." +- $AUTOMAKE --gnu --copy --add-missing +- echo "" +-]) ++if test X"$cross_compiling" != Xyes; then ++ AC_MSG_CHECKING([for aclocal.m4]) ++ AC_CHECK_FILE(aclocal.m4, , [ ++ echo "" ++ echo "Invoking aclocal to create aclocal.m4..." ++ $ACLOCAL ++ echo "" ++ ]) ++ AC_CHECK_FILE(depcomp, , [ ++ echo "" ++ echo "depcomp missing... will install it in this ntop directory." ++ echo " Invoking automake to copy depcomp..." ++ $AUTOMAKE --gnu --copy --add-missing ++ echo "" ++ ]) ++fi + + dnl> Handle the root -> lib/include settings + NTOP_SET_LIBINC(PCAP) +@@ -2105,15 +2102,15 @@ + AC_STRUCT_TM + AC_STRUCT_TIMEZONE + +-AC_CHECK_TYPEDEF(u_int64_t, sys/types.h) +-AC_CHECK_TYPEDEF(uint64_t, sys/types.h) +-AC_CHECK_TYPEDEF(u_int32_t, sys/types.h) +-AC_CHECK_TYPEDEF(u_int16_t, sys/types.h) +-AC_CHECK_TYPEDEF(u_int8_t, sys/types.h) +-AC_CHECK_TYPEDEF(int64_t, sys/types.h) +-AC_CHECK_TYPEDEF(int32_t, sys/types.h) +-AC_CHECK_TYPEDEF(int16_t, sys/types.h) +-AC_CHECK_TYPEDEF(int8_t, sys/types.h) ++AC_CHECK_TYPES([u_int64_t]) ++AC_CHECK_TYPES([uint64_t]) ++AC_CHECK_TYPES([u_int32_t]) ++AC_CHECK_TYPES([u_int16_t]) ++AC_CHECK_TYPES([u_int8_t]) ++AC_CHECK_TYPES([int64_t]) ++AC_CHECK_TYPES([int32_t]) ++AC_CHECK_TYPES([int16_t]) ++AC_CHECK_TYPES([int8_t]) + + dnl> If this fails, it could be a bad -l which is going to kill + dnl> ALL the tests... so do the trivial compile test... diff --git a/recipes/ntop/ntop-3.0/plugins.patch b/recipes/ntop/ntop-3.0/plugins.patch new file mode 100644 index 0000000000..5552fe1077 --- /dev/null +++ b/recipes/ntop/ntop-3.0/plugins.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- ntop-3.0/plugins/Makefile.am~plugins ++++ ntop-3.0/plugins/Makefile.am +@@ -175,3 +175,12 @@ + @@AWK@ -f ../utils/xmldump.awk globals-structtypes.xml + + .NOTPARALLEL: ++icmpPlugin_so_SOURCES = ++lastSeenPlugin_so_SOURCES = ++netflowPlugin_so_SOURCES = ++nfsPlugin_so_SOURCES = ++pdaPlugin_so_SOURCES = ++rrdPlugin_so_SOURCES = ++sflowPlugin_so_SOURCES = ++xmldumpPlugin_so_SOURCES = ++rmonPlugin_so_SOURCES = diff --git a/recipes/ntop/ntop_3.0.bb b/recipes/ntop/ntop_3.0.bb new file mode 100644 index 0000000000..aa725222e9 --- /dev/null +++ b/recipes/ntop/ntop_3.0.bb @@ -0,0 +1,38 @@ +LICENSE = "GPL" +DESCRIPTION = "ntop is network top" +SECTION = "console/network" +PRIORITY = "optional" +DEPENDS = "gdbm zlib libpcap libpng gd" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tgz \ + file://${FILESDIR}/autotools.patch;patch=1 \ + file://${FILESDIR}/plugins.patch;patch=1" + +inherit autotools + +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}" + +FILES_ntop_append = " ${libdir}/ntop/plugins/*.so ${libdir}/libntop-*.so \ + ${libdir}/libntopreport-*.so" +FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so ${libdir}/libntopreport.so \ + ${libdir}/*.a ${libdir}/libntopreport.a ${libdir}/*.la" +FILES_${PN}-dbg += "${libdir}/ntop/plugins/.debug" + +do_configure_prepend () { + if [ ! -e acinclude.m4 ]; then + mv acinclude.m4.ntop acinclude.m4 + fi + rm -f libtool + cp ${STAGING_BINDIR_NATIVE}/${TARGET_SYS}-libtool libtool +} -- cgit 1.2.3-korg