[packages/ntop.git] / ntop-configure.patch

diff -urN ntop.org/Makefile.am ntop/Makefile.am
--- ntop.org/Makefile.am	Mon Mar 26 19:30:37 2001
+++ ntop/Makefile.am	Mon Mar 26 20:14:32 2001
@@ -214,15 +214,15 @@
 	@echo ""
 
 install-data-local:
-	@cp -p ntop-cert.pem $(bindir)/ntop-cert.pem
-	@$(top_srcdir)/mkinstalldirs $(libdir)/plugins;
-	@$(top_srcdir)/mkinstalldirs $(datadir)/ntop;
-	@$(top_srcdir)/mkinstalldirs $(datadir)/ntop/html;
+	@cp -p ntop-cert.pem $(DESTDIR)$(bindir)/ntop-cert.pem
+	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/plugins;
+	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop;
+	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop/html;
 	@for file in $(NTOPHTML); do \
           if test -d $$file; then \
-             $(top_srcdir)/mkinstalldirs $(datadir)/ntop/$$file; \
+             $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop/$$file; \
            else \
-             cp -p $$file $(datadir)/ntop/$$file; \
+             cp -p $$file $(DESTDIR)$(datadir)/ntop/$$file; \
           fi; \
         done
 
diff -urN ntop.org/configure.in ntop/configure.in
--- ntop.org/configure.in	Mon Mar 26 19:30:37 2001
+++ ntop/configure.in	Mon Mar 26 20:16:17 2001
@@ -385,12 +385,18 @@
     echo "checking for ncurses.h... yes"
     AC_DEFINE(HAVE_NCURSES_H)
   else
+    if test -f "/usr/include/ncurses/ncurses.h"; then
+      echo "checking for ncurses/ncurses.h... yes"
+      CFLAGS="$CFLAGS -I/usr/include/ncurses"
+      AC_DEFINE(HAVE_NCURSES_H)
+  else
     if test -f "/usr/include/curses.h"; then
       echo "checking for curses.h... yes"
       AC_DEFINE(HAVE_CURSES_H)
     else
       AC_MSG_WARN([It looks that you don't have ncurses.h/curses.h installed. Some ntop's features will be disabled.])
     fi
+   fi
   fi
 fi
 
@@ -534,7 +540,23 @@
 dnl>
 if test ".$ac_enable_tcpwrap" = ".yes"; then
   AC_MSG_WARN([TCP Wrap support enabled, if available, via command line option!])
-  AC_CHECK_LIB(wrap, request_init, MORELIBS="$MORELIBS -lwrap" && AC_DEFINE(HAVE_LIBWRAP))
+  AC_MSG_CHECKING(for libwrap)
+  saved_LIBS="$LIBS"
+  LIBS="$LIBS -lwrap"
+  AC_TRY_LINK([
+#include <tcpd.h>
+int deny_severity = 0, allow_severity = 0;
+	      ],
+	      [hosts_access(0);],
+              [
+	      	AC_MSG_RESULT(yes)
+		MORELIBS="$MORELIBS -lwrap"
+		AC_DEFINE(HAVE_LIBWRAP)
+	      ],
+	      [
+	      	AC_MSG_RESULT(no)
+	      ])
+  LIBS="$saved_LIBS"
 fi
 
 
@@ -860,12 +882,9 @@
   if test ".${GDCHART_ROOT}" != .; then
     if test -d $GDCHART_ROOT &&
        test -r $GDCHART_ROOT/libgdchart.a &&
-       test -r $GDCHART_ROOT/gdc.h &&
-       test -r $GDCHART_ROOT/gd-1.8.3/libgd.a &&
-       test -r $GDCHART_ROOT/gd-1.8.3/gd.h &&
-       test -r $GDCHART_ROOT/zlib-1.1.3/libz.a; then
+       test -r $GDCHART_ROOT/gdc.h; then
          GDCHART_ROOT=`cd ${GDCHART_ROOT} && pwd`
