Merge pull request #28 from cooljeanius/macos-12-to-13

bump macos version used for CI from 12 to 13

.github/workflows/emacs-apple.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
     - name: checkout
       uses: actions/checkout@v4

.yamllint.yml

@@ -0,0 +1,23 @@
+---
+# https://yamllint.readthedocs.io/en/stable/configuration.html
+extends: default
+
+ignore:
+  - test/infra/test-jobs.yml
+
+rules:
+  float-values: enable
+  indentation:
+    ignore:
+      - .github/workflows/*.yml
+  # some lines might be really long in this repo, and I don't feel like
+  # figuring out how to break them up:
+  line-length:
+    max: 320
+    level: warning
+    ignore:
+      - .gitlab-ci.yml
+      - .travis.yml
+      - test/infra/gitlab-ci.yml
+  octal-values: enable
+  truthy: disable

autogen.sh

@@ -114,9 +114,16 @@ fi
 automake_min="`sed -n 's/^ *AM_INIT_AUTOMAKE(\([0-9\.]*\)).*/\1/p' configure.ac`"
 if test "x${automake_min}" = "x"; then
   test -z "${automake_min}"
-  echo "warning: failed to extract required automake version from configure.ac" >&2
-  automake_min="1.11.6"
-  echo "falling back to default set in $0 for automake (i.e. '${automake_min}')"
+  echo "warning: failed to extract required automake version from configure.ac; making a secont attempt at it..." >&2
+  automake_min="`sed -n 's/^ *AM_INIT_AUTOMAKE(\[\([0-9\.]*\)]).*/\1/p' configure.ac`"
+  if test "x${automake_min}" = "x"; then
+    test -z "${automake_min}"
+    echo "warning: still failing to extract required automake version from configure.ac" >&2
+    automake_min="1.11.6"
+    echo "falling back to default set in $0 for automake (i.e. '${automake_min}')"
+  else
+    echo "now using '${automake_min}' for minimum required automake version"
+  fi
 fi
 
 ## prevent perl version from polluting automake version:
@@ -336,7 +343,7 @@ echo "timestamp: `date`" > src/stamp-h.in || echo timestamp > src/stamp-h.in ||
 ## Configure Git, if using Git.
 if test -d .git && (git status -s) >/dev/null 2>&1; then
 
-	# Check hashes when transferring objects among repositories.
+    # Check hashes when transferring objects among repositories.
 
     git config transfer.fsckObjects true || exit
 
@@ -402,7 +409,7 @@ if test -d .git && (git status -s) >/dev/null 2>&1; then
 		echo "skipping git hooks"
     fi
 else
-	echo "skipping git stuff"
+    echo "skipping git stuff"
 fi
 
 echo ""

configure

@@ -6931,7 +6931,7 @@ if test "x${am_cv_make_support_nested_variables}" = "x"; then
   test -z "${am_cv_make_support_nested_variables}" && am_cv_make_support_nested_variables=yes
 fi  ##end cache value check
 
-test -z "${ac_cv_prog_make_make_set}"
+test -z "${ac_cv_prog_make_make_set}" || stat "`which make`" || sync
 
 emacs_check_gnu_make ()
 {
@@ -39419,7 +39419,7 @@ printf "%s\n" "#define uint64_t $ac_cv_c_uint64_t" >>confdefs.h
   esac
 
 if test "x${ac_cv_type_max_align_t}" = "x"; then
-  test -z "${ac_cv_type_max_align_t}"
+  test -z "${ac_cv_type_max_align_t}" || unset ac_cv_type_max_align_t
   ac_fn_c_check_type "$LINENO" "max_align_t" "ac_cv_type_max_align_t" "$ac_includes_default"
 if test "x$ac_cv_type_max_align_t" = xyes
 then :
@@ -40083,7 +40083,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 
 if test "x${ac_cv_header_termios_h}" = "x"; then
-  test -z "${ac_cv_header_termios_h}"
+  test -z "${ac_cv_header_termios_h}" || unset ac_cv_header_termios_h
     ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default"
 if test "x$ac_cv_header_termios_h" = xyes
 then :
@@ -49540,7 +49540,7 @@ fi
   macfont_file=""
   if test "x${NS_IMPL_COCOA}" = "xyes"; then
             if test "x${ac_cv_header_appkit_appkit_h}" = "x"; then
-      test -z "${ac_cv_header_appkit_appkit_h}"
+      test -z "${ac_cv_header_appkit_appkit_h}" || unset ac_cv_header_appkit_appkit_h
       ac_fn_c_check_header_compile "$LINENO" "AppKit/AppKit.h" "ac_cv_header_AppKit_AppKit_h" "$ac_includes_default"
 if test "x$ac_cv_header_AppKit_AppKit_h" = xyes
 then :
@@ -51552,7 +51552,7 @@ then :
 fi
     ## use cache value as guard:
   if test "x${ac_cv_header_X11_X_h}" = "x"; then
-    test -z "${ac_cv_header_X11_X_h}"
+    test -z "${ac_cv_header_X11_X_h}" || unset ac_cv_header_X11_X_h
     ac_fn_c_check_header_compile "$LINENO" "X11/X.h" "ac_cv_header_X11_X_h" "$ac_includes_default"
 if test "x$ac_cv_header_X11_X_h" = xyes
 then :
@@ -51828,7 +51828,7 @@ printf "%s\n" "no" >&6; }
     ## compilers (such as clang) cannot handle this flag, so check and then
     ## remove it if necessary:
     if test "x${ac_cv_prog_c_openmp}" = "x"; then
