diff --git a/bootstrap.sh b/bootstrap.sh
index 051ee3e82e..272c57b948 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -46,7 +46,7 @@ check_for_app aclocal${MY_AM_VER}
 
 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 1f329a4e70..cbf302269c 100755
--- a/configure
+++ b/configure
@@ -9209,7 +9209,7 @@ PJPROJECT_BUNDLED=no
 
 # 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 82ebbc1c03..931abe19fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -431,7 +431,7 @@ AH_TEMPLATE(m4_bpatsubst([[HAVE_PJPROJECT_BUNDLED]], [(.*)]), [Define to 1 when
 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])