Skip to content

Use AS_HELP_STRING instead of obsolete AC_HELP_STRING macro #2806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/curl.m4
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ AC_DEFUN([CHECK_CURL], [

AC_ARG_WITH(
curl,
[AC_HELP_STRING([--with-curl=PATH],[Path to curl prefix or config script])],
[AS_HELP_STRING([--with-curl=PATH],[Path to curl prefix or config script])],
[test_paths="${with_curl}"],
[test_paths="/usr/local/libcurl /usr/local/curl /usr/local /opt/libcurl /opt/curl /opt /usr"])

Expand Down
2 changes: 1 addition & 1 deletion build/libxml.m4
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ AC_DEFUN([CHECK_LIBXML2], [

AC_ARG_WITH(
libxml,
[AC_HELP_STRING([--with-libxml=PATH],[Path to libxml2 prefix or config script])],
[AS_HELP_STRING([--with-libxml=PATH],[Path to libxml2 prefix or config script])],
[test_paths="${with_libxml}"],
[test_paths="/usr/local/libxml2 /usr/local/xml2 /usr/local/xml /usr/local /opt/libxml2 /opt/libxml /opt/xml2 /opt/xml /opt /usr"])

Expand Down
5 changes: 1 addition & 4 deletions build/lmdb.m4
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ LMDB_LDFLAGS=""

AC_ARG_WITH(
lmdb,
AC_HELP_STRING(
[--with-lmdb=PATH],
[Path to lmdb prefix or config script]
)
[AS_HELP_STRING([--with-lmdb=PATH],[Path to lmdb prefix or config script])]
)

if test "x${with_lmdb}" == "xno"; then
Expand Down
5 changes: 1 addition & 4 deletions build/lua.m4
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ LUA_DISPLAY=""

AC_ARG_WITH(
lua,
AC_HELP_STRING(
[--with-lua=PATH],
[Path to lua prefix]
)
[AS_HELP_STRING([--with-lua=PATH],[Path to lua prefix])]
)


Expand Down
2 changes: 1 addition & 1 deletion build/pcre.m4
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ AC_DEFUN([CHECK_PCRE],

AC_ARG_WITH(
pcre,
[AC_HELP_STRING([--with-pcre=PATH],[Path to pcre prefix or config script])],
[AS_HELP_STRING([--with-pcre=PATH],[Path to pcre prefix or config script])],
[test_paths="${with_pcre}"],
[test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr /opt/local"])

Expand Down
5 changes: 1 addition & 4 deletions build/pcre2.m4
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ PCRE2_LDFLAGS=""

AC_ARG_WITH(
pcre2,
AC_HELP_STRING(
[--with-pcre2=PATH],
[Path to pcre2 prefix or config script]
)
[AS_HELP_STRING([--with-pcre2=PATH],[Path to pcre2 prefix or config script])]
)

if test "x${with_pcre2}" == "xno"; then
Expand Down
5 changes: 1 addition & 4 deletions build/ssdeep.m4
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@ SSDEEP_DISPLAY=""

AC_ARG_WITH(
ssdeep,
AC_HELP_STRING(
[--with-ssdeep=PATH],
[Path to ssdeep prefix]
)
[AS_HELP_STRING([--with-ssdeep=PATH],[Path to ssdeep prefix])]
)


Expand Down
5 changes: 1 addition & 4 deletions build/yajl.m4
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ YAJL_LDFLAGS=""

AC_ARG_WITH(
yajl,
AC_HELP_STRING(
[--with-yajl=PATH],
[Path to yajl prefix or config script]
)
[AS_HELP_STRING([--with-yajl=PATH],[Path to yajl prefix or config script])]
)

if test "x${with_yajl}" == "xno"; then
Expand Down
10 changes: 5 additions & 5 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ AC_SUBST([MSC_GIT_VERSION])


AC_ARG_ENABLE(debug-logs,
[AC_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])],
[AS_HELP_STRING([--disable-debug-logs],[Turn off the SecDebugLog feature])],

[case "${enableval}" in
yes) debugLogs=true ;;
Expand All @@ -247,7 +247,7 @@ fi

# Fuzzer
AC_ARG_ENABLE(afl-fuzz,
[AC_HELP_STRING([--enable-afl-fuzz],[Turn on the afl fuzzer compilation utilities])],
[AS_HELP_STRING([--enable-afl-fuzz],[Turn on the afl fuzzer compilation utilities])],

[case "${enableval}" in
yes) aflFuzzer=true ;;
Expand All @@ -260,7 +260,7 @@ AC_ARG_ENABLE(afl-fuzz,

# Examples
AC_ARG_ENABLE(examples,
[AC_HELP_STRING([--enable-examples],[Turn on the examples compilation (default option)])],
[AS_HELP_STRING([--enable-examples],[Turn on the examples compilation (default option)])],

[case "${enableval}" in
yes) buildExamples=true ;;
Expand All @@ -273,7 +273,7 @@ AC_ARG_ENABLE(examples,

# Parser
AC_ARG_ENABLE(parser-generation,
[AC_HELP_STRING([--enable-parser-generation],[Enables parser generation during the build])],
[AS_HELP_STRING([--enable-parser-generation],[Enables parser generation during the build])],

[case "${enableval}" in
yes) buildParser=true ;;
Expand All @@ -286,7 +286,7 @@ AC_ARG_ENABLE(parser-generation,

# Mutex
AC_ARG_ENABLE(mutex-on-pm,
[AC_HELP_STRING([--enable-mutex-on-pm],[Treats pm operations as a critical section])],
[AS_HELP_STRING([--enable-mutex-on-pm],[Treats pm operations as a critical section])],

[case "${enableval}" in
yes) mutexPm=true ;;
Expand Down