-         MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -L$GDCHART_ROOT/gd-1.8.3 -lgd -L$GDCHART_ROOT/gd-1.8.3/libpng-1.0.8 -lpng -L$GDCHART_ROOT/zlib-1.1.3 -lz"
+         MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -lgd -lpng -lz"
          INCS="${INCS} -I$GDCHART_ROOT"
          AC_DEFINE(HAVE_GDCHART)
          AC_MSG_RESULT([found in $GDCHART_ROOT])
@@ -883,14 +902,10 @@
   else
     if test -d ../gdchart0.94c &&
        test -r ../gdchart0.94c/gdc.h &&
-       test -r ../gdchart0.94c/libgdchart.a &&
-       test -r ../gdchart0.94c/gd-1.8.3/libgd.a &&
-       test -r ../gdchart0.94c/gd-1.8.3/gd.h &&
-       test -r ../gdchart0.94c/gd-1.8.3/libpng-1.0.8/libpng.a &&
-       test -r ../gdchart0.94c/gd-1.8.3/libpng-1.0.8/gd.h; then
+       test -r ../gdchart0.94c/libgdchart.a; then
          GDCHART_ROOT="../gdchart0.94c"
          GDCHART_ROOT=`cd ${GDCHART_ROOT} && pwd`
-         MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -L$GDCHART_ROOT/gd-1.8.3 -lgd -L$GDCHART_ROOT/gd-1.8.3/libpng-1.0.8 -lpng"
+         MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -lgd -lpng"
          INCS="${INCS} -I$GDCHART_ROOT"
          AC_DEFINE(HAVE_GDCHART)
          AC_MSG_RESULT([found in $GDCHART_ROOT])
@@ -921,11 +936,14 @@
   AC_MSG_CHECKING([for OpenSSL Library by Open SLL Project (optional package)])
   if test ".${OSSL_ROOT}" != .; then
     if test -d $OSSL_ROOT &&
-       test -r $OSSL_ROOT/libssl.a &&
-       test -r $OSSL_ROOT/openssl/ssl.h; then
+       test -r $OSSL_ROOT/lib/libssl.so &&
+       test -r $OSSL_ROOT/include/openssl/ssl.h; then
+         if test -f $OSSL_ROOT/lib/libcrypto.so; then
+	 	MORELIBS="${MORELIBS} -lcrypto"
+	 fi
          OSSL_ROOT=`cd ${OSSL_ROOT} && pwd`
-         MORELIBS="${MORELIBS} -L$OSSL_ROOT -lssl"
-         INCS="${INCS} -I$OSSL_ROOT"
+         MORELIBS="${MORELIBS} -L$OSSL_ROOT/lib -lssl"
+         INCS="${INCS} -I$OSSL_ROOT/include/openssl"
          AC_DEFINE(HAVE_OPENSSL)
          AC_MSG_RESULT([found in $OSSL_ROOT])
     else
@@ -1005,8 +1023,7 @@
 dnl> Do not walk in the plugins/ subdir if the user decided he/she does not need any plugin.
 dnl>
 if test "$ac_disable_plugins" = yes; then
