[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 01/01: * configure.ac: Relocate some recent changes
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 01/01: * configure.ac: Relocate some recent changes to a more logical location. |
Date: |
Mon, 24 Nov 2014 18:40:18 +0000 |
branch: master
commit 8df5745cf5234391fdb4452e23a1aa75fb010b12
Author: Glenn Morris <address@hidden>
Date: Mon Nov 24 13:40:02 2014 -0500
* configure.ac: Relocate some recent changes to a more logical location.
---
configure.ac | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1c7ec54..0f1508f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1885,6 +1885,13 @@ if test "${HAVE_W32}" = "yes"; then
x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
*) EMACS_MANIFEST="emacs-x86.manifest" ;;
esac
+ dnl Construct something of the form "24,4,0,0" with 4 components.
+ comma_version=`echo "$version.0.0" | sed -e 's/\./,/g' -e
's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'`
+
+ comma_space_version=`echo "$comma_version" | sed 's/,/, /g'`
+ AC_SUBST(comma_version)
+ AC_SUBST(comma_space_version)
+ AC_CONFIG_FILES([nt/emacs.rc nt/emacsclient.rc])
if test "${opsys}" = "cygwin"; then
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
@@ -4682,18 +4689,6 @@ case $opsys in
;;
esac
-if test "${HAVE_W32}" = "yes"; then
- dnl Construct something of the form "24,4,0,0" with 4 components.
- comma_version=`echo "$version.0.0" | sed -e 's/\./,/g' -e
's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'`
-
- comma_space_version=`echo "$comma_version" | sed 's/,/, /g'`
-
- AC_SUBST(comma_version)
- AC_SUBST(comma_space_version)
- AC_CONFIG_FILES([nt/emacs.rc nt/emacsclient.rc])
-fi
-
-
XMENU_OBJ=
XOBJ=
FONT_OBJ=
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 01/01: * configure.ac: Relocate some recent changes to a more logical location.,
Glenn Morris <=