diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2016-05-07 00:43:33 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-05-18 13:15:57 -0400 |
| commit | 1bb932bf1417ff319a594d7e40f6813a26936784 (patch) | |
| tree | af4041d1a988cd0d74c6e85b4f139b718315155d /configure.ac | |
| parent | 2fbf5c2f91d33efbda573c4be036248b1d8ed7f1 (diff) | |
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@apple.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 2633f4e58..cf131238c 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}" ], |