dpdk configure for configure.ac

diff --git a/configure b/configure
index 4b98e50fffb9421bffe1df986c5df31803fb137b..854ecba3567c7d77cd1473898e30677aba1df1fd 100755 (executable)
--- a/configure
+++ b/configure
@@ -767,9 +767,7 @@ enable_universal
 enable_shared
 enable_usb
 enable_netmap
 enable_shared
 enable_usb
 enable_netmap

-enable_dpdk
-with_dpdk_includes
-with_dpdk_libraries
+with_dpdk

 enable_bluetooth
 enable_dbus
 enable_rdma
 enable_bluetooth
 enable_dbus
 enable_rdma


@@ -1414,7 +1412,6 @@ Optional Features:
                           available]
   --enable-netmap         enable netmap support [default=yes, if support
                           available]
                           available]
   --enable-netmap         enable netmap support [default=yes, if support
                           available]

-  --enable-dpdk           enable dpdk support [default=no]

   --enable-bluetooth      enable Bluetooth support [default=yes, if support
                           available]
   --enable-dbus           enable D-Bus capture support [default=yes, if
   --enable-bluetooth      enable Bluetooth support [default=yes, if support
                           available]
   --enable-dbus           enable D-Bus capture support [default=yes, if


@@ -1446,10 +1443,8 @@ Optional Packages:
   --with-turbocap[=DIR]   include Riverbed TurboCap support (located in
                           directory DIR, if supplied). [default=yes, if
                           present]
   --with-turbocap[=DIR]   include Riverbed TurboCap support (located in
                           directory DIR, if supplied). [default=yes, if
                           present]

-  --with-dpdk-includes=IDIR
-                          Endace DPDK include directory, if not DIR/include
-  --with-dpdk-libraries=LDIR
-                          Endace DPDK library directory, if not DIR/lib
+  --with-dpdk[=DIR]       include DPDK support (located in directory DIR, if
+                          supplied). [default=yes, if present]

 
 Some influential environment variables:
   CC          C compiler command
 
 Some influential environment variables:
   CC          C compiler command


@@ -6701,6 +6696,15 @@ dag)
        xxx_only=yes
        ;;
 
        xxx_only=yes
        ;;
 

+dpdk)
+       #
+       # --with-pcap=dpdk is the only way to get here, and it means
+       # "DAG support but nothing else"
+       #
+       V_DEFS="$V_DEFS -DDPDK_ONLY"
+       xxx_only=yes
+       ;;
+

 septel)
        #
        # --with-pcap=septel is the only way to get here, and it means
 septel)
        #
        # --with-pcap=septel is the only way to get here, and it means


@@ -10407,57 +10411,116 @@ $as_echo "#define PCAP_SUPPORT_NETMAP 1" >>confdefs.h
 
 fi
 
 
 fi
 

-# Check for DPDK support, defualt no. --enable-dpdk shall be setted explicitly.
-# Check whether --enable-dpdk was given.
-if test "${enable_dpdk+set}" = set; then :
-  enableval=$enable_dpdk; enable_dpdk=$enableval
-else
-  enable_dpdk=no
-fi
+# Check for DPDK support.

 
 

+# Check whether --with-dpdk was given.
+if test "${with_dpdk+set}" = set; then :
+  withval=$with_dpdk;
+       if test "$withval" = no
+       then
+               # User doesn't want DPDK support.
+               want_dpdk=no
+       elif test "$withval" = yes
+       then
+               # User wants DPDK support but hasn't specified a directory.
+               want_dpdk=yes
+       else
+               # User wants DPDK support and has specified a directory, so use the provided value.
+               want_dpdk=yes
+               dpdk_dir=$withval
+               dpdk_inc_dir="$dpdk_dir/include"
+               dpdk_lib_dir="$dpdk_dir/lib"
+       fi

 
 

+else

 
 

