[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 01/01: * configure.ac [HAVE_W32]: Generate nt/*.rc
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 01/01: * configure.ac [HAVE_W32]: Generate nt/*.rc files when HAVE_W32. |
Date: |
Mon, 24 Nov 2014 17:07:57 +0000 |
branch: master
commit 409e4c82dccb9dc0d48c54735161c8f4cc383625
Author: Glenn Morris <address@hidden>
Date: Mon Nov 24 09:07:45 2014 -0800
* configure.ac [HAVE_W32]: Generate nt/*.rc files when HAVE_W32.
---
ChangeLog | 5 +++++
configure.ac | 7 +++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f40624c..5fe2a91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-24 Glenn Morris <address@hidden>
+
+ * configure.ac [HAVE_W32]: Generate nt/*.rc files when HAVE_W32,
+ not just when using mingw32.
+
2014-11-22 Glenn Morris <address@hidden>
Further reduce number of versioned files storing Emacs version number.
diff --git a/configure.ac b/configure.ac
index 85d1123..1c7ec54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4679,7 +4679,10 @@ AH_TEMPLATE(config_opsysfile, [Some platforms that do
not use configure
case $opsys in
mingw32)
AC_DEFINE(config_opsysfile, <ms-w32.h>, [])
+ ;;
+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/'`
@@ -4688,8 +4691,8 @@ case $opsys in
AC_SUBST(comma_version)
AC_SUBST(comma_space_version)
AC_CONFIG_FILES([nt/emacs.rc nt/emacsclient.rc])
- ;;
-esac
+fi
+
XMENU_OBJ=
XOBJ=
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 01/01: * configure.ac [HAVE_W32]: Generate nt/*.rc files when HAVE_W32.,
Glenn Morris <=