Skip to content

Commit 700a9e9

Browse files
authored
Merge pull request #2806 from hughmcmaster/as_help_string
Use AS_HELP_STRING instead of obsolete AC_HELP_STRING macro
2 parents 933daee + f05f322 commit 700a9e9

File tree

9 files changed

+13
-28
lines changed

9 files changed

+13
-28
lines changed

Diff for: build/curl.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ AC_DEFUN([CHECK_CURL], [
1717
1818
AC_ARG_WITH(
1919
curl,
20-
[AC_HELP_STRING([--with-curl=PATH],[Path to curl prefix or config script])],
20+
[AS_HELP_STRING([--with-curl=PATH],[Path to curl prefix or config script])],
2121
[test_paths="${with_curl}"],
2222
[test_paths="/usr/local/libcurl /usr/local/curl /usr/local /opt/libcurl /opt/curl /opt /usr"])
2323

Diff for: build/libxml.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ AC_DEFUN([CHECK_LIBXML2], [
6464
6565
AC_ARG_WITH(
6666
libxml,
67-
[AC_HELP_STRING([--with-libxml=PATH],[Path to libxml2 prefix or config script])],
67+
[AS_HELP_STRING([--with-libxml=PATH],[Path to libxml2 prefix or config script])],
6868
[test_paths="${with_libxml}"],
6969
[test_paths="/usr/local/libxml2 /usr/local/xml2 /usr/local/xml /usr/local /opt/libxml2 /opt/libxml /opt/xml2 /opt/xml /opt /usr"])
7070

Diff for: build/lmdb.m4

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ LMDB_LDFLAGS=""
2121
2222
AC_ARG_WITH(
2323
lmdb,
24-
AC_HELP_STRING(
25-
[--with-lmdb=PATH],
26-
[Path to lmdb prefix or config script]
27-
)
24+
[AS_HELP_STRING([--with-lmdb=PATH],[Path to lmdb prefix or config script])]
2825
)
2926
3027
if test "x${with_lmdb}" == "xno"; then

Diff for: build/lua.m4

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ LUA_DISPLAY=""
2222
2323
AC_ARG_WITH(
2424
lua,
25-
AC_HELP_STRING(
26-
[--with-lua=PATH],
27-
[Path to lua prefix]
28-
)
25+
[AS_HELP_STRING([--with-lua=PATH],[Path to lua prefix])]
2926
)
3027
3128

Diff for: build/pcre.m4

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ AC_DEFUN([CHECK_PCRE],
1717
1818
AC_ARG_WITH(
1919
pcre,
20-
[AC_HELP_STRING([--with-pcre=PATH],[Path to pcre prefix or config script])],
20+
[AS_HELP_STRING([--with-pcre=PATH],[Path to pcre prefix or config script])],
2121
[test_paths="${with_pcre}"],
2222
[test_paths="/usr/local/libpcre /usr/local/pcre /usr/local /opt/libpcre /opt/pcre /opt /usr /opt/local"])
2323

Diff for: build/pcre2.m4

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ PCRE2_LDFLAGS=""
2121
2222
AC_ARG_WITH(
2323
pcre2,
24-
AC_HELP_STRING(
25-
[--with-pcre2=PATH],
26-
[Path to pcre2 prefix or config script]
27-
)
24+
[AS_HELP_STRING([--with-pcre2=PATH],[Path to pcre2 prefix or config script])]
2825
)
2926
3027
if test "x${with_pcre2}" == "xno"; then

Diff for: build/ssdeep.m4

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ SSDEEP_DISPLAY=""
2222
2323
AC_ARG_WITH(
2424
ssdeep,
25-
AC_HELP_STRING(
26-
[--with-ssdeep=PATH],
27-
[Path to ssdeep prefix]
28-
)
25+
[AS_HELP_STRING([--with-ssdeep=PATH],[Path to ssdeep prefix])]
2926
)
3027
3128

Diff for: build/yajl.m4

+1-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@ YAJL_LDFLAGS=""
2121
2222
AC_ARG_WITH(
2323
yajl,
24-
AC_HELP_STRING(
25-
[--with-yajl=PATH],
26-
[Path to yajl prefix or config script]
27-
)
24+
[AS_HELP_STRING([--with-yajl=PATH],[Path to yajl prefix or config script])]
2825
)
2926
3027
if test "x${with_yajl}" == "xno"; then

Diff for: configure.ac

+5-5
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ AC_SUBST([MSC_GIT_VERSION])
229229

230230

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

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

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

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

261261
# Examples
262262
AC_ARG_ENABLE(examples,
263-
[AC_HELP_STRING([--enable-examples],[Turn on the examples compilation (default option)])],
263+
[AS_HELP_STRING([--enable-examples],[Turn on the examples compilation (default option)])],
264264

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

274274
# Parser
275275
AC_ARG_ENABLE(parser-generation,
276-
[AC_HELP_STRING([--enable-parser-generation],[Enables parser generation during the build])],
276+
[AS_HELP_STRING([--enable-parser-generation],[Enables parser generation during the build])],
277277

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

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

291291
[case "${enableval}" in
292292
yes) mutexPm=true ;;

0 commit comments

Comments
 (0)