configure: Sort AC_ARG_WITH to get better help text

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2021-02-11 07:25:49 +01:00
parent 974e396542
commit ddc36722b2

View File

@ -243,11 +243,21 @@ if test "$enable_opencl" = "yes"; then
]) ])
fi fi
# Check whether to build with support for TensorFlow. # Configure arguments which allow disabling some optional libraries.
AC_ARG_WITH([archive],
AS_HELP_STRING([--with-archive],
[Build with libarchive which supports compressed model files @<:@default=check@:>@]
))
AC_ARG_WITH([curl],
AS_HELP_STRING([--with-curl],
[Build with libcurl which supports processing an image URL @<:@default=check@:>@]
))
AC_ARG_WITH([tensorflow], AC_ARG_WITH([tensorflow],
AS_HELP_STRING([--with-tensorflow], AS_HELP_STRING([--with-tensorflow],
[support TensorFlow @<:@default=check@:>@]), [support TensorFlow @<:@default=check@:>@]),
[], [with_tensorflow=check]) [], [with_tensorflow=check])
# Check whether to build with support for TensorFlow.
AM_CONDITIONAL([TENSORFLOW], false) AM_CONDITIONAL([TENSORFLOW], false)
TENSORFLOW_LIBS= TENSORFLOW_LIBS=
AS_IF([test "x$with_tensorflow" != xno], AS_IF([test "x$with_tensorflow" != xno],
@ -470,11 +480,6 @@ AC_CHECK_TYPES([long long int])
# Test auxiliary packages # Test auxiliary packages
# ---------------------------------------- # ----------------------------------------
AC_ARG_WITH([curl],
AS_HELP_STRING([--with-curl],
[Build with libcurl which supports processing an image URL @<:@default=check@:>@]
))
AM_CONDITIONAL([HAVE_LIBCURL], false) AM_CONDITIONAL([HAVE_LIBCURL], false)
AS_IF([test "x$with_curl" != xno], [ AS_IF([test "x$with_curl" != xno], [
PKG_CHECK_MODULES([libcurl], [libcurl], [have_libcurl=true], [have_libcurl=false]) PKG_CHECK_MODULES([libcurl], [libcurl], [have_libcurl=true], [have_libcurl=false])
@ -496,11 +501,6 @@ else
AC_MSG_ERROR([Leptonica 1.74 or higher is required. Try to install libleptonica-dev package.]) AC_MSG_ERROR([Leptonica 1.74 or higher is required. Try to install libleptonica-dev package.])
fi fi
AC_ARG_WITH([archive],
AS_HELP_STRING([--with-archive],
[Build with libarchive which supports compressed model files @<:@default=check@:>@]
))
AM_CONDITIONAL([HAVE_LIBARCHIVE], false) AM_CONDITIONAL([HAVE_LIBARCHIVE], false)
AS_IF([test "x$with_archive" != xno], [ AS_IF([test "x$with_archive" != xno], [
PKG_CHECK_MODULES([libarchive], [libarchive], [have_libarchive=true], [have_libarchive=false]) PKG_CHECK_MODULES([libarchive], [libarchive], [have_libarchive=true], [have_libarchive=false])