Attachment 3447 Details for Bug 8866 – the fix

[patch] the fix

ntop-5.0.1-system_ndpi.diff (text/plain), 1.19 KB, created by Oden Eriksson on 2013-01-28 12:28:04 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Oden Eriksson

Created: 2013-01-28 12:28:04 CET

Size: 1.19 KB

patch

obsolete

>diff -Naurp ntop-5.0.1/autogen.sh ntop-5.0.1.oden/autogen.sh
>--- ntop-5.0.1/autogen.sh	2012-02-20 11:35:43.000000000 +0100
>+++ ntop-5.0.1.oden/autogen.sh	2013-01-28 11:38:57.969085533 +0100
>@@ -434,26 +434,6 @@ rm -f /tmp/acin* /tmp/acout*
> rm -f autoha*
> rm -f confdefs.h
> 
>-# Get nDPI
>-
>-echo "9. Downloading nDPI..."
>-
>-NDPI_URL=https://svn.ntop.org/svn/ntop/trunk/nDPI/
>-if test -d nDPI; then
>-    echo "nDPI already available"
>-else
>-    svn co $NDPI_URL
>-fi
>-
>-dnl> nDPI compilation
>-if test -f NDPI_LIB; then
>-    echo "nDPI already compiled"
>-else
>-    echo "10. Compiling nDPI..."
>-    cd nDPI; ./configure --with-pic; make; cd ..
>-fi
>-
>-
> echo
> echo "Now we're ready to compile ntop"
> 
>diff -Naurp ntop-5.0.1/configure.in ntop-5.0.1.oden/configure.in
>--- ntop-5.0.1/configure.in	2013-01-28 11:36:46.998091799 +0100
>+++ ntop-5.0.1.oden/configure.in	2013-01-28 11:38:58.016085530 +0100
>@@ -688,8 +688,8 @@ if test ".${ac_cv_header_gdbm_h}" != ".y
> fi
> 
> dnl> nDPI based on OpenDPI (https://code.google.com/p/opendpi/)
>-NDPI_LIB=./nDPI/src/lib/.libs/libndpi.a
>-NDPI_INC=./nDPI/src/include/
>+NDPI_LIB=`pkg-config --libs libndpi`
>+NDPI_INC=`pkg-config --cflags libndpi`
> 
> 
> dnl> Define the arguments we accept...

diff -Naurp ntop-5.0.1/autogen.sh ntop-5.0.1.oden/autogen.sh
--- ntop-5.0.1/autogen.sh	2012-02-20 11:35:43.000000000 +0100
+++ ntop-5.0.1.oden/autogen.sh	2013-01-28 11:38:57.969085533 +0100
@@ -434,26 +434,6 @@ rm -f /tmp/acin* /tmp/acout*
 rm -f autoha*
 rm -f confdefs.h
 
-# Get nDPI
-
-echo "9. Downloading nDPI..."
-
-NDPI_URL=https://svn.ntop.org/svn/ntop/trunk/nDPI/
-if test -d nDPI; then
-    echo "nDPI already available"
-else
-    svn co $NDPI_URL
-fi
-
-dnl> nDPI compilation
-if test -f NDPI_LIB; then
-    echo "nDPI already compiled"
-else
-    echo "10. Compiling nDPI..."
-    cd nDPI; ./configure --with-pic; make; cd ..
-fi
-
-
 echo
 echo "Now we're ready to compile ntop"
 
diff -Naurp ntop-5.0.1/configure.in ntop-5.0.1.oden/configure.in
--- ntop-5.0.1/configure.in	2013-01-28 11:36:46.998091799 +0100
+++ ntop-5.0.1.oden/configure.in	2013-01-28 11:38:58.016085530 +0100
@@ -688,8 +688,8 @@ if test ".${ac_cv_header_gdbm_h}" != ".y
 fi
 
 dnl> nDPI based on OpenDPI (https://code.google.com/p/opendpi/)
-NDPI_LIB=./nDPI/src/lib/.libs/libndpi.a
-NDPI_INC=./nDPI/src/include/
+NDPI_LIB=`pkg-config --libs libndpi`
+NDPI_INC=`pkg-config --cflags libndpi`
 
 
 dnl> Define the arguments we accept...

Actions: View | Diff

Attachments on bug 8866: 3447