diff --git a/configure b/configure index 37daec97b..e5145a012 100755 --- a/configure +++ b/configure @@ -55,7 +55,7 @@ function usage() echo " crypto Build vbdev crypto module." echo " No path required." echo " fio Build fio_plugin." - echo " example: /usr/src/fio" + echo " default: /usr/src/fio" echo " vhost Build vhost target. Enabled by default." echo " No path required." echo " internal-vhost-lib Use the internal copy of rte_vhost. By default, the upstream" @@ -363,13 +363,15 @@ for i in "$@"; do --without-vpp) CONFIG[VPP]=n ;; + --with-fio) ;& --with-fio=*) - check_dir "$i" - CONFIG[FIO_SOURCE_DIR]="${i#*=}" + if [[ ${i#*=} != "$i" ]]; then + CONFIG[FIO_SOURCE_DIR]=$(readlink -f "${i#*=}") + fi + check_dir "--with-fio=${CONFIG[FIO_SOURCE_DIR]}" CONFIG[FIO_PLUGIN]=y ;; --without-fio) - CONFIG[FIO_SOURCE_DIR]= CONFIG[FIO_PLUGIN]=n ;; --with-vtune=*) @@ -521,15 +523,6 @@ else CONFIG[VIRTIO]="n" fi -if [ "${CONFIG[FIO_PLUGIN]}" = "y" ]; then - if [ -z "${CONFIG[FIO_SOURCE_DIR]}" ]; then - echo "When fio is enabled, you must specify the fio directory using --with-fio=path" - exit 1 - fi -else - CONFIG[FIO_SOURCE_DIR]= -fi - if [ "${CONFIG[VTUNE]}" = "y" ]; then if [ -z "${CONFIG[VTUNE_DIR]}" ]; then echo "When VTune is enabled, you must specify the VTune directory using --with-vtune=path"