-      test -z "${ac_cv_prog_c_openmp}"
+      test -z "${ac_cv_prog_c_openmp}" || unset ac_cv_prog_c_openmp
       if test -e penmp || test -e mp; then
   as_fn_error $? "AC_OPENMP clobbers files named 'mp' and 'penmp'. Aborting configure because one of these files already exists." "$LINENO" 5
 fi
@@ -52293,7 +52293,7 @@ printf "%s\n" "#define HAVE_GTK_FILE_BOTH 1" >>confdefs.h
       if test "x${HAVE_GTK_FILE_CHOOSER}" = "xyes"; then
     HAVE_GTK_AND_PTHREAD=no
     if test "x${ac_cv_header_pthread_h}" = "x"; then
-      test -z "${ac_cv_header_pthread_h}"
+      test -z "${ac_cv_header_pthread_h}" || unset ac_cv_header_pthread_h
       ac_fn_c_check_header_compile "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
 if test "x$ac_cv_header_pthread_h" = xyes
 then :
@@ -52303,7 +52303,7 @@ fi
 
     fi
     if test "x${ac_cv_header_pthread_h}" != "x" && test "x${ac_cv_header_pthread_h}" != "xno"; then
-      test -n "${ac_cv_header_pthread_h}"
+      test -n "${ac_cv_header_pthread_h}" && echo "Is pthread.h available for gtk_file_chooser? ${ac_cv_header_pthread_h}"
       unset ac_cv_lib_pthread_pthread_self
       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5
 printf %s "checking for pthread_self in -lpthread... " >&6; }
@@ -53385,7 +53385,7 @@ LIBXTR6=""
 LIBXMU=""
 if test "x${USE_X_TOOLKIT}" != "xnone"; then
       if test "x${ac_cv_header_X11_Intrinsic_h}" = "x"; then
-    test -z "${ac_cv_header_X11_Intrinsic_h}"
+    test -z "${ac_cv_header_X11_Intrinsic_h}" || unset ac_cv_header_X11_Intrinsic_h
     ac_fn_c_check_header_compile "$LINENO" "X11/Intrinsic.h" "ac_cv_header_X11_Intrinsic_h" "$ac_includes_default"
 if test "x$ac_cv_header_X11_Intrinsic_h" = xyes
 then :
@@ -54209,7 +54209,7 @@ fi
 	XFT_LIBS="-lXrender ${XFT_LIBS}"
 	LIBS="${XFT_LIBS} ${LIBS}"
         if test "x${ac_cv_header_X11_X_h}" != "x"; then
-          test -z "${ac_cv_header_X11_X_h}"
+          test -z "${ac_cv_header_X11_X_h}" || unset ac_cv_header_X11_X_h
           ac_fn_c_check_header_compile "$LINENO" "X11/X.h" "ac_cv_header_X11_X_h" "$ac_includes_default"
 if test "x$ac_cv_header_X11_X_h" = xyes
 then :
@@ -54274,15 +54274,15 @@ fi
 	if test "x${HAVE_XFT}" = "xyes"; then
 
 printf "%s\n" "#define HAVE_XFT 1" >>confdefs.h
-	            ## this is the relevant variable to put the revelant CFLAGS in:
+	  	  ## this is the relevant variable to put the revelant CFLAGS in:
 	  C_SWITCH_X_SITE="${C_SWITCH_X_SITE} ${XFT_CFLAGS}"
 	else
 	  CPPFLAGS="${OLD_CPPFLAGS}"
 	  CFLAGS="${OLD_CFLAGS}"
 	  LIBS="${OLD_LIBS}"
 	fi                        # "x${HAVE_XFT}" = "xyes"
       else
