From f3fdda531fe7181b8e862ecfb0c80d2737a37433 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 3 Jan 2018 11:41:07 +0100 Subject: [PATCH 1/2] configure.ac: Strip trailing spaces --- configure.ac | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index d9a6398..fc65ef4 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ if test "$no_x" = "yes"; then echo exit 1 fi - + AC_PATH_TOOL(PKG_CONFIG, pkg-config) AC_SEARCH_LIBS(socket, socket) @@ -106,9 +106,9 @@ AC_DEFINE_UNQUOTED(ssldir, "$ssldir") dnl Add OpenSSL includes and libraries CFLAGS="$CFLAGS -I$ssldir/include" -AC_ARG_ENABLE(static-openssl, +AC_ARG_ENABLE(static-openssl, [ --enable-static-openssl link OpenSSL statically], - [static_openssl=yes], + [static_openssl=yes], [static_openssl=no]) if test x"$static_openssl" = "xyes"; then # OpenSSL generally relies on libz @@ -251,11 +251,11 @@ int main(int argc, char **argv) return 1; } return 0; -}], - [AC_MSG_RESULT(no)], - [AC_MSG_RESULT(yes) - AC_DEFINE(NEED_ALIGN)], - [AC_MSG_RESULT(assuming yes) +}], + [AC_MSG_RESULT(no)], + [AC_MSG_RESULT(yes) + AC_DEFINE(NEED_ALIGN)], + [AC_MSG_RESULT(assuming yes) AC_DEFINE(NEED_ALIGN)]) @@ -277,17 +277,17 @@ AC_DEFINE_UNQUOTED(EGD_SOCKET, "$EGD_SOCKET") sound="yes" AC_ARG_WITH(sound, [ --with-sound select sound system ("oss", "sgi", "sun", "alsa", "pulse" or "libao") ], - [ - sound="$withval" + [ + sound="$withval" ]) AC_CHECK_HEADER(sys/soundcard.h, [HAVE_OSS=1], [HAVE_OSS=0]) AC_CHECK_HEADER(dmedia/audio.h, [HAVE_SGI=1], [HAVE_SGI=0]) AC_CHECK_HEADER(sys/audioio.h, [HAVE_SUN=1], [HAVE_SUN=0]) -AC_ARG_ENABLE(static-libsamplerate, - [ --enable-static-libsamplerate link libsamplerate statically], - [static_libsamplerate=yes], +AC_ARG_ENABLE(static-libsamplerate, + [ --enable-static-libsamplerate link libsamplerate statically], + [static_libsamplerate=yes], [static_libsamplerate=no]) if test -n "$PKG_CONFIG"; then @@ -879,7 +879,7 @@ AC_CHECK_FUNCS(setmntent) # AC_ARG_WITH(ipv6, [ --with-ipv6 enable IPv6-support], - [ + [ if test $withval != "no"; then AC_DEFINE(IPv6,1) From 41eac12a59caeaf03544fbd9306a91c5f7a0dcfc Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 3 Jan 2018 11:42:02 +0100 Subject: [PATCH 2/2] configure.ac: Use verb in imperative mood for consistency --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fc65ef4..6c9fe41 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,7 @@ m4_ifdef([PKG_CHECK_MODULES], [], [ dnl Add option to build with using address sanitizer AC_ARG_ENABLE([address-sanitizer], AS_HELP_STRING([--enable-address-sanitizer], \ - [enabled AddressSanitizer support for detecting a wide variety of \ + [enable AddressSanitizer support for detecting a wide variety of \ memory allocation and deallocation errors]), \ [AC_DEFINE(HAVE_ADDRESS_SANITIZER, 1, [enable AddressSanitizer]) CFLAGS="$CFLAGS -fsanitize=address"