Skip to content

Commit bf0f769

Browse files
committed
Remove extraneous configure flag
--with-sodium --with-libsodium[=DIR] is inconsistent with existing extensions. Unify these into a single --with-sodium[=DIR] option
1 parent d1ee666 commit bf0f769

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

ext/sodium/config.m4

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
dnl $Id$
22
dnl config.m4 for extension sodium
33

4-
PHP_ARG_WITH(libsodium, for libsodium library location,
5-
[ --with-libsodium[[=DIR]] libsodium library location, else rely on pkg-config])
6-
74
PHP_ARG_WITH(sodium, for sodium support,
8-
[ --with-sodium Include sodium support])
5+
[ --with-sodium[=DIR] Include sodium support])
96

107
if test "$PHP_SODIUM" != "no"; then
118
SEARCH_PATH="/usr/local /usr" # you might want to change this
@@ -15,9 +12,9 @@ if test "$PHP_SODIUM" != "no"; then
1512
AC_MSG_CHECKING([for libsodium])
1613

1714
dnl user provided location
18-
if test -r $PHP_LIBSODIUM/$SEARCH_FOR; then # path given as parameter
19-
LIBSODIUM_DIR=$PHP_LIBSODIUM
20-
AC_MSG_RESULT([found in $PHP_LIBSODIUM])
15+
if test -r $PHP_SODIUM/$SEARCH_FOR; then # path given as parameter
16+
LIBSODIUM_DIR=$PHP_SODIUM
17+
AC_MSG_RESULT([found in $PHP_SODIUM])
2118

2219
dnl pkg-config output
2320
elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsodium; then

0 commit comments

Comments
 (0)