xserver: Branch 'master'

[Adam Jackson]

 configure.ac |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 1bb932bf1417ff319a594d7e40f6813a26936784
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sat May 7 00:43:33 2016 -0700

    XQuartz: Fix default CFBundleVersion
    
    m4/shell variable name collision broke the case when the configure
    option was not used
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

diff --git a/configure.ac b/configure.ac
index 2633f4e..cf13123 100644
--- a/configure.ac
+++ b/configure.ac
@@ -559,11 +559,10 @@ AC_ARG_WITH(bundle-id-prefix,  AS_HELP_STRING([--with-bundle-id-prefix=RDNS_PREF
                                [ BUNDLE_ID_PREFIX="${withval}" ])
 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.]))
+m4_define(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: ]DEFAULT_BUNDLE_VERSION[)]),
                                [ BUNDLE_VERSION="${withval}" ],
-                               [ BUNDLE_VERSION="${DEFAULT_BUNDLE_VERSION}" ])
+                               [ BUNDLE_VERSION="DEFAULT_BUNDLE_VERSION" ])
 AC_SUBST([BUNDLE_VERSION])
 AC_ARG_WITH(bundle-version-string, AS_HELP_STRING([--with-bundle-version-string=VERSION], [Version to use for X11.app's CFBundleShortVersionString (default: ]AC_PACKAGE_VERSION[)]),
                                [ BUNDLE_VERSION_STRING="${withval}" ],