-# Check whether --with-dpdk-includes was given.
-if test "${with_dpdk_includes+set}" = set; then :
-  withval=$with_dpdk_includes;
-       # User wants DPDK support and has specified a header directory, so use the provided value.
-       dpdk_include_dir=$withval
+       if test "$V_PCAP" = dpdk; then
+               # User requested DPDK-only libpcap, so we'd better have
+               # the DPDK API.
+               want_dpdk=yes
+       elif test "xxx_only" = yes; then
+               # User requested something-else-only pcap, so they don't
+               # want DAG support.
+               want_dpdk=no
+       else
+               #
+               # Use DAG API if present, otherwise don't
+               #
+               want_dag=ifpresent
+       fi

 
 fi
 
 
 
 fi
 
 

+if test "$want_dpdk" != no; then
+       if test -z "$dpdk_dir"; then
+               dpdk_inc_dir="/usr/local/include/dpdk"
+               dpdk_lib_dir="/usr/local/lib"
+       fi
+       DPDK_MACHINE_CFLAGS="-march=native"
+       DPDK_CFLAGS="$DPDK_MACHINE_CFLAGS -I$dpdk_inc_dir"
+       DPDK_LDFLAGS="-L$dpdk_lib_dir -ldpdk -lrt -lm -lnuma -ldl -pthread"

 
 

-# Check whether --with-dpdk-libraries was given.
-if test "${with_dpdk_libraries+set}" = set; then :
-  withval=$with_dpdk_libraries;
-       # User wants DPDK support and has specified a library directory, so use the provided value.
-       dpdk_lib_dir=$withval
+       save_CFLAGS="$CFLAGS"
+       save_LIBS="$LIBS"
+       save_LDFLAGS="$LDFLAGS"
+       CFLAGS="$CFLAGS $DPDK_CFLAGS"
+       LIBS="$LIBS $DPDK_LDFLAGS"
+       LDFLAGS="$LDFLAGS $DPDK_LDFLAGS"
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compile the DPDK support" >&5
+$as_echo_n "checking whether we can compile the DPDK support... " >&6; }
+       if ${ac_cv_dpdk_can_compile+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */

 
 

+$ac_includes_default
+#include <rte_common.h>
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_dpdk_can_compile=yes
+else
+  ac_cv_dpdk_can_compile=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext

 fi
 
 fi
 

+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_dpdk_can_compile" >&5
+$as_echo "$ac_cv_dpdk_can_compile" >&6; }

 
 

-if test "x$enable_dpdk" != "xno" ; then
-       # If necessary, set default paths for DPDK API headers and libraries.
-       if test -z "$dpdk_include_dir"; then
-               dpdk_include_dir="$RTE_SDK/$RTE_TARGET/include"
-       fi
+       CFLAGS=$save_LDFLAGS
+       LIBS=$save_LIBS
+       LDFLAGS=$save_LDFLAGS

 
 

-       if test -z "$dpdk_lib_dir"; then
-               dpdk_lib_dir="$RTE_SDK/$RTE_TARGET/lib"
-       fi
-       DPDK_MACHINE_CFLAGS="-march=native"
-       DPDK_CFLAGS="$DPDK_MACHINE_CFLAGS -I$dpdk_include_dir"
-       DPDK_LDFLAGS="-L$dpdk_lib_dir -ldpdk -lrt -lm -lnuma -ldl -pthread"
-       DPDK_LIBS=$DPDK_LDFLAGS
-       CFLAGS="$CFLAGS $DPDK_CFLAGS"
-       LIBS="$LIBS $DPDK_LIBS"
-       LDFLAGS="$LDFLAGS $DPDK_LDFLAGS"
-       V_INCLS="$V_INCLS $DPDK_CFLAGS"
-       if test $enable_dpdk = yes ; then
+       if test "$ac_cv_dpdk_can_compile" = yes; then
+               CFLAGS="$CFLAGS $DPDK_CFLAGS"
+               LIBS="$LIBS $DPDK_LDFLAGS"
+               LDFLAGS="$LDFLAGS $DPDK_LDFLAGS"
+               V_INCLS="$V_INCLS $DPDK_CFLAGS"

 
 $as_echo "#define PCAP_SUPPORT_DPDK 1" >>confdefs.h
 
                DPDK_SRC=pcap-dpdk.c
 
 $as_echo "#define PCAP_SUPPORT_DPDK 1" >>confdefs.h
 
                DPDK_SRC=pcap-dpdk.c

