Skip to content

Commit 82516b3

Browse files
committed
Use AC_HELP_STRING for PHP_ARG_WITH in config.m4
This also documents "yes" values for the libbson/libmongoc parameters, and the "auto" default for SASL.
1 parent 6f9bd6e commit 82516b3

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

config.m4

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,18 @@ if test "$PHP_MONGODB" != "no"; then
226226
src/MongoDB/Monitoring/functions.c \
227227
"
228228

229-
PHP_ARG_WITH(libbson, whether to use system libbson,
230-
[ --with-libbson MongoDB: Use system libbson], no, no)
231-
PHP_ARG_WITH(libmongoc, whether to use system libmongoc,
232-
[ --with-libmongoc MongoDB: Use system libmongoc], no, no)
229+
PHP_ARG_WITH([libbson],
230+
[whether to use system libbson],
231+
[AS_HELP_STRING([--with-libbson=@<:@yes/no@:>@],
232+
[MongoDB: Use system libbson [default=no]])],
233+
[no],
234+
[no])
235+
PHP_ARG_WITH([libmongoc],
236+
[whether to use system libmongoc],
237+
[AS_HELP_STRING([--with-libmongoc=@<:@yes/no@:>@],
238+
[MongoDB: Use system libmongoc [default=no]])],
239+
[no],
240+
[no])
233241

234242
if test "$PHP_LIBBSON" != "no"; then
235243
if test "$PHP_LIBMONGOC" = "no"; then
@@ -335,8 +343,12 @@ if test "$PHP_MONGODB" != "no"; then
335343
fi
336344

337345

338-
PHP_ARG_WITH(mongodb-sasl, for Cyrus SASL support,
339-
[ --with-mongodb-sasl[=DIR] MongoDB: Include Cyrus SASL support], auto, no)
346+
PHP_ARG_WITH([mongodb-sasl],
347+
[for Cyrus SASL support],
348+
[AC_HELP_STRING([--with-mongodb-sasl=@<:@auto/no/DIR@:>@],
349+
[MongoDB: Cyrus SASL support [default=auto]])],
350+
[auto],
351+
[no])
340352

341353
AC_SUBST(MONGOC_ENABLE_SASL, 0)
342354
AC_SUBST(MONGOC_HAVE_SASL_CLIENT_DONE, 0)

0 commit comments

Comments
 (0)