Skip to content

Commit 0aadbf7

Browse files
committed
configure.ac: support --with-jq=yes
and some other text display corrections Signed-off-by: Hans Zandbelt <[email protected]>
1 parent 7355470 commit 0aadbf7

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

configure.ac

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LT_INIT([dlopen])
1414

1515
# Checks for apxs.
1616
AC_ARG_WITH([apxs],
17-
[AS_HELP_STRING([--with-apxs=PATH/NAME],[path to the apxs binary for Apache [[apxs]]])],
17+
[AS_HELP_STRING([--with-apxs=PATH/NAME],[path to the apxs binary for Apache [apxs]])],
1818
[AC_SUBST(APXS, $with_apxs)],
1919
[AC_PATH_PROGS(APXS, [apxs apxs2],,)])
2020

@@ -119,7 +119,7 @@ AC_SUBST(PCRE_CFLAGS)
119119
AC_SUBST(PCRE_LIBS)
120120

121121
AC_ARG_WITH(brotli,
122-
AS_HELP_STRING([--with-brotli], [enable brotli compression support]),
122+
AS_HELP_STRING([--with-brotli], [enable brotli compression support [default=no]]),
123123
ac_brotli=$withval, ac_brotli=no)
124124
if test x$ac_brotli != xno; then
125125
PKG_CHECK_MODULES(LIBBROTLIENC, [libbrotlienc >= 1.0.0], [with_libbrotlienc=yes], [with_libbrotlienc=no])
@@ -157,16 +157,19 @@ AC_SUBST(HIREDIS_LIBS)
157157
# JQ
158158
HAVE_LIBJQ=0
159159

160-
AC_ARG_WITH([jq],
161-
AS_HELP_STRING([--with-jq=PATH], [location of your libjq installation])])
160+
AC_ARG_WITH([jq], AS_HELP_STRING([--with-jq=PATH], [location of libjq development headers]),)
162161

163162
if test -n "$with_jq"
164163
then
165164
if test "$JQ_CFLAGS" == ""; then
166165
JQ_CFLAGS="-I$with_jq/include"
167166
fi
168167
if test "$JQ_LIBS" == ""; then
169-
JQ_LIBS="-L$with_jq/lib -ljq"
168+
if test "$with_jq" == "yes"; then
169+
JQ_LIBS="-L/usr/lib -ljq"
170+
else
171+
JQ_LIBS="-L$with_jq/lib -ljq"
172+
fi
170173
fi
171174

172175
CPPFLAGS="$JQ_CFLAGS $CPPFLAGS"

0 commit comments

Comments
 (0)