From b1591b473129ae23867b3273f549b56b88b7bb31 Mon Sep 17 00:00:00 2001 From: Fuzzbawls Date: Fri, 3 May 2024 17:30:34 -0700 Subject: [PATCH] build: cleanup AC_ARG_WITH() usage --- build-aux/m4/bitcoin_qt.m4 | 12 ++++++------ configure.ac | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 2863c7fb15bcd..db4e9acab417d 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -64,12 +64,12 @@ AC_DEFUN([BITCOIN_QT_INIT],[ ], [bitcoin_qt_want_version=auto]) - AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-qt-incdir=INC_DIR],[specify Qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], []) - AC_ARG_WITH([qt-libdir],[AS_HELP_STRING([--with-qt-libdir=LIB_DIR],[specify Qt lib path (overridden by pkgconfig)])], [qt_lib_path=$withval], []) - AC_ARG_WITH([qt-plugindir],[AS_HELP_STRING([--with-qt-plugindir=PLUGIN_DIR],[specify Qt plugin path (overridden by pkgconfig)])], [qt_plugin_path=$withval], []) - AC_ARG_WITH([qt-translationdir],[AS_HELP_STRING([--with-qt-translationdir=PLUGIN_DIR],[specify Qt translation path (overridden by pkgconfig)])], [qt_translation_path=$withval], []) - AC_ARG_WITH([qt-svgdir],[AS_HELP_STRING([--with-qt-svgdir=PLUGIN_DIR],[specify Qt svg path (overridden by pkgconfig)])], [qt_svg_path=$withval], []) - AC_ARG_WITH([qt-bindir],[AS_HELP_STRING([--with-qt-bindir=BIN_DIR],[specify Qt bin path])], [qt_bin_path=$withval], []) + AC_ARG_WITH([qt-incdir], [AS_HELP_STRING([--with-qt-incdir=INC_DIR], [specify Qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], []) + AC_ARG_WITH([qt-libdir], [AS_HELP_STRING([--with-qt-libdir=LIB_DIR], [specify Qt lib path (overridden by pkgconfig)])], [qt_lib_path=$withval], []) + AC_ARG_WITH([qt-plugindir], [AS_HELP_STRING([--with-qt-plugindir=PLUGIN_DIR], [specify Qt plugin path (overridden by pkgconfig)])], [qt_plugin_path=$withval], []) + AC_ARG_WITH([qt-translationdir], [AS_HELP_STRING([--with-qt-translationdir=PLUGIN_DIR], [specify Qt translation path (overridden by pkgconfig)])], [qt_translation_path=$withval], []) + AC_ARG_WITH([qt-svgdir], [AS_HELP_STRING([--with-qt-svgdir=PLUGIN_DIR], [specify Qt svg path (overridden by pkgconfig)])], [qt_svg_path=$withval], []) + AC_ARG_WITH([qt-bindir], [AS_HELP_STRING([--with-qt-bindir=BIN_DIR], [specify Qt bin path])], [qt_bin_path=$withval], []) AC_ARG_WITH([qtdbus], [AS_HELP_STRING([--with-qtdbus], diff --git a/configure.ac b/configure.ac index d04ce1ef5c267..ccb27ec2503a8 100644 --- a/configure.ac +++ b/configure.ac @@ -109,14 +109,14 @@ AC_ARG_ENABLE([online-rust], AM_CONDITIONAL([ENABLE_ONLINE_RUST], [test "$enable_online_rust" != no]) AC_ARG_WITH([params-dir], - AS_HELP_STRING([--with-params-dir=PARAMS_DIR], - [specify zk params path]), + [AS_HELP_STRING([--with-params-dir=PARAMS_DIR], + [specify zk params path])], [ if test -d "$withval" then - params_path="$withval" + params_path="$withval" else - AC_MSG_ERROR([--with-params-dir expected directory name]) + AC_MSG_ERROR([--with-params-dir expected directory name]) fi ], [params_path=""]) @@ -273,9 +273,9 @@ AC_ARG_ENABLE([debug], dnl Enable different -fsanitize options AC_ARG_WITH([sanitizers], - [AS_HELP_STRING([--with-sanitizers], - [comma separated list of extra sanitizers to build with (default is none enabled)])], - [use_sanitizers=$withval]) + [AS_HELP_STRING([--with-sanitizers], + [comma separated list of extra sanitizers to build with (default is none enabled)])], + [use_sanitizers=$withval]) dnl Enable gprof profiling AC_ARG_ENABLE([gprof],