From: Ken Brown <kbrown@cornell.edu>
Date: Thu, 3 Apr 2014 19:10:35 +0000 (-0400)
Subject: Don't use manifest on Cygwin.  (Bug#17176)
X-Git-Tag: emacs-24.3.90~49
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebe8e0765cf469daeda515bab7e3afa6a35fcb43;p=emacs.git

Don't use manifest on Cygwin.  (Bug#17176)

* nt/emacs.rc: Don't use manifest on Cygwin.
* configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
variables empty on Cygwin.
* src/Makefile.in (EMACS_MANIFEST): Update comment.
---

diff --git a/ChangeLog b/ChangeLog
index 65e730fffd7..0060060b713 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-03  Ken Brown  <kbrown@cornell.edu>
+
+	* configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
+	variables empty on Cygwin.  (Bug#17176)
+
 2014-03-31  Glenn Morris  <rgm@gnu.org>
 
 	* configure.ac: Make the final "Does Emacs use Gsettings" message
diff --git a/configure.ac b/configure.ac
index 83bbb32959b..086bd7d4bdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1834,11 +1834,6 @@ 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
-  UPDATE_MANIFEST=update-game-score.exe.manifest
   if test "${opsys}" = "cygwin"; then
     W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
     W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
@@ -1846,6 +1841,11 @@ 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"
     W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10"
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 62a33906b0d..8e2875805dd 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-03  Ken Brown  <kbrown@cornell.edu>
+
+	* emacs.rc: Don't use manifest on Cygwin.  (Bug#17176)
+
 2014-02-17  Juanma Barranquero  <lekktu@gmail.com>
 
 	* Makefile.in (install): Create destination directory before copying
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 92c303ad4ef..fa019b4d98a 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -1,10 +1,12 @@
 Emacs ICON   icons/emacs.ico
 32649 CURSOR icons/hand.cur
-#if defined (WIN64) || defined (__x86_64__)
+#ifndef __CYGWIN__
+#ifdef WIN64
 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 6f42a46cbd4..c35206447f1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-03  Ken Brown  <kbrown@cornell.edu>
+
+	* Makefile.in (EMACS_MANIFEST): Update comment.  (Bug#17176)
+
 2014-04-02  Martin Rudalics  <rudalics@gmx.at>
 
 	* xterm.c (x_new_font): Don't calculate non-toolkit scrollbar
diff --git a/src/Makefile.in b/src/Makefile.in
index 388923596c9..7e71d030279 100644
--- 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 HAVE_W32
+## emacs-*.manifest if WINDOWSNT
 EMACS_MANIFEST = @EMACS_MANIFEST@
 ## If HAVE_W32, compiler arguments for including
 ## the resource file in the binary.