upstream

2 files changed, 13 insertions, 10 deletions

diff --git a/autogen/config.in b/autogen/config.in
index cbf7c225bd7..fd2c4f8eda5 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1473,9 +1473,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   /* GC_SETJMP_WORKS is nearly always appropriate for GCC.  */
 #    define GC_SETJMP_WORKS 1
 #  endif
-#  ifndef GC_LISP_OBJECT_ALIGNMENT
-#    define GC_LISP_OBJECT_ALIGNMENT (__alignof__ (Lisp_Object))
-#  endif
 #endif
 
 #endif /* EMACS_CONFIG_H */
diff --git a/autogen/configure b/autogen/configure
index 7a4a3c10bdc..29fcb81a452 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -7040,6 +7040,8 @@ esac
   # Code from module stat:
   # Code from module stdarg:
 
+
+
   # Code from module stdbool:
   # Code from module stddef:
   # Code from module stdint:
@@ -10781,13 +10783,13 @@ XOpenDisplay ("foo");
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  xlinux_first_failure=no
+  xgnu_linux_first_failure=no
 else
-  xlinux_first_failure=yes
+  xgnu_linux_first_failure=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    if test "${xlinux_first_failure}" = "yes"; then
+    if test "${xgnu_linux_first_failure}" = "yes"; then
       OLD_LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE"
       OLD_C_SWITCH_X_SITE="$C_SWITCH_X_SITE"
       OLD_CPPFLAGS="$CPPFLAGS"
@@ -10808,13 +10810,13 @@ XOpenDisplay ("foo");
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  xlinux_second_failure=no
+  xgnu_linux_second_failure=no
 else
-  xlinux_second_failure=yes
+  xgnu_linux_second_failure=yes
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-      if test "${xlinux_second_failure}" = "yes"; then
+      if test "${xgnu_linux_second_failure}" = "yes"; then
         # If we get the same failure with -b, there is no use adding -b.
         # So take it out.  This plays safe.
         LD_SWITCH_X_SITE="$OLD_LD_SWITCH_X_SITE"
@@ -22141,10 +22143,14 @@ fi
 
 
       gl_gnulib_enabled_stat=true
-      if $condition; then
+      if test $REPLACE_STAT = 1; then
         func_gl_gnulib_m4code_dosname
       fi
+<<<<<<< TREE
       if $condition; then
+=======
+      if test $REPLACE_STAT = 1; then
+>>>>>>> MERGE-SOURCE
         func_gl_gnulib_m4code_verify
       fi
     fi