-        test -z "${ac_cv_header_X11_X_h}"
+        test -z "${ac_cv_header_X11_X_h}" || unset ac_cv_header_X11_X_h
         ac_fn_c_check_header_compile "$LINENO" "X11/X.h" "ac_cv_header_X11_X_h" "$ac_includes_default"
 if test "x$ac_cv_header_X11_X_h" = xyes
 then :
@@ -54882,7 +54882,7 @@ HAVE_JPEG=no
 LIBJPEG=""
 if test "x${with_jpeg}" != "xno"; then
       if test "x${ac_cv_header_stdlib_h}" = "x"; then
-    test -z "${ac_cv_header_stdlib_h}"
+    test -z "${ac_cv_header_stdlib_h}" || unset ac_cv_header_stdlib_h
     ac_fn_c_check_header_compile "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
 if test "x$ac_cv_header_jpeglib_h" = xyes
 then :
@@ -56003,7 +56003,7 @@ printf %s "checking darwin/NeXTstep... " >&6; }
 printf "%s\n" "darwin darwin darwin..." >&6; }
 case "${opsys}" in
   darwin)
-    test -z "${ac_cv_header_malloc_malloc_h}"
+    test -z "${ac_cv_header_malloc_malloc_h}" || unset ac_cv_header_malloc_malloc_h
             ac_fn_c_check_header_compile "$LINENO" "malloc/malloc.h" "ac_cv_header_malloc_malloc_h" "$ac_includes_default"
 if test "x$ac_cv_header_malloc_malloc_h" = xyes
 then :
@@ -70104,7 +70104,7 @@ then :
 fi
 
 if test "x${ac_cv_func_tzset}" = "x"; then
-  test -z "${ac_cv_func_tzset}"
+  test -z "${ac_cv_func_tzset}" || unset ac_cv_func_tzset
   ac_fn_c_check_func "$LINENO" "tzset" "ac_cv_func_tzset"
 if test "x$ac_cv_func_tzset" = xyes
 then :
@@ -70184,7 +70184,7 @@ fi
 
 if test "x${HAVE_TIMEVAL}" = "xyes"; then
   if test "x${ac_cv_func_gettimeofday}" = "x"; then
-    test -z "${ac_cv_func_gettimeofday}"
+    test -z "${ac_cv_func_gettimeofday}" || unset ac_cv_func_gettimeofday
     ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
 if test "x$ac_cv_func_gettimeofday" = xyes
 then :
@@ -71987,7 +71987,7 @@ fi
 
 
 if test "x${ac_cv_c_inline}" = "x"; then
-  test -z "${ac_cv_c_inline}"
+  test -z "${ac_cv_c_inline}" || unset ac_cv_c_inline
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 printf %s "checking for inline... " >&6; }
 if test ${ac_cv_c_inline+y}

configure.ac

