I actually already had a patch for that on my branch and just hadn't gotten around to sending it, sorry:
https://github.com/XQuartz/xorg-server/commit/eb7c1e7fb16338d8fc03a0bb0f9bb53eb99ee139 I ended up just getting rid of the shell variable and only using the m4 variable. I don't think we should be using AC_ as that should be seen as a restricted namespace (like m4_, AS_, and AM_). If you change the m4 variable name, then 'Reviewed-by: Jeremy Sequoia <jerem...@apple.com>' or you can merge mine: The following changes since commit 7f0494671f95cfa33f6f2c7c74b20a21f239f8c5: modesetting: fix build with glamor disabled. (2016-05-06 08:59:45 +1000) are available in the git repository at: https://github.com/XQuartz/xorg-server.git for you to fetch changes up to eb7c1e7fb16338d8fc03a0bb0f9bb53eb99ee139: XQuartz: Fix default CFBundleVersion (2016-05-07 00:43:36 -0700) ---------------------------------------------------------------- Jeremy Huddleston Sequoia (1): XQuartz: Fix default CFBundleVersion configure.ac | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) > On May 12, 2016, at 10:35, Keith Packard <kei...@keithp.com> wrote: > > 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 <kei...@keithp.com> > --- > 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 >
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: https://lists.x.org/mailman/listinfo/xorg-devel