Commit e8c6640c authored by 's avatar

Removed --enable-dagflib. If --enable-dag has been specified, then dagflib is compiled as well.

git-svn-id: file:///home/svn/mapi/trunk@732 8d5bb341-7cf1-0310-8cf6-ba355fef3186
parent 9f1e9e9e
......@@ -176,6 +176,9 @@ AC_DEFINE(DEBUG, 1, [keep debugging on during beta testing])
AC_DEFINE(VALGRIND, 1, [easier debugging using valgrind])
#AC_DEFINE(WITH_AUTHENTICATION, 1, [support for authentication])
# in the end will contain all the compiled MAPI function libraries
MAPI_FUNC_LIBS="stdflib.so"
# DiMAPI
AC_MSG_CHECKING([if distributed monitoring (DiMAPI) is enabled])
AC_ARG_ENABLE(dimapi,
......@@ -203,8 +206,10 @@ AS_HELP_STRING([--enable-dag], [Enable support for Endace's DAG cards]),
*) AC_MSG_ERROR(bad value ${enableval} for --enable-dag) ;;
esac], [dag=false])
AM_CONDITIONAL(DRIVER_DAG, test x$dag = xtrue)
AM_CONDITIONAL(BINARY_DAGFLIB, test x$dag = xtrue)
if test x$dag = xtrue; then
MAPI_CONF_DAG_ENTRY=$srcdir/config/mapi.conf.dag.entry
MAPI_FUNC_LIBS="${MAPI_FUNC_LIBS}:dagflib.so"
AC_MSG_RESULT(yes)
else
MAPI_CONF_DAG_ENTRY=/dev/null
......@@ -215,9 +220,6 @@ AC_SUBST_FILE(MAPI_CONF_DAG_ENTRY)
# optional MAPI function libraries
# in the end will contain all the compiled MAPI function libraries
MAPI_FUNC_LIBS="stdflib.so"
# trackflib
AC_MSG_CHECKING(if the traffic characterization library is enabled)
AC_ARG_ENABLE(trackflib,
......@@ -254,27 +256,6 @@ else
AC_MSG_RESULT(no)
fi
# dagflib
AC_MSG_CHECKING(if the DAG library is enabled)
AC_ARG_ENABLE(dagflib,
AS_HELP_STRING([--enable-dagflib], [Build the DAG function library]),
[case "${enableval}" in
yes) dagflib=true ;;
no) dagflib=false ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-dagflib) ;;
esac], [dagflib=false])
if test x$dagflib = xtrue -a x$dag = xfalse; then
AC_MSG_RESULT(yes)
AC_MSG_ERROR(Please use --enable-dagflib only in conjunction with --enable-dag. You don't need to build dagflib if you are not going to use a DAG card.)
fi
AM_CONDITIONAL(BINARY_DAGFLIB, test x$dagflib = xtrue)
if test x$dagflib = xtrue; then
MAPI_FUNC_LIBS="${MAPI_FUNC_LIBS}:dagflib.so"
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
# ipfixflib
AC_MSG_CHECKING(if the ipfix library is enabled)
AC_ARG_ENABLE(ipfixflib,
......@@ -398,7 +379,10 @@ AS_HELP_STRING([--with-libdag=DIR], [Manual libdag path configuration, in case t
;;
esac ],
[ if test x$dag = xtrue; then
if test -f ${prefix}/include/dagapi.h; then
if test -f ${prefix}/include/dagapi.h -a -f ${prefix}/lib/libdag.a; then
DAGINC="-I${prefix}/include"
DAGLIB="-L${prefix}/lib -ldag"
elif test -f /usr/local/include/dagapi.h -a -f /usr/local/lib/libdag.a; then
DAGINC="-I${prefix}/include"
DAGLIB="-L${prefix}/lib -ldag"
elif test -f /usr/include/dag/dagapi.h; then
......@@ -570,3 +554,4 @@ fi
if test x$dag = xtrue; then
echo "option: support for DAG cards"
fi
No preview for this file type
......@@ -350,7 +350,6 @@ Section~\ref{sec:dimapi}) \\
\multicolumn{2}{l}{MAPI function libraries} \\
{\tt --enable-trackflib} & Build the traffic characterization library \\
{\tt --enable-anonflib} & Build the traffic anonymization library \\
{\tt --enable-dagflib} & Build the DAG function library \\
{\tt --enable-ipfixflib} & Build the NetFlow export library \\
{\tt --enable-extraflib} & Build the Extra MAPI function library \\
\multicolumn{2}{l}{Miscellaneous options} \\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment