Ticket #38579: patch-m4-acinclude.m4.diff

.m4

@@ -24 +24 @@
 #               HAVE_FRAMEWORK_COREFOUNDATION
 #
 #------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_FRAMEWORK_COREFOUNDATION, [
+AC_DEFUN([MP_CHECK_FRAMEWORK_COREFOUNDATION], [
         FRAMEWORK_LIBS="-framework CoreFoundation"
 
         AC_MSG_CHECKING([for CoreFoundation framework])
@@ -82 +82 @@
 #               HAVE_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER
 #
 #------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER, [
+AC_DEFUN([MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER], [
         FRAMEWORK_LIBS="-framework CoreFoundation"
 
         AC_MSG_CHECKING([for CFNotificationCenterGetDarwinNotifyCenter])
@@ -138 +138 @@
 #               HAVE_FRAMEWORK_SYSTEMCONFIGURATION
 #
 #------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_FRAMEWORK_SYSTEMCONFIGURATION, [
+AC_DEFUN([MP_CHECK_FRAMEWORK_SYSTEMCONFIGURATION], [
         FRAMEWORK_LIBS="-framework SystemConfiguration"
 
         AC_MSG_CHECKING([for SystemConfiguration framework])
@@ -195 +195 @@
 #               HAVE_FRAMEWORK_IOKIT
 #
 #------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_FRAMEWORK_IOKIT, [
+AC_DEFUN([MP_CHECK_FRAMEWORK_IOKIT], [
         FRAMEWORK_LIBS="-framework IOKit"
 
         AC_MSG_CHECKING([for IOKit framework])
 
-        AC_CACHE_VAL(mp_cv_have_framework_iokit, [
+        AC_CACHE_VAL([mp_cv_have_framework_iokit], [
                 ac_save_LIBS="$LIBS"
                 LIBS="$FRAMEWORK_LIBS $LIBS"
                 
@@ -572 +572 @@
         AC_REQUIRE([MP_CHECK_FRAMEWORK_IOKIT])
         AC_REQUIRE([MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER])
         
-    AC_MSG_CHECKING(for whether we will build daemondo)
+    AC_MSG_CHECKING([for whether we will build daemondo])
     result=no
         case $host_os in
         darwin*)
@@ -612 +612 @@
 #               TCL_PACKAGE_DIR
 #------------------------------------------------------------------------
 
-AC_DEFUN(MP_TCL_PACKAGE_DIR, [
+AC_DEFUN([MP_TCL_PACKAGE_DIR], [
         AC_REQUIRE([MP_CHECK_INSTALLUSER])
 
-    AC_MSG_CHECKING(for Tcl package directory)
+    AC_MSG_CHECKING([for Tcl package directory])
 
-    AC_ARG_WITH(tclpackage, [  --with-tclpackage       Tcl package installation directory.], with_tclpackagedir=${withval})
+    AC_ARG_WITH([tclpackage], [  --with-tclpackage       Tcl package installation directory.], with_tclpackagedir=${withval})
 
     if test x"${with_tclpackagedir}" != x ; then
         ac_cv_c_tclpkgd=${with_tclpackagedir}
@@ -1012 +1012 @@
 #               READLINK_IS_NOT_P1003_1A
 #
 #------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_READLINK_IS_P1003_1A, [
+AC_DEFUN([MP_CHECK_READLINK_IS_P1003_1A], [
         AC_MSG_CHECKING([if readlink conforms to POSIX 1003.1a])
 
-        AC_CACHE_VAL(mp_cv_readlink_is_posix_1003_1a, [
+        AC_CACHE_VAL([mp_cv_readlink_is_posix_1003_1a], [
                 AC_COMPILE_IFELSE([
                         AC_LANG_PROGRAM([
                                         #include <unistd.h>
@@ -1087 +1087 @@
 #       sets mp_sqlite_version_ge_$1 to yes or no
 #
 #------------------------------------------------------------------------
-AC_DEFUN(MP_CHECK_SQLITE_VERSION, [
+AC_DEFUN([MP_CHECK_SQLITE_VERSION], [
         AC_REQUIRE([MP_SQLITE3_FLAGS])
 
         AC_MSG_CHECKING([for SQLite >= $1])
@@ -1095 +1095 @@
         mp_check_sqlite_version_cppflags_save=$CPPFLAGS
         CPPFLAGS="$CPPFLAGS $CFLAGS_SQLITE3"
 
-        AC_CACHE_VAL(mp_cv_sqlite_version_defined, [
+        AC_CACHE_VAL([mp_cv_sqlite_version_defined], [
                 AC_PREPROC_IFELSE(
                         [AC_LANG_SOURCE(
                                 [[