The help string for --with-bundle-version can't have any shell variable expansion, so it uses an m4 variable instead. Using the same name as the shell variable causes the configure script to end up with the expanded string (1.18.99\n) instead of the variable name (DEFAULT_BUNDLE_VERSION).
Using AC_DEFAULT_BUNDLE_VERSION for the m4 variable avoids this problem. At the same time, remove an extra newline in the m4 value. Signed-off-by: Keith Packard <[email protected]> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 59619ae..d310140 100644 --- a/configure.ac +++ b/configure.ac @@ -553,8 +553,8 @@ AC_ARG_WITH(bundle-id-prefix, AS_HELP_STRING([--with-bundle-id-prefix=RDNS_PREF AC_SUBST([BUNDLE_ID_PREFIX]) AC_DEFINE_UNQUOTED(BUNDLE_ID_PREFIX, "$BUNDLE_ID_PREFIX", [Prefix to use for bundle identifiers]) DEFAULT_BUNDLE_VERSION=`echo ${PACKAGE_VERSION} | cut -f1-3 -d.` -m4_define(DEFAULT_BUNDLE_VERSION, m4_esyscmd([echo ]AC_PACKAGE_VERSION[ | cut -f1-3 -d.])) -AC_ARG_WITH(bundle-version, AS_HELP_STRING([--with-bundle-version=VERSION], [Version to use for X11.app's CFBundleVersion (default: ]DEFAULT_BUNDLE_VERSION[)]), +m4_define(AC_DEFAULT_BUNDLE_VERSION, m4_esyscmd([echo ]AC_PACKAGE_VERSION[ | cut -f1-3 -d. | tr -d '\n'])) +AC_ARG_WITH(bundle-version, AS_HELP_STRING([--with-bundle-version=VERSION], [Version to use for X11.app's CFBundleVersion (default: ]AC_DEFAULT_BUNDLE_VERSION[)]), [ BUNDLE_VERSION="${withval}" ], [ BUNDLE_VERSION="${DEFAULT_BUNDLE_VERSION}" ]) AC_SUBST([BUNDLE_VERSION]) -- 2.8.0.rc3 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel
