* configure.ac [HAVE_W32]: Generate nt/*.rc files when HAVE_W32.

diff --git a/ChangeLog b/ChangeLog
index f40624c42e94f092475ba4b3aa4d2085a1d63fec..5fe2a913b933c54bf152f512fd74d53526bca938 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-24  Glenn Morris  <rgm@gnu.org>
+
+       * configure.ac [HAVE_W32]: Generate nt/*.rc files when HAVE_W32,
+       not just when using mingw32.
+
 2014-11-22  Glenn Morris  <rgm@gnu.org>
 
        Further reduce number of versioned files storing Emacs version number.

diff --git a/configure.ac b/configure.ac
index 85d11234035e9b79b8803b5602753d6f7fc601d6..1c7ec54ec1780309f8941dfd08f8893811edff8d 100644 (file)
--- 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=