From: Glenn Morris Date: Sat, 10 Aug 2013 10:18:08 +0000 (-0400) Subject: Auto-commit of generated files. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1686^2~336 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=68b8ed38d00e9318e21424c32de4df1afadea1ea;p=emacs.git Auto-commit of generated files. --- diff --git a/autogen/Makefile.in b/autogen/Makefile.in index f0a6f60d4ae..af3dbeaf264 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in @@ -1129,6 +1129,7 @@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNEXEC_OBJ = @UNEXEC_OBJ@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ +UPDATE_MANIFEST = @UPDATE_MANIFEST@ USE_ACL = @USE_ACL@ VERSION = @VERSION@ VMLIMIT_OBJ = @VMLIMIT_OBJ@ diff --git a/autogen/configure b/autogen/configure index 25466424615..c319167fc51 100755 --- a/autogen/configure +++ b/autogen/configure @@ -1368,6 +1368,7 @@ FIRSTFILE_OBJ W32_RES_LINK CLIENTW CLIENTRES +UPDATE_MANIFEST EMACS_MANIFEST EMACSRES W32_LIBS @@ -10080,6 +10081,7 @@ CLIENTRES= CLIENTW= W32_RES_LINK= EMACS_MANIFEST= +UPDATE_MANIFEST= if test "${with_w32}" != no; then case "${opsys}" in cygwin) @@ -10243,6 +10245,7 @@ fi 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" @@ -10280,6 +10283,7 @@ fi + if test "${HAVE_W32}" = "yes"; then window_system=w32 with_xft=no