Skip to content

Commit 0002e2d

Browse files
derickrjmikola
authored andcommitted
Move crypto system profile flags below OpenSSL detection
This makes for more chronological configure output
1 parent c2988bb commit 0002e2d

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

scripts/build/autotools/CheckSSL.m4

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,13 @@ PHP_ARG_WITH([mongodb-ssl],
55
[auto],
66
[no])
77

8-
PHP_ARG_ENABLE([mongodb-crypto-system-profile],
9-
[whether to use system crypto profile],
10-
[AC_HELP_STRING([--enable-mongodb-crypto-system-profile],
11-
[MongoDB: Use system crypto profile (OpenSSL only) [default=no]])],
12-
[no],
13-
[no])
14-
158
PHP_ARG_WITH([openssl-dir],
169
[deprecated option for OpenSSL library path],
1710
[AC_HELP_STRING([--with-openssl-dir=@<:@auto/DIR@:>@],
1811
[MongoDB: OpenSSL library path (deprecated for pkg-config) [default=auto]])],
1912
[auto],
2013
[no])
2114

22-
PHP_ARG_WITH([system-ciphers],
23-
[deprecated option for whether to use system crypto profile],
24-
AC_HELP_STRING([--enable-system-ciphers],
25-
[MongoDB: whether to use system crypto profile (deprecated for --enable-mongodb-crypto-system-profile) [default=no]]),
26-
[no],
27-
[no])
28-
2915
AS_IF([test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "auto"],[
3016
found_openssl="no"
3117
@@ -206,6 +192,20 @@ else
206192
AC_SUBST(MONGOC_HAVE_ASN1_STRING_GET0_DATA, 0)
207193
fi
208194

195+
PHP_ARG_ENABLE([mongodb-crypto-system-profile],
196+
[whether to use system crypto profile],
197+
[AC_HELP_STRING([--enable-mongodb-crypto-system-profile],
198+
[MongoDB: Use system crypto profile (OpenSSL only) [default=no]])],
199+
[no],
200+
[no])
201+
202+
PHP_ARG_WITH([system-ciphers],
203+
[deprecated option for whether to use system crypto profile],
204+
AC_HELP_STRING([--enable-system-ciphers],
205+
[MongoDB: whether to use system crypto profile (deprecated for --enable-mongodb-crypto-system-profile) [default=no]]),
206+
[no],
207+
[no])
208+
209209
dnl Also consider the deprecated --enable-system-ciphers option
210210
if test "$PHP_MONGODB_CRYPTO_SYSTEM_PROFILE" = "yes" -o "$PHP_SYSTEM_CIPHERS" = "yes"; then
211211
if test "$PHP_MONGODB_SSL" = "openssl"; then

0 commit comments

Comments
 (0)