-    PLUGINS=''
-else
+  PLUGINS=''
   AC_MSG_WARN([compilation of ntop's plugins disabled via command line option!])
 fi
 
diff -urN ntop.org/intop/intop.c ntop/intop/intop.c
--- ntop.org/intop/intop.c	Mon Mar 26 19:30:37 2001
+++ ntop/intop/intop.c	Mon Mar 26 20:14:32 2001
@@ -66,6 +66,10 @@
 int active = -1;               /* an index for the active interface (if any) */
 int previous = -1;             /* an index for the previous interface (if any) */
 
+#ifdef HAVE_LIBWRAP
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_WARNING;
+#endif
 
 /*
  * You are welcome!
diff -urN ntop.org/main.c ntop/main.c
--- ntop.org/main.c	Mon Mar 26 19:30:37 2001
+++ ntop/main.c	Mon Mar 26 20:14:32 2001
@@ -67,6 +67,10 @@
 
 /* That's the meat */
 int main(int argc, char *argv[]) {
+#ifdef HAVE_LIBWRAP
+    int allow_severity = LOG_INFO;
+    int deny_severity = LOG_WARNING;
+#endif                                             
   int pflag, i;
 #ifdef WIN32
   int optind=0;
diff -urN ntop.org/plugins/Makefile.am ntop/plugins/Makefile.am
--- ntop.org/plugins/Makefile.am	Mon Mar 26 19:30:37 2001
+++ ntop/plugins/Makefile.am	Mon Mar 26 20:14:32 2001
@@ -93,9 +93,9 @@
 	@ln -s .libs/libwapPlugin.so wapPlugin.so
 
 install-data-local:
-	@$(top_srcdir)/mkinstalldirs $(plugindir);
+	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir);
 	@for file in $(noinst_PROGRAMS); do \
-             cp -p $$file $(plugindir)/$$file; \
+             cp -p $$file $(DESTDIR)$(plugindir)/$$file; \
          done
 # remove installed libraries
 	@for file in $(lib_LTLIBRARIES); do \
Commit	Line	Data
ceb57a05 AM	1	diff -urN ntop.org/Makefile.am ntop/Makefile.am
	2	--- ntop.org/Makefile.am Mon Mar 26 19:30:37 2001
	3	+++ ntop/Makefile.am Mon Mar 26 20:14:32 2001
	4	@@ -214,15 +214,15 @@
c93ca0c3 AM	5	@echo ""
	6
	7	install-data-local:
	8	- @cp -p ntop-cert.pem $(bindir)/ntop-cert.pem
	9	- @$(top_srcdir)/mkinstalldirs $(libdir)/plugins;
	10	- @$(top_srcdir)/mkinstalldirs $(datadir)/ntop;
	11	- @$(top_srcdir)/mkinstalldirs $(datadir)/ntop/html;
	12	+ @cp -p ntop-cert.pem $(DESTDIR)$(bindir)/ntop-cert.pem
	13	+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/plugins;
	14	+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop;
	15	+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop/html;
	16	@for file in $(NTOPHTML); do \
	17	if test -d $$file; then \
	18	- $(top_srcdir)/mkinstalldirs $(datadir)/ntop/$$file; \
	19	+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop/$$file; \
	20	else \
	21	- cp -p $$file $(datadir)/ntop/$$file; \
	22	+ cp -p $$file $(DESTDIR)$(datadir)/ntop/$$file; \
	23	fi; \
	24	done
	25
ceb57a05 AM	26	diff -urN ntop.org/configure.in ntop/configure.in
	27	--- ntop.org/configure.in Mon Mar 26 19:30:37 2001
	28	+++ ntop/configure.in Mon Mar 26 20:16:17 2001
	29	@@ -385,12 +385,18 @@
c93ca0c3 AM	30	echo "checking for ncurses.h... yes"
	31	AC_DEFINE(HAVE_NCURSES_H)
	32	else
	33	+ if test -f "/usr/include/ncurses/ncurses.h"; then
	34	+ echo "checking for ncurses/ncurses.h... yes"
	35	+ CFLAGS="$CFLAGS -I/usr/include/ncurses"
	36	+ AC_DEFINE(HAVE_NCURSES_H)
	37	+ else
	38	if test -f "/usr/include/curses.h"; then
	39	echo "checking for curses.h... yes"
	40	AC_DEFINE(HAVE_CURSES_H)
	41	else
	42	AC_MSG_WARN([It looks that you don't have ncurses.h/curses.h installed. Some ntop's features will be disabled.])
	43	fi
	44	+ fi
	45	fi
	46	fi
	47
ceb57a05	48	@@ -534,7 +540,23 @@
c93ca0c3 AM	49	dnl>
	50	if test ".$ac_enable_tcpwrap" = ".yes"; then
	51	AC_MSG_WARN([TCP Wrap support enabled, if available, via command line option!])
	52	- AC_CHECK_LIB(wrap, request_init, MORELIBS="$MORELIBS -lwrap" && AC_DEFINE(HAVE_LIBWRAP))
	53	+ AC_MSG_CHECKING(for libwrap)
	54	+ saved_LIBS="$LIBS"
	55	+ LIBS="$LIBS -lwrap"
	56	+ AC_TRY_LINK([
	57	+#include <tcpd.h>
	58	+int deny_severity = 0, allow_severity = 0;
	59	+ ],
	60	+ [hosts_access(0);],
	61	+ [
	62	+ AC_MSG_RESULT(yes)
	63	+ MORELIBS="$MORELIBS -lwrap"
	64	+ AC_DEFINE(HAVE_LIBWRAP)
	65	+ ],
	66	+ [
	67	+ AC_MSG_RESULT(no)
	68	+ ])
	69	+ LIBS="$saved_LIBS"
	70	fi
	71
	72
ceb57a05 AM	73	@@ -860,12 +882,9 @@
	74	if test ".${GDCHART_ROOT}" != .; then
	75	if test -d $GDCHART_ROOT &&
	76	test -r $GDCHART_ROOT/libgdchart.a &&
	77	- test -r $GDCHART_ROOT/gdc.h &&
	78	- test -r $GDCHART_ROOT/gd-1.8.3/libgd.a &&
	79	- test -r $GDCHART_ROOT/gd-1.8.3/gd.h &&
	80	- test -r $GDCHART_ROOT/zlib-1.1.3/libz.a; then
	81	+ test -r $GDCHART_ROOT/gdc.h; then
	82	GDCHART_ROOT=`cd ${GDCHART_ROOT} && pwd`
	83	- MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -L$GDCHART_ROOT/gd-1.8.3 -lgd -L$GDCHART_ROOT/gd-1.8.3/libpng-1.0.8 -lpng -L$GDCHART_ROOT/zlib-1.1.3 -lz"
	84	+ MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -lgd -lpng -lz"
	85	INCS="${INCS} -I$GDCHART_ROOT"
	86	AC_DEFINE(HAVE_GDCHART)
	87	AC_MSG_RESULT([found in $GDCHART_ROOT])
	88	@@ -883,14 +902,10 @@
	89	else
	90	if test -d ../gdchart0.94c &&
	91	test -r ../gdchart0.94c/gdc.h &&
	92	- test -r ../gdchart0.94c/libgdchart.a &&
	93	- test -r ../gdchart0.94c/gd-1.8.3/libgd.a &&
	94	- test -r ../gdchart0.94c/gd-1.8.3/gd.h &&
	95	- test -r ../gdchart0.94c/gd-1.8.3/libpng-1.0.8/libpng.a &&
	96	- test -r ../gdchart0.94c/gd-1.8.3/libpng-1.0.8/gd.h; then
	97	+ test -r ../gdchart0.94c/libgdchart.a; then
	98	GDCHART_ROOT="../gdchart0.94c"
	99	GDCHART_ROOT=`cd ${GDCHART_ROOT} && pwd`
	100	- MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -L$GDCHART_ROOT/gd-1.8.3 -lgd -L$GDCHART_ROOT/gd-1.8.3/libpng-1.0.8 -lpng"
	101	+ MORELIBS="${MORELIBS} -L$GDCHART_ROOT -lgdchart -lgd -lpng"
	102	INCS="${INCS} -I$GDCHART_ROOT"
	103	AC_DEFINE(HAVE_GDCHART)
	104	AC_MSG_RESULT([found in $GDCHART_ROOT])
	105	@@ -921,11 +936,14 @@
c93ca0c3 AM	106	AC_MSG_CHECKING([for OpenSSL Library by Open SLL Project (optional package)])
	107	if test ".${OSSL_ROOT}" != .; then
	108	if test -d $OSSL_ROOT &&
	109	- test -r $OSSL_ROOT/libssl.a &&
	110	- test -r $OSSL_ROOT/openssl/ssl.h; then
	111	+ test -r $OSSL_ROOT/lib/libssl.so &&
	112	+ test -r $OSSL_ROOT/include/openssl/ssl.h; then
	113	+ if test -f $OSSL_ROOT/lib/libcrypto.so; then
	114	+ MORELIBS="${MORELIBS} -lcrypto"
	115	+ fi
	116	OSSL_ROOT=`cd ${OSSL_ROOT} && pwd`
	117	- MORELIBS="${MORELIBS} -L$OSSL_ROOT -lssl"
	118	- INCS="${INCS} -I$OSSL_ROOT"
	119	+ MORELIBS="${MORELIBS} -L$OSSL_ROOT/lib -lssl"
	120	+ INCS="${INCS} -I$OSSL_ROOT/include/openssl"
	121	AC_DEFINE(HAVE_OPENSSL)
	122	AC_MSG_RESULT([found in $OSSL_ROOT])
	123	else
ceb57a05 AM	124	@@ -1005,8 +1023,7 @@
	125	dnl> Do not walk in the plugins/ subdir if the user decided he/she does not need any plugin.
	126	dnl>
	127	if test "$ac_disable_plugins" = yes; then
	128	- PLUGINS=''
	129	-else
	130	+ PLUGINS=''
	131	AC_MSG_WARN([compilation of ntop's plugins disabled via command line option!])
	132	fi
	133
	134	diff -urN ntop.org/intop/intop.c ntop/intop/intop.c
	135	--- ntop.org/intop/intop.c Mon Mar 26 19:30:37 2001
	136	+++ ntop/intop/intop.c Mon Mar 26 20:14:32 2001
c93ca0c3 AM	137	@@ -66,6 +66,10 @@
	138	int active = -1; /* an index for the active interface (if any) */
	139	int previous = -1; /* an index for the previous interface (if any) */
	140
	141	+#ifdef HAVE_LIBWRAP
	142	+int allow_severity = LOG_INFO;
	143	+int deny_severity = LOG_WARNING;
	144	+#endif
	145
	146	/*
	147	* You are welcome!
ceb57a05 AM	148	diff -urN ntop.org/main.c ntop/main.c
	149	--- ntop.org/main.c Mon Mar 26 19:30:37 2001
	150	+++ ntop/main.c Mon Mar 26 20:14:32 2001
c93ca0c3 AM	151	@@ -67,6 +67,10 @@
	152
	153	/* That's the meat */
	154	int main(int argc, char *argv[]) {
	155	+#ifdef HAVE_LIBWRAP
ceb57a05 AM	156	+ int allow_severity = LOG_INFO;
	157	+ int deny_severity = LOG_WARNING;
	158	+#endif
	159	int pflag, i;
c93ca0c3 AM	160	#ifdef WIN32
c93ca0c3 AM	161	int optind=0;
ceb57a05 AM	162	diff -urN ntop.org/plugins/Makefile.am ntop/plugins/Makefile.am
	163	--- ntop.org/plugins/Makefile.am Mon Mar 26 19:30:37 2001
	164	+++ ntop/plugins/Makefile.am Mon Mar 26 20:14:32 2001
	165	@@ -93,9 +93,9 @@
c93ca0c3 AM	166	@ln -s .libs/libwapPlugin.so wapPlugin.so
	167
	168	install-data-local:
	169	- @$(top_srcdir)/mkinstalldirs $(plugindir);
	170	+ @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(plugindir);
	171	@for file in $(noinst_PROGRAMS); do \
	172	- cp -p $$file $(plugindir)/$$file; \
	173	+ cp -p $$file $(DESTDIR)$(plugindir)/$$file; \
	174	done
	175	# remove installed libraries
	176	@for file in $(lib_LTLIBRARIES); do \