From c8a97f91e264039f33c58088eb558ca52d925510 Mon Sep 17 00:00:00 2001 From: Carsten Schoenert Date: Sat, 24 Jun 2017 13:47:13 +0200 Subject: [PATCH] configure.ac: fix up typos and indentation No technical changes, only correction of typos and indentation oon some parts. --- configure.ac | 53 ++++++++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/configure.ac b/configure.ac index 08eb9739..080532af 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ AM_INIT_AUTOMAKE([1.10 -Wall no-define no-dist-gzip dist-bzip2]) PKG_PROG_PKG_CONFIG([0.20]) # Generate one configuration header file for building the library itself with -# an autogenerated template. We need later a second one (include/libcoap.h) +# an auto generated template. We need later a second one (include/libcoap.h) # that will be installed alongside the library. AC_CONFIG_HEADERS([coap_config.h]) @@ -155,8 +155,8 @@ AC_SUBST(libcoap_SYMBOLS) # configure options # __documentation__ AC_ARG_ENABLE([documentation], - [AC_HELP_STRING([--enable-documentation], - [Enable building the documentation [default=yes]])], + [AS_HELP_STRING([--enable-documentation], + [Enable building the documentation [default=yes]])], [build_documentation="$enableval"], [build_documentation="yes"]) @@ -171,15 +171,16 @@ if test "x$build_documentation" = "xyes"; then fi else AC_MSG_CHECKING([for compatible doxygen version (>= 1.7.0)]) - doxygen_version=`$DOXYGEN --version` - AS_VERSION_COMPARE([$doxygen_version], [1.7.0], - [AC_MSG_RESULT([no]) - DOXYGEN=""], - [AC_MSG_RESULT([yes $doxygen_version])], - [AC_MSG_RESULT([yes $doxygen_version])]) + doxygen_version=`$DOXYGEN --version` + AS_VERSION_COMPARE([$doxygen_version], + [1.7.0], + [AC_MSG_RESULT([no]) + DOXYGEN=""], + [AC_MSG_RESULT([yes $doxygen_version])], + [AC_MSG_RESULT([yes $doxygen_version])]) if test "x$DOXYGEN" = "x" -a "x$build_documentation" = "xyes"; then AC_MSG_ERROR([==> Doxygen $doxygen_version too old. Doxygen 1.7+ required for documentation build.]) - AC_MSG_ERROR([==> Install required doxygen version or disable the documentation using --disable-documentation]) + AC_MSG_ERROR([==> Install required doxygen version or disable the documentation using '--disable-documentation'.]) else # we found doxygen and the version is valid DOC_DIR=doc @@ -210,14 +211,15 @@ if test "x$build_documentation" = "xyes"; then ;; esac - AS_VERSION_COMPARE([$dot_version], [2.26.0], + AS_VERSION_COMPARE([$dot_version], + [2.26.0], [AC_MSG_RESULT([no]) DOT=""], [AC_MSG_RESULT([yes $dot_version])], [AC_MSG_RESULT([yes $dot_version])]) if test "x$DOT" = "x" -a "x$build_documentation" = "xyes"; then - AC_MSG_WARN([==> Graphviz dot $dot_version too old. Graphviz 2.26+ required for documentation build.]) - AC_MSG_ERROR([==> Install required graphviz version or disable the documentation using --disable-documentation]) + AC_MSG_WARN([==> Graphviz dot $dot_version too old. Graphviz 2.26+ required for documentation build.]) + AC_MSG_ERROR([==> Install required graphviz version or disable the documentation using '--disable-documentation'.]) fi # we found dot and the version is valid HAVE_DOT="YES" @@ -233,9 +235,8 @@ if test "x$build_documentation" = "xyes"; then fi AM_CONDITIONAL(BUILD_DOCUMENTATION, [test "x$build_documentation" = "xyes"]) -AM_CONDITIONAL([HAVE_DOXYGEN], - [test -n "$DOXYGEN"])AM_COND_IF([HAVE_DOXYGEN], - [AC_CONFIG_FILES([doc/Doxyfile])]) +AM_CONDITIONAL([HAVE_DOXYGEN], [test -n "$DOXYGEN"]) +AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])]) # configure options # __dtls__ @@ -383,8 +384,8 @@ fi # configure options # __tests__ AC_ARG_ENABLE([tests], - [AC_HELP_STRING([--enable-tests], - [Enable building the binary testsuite [default=no]])], + [AS_HELP_STRING([--enable-tests], + [Enable building the binary testsuite [default=no]])], [build_tests="$enableval"], [build_tests="no"]) @@ -395,7 +396,7 @@ if test "x$build_tests" = "xyes"; then AC_DEFINE(HAVE_LIBCUNIT, [1], [Define if the system has libcunit])], [have_cunit=no AC_MSG_WARN([==> You want to build the testing binary but the pkg-config file cunit.pc could not be found or installed CUnit version is too old!]) - AC_MSG_ERROR([==> Install the package(s) containing the development files for CUnit or disable the testing binary using --disable-tests.]) + AC_MSG_ERROR([==> Install the package(s) containing the development files for CUnit or disable the testing binary using '--disable-tests'.]) ]) fi AM_CONDITIONAL(HAVE_CUNIT, [test "x$CUNIT_LIBS" != "x"]) @@ -403,8 +404,8 @@ AM_CONDITIONAL(HAVE_CUNIT, [test "x$CUNIT_LIBS" != "x"]) # configure options # __examples__ AC_ARG_ENABLE([examples], - [AC_HELP_STRING([--enable-examples], - [Enable building the example binaries [default=yes]])], + [AS_HELP_STRING([--enable-examples], + [Enable building the example binaries [default=yes]])], [build_examples="$enableval"], [build_examples="yes"]) @@ -413,7 +414,7 @@ if test "x$build_examples" = "xyes" -a "x$build_documentation" = "xyes"; then AC_PATH_PROG([A2X], [a2x]) if test "x$A2X" = "x"; then AC_MSG_WARN([==> You want to build the examples binaries, that is also including the respective manpages but a2x was not found!]) - AC_MSG_ERROR([==> Install the package containg a2x (mostly asciidoc) or disable the build of the examples using --disable-examples.]) + AC_MSG_ERROR([==> Install the package containg a2x (mostly asciidoc) or disable the build of the examples using '--disable-examples'.]) fi build_examples="yes" fi @@ -422,8 +423,8 @@ AM_CONDITIONAL(BUILD_EXAMPLES, [test "x$build_examples" = "xyes"]) # end configure options ####################### -########################################## -# from configure options independed checks +########################################### +# from configure options independent checks # Check for (ex)ctags binary # The needed ctags binary name differs on FreeBSD and Linux, on Linux @@ -529,12 +530,12 @@ esac PREDEFINED_CFLAGS=`echo $ADDITIONAL_CFLAGS | $SED -e 's/-D//g'` AC_SUBST(PREDEFINED_CFLAGS) -# And finaly combining the CFLAGS together ... +# And finally combining the CFLAGS together ... CFLAGS="$CFLAGS $ADDITIONAL_CFLAGS" # Override the various template files, currently just makefiles and the # pkgconfig *.pc file. -# Later if the API version is changing dont forget to change the +# Later if the API version is changing don't forget to change the # libcoap-$LIBCOAP_API_VERSION.pc.in file too!! You will have to change # the 'Cflags' variable to something like # Cflags: -I${includedir}/coap-@LIBCOAP_API_VERSION@