From 6ec9a5a7b5efb129807f567709ca858211ed7840 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 4 Sep 2012 06:17:39 -0400
Subject: [PATCH] Auto-commit of generated files.

---
 autogen/config.in |  6 ++++--
 autogen/configure | 36 ++++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/autogen/config.in b/autogen/config.in
index c39453938b..59bc8dca23 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1542,10 +1542,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    declarations. Define as empty for no equivalent. */
 #undef __restrict_arr
 
-/* Some platforms redefine this. */
+/* Define to longjmp if _setjmp and _longjmp do not work. Because longjmp may
+   alter signal masks, callers of _longjmp should not assume that it leaves
+   signal masks alone. */
 #undef _longjmp
 
-/* Some platforms redefine this. */
+/* Define to setjmp if _setjmp and _longjmp do not work. See _longjmp. */
 #undef _setjmp
 
 /* Some platforms that do not use configure define this to include extra
diff --git a/autogen/configure b/autogen/configure
index 1223981869..885b6f4b47 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -7218,6 +7218,7 @@ fi
   nw="$nw -Wswitch-default"         # Too many warnings for now
   nw="$nw -Wfloat-equal"            # warns about high-quality code
   nw="$nw -Winline"                 # OK to ignore 'inline'
+  nw="$nw -Wjump-misses-init"       # We sometimes safely jump over init.
   nw="$nw -Wsync-nand"              # irrelevant here, and provokes ObjC warning
   nw="$nw -Wunsafe-loop-optimizations" # OK to suppress unsafe optimizations
 
@@ -15480,15 +15481,46 @@ else
       ;;
   esac
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _setjmp" >&5
+$as_echo_n "checking for _setjmp... " >&6; }
+if test "${emacs_cv_func__setjmp+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <setjmp.h>
 
-case $opsys in
-  sol2* | unixware )
+int
+main ()
+{
+jmp_buf j;
+	 if (! _setjmp (j))
+	   _longjmp (j, 1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  emacs_cv_func__setjmp=yes
+else
+  emacs_cv_func__setjmp=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_func__setjmp" >&5
+$as_echo "$emacs_cv_func__setjmp" >&6; }
+if test $emacs_cv_func__setjmp = no; then
 
 $as_echo "#define _setjmp setjmp" >>confdefs.h
 
 
 $as_echo "#define _longjmp longjmp" >>confdefs.h
 
+fi
+
+case $opsys in
+  sol2* | unixware )
 
 $as_echo "#define TIOCSIGSEND TIOCSIGNAL" >>confdefs.h
 
-- 
2.39.2