[asterisk-commits] configure: fix with-pjproject-bundled (asterisk[14])

[SVN commits to the Asterisk project]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/4637 )

Change subject: configure: fix with-pjproject-bundled
......................................................................


configure: fix with-pjproject-bundled

The AC_ARG_WITH macro's shell variable is withval; not enableval. Purely
coincidentally, the option would work when --enable-dev-mode is given.

Also fixed a portability problem with bootstrap.sh, since -printf is not
a portable option for find.

Change-Id: I0f0e5b1a934b5af5737713834361e9c95b96b376
---
M bootstrap.sh
M configure
M configure.ac
3 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Verified



diff --git a/bootstrap.sh b/bootstrap.sh
index 051ee3e..272c57b 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -46,7 +46,7 @@
 
 echo "Generating the configure script ..."
 
-aclocal${MY_AM_VER} -I autoconf `find third-party/ -maxdepth 1 -type d -printf "-I %p "`
+aclocal${MY_AM_VER} -I autoconf `find third-party -maxdepth 1 -type d | xargs -I {} echo -I {}`
 autoconf${MY_AC_VER}
 autoheader${MY_AC_VER}
 automake${MY_AM_VER} --add-missing --copy 2>/dev/null
diff --git a/configure b/configure
index 6149b0e..a87b837 100755
--- a/configure
+++ b/configure
@@ -9284,7 +9284,7 @@
 
 # Check whether --with-pjproject-bundled was given.
 if test "${with_pjproject_bundled+set}" = set; then :
-  withval=$with_pjproject_bundled; case "${enableval}" in
+  withval=$with_pjproject_bundled; case "${withval}" in
 	      n|no) PJPROJECT_BUNDLED=no ;;
 	      *) PJPROJECT_BUNDLED=yes ;;
 	esac
diff --git a/configure.ac b/configure.ac
index 11cc3e1..53bede4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -430,7 +430,7 @@
 AC_ARG_WITH([pjproject-bundled],
 	[AS_HELP_STRING([--with-pjproject-bundled],
 		[Use bundled pjproject libraries])],
-	[case "${enableval}" in
+	[case "${withval}" in
 	      n|no) PJPROJECT_BUNDLED=no ;;
 	      *) PJPROJECT_BUNDLED=yes ;;
 	esac])

-- 
To view, visit https://gerrit.asterisk.org/4637
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f0e5b1a934b5af5737713834361e9c95b96b376
Gerrit-PatchSet: 2
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-Owner: David M. Lee <dlee at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>