@@ -170,7 +170,7 @@ fi  ##end cache value check
 m4_ifdef([AC_PROG_MAKE_SET],[
 dnl# trunk would normally override the definition, but I do not feel
 dnl# comfortable doing that yet...
-test -z "${ac_cv_prog_make_make_set}"
+test -z "${ac_cv_prog_make_make_set}" || stat "`which make`" || sync
 ],[
   AC_DEFUN([AC_PROG_MAKE_SET],[
     if test "x${SET_MAKE}" = "x"; then
@@ -4655,7 +4655,7 @@ AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 if test "x${ac_cv_type_max_align_t}" = "x"; then
-  test -z "${ac_cv_type_max_align_t}"
+  test -z "${ac_cv_type_max_align_t}" || unset ac_cv_type_max_align_t
   AC_CHECK_TYPES([max_align_t])dnl
   ## gnulib might also check it below...
 fi
@@ -4711,7 +4711,7 @@ fi
 
 dnl# Check for speed_t typedef.
 if test "x${ac_cv_header_termios_h}" = "x"; then
-  test -z "${ac_cv_header_termios_h}"
+  test -z "${ac_cv_header_termios_h}" || unset ac_cv_header_termios_h
   dnl# Need this first though:
   AC_CHECK_HEADERS([termios.h])
 fi
@@ -5819,7 +5819,7 @@ if test "x${with_ns}" != "xno"; then
     dnl# "_ONCE" causes test to jump out of the conditional and be done at
     dnl# wrong location, so instead check the cache value:
     if test "x${ac_cv_header_appkit_appkit_h}" = "x"; then
-      test -z "${ac_cv_header_appkit_appkit_h}"
+      test -z "${ac_cv_header_appkit_appkit_h}" || unset ac_cv_header_appkit_appkit_h
       AC_CHECK_HEADERS([AppKit/AppKit.h])
     fi
     AC_MSG_CHECKING([for OSX 10.4 or newer])
@@ -6526,7 +6526,7 @@ if test "x${HAVE_X11}" = "xyes"; then
   dnl# and some misc. X headers, if not yet checked:
   ## use cache value as guard:
   if test "x${ac_cv_header_X11_X_h}" = "x"; then
-    test -z "${ac_cv_header_X11_X_h}"
+    test -z "${ac_cv_header_X11_X_h}" || unset ac_cv_header_X11_X_h
     AC_CHECK_HEADER([X11/X.h])
   fi
 else
@@ -6628,7 +6628,7 @@ if test "x${HAVE_X11}" = "xyes" || test "x${HAVE_NS}" = "xyes" || test "x${HAVE_
     ## compilers (such as clang) cannot handle this flag, so check and then
     ## remove it if necessary:
     if test "x${ac_cv_prog_c_openmp}" = "x"; then
-      test -z "${ac_cv_prog_c_openmp}"
+      test -z "${ac_cv_prog_c_openmp}" || unset ac_cv_prog_c_openmp
       AC_OPENMP
     fi
     if test "x${emacs_cv_clang}" = "xyes" || test "x${ac_cv_prog_c_openmp}" = "xunsupported"; then
@@ -6832,11 +6832,11 @@ if test "x${HAVE_GTK}" = "xyes"; then
   if test "x${HAVE_GTK_FILE_CHOOSER}" = "xyes"; then
     HAVE_GTK_AND_PTHREAD=no
     if test "x${ac_cv_header_pthread_h}" = "x"; then
-      test -z "${ac_cv_header_pthread_h}"
+      test -z "${ac_cv_header_pthread_h}" || unset ac_cv_header_pthread_h
       AC_CHECK_HEADERS([pthread.h])
     fi
     if test "x${ac_cv_header_pthread_h}" != "x" && test "x${ac_cv_header_pthread_h}" != "xno"; then
-      test -n "${ac_cv_header_pthread_h}"
+      test -n "${ac_cv_header_pthread_h}" && echo "Is pthread.h available for gtk_file_chooser? ${ac_cv_header_pthread_h}"
       unset ac_cv_lib_pthread_pthread_self
       AC_CHECK_LIB([pthread],[pthread_self],[HAVE_GTK_AND_PTHREAD=yes])
     elif test "x${ac_cv_lib_pthread_pthread_self}" = "xyes"; then
@@ -7192,7 +7192,7 @@ if test "x${USE_X_TOOLKIT}" != "xnone"; then
   dnl# "_ONCE" causes test to jump out of the conditional and be done at
   dnl# wrong location, so check ac_cv_header_X11_Intrinsic_h instead:
   if test "x${ac_cv_header_X11_Intrinsic_h}" = "x"; then
-    test -z "${ac_cv_header_X11_Intrinsic_h}"
+    test -z "${ac_cv_header_X11_Intrinsic_h}" || unset ac_cv_header_X11_Intrinsic_h
     AC_CHECK_HEADERS([X11/Intrinsic.h])
   fi
   AC_MSG_CHECKING([X11 toolkit version])
@@ -7479,7 +7479,7 @@ if test "x${HAVE_X11}" = "xyes"; then
 	XFT_LIBS="-lXrender ${XFT_LIBS}"
 	LIBS="${XFT_LIBS} ${LIBS}"
         if test "x${ac_cv_header_X11_X_h}" != "x"; then
-          test -z "${ac_cv_header_X11_X_h}"
+          test -z "${ac_cv_header_X11_X_h}" || unset ac_cv_header_X11_X_h
           AC_CHECK_HEADER([X11/X.h])
         fi
 	AC_CHECK_HEADER([X11/Xft/Xft.h],
@@ -7491,15 +7491,15 @@ if test "x${HAVE_X11}" = "xyes"; then
 	  AC_DEFINE([HAVE_XFT],[1],
                     [Define to 1 if you have the Xft library.])dnl
 	  AC_SUBST([XFT_LIBS])dnl
-          ## this is the relevant variable to put the revelant CFLAGS in:
+	  ## this is the relevant variable to put the revelant CFLAGS in:
 	  C_SWITCH_X_SITE="${C_SWITCH_X_SITE} ${XFT_CFLAGS}"
 	else
 	  CPPFLAGS="${OLD_CPPFLAGS}"
 	  CFLAGS="${OLD_CFLAGS}"
 	  LIBS="${OLD_LIBS}"
 	fi                        # "x${HAVE_XFT}" = "xyes"
       else
-        test -z "${ac_cv_header_X11_X_h}"
+        test -z "${ac_cv_header_X11_X_h}" || unset ac_cv_header_X11_X_h
         AC_CHECK_HEADER([X11/X.h])
       fi                          # "x${HAVE_XFT}" != "xno"
     fi                            # "x${with_xft}" != "xno"
@@ -7714,7 +7714,7 @@ if test "x${with_jpeg}" != "xno"; then
   dnl# Checking for jpeglib.h can lose because of a redefinition of
   dnl# HAVE_STDLIB_H, so do it conditionally:
   if test "x${ac_cv_header_stdlib_h}" = "x"; then
-    test -z "${ac_cv_header_stdlib_h}"
+    test -z "${ac_cv_header_stdlib_h}" || unset ac_cv_header_stdlib_h
     AC_CHECK_HEADER([jpeglib.h],[HAVE_JPEG=yes],[:])
   fi
   dnl# and also check for this just in case:
@@ -8037,7 +8037,7 @@ AC_MSG_RESULT([darwin darwin darwin...])
 dnl# Check for malloc/malloc.h on darwin:
 case "${opsys}" in
   darwin)
-    test -z "${ac_cv_header_malloc_malloc_h}"
+    test -z "${ac_cv_header_malloc_malloc_h}" || unset ac_cv_header_malloc_malloc_h
     dnl# "_ONCE" causes test to jump out of the conditional and be done at
     dnl# wrong location, so leave that part off:
     AC_CHECK_HEADERS([malloc/malloc.h])dnl
@@ -9031,7 +9031,7 @@ AC_CHECK_HEADERS([valgrind/valgrind.h])dnl
 dnl# "_ONCE" causes test to be done at wrong location, so instead check the
 dnl# cache value:
 if test "x${ac_cv_func_tzset}" = "x"; then
-  test -z "${ac_cv_func_tzset}"
+  test -z "${ac_cv_func_tzset}" || unset ac_cv_func_tzset
   AC_CHECK_FUNCS([tzset])
 fi
 dnl# okay to do this one in a different location though:
@@ -9081,7 +9081,7 @@ fi
 
 if test "x${HAVE_TIMEVAL}" = "xyes"; then
   if test "x${ac_cv_func_gettimeofday}" = "x"; then
-    test -z "${ac_cv_func_gettimeofday}"
+    test -z "${ac_cv_func_gettimeofday}" || unset ac_cv_func_gettimeofday
     AC_CHECK_FUNCS([gettimeofday])
   fi
   if test "x${ac_cv_func_gettimeofday}" = "xyes"; then
@@ -10324,7 +10324,7 @@ AH_VERBATIM([FORTIFY_SOUR],[
 
 dnl# speaking of inline-ing:
 if test "x${ac_cv_c_inline}" = "x"; then
-  test -z "${ac_cv_c_inline}"
+  test -z "${ac_cv_c_inline}" || unset ac_cv_c_inline
   AC_C_INLINE
 fi
 

emacswrapper.c

@@ -25,7 +25,7 @@ int main(int argc, char *argv[])
 #endif /* DEBUG || lint */
 
   if (!is_emacs_valid(0)) {
-    const char *newargs[2];
+    const char *newargs[3];
     newargs[0] = kDumpEmacsPath;
     if (geteuid() != 0) {
       newargs[1] = "-n";

src/emacs.c

@@ -725,7 +725,11 @@ main(int argc, char **argv)
   char *original_pwd = 0;
 
 #if defined(DEBUG) || defined(VERBOSE) || defined(_DEBUG) || defined(__APPLE__)
-  printf("%s, line %d: Hello.\n", __FILE__, __LINE__);
+# if defined(__FUNCTION__) || defined(__GNUC__)
+  printf("%s, line %d: Hello from %s.\n", __FILE__, __LINE__, __FUNCTION__);
+# else
+  printf("%s, line %d: Hello, here we go.\n", __FILE__, __LINE__);
+# endif /* __FUNCTION__ || __GNUC__ */
 #endif /* DEBUG || VERBOSE || _DEBUG || __APPLE__ */
 
 #if GC_MARK_STACK