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

diff --git a/bootstrap.sh b/bootstrap.sh
index 051ee3e82e93aaefec5c5eb41c126886d34b15cd..272c57b94819aafa008b96a1d80fdab42f0f2a20 100755 (executable)
--- 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 1f329a4e70dca6761ad8e3e425303b2766b9839d..cbf302269c210210a39b4f7f659f23ab61a8ba62 100755 (executable)
--- 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 82ebbc1c036cfd095b1dcf39f523c57bd5aa3a80..931abe19fdc73f103f51750d0936f372a9d42827 100644 (file)
--- 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])