diff options
author | David M. Lee <dlee@respoke.io> | 2016-12-16 01:32:57 -0600 |
---|---|---|
committer | George Joseph <gjoseph@digium.com> | 2016-12-16 07:53:11 -0600 |
commit | ab447f8a6a3d05908395ed52ec3b981c1e8943c1 (patch) | |
tree | a6051f3778e4f0e8c041ac7cfe1ae914ab4e0c66 | |
parent | 91485734a48e9e44292b80b8993fb464bc3817b0 (diff) |
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
-rwxr-xr-x | bootstrap.sh | 2 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index 051ee3e82..272c57b94 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 @@ -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 82ebbc1c0..931abe19f 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]) |