+       else
+               if test "$V_PCAP" = dpdk; then
+                       # User requested "dpdk" capture type but we couldn't
+                       # find the DPDK API support.
+                       as_fn_error $? "DPDK support requested with --with-pcap=dpdk, but the DPDK headers weren't found at $dpdk_inc_dir: make sure the DPDK support is installed, specify a different path or paths if necessary, or don't request DPDK support" "$LINENO" 5
+               fi
+
+               if test "$want_dag" = yes; then
+                       # User wanted DPDK support but we couldn't find it.
+                       as_fn_error $? "DPDK support requested with --with-pcap=dpdk, but the DPDK headers weren't found at $dpdk_inc_dir: make sure the DPDK support is installed, specify a different path or paths if necessary, or don't request DPDK support" "$LINENO" 5
+               fi

        fi
 fi
 
        fi
 fi
 

diff --git a/configure.ac b/configure.ac
index 24df7d026bd299e10908d6efd304052a876557b9..232d23f13d2bb114cfea5840fc22625068a053c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -902,6 +902,15 @@ dag)
        xxx_only=yes
        ;;
 
        xxx_only=yes
        ;;
 

+dpdk)
+       #
+       # --with-pcap=dpdk is the only way to get here, and it means
+       # "DPDK support but nothing else"
+       #
+       V_DEFS="$V_DEFS -DDPDK_ONLY"
+       xxx_only=yes
+       ;;
+

 septel)
        #
        # --with-pcap=septel is the only way to get here, and it means
 septel)
        #
        # --with-pcap=septel is the only way to get here, and it means


@@ -2128,47 +2137,91 @@ AC_INCLUDES_DEFAULT
        AC_SUBST(NETMAP_SRC)
 fi
 
        AC_SUBST(NETMAP_SRC)
 fi
 

-# Check for DPDK support, defualt no. --enable-dpdk shall be setted explicitly. 
-AC_ARG_ENABLE([dpdk],
-[AC_HELP_STRING([--enable-dpdk],[enable dpdk support @<:@default=no@:>@])],
-    [enable_dpdk=$enableval],
-    [enable_dpdk=no])
-
-AC_ARG_WITH([dpdk-includes],
-AC_HELP_STRING([--with-dpdk-includes=IDIR],[Endace DPDK include directory, if not DIR/include]),
+# Check for DPDK support.
+AC_ARG_WITH([dpdk],
+AC_HELP_STRING([--with-dpdk@<:@=DIR@:>@],[include DPDK support (located in directory DIR, if supplied).  @<:@default=yes, if present@:>@]),

 [
 [

-       # User wants DPDK support and has specified a header directory, so use the provided value.
-       dpdk_include_dir=$withval
-],[])
-
-AC_ARG_WITH([dpdk-libraries],
-AC_HELP_STRING([--with-dpdk-libraries=LDIR],[Endace DPDK library directory, if not DIR/lib]),
-[
-       # User wants DPDK support and has specified a library directory, so use the provided value.
-       dpdk_lib_dir=$withval
-],[])
-
-if test "x$enable_dpdk" != "xno" ; then
-       # If necessary, set default paths for DPDK API headers and libraries.
-       if test -z "$dpdk_include_dir"; then
-               dpdk_include_dir="$RTE_SDK/$RTE_TARGET/include"
+       if test "$withval" = no
+       then
+               # User doesn't want DPDK support.
+               want_dpdk=no
+       elif test "$withval" = yes
+       then
+               # User wants DPDK support but hasn't specified a directory.
+               want_dpdk=yes
+       else
+               # User wants DPDK support and has specified a directory, so use the provided value.
+               want_dpdk=yes
+               dpdk_dir=$withval
+               dpdk_inc_dir="$dpdk_dir/include"
+               dpdk_lib_dir="$dpdk_dir/lib"
+       fi
+],[
+       if test "$V_PCAP" = dpdk; then
+               # User requested DPDK-only libpcap, so we'd better have
+               # the DPDK API.
+               want_dpdk=yes
+       elif test "xxx_only" = yes; then
+               # User requested something-else-only pcap, so they don't
+               # want DAG support.
+               want_dpdk=no
+       else
+               #
+               # Use DAG API if present, otherwise don't
+               #
+               want_dag=ifpresent

        fi
        fi

+])

 
 

