[Emacs-diffs] emacs-24 r116901: Don't use manifest on Cygwin. (Bug#17176)

[Ken Brown]

------------------------------------------------------------
revno: 116901
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-04-03 15:10:35 -0400
message:
  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.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  nt/ChangeLog                   changelog-20091113204419-o5vbwnq5f7feedwu-1545
  nt/emacs.rc                    emacs.rc-20091113204419-o5vbwnq5f7feedwu-875
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/Makefile.in                makefile.in-20091113204419-o5vbwnq5f7feedwu-631

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-03-31 16:22:32 +0000
+++ b/ChangeLog 2014-04-03 19:10:35 +0000
@@ -1,3 +1,8 @@
+2014-04-03  Ken Brown  <address@hidden>
+
+       * configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
+       variables empty on Cygwin.  (Bug#17176)
+
 2014-03-31  Glenn Morris  <address@hidden>
 
        * configure.ac: Make the final "Does Emacs use Gsettings" message

=== modified file 'configure.ac'
--- a/configure.ac      2014-03-31 16:22:32 +0000
+++ b/configure.ac      2014-04-03 19:10:35 +0000
@@ -1834,11 +1834,6 @@
   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 @@
     # 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"

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2014-03-03 04:57:26 +0000
+++ b/nt/ChangeLog      2014-04-03 19:10:35 +0000
@@ -1,3 +1,7 @@
+2014-04-03  Ken Brown  <address@hidden>
+
+       * emacs.rc: Don't use manifest on Cygwin.  (Bug#17176)
+
 2014-02-17  Juanma Barranquero  <address@hidden>
 
        * Makefile.in (install): Create destination directory before copying

=== modified file 'nt/emacs.rc'
--- a/nt/emacs.rc       2014-01-01 08:31:29 +0000
+++ b/nt/emacs.rc       2014-04-03 19:10:35 +0000
@@ -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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-04-03 00:41:09 +0000
+++ b/src/ChangeLog     2014-04-03 19:10:35 +0000
@@ -1,3 +1,7 @@
+2014-04-03  Ken Brown  <address@hidden>
+
+       * Makefile.in (EMACS_MANIFEST): Update comment.  (Bug#17176)
+
 2014-04-02  Martin Rudalics  <address@hidden>
 
        * xterm.c (x_new_font): Don't calculate non-toolkit scrollbar

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2014-01-12 17:27:17 +0000
+++ b/src/Makefile.in   2014-04-03 19:10:35 +0000
@@ -259,7 +259,7 @@
 
 ## 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.