ntop-am.patch

   1 --- ntop-3.2/Makefile.am~       2006-01-02 02:50:33.000000000 +0200
   2 +++ ntop-3.2/Makefile.am        2006-01-02 02:50:35.000000000 +0200
   3 @@ -97,7 +97,7 @@
   4  #
   5  # The Games
   6  #
   7 -bin_PROGRAMS   = ntop
   8 +sbin_PROGRAMS   = ntop
   9  EXTRA_PROGRAMS = ntops sntop
  10  bin_SCRIPTS    =
  11
  12 --- ntop-3.2/configure.in~      2006-01-02 02:53:17.000000000 +0200
  13 +++ ntop-3.2/configure.in       2006-01-02 02:53:46.000000000 +0200
  14 @@ -234,7 +234,7 @@
  15  AC_PROG_INSTALL
  16  AC_PROG_LN_S
  17  AC_PROG_MAKE_SET
  18 -AC_PROG_RANLIB
  19 +AC_PROG_LIBTOOL
  20
  21  NTOPCONFIGDEBUG_SETTINGS([After ac stuff])
  22
  23 --- ntop-3.2/configure.in~      2006-01-02 02:54:22.000000000 +0200
  24 +++ ntop-3.2/configure.in       2006-01-02 02:58:04.000000000 +0200
  25 @@ -61,7 +61,7 @@
  26  HAS_ERROR=
  27  HAS_WARNING=
  28
  29 -NTOP_VERSION_EXTRA=" SourceForge .tgz"
  30 +NTOP_VERSION_EXTRA=" PLD Linux RPM"
  31
  32  echo
  33  echo "Welcome to $PACKAGE_NAME, Version $PACKAGE_VERSION $NTOP_VERSION_EXTRA"
  34 diff -ur ntop-3.2/Makefile.am ntop-3.2.am/Makefile.am
  35 --- ntop-3.2/Makefile.am        2006-01-02 12:32:14.000000000 +0200
  36 +++ ntop-3.2.am/Makefile.am     2006-01-02 12:28:11.000000000 +0200
  37 @@ -46,13 +46,6 @@
  38  CLEANFILES     = $(DISTCLEANFILES)
  39  INSTALLCLEANFILES = addressQueue.db dnsCache.db
  40
  41 -#
  42 -# Fake out the missing tests for the auto* tools
  43 -#
  44 -ACLOCAL = /bin/sh ./missing --run echo
  45 -AUTOCONF = /bin/sh ./missing --run echo
  46 -AUTOMAKE = /bin/sh ./missing --run echo
  47 -AUTOHEADER = /bin/sh ./missing --run echo
  48
  49  # A list of all the files in the current directory which can be regenerated
  50  MAINTAINERCLEANFILES = COPYING Makefile.in aclocal.m4 config.guess \
  51 diff -ur ntop-3.2/configure.in ntop-3.2.am/configure.in
  52 --- ntop-3.2/configure.in       2006-01-02 12:32:14.000000000 +0200
  53 +++ ntop-3.2.am/configure.in    2006-01-02 12:27:48.000000000 +0200
  54 @@ -1827,6 +1827,7 @@
  55        AC_DEFINE(HAVE_ISINF,1,we have the isinf function)],[AC_MSG_RESULT(no)])])
  56
  57  dnl> XML dump (plugin)
  58 +AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib2 distribution not found.), gmodule)
  59  AC_CHECK_HEADERS(glib.h glibconfig.h)
  60  AC_CHECK_HEADERS(gdome.h)
  61
  62 diff -u ntop-3.2/configure.in ntop-3.2.gdome/configure.in
  63 --- ntop-3.2/configure.in       2006-01-02 15:42:02.000000000 +0200
  64 +++ ntop-3.2.gdome/configure.in 2006-01-02 14:45:38.000000000 +0200
  65 @@ -1827,9 +1827,21 @@
  66        AC_DEFINE(HAVE_ISINF,1,we have the isinf function)],[AC_MSG_RESULT(no)])])
  67
  68  dnl> XML dump (plugin)
  69 -AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS", AC_MSG_ERROR(GLib2 distribution not found.), gmodule)
  70 +AM_PATH_GLIB_2_0(2.0.0, , AC_MSG_ERROR(GLib2 distribution not found.), gmodule)
  71 +
  72 +CPPFLAGS_save="$CPPFLAGS"
  73 +CPPFLAGS="$CPPFLAGS $GLIB_CFLAGS"
  74  AC_CHECK_HEADERS(glib.h glibconfig.h)
  75 +CPPFLAGS="$CPPFLAGS_save"
  76 +
  77 +PKG_CHECK_MODULES(GDOME, gdome2 >= 0.7.0,, AC_MSG_ERROR(could not find Gdome2))
  78 +AC_SUBST(GDOME_CFLAGS)
  79 +AC_SUBST(GDOME_LIBS)
  80 +
  81 +CPPFLAGS_save="$CPPFLAGS"
  82 +CPPFLAGS="$CPPFLAGS $GDOME_CFLAGS"
  83  AC_CHECK_HEADERS(gdome.h)
  84 +CPPFLAGS="$CPPFLAGS_save"
  85
  86  AC_TYPE_PID_T
  87  dnl> Autoconf2: AC_CHECK_TYPE(pid_t, int)
  88 diff -u ntop-3.2/plugins/Makefile.am ntop-3.2.gdome/plugins/Makefile.am
  89 --- ntop-3.2/plugins/Makefile.am        2006-01-02 15:42:02.000000000 +0200
  90 +++ ntop-3.2.gdome/plugins/Makefile.am  2006-01-02 15:41:18.000000000 +0200
  91 @@ -84,7 +84,7 @@
  92
  93  libxmldumpPlugin_la_SOURCES = xmldumpPlugin.c
  94  libxmldumpPlugin_la_LDFLAGS = -shared -release @PACKAGE_VERSION@ @DYN_FLAGS@
  95 -libxmldumpPlugin_la_CFLAGS = $(AM_CFLAGS)
  96 +libxmldumpPlugin_la_CFLAGS = $(AM_CFLAGS) $(GDOME_CFLAGS) $(GLIB_CFLAGS)
  97
  98  #
  99  # Dependencies to allow ntop loading plugins on-place