-       if test -z "$dpdk_lib_dir"; then
-               dpdk_lib_dir="$RTE_SDK/$RTE_TARGET/lib"
+if test "$want_dpdk" != no; then
+       if test -z "$dpdk_dir"; then
+               dpdk_inc_dir="/usr/local/include/dpdk"
+               dpdk_lib_dir="/usr/local/lib"

        fi
        DPDK_MACHINE_CFLAGS="-march=native"
        fi
        DPDK_MACHINE_CFLAGS="-march=native"

-       DPDK_CFLAGS="$DPDK_MACHINE_CFLAGS -I$dpdk_include_dir"
+       DPDK_CFLAGS="$DPDK_MACHINE_CFLAGS -I$dpdk_inc_dir"

        DPDK_LDFLAGS="-L$dpdk_lib_dir -ldpdk -lrt -lm -lnuma -ldl -pthread"
        DPDK_LDFLAGS="-L$dpdk_lib_dir -ldpdk -lrt -lm -lnuma -ldl -pthread"

-       DPDK_LIBS=$DPDK_LDFLAGS
+
+       save_CFLAGS="$CFLAGS"
+       save_LIBS="$LIBS"
+       save_LDFLAGS="$LDFLAGS"

        CFLAGS="$CFLAGS $DPDK_CFLAGS"
        CFLAGS="$CFLAGS $DPDK_CFLAGS"

-       LIBS="$LIBS $DPDK_LIBS"
+       LIBS="$LIBS $DPDK_LDFLAGS"

        LDFLAGS="$LDFLAGS $DPDK_LDFLAGS"
        LDFLAGS="$LDFLAGS $DPDK_LDFLAGS"

-       V_INCLS="$V_INCLS $DPDK_CFLAGS"
-       if test $enable_dpdk = yes ; then
+
+       AC_MSG_CHECKING(whether we can compile the DPDK support)
+       AC_CACHE_VAL(ac_cv_dpdk_can_compile,
+       AC_TRY_COMPILE([
+AC_INCLUDES_DEFAULT
+#include <rte_common.h>],
+           [],
+           ac_cv_dpdk_can_compile=yes,
+           ac_cv_dpdk_can_compile=no))
+       AC_MSG_RESULT($ac_cv_dpdk_can_compile)
+
+       CFLAGS=$save_LDFLAGS
+       LIBS=$save_LIBS
+       LDFLAGS=$save_LDFLAGS
+       
+       if test "$ac_cv_dpdk_can_compile" = yes; then
+               CFLAGS="$CFLAGS $DPDK_CFLAGS"
+               LIBS="$LIBS $DPDK_LDFLAGS"
+               LDFLAGS="$LDFLAGS $DPDK_LDFLAGS"
+               V_INCLS="$V_INCLS $DPDK_CFLAGS"

                AC_DEFINE(PCAP_SUPPORT_DPDK, 1,
                [target host supports dpdk])
                DPDK_SRC=pcap-dpdk.c
                AC_DEFINE(PCAP_SUPPORT_DPDK, 1,
                [target host supports dpdk])
                DPDK_SRC=pcap-dpdk.c

+       else
+               if test "$V_PCAP" = dpdk; then
+                       # User requested "dpdk" capture type but we couldn't
+                       # find the DPDK API support.
+                       AC_MSG_ERROR([DPDK support requested with --with-pcap=dpdk, but the DPDK headers weren't found at $dpdk_inc_dir: make sure the DPDK support is installed, specify a different path or paths if necessary, or don't request DPDK support])
+               fi
+
+               if test "$want_dag" = yes; then
+                       # User wanted DPDK support but we couldn't find it.
+                       AC_MSG_ERROR([DPDK support requested with --with-pcap=dpdk, but the DPDK headers weren't found at $dpdk_inc_dir: make sure the DPDK support is installed, specify a different path or paths if necessary, or don't request DPDK support])
+               fi

        fi
 fi
 AC_SUBST(PCAP_SUPPORT_DPDK)
        fi
 fi
 AC_SUBST(PCAP_SUPPORT_DPDK)