Revert most of the recent change involving manifests on Cygwin. (Bug#17176)

* configure.ac (EMACS_MANIFEST): Revert last change (but leave
UPDATE_MANIFEST empty).
* nt/emacs.rc: Revert last change.
* src/Makefile.in (EMACS_MANIFEST): Revert last change.

diff --git a/ChangeLog b/ChangeLog
index 0060060b71338923f686e7ce8c5f20f783ee32a6..e55beb896b1091861fa372d8f35302e7a5819ab3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-09  Ken Brown  <kbrown@cornell.edu>
+
+       * configure.ac (EMACS_MANIFEST): Revert last change (but leave
+       UPDATE_MANIFEST empty).
+
 2014-04-03  Ken Brown  <kbrown@cornell.edu>
 
        * configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these

diff --git a/configure.ac b/configure.ac
index 086bd7d4bdf7ae5c965073f8b2063a45283aa098..f7675fb405660631bff15854a2fe62bc7482426c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1834,6 +1834,10 @@ if test "${HAVE_W32}" = "yes"; then
   W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
   W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
   EMACSRES="emacs.res"
+  case "$canonical" in
+    x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
+    *) EMACS_MANIFEST="emacs-x86.manifest" ;;
+  esac
   if test "${opsys}" = "cygwin"; then
     W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
     W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
@@ -1841,10 +1845,6 @@ if test "${HAVE_W32}" = "yes"; then
     # the rc file), not a linker script.
     W32_RES_LINK="-Wl,emacs.res"
   else
-    case "$canonical" in
-      x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
-      *) EMACS_MANIFEST="emacs-x86.manifest" ;;
-    esac
     UPDATE_MANIFEST=update-game-score.exe.manifest
     W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o"
     W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 8e2875805ddf63e7560981da86b7a2ea46873321..38e5512043d7d59183e238be0959c6131199bfc4 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-09  Ken Brown  <kbrown@cornell.edu>
+
+       * emacs.rc: Revert last change.
+
 2014-04-03  Ken Brown  <kbrown@cornell.edu>
 
        * emacs.rc: Don't use manifest on Cygwin.  (Bug#17176)

diff --git a/nt/emacs.rc b/nt/emacs.rc
index fa019b4d98a81a89d48d85be8f5bd433e36d7b1d..92c303ad4efdfbfe5fb6021e473a7ab580f055ba 100644 (file)
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -1,12 +1,10 @@
 Emacs ICON   icons/emacs.ico
 32649 CURSOR icons/hand.cur
-#ifndef __CYGWIN__
-#ifdef WIN64
+#if defined (WIN64) || defined (__x86_64__)
 1 24 "emacs-x64.manifest"
 #else
 1 24 "emacs-x86.manifest"
 #endif
-#endif
 
 #ifndef VS_VERSION_INFO
 #define VS_VERSION_INFO 1

diff --git a/src/ChangeLog b/src/ChangeLog
index 7618fb202e0673ccd6aac970e5c66a0d7cae1206..e2c925f03d30c7c8e31e843c17423d1e484d696a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-09  Ken Brown  <kbrown@cornell.edu>
+
+       * Makefile.in (EMACS_MANIFEST): Revert last change.
+
 2014-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * lisp.h (struct Lisp_Symbol): New bitfield `pinned'.

diff --git a/src/Makefile.in b/src/Makefile.in
index 7e71d030279829e95b7f1b21aace1742dec852fc..388923596c9fb853345f343f048be11d682f8679 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -259,7 +259,7 @@ W32_LIBS=@W32_LIBS@
 
 ## emacs.res if HAVE_W32
 EMACSRES = @EMACSRES@
-## emacs-*.manifest if WINDOWSNT
+## emacs-*.manifest if HAVE_W32
 EMACS_MANIFEST = @EMACS_MANIFEST@
 ## If HAVE_W32, compiler arguments for including
 ## the resource file in the binary.