From: Sara Golemon <pollita@php.net>
Date: Wed, 12 Jul 2017 02:12:56 +0000 (-0400)
Subject: Remove extraneous configure flag
X-Git-Tag: php-7.2.0beta1~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bf0f769d589f9533acd99541a437b2c0216e8065;p=php

Remove extraneous configure flag

--with-sodium --with-libsodium[=DIR] is inconsistent with
existing extensions. Unify these into a single
--with-sodium[=DIR] option
---

diff --git a/ext/sodium/config.m4 b/ext/sodium/config.m4
index dc7ffe1e8d..f0fef93eb9 100644
--- a/ext/sodium/config.m4
+++ b/ext/sodium/config.m4
@@ -1,11 +1,8 @@
 dnl $Id$
 dnl config.m4 for extension sodium
 
-PHP_ARG_WITH(libsodium, for libsodium library location,
-[  --with-libsodium[[=DIR]]  libsodium library location, else rely on pkg-config])
-
 PHP_ARG_WITH(sodium, for sodium support,
-[  --with-sodium           Include sodium support])
+[  --with-sodium[=DIR]     Include sodium support])
 
 if test "$PHP_SODIUM" != "no"; then
   SEARCH_PATH="/usr/local /usr"     # you might want to change this
@@ -15,9 +12,9 @@ if test "$PHP_SODIUM" != "no"; then
   AC_MSG_CHECKING([for libsodium])
 
   dnl user provided location
-  if test -r $PHP_LIBSODIUM/$SEARCH_FOR; then # path given as parameter
-    LIBSODIUM_DIR=$PHP_LIBSODIUM
-    AC_MSG_RESULT([found in $PHP_LIBSODIUM])
+  if test -r $PHP_SODIUM/$SEARCH_FOR; then # path given as parameter
+    LIBSODIUM_DIR=$PHP_SODIUM
+    AC_MSG_RESULT([found in $PHP_SODIUM])
 
   dnl pkg-config output
   elif test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsodium; then