diff options
-rw-r--r-- | m4/ax_append_compile_flags.m4 | 10 | ||||
-rw-r--r-- | m4/ax_append_flag.m4 | 6 | ||||
-rw-r--r-- | m4/ax_check_compile_flag.m4 | 6 | ||||
-rw-r--r-- | m4/ax_check_link_flag.m4 | 6 | ||||
-rw-r--r-- | m4/ax_count_cpus.m4 | 29 | ||||
-rw-r--r-- | m4/ax_have_epoll.m4 | 4 | ||||
-rw-r--r-- | m4/ax_pthread.m4 | 6 | ||||
-rw-r--r-- | m4/ax_require_defined.m4 | 4 |
8 files changed, 38 insertions, 33 deletions
diff --git a/m4/ax_append_compile_flags.m4 b/m4/ax_append_compile_flags.m4 index 2bb27ef2..5b6f1af5 100644 --- a/m4/ax_append_compile_flags.m4 +++ b/m4/ax_append_compile_flags.m4 | |||
@@ -1,6 +1,6 @@ | |||
1 | # =========================================================================== | 1 | # ============================================================================ |
2 | # http://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html | 2 | # https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html |
3 | # =========================================================================== | 3 | # ============================================================================ |
4 | # | 4 | # |
5 | # SYNOPSIS | 5 | # SYNOPSIS |
6 | # | 6 | # |
@@ -41,7 +41,7 @@ | |||
41 | # Public License for more details. | 41 | # Public License for more details. |
42 | # | 42 | # |
43 | # You should have received a copy of the GNU General Public License along | 43 | # You should have received a copy of the GNU General Public License along |
44 | # with this program. If not, see <http://www.gnu.org/licenses/>. | 44 | # with this program. If not, see <https://www.gnu.org/licenses/>. |
45 | # | 45 | # |
46 | # As a special exception, the respective Autoconf Macro's copyright owner | 46 | # As a special exception, the respective Autoconf Macro's copyright owner |
47 | # gives unlimited permission to copy, distribute and modify the configure | 47 | # gives unlimited permission to copy, distribute and modify the configure |
@@ -56,7 +56,7 @@ | |||
56 | # modified version of the Autoconf Macro, you may extend this special | 56 | # modified version of the Autoconf Macro, you may extend this special |
57 | # exception to the GPL to apply to your modified version as well. | 57 | # exception to the GPL to apply to your modified version as well. |
58 | 58 | ||
59 | #serial 5 | 59 | #serial 6 |
60 | 60 | ||
61 | AC_DEFUN([AX_APPEND_COMPILE_FLAGS], | 61 | AC_DEFUN([AX_APPEND_COMPILE_FLAGS], |
62 | [AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) | 62 | [AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG]) |
diff --git a/m4/ax_append_flag.m4 b/m4/ax_append_flag.m4 index 08f2e07e..e8c5312a 100644 --- a/m4/ax_append_flag.m4 +++ b/m4/ax_append_flag.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # =========================================================================== | 1 | # =========================================================================== |
2 | # http://www.gnu.org/software/autoconf-archive/ax_append_flag.html | 2 | # https://www.gnu.org/software/autoconf-archive/ax_append_flag.html |
3 | # =========================================================================== | 3 | # =========================================================================== |
4 | # | 4 | # |
5 | # SYNOPSIS | 5 | # SYNOPSIS |
@@ -34,7 +34,7 @@ | |||
34 | # Public License for more details. | 34 | # Public License for more details. |
35 | # | 35 | # |
36 | # You should have received a copy of the GNU General Public License along | 36 | # You should have received a copy of the GNU General Public License along |
37 | # with this program. If not, see <http://www.gnu.org/licenses/>. | 37 | # with this program. If not, see <https://www.gnu.org/licenses/>. |
38 | # | 38 | # |
39 | # As a special exception, the respective Autoconf Macro's copyright owner | 39 | # As a special exception, the respective Autoconf Macro's copyright owner |
40 | # gives unlimited permission to copy, distribute and modify the configure | 40 | # gives unlimited permission to copy, distribute and modify the configure |
@@ -49,7 +49,7 @@ | |||
49 | # modified version of the Autoconf Macro, you may extend this special | 49 | # modified version of the Autoconf Macro, you may extend this special |
50 | # exception to the GPL to apply to your modified version as well. | 50 | # exception to the GPL to apply to your modified version as well. |
51 | 51 | ||
52 | #serial 6 | 52 | #serial 7 |
53 | 53 | ||
54 | AC_DEFUN([AX_APPEND_FLAG], | 54 | AC_DEFUN([AX_APPEND_FLAG], |
55 | [dnl | 55 | [dnl |
diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 index ca363971..dcabb92a 100644 --- a/m4/ax_check_compile_flag.m4 +++ b/m4/ax_check_compile_flag.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # =========================================================================== | 1 | # =========================================================================== |
2 | # http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html | 2 | # https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html |
3 | # =========================================================================== | 3 | # =========================================================================== |
4 | # | 4 | # |
5 | # SYNOPSIS | 5 | # SYNOPSIS |
@@ -40,7 +40,7 @@ | |||
40 | # Public License for more details. | 40 | # Public License for more details. |
41 | # | 41 | # |
42 | # You should have received a copy of the GNU General Public License along | 42 | # You should have received a copy of the GNU General Public License along |
43 | # with this program. If not, see <http://www.gnu.org/licenses/>. | 43 | # with this program. If not, see <https://www.gnu.org/licenses/>. |
44 | # | 44 | # |
45 | # As a special exception, the respective Autoconf Macro's copyright owner | 45 | # As a special exception, the respective Autoconf Macro's copyright owner |
46 | # gives unlimited permission to copy, distribute and modify the configure | 46 | # gives unlimited permission to copy, distribute and modify the configure |
@@ -55,7 +55,7 @@ | |||
55 | # modified version of the Autoconf Macro, you may extend this special | 55 | # modified version of the Autoconf Macro, you may extend this special |
56 | # exception to the GPL to apply to your modified version as well. | 56 | # exception to the GPL to apply to your modified version as well. |
57 | 57 | ||
58 | #serial 4 | 58 | #serial 5 |
59 | 59 | ||
60 | AC_DEFUN([AX_CHECK_COMPILE_FLAG], | 60 | AC_DEFUN([AX_CHECK_COMPILE_FLAG], |
61 | [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF | 61 | [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF |
diff --git a/m4/ax_check_link_flag.m4 b/m4/ax_check_link_flag.m4 index eb01a6ce..819409a2 100644 --- a/m4/ax_check_link_flag.m4 +++ b/m4/ax_check_link_flag.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # =========================================================================== | 1 | # =========================================================================== |
2 | # http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html | 2 | # https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html |
3 | # =========================================================================== | 3 | # =========================================================================== |
4 | # | 4 | # |
5 | # SYNOPSIS | 5 | # SYNOPSIS |
@@ -40,7 +40,7 @@ | |||
40 | # Public License for more details. | 40 | # Public License for more details. |
41 | # | 41 | # |
42 | # You should have received a copy of the GNU General Public License along | 42 | # You should have received a copy of the GNU General Public License along |
43 | # with this program. If not, see <http://www.gnu.org/licenses/>. | 43 | # with this program. If not, see <https://www.gnu.org/licenses/>. |
44 | # | 44 | # |
45 | # As a special exception, the respective Autoconf Macro's copyright owner | 45 | # As a special exception, the respective Autoconf Macro's copyright owner |
46 | # gives unlimited permission to copy, distribute and modify the configure | 46 | # gives unlimited permission to copy, distribute and modify the configure |
@@ -55,7 +55,7 @@ | |||
55 | # modified version of the Autoconf Macro, you may extend this special | 55 | # modified version of the Autoconf Macro, you may extend this special |
56 | # exception to the GPL to apply to your modified version as well. | 56 | # exception to the GPL to apply to your modified version as well. |
57 | 57 | ||
58 | #serial 4 | 58 | #serial 5 |
59 | 59 | ||
60 | AC_DEFUN([AX_CHECK_LINK_FLAG], | 60 | AC_DEFUN([AX_CHECK_LINK_FLAG], |
61 | [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF | 61 | [AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF |
diff --git a/m4/ax_count_cpus.m4 b/m4/ax_count_cpus.m4 index 2f5ba70a..5db89255 100644 --- a/m4/ax_count_cpus.m4 +++ b/m4/ax_count_cpus.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # =========================================================================== | 1 | # =========================================================================== |
2 | # http://www.gnu.org/software/autoconf-archive/ax_count_cpus.html | 2 | # https://www.gnu.org/software/autoconf-archive/ax_count_cpus.html |
3 | # =========================================================================== | 3 | # =========================================================================== |
4 | # | 4 | # |
5 | # SYNOPSIS | 5 | # SYNOPSIS |
@@ -28,7 +28,7 @@ | |||
28 | # and this notice are preserved. This file is offered as-is, without any | 28 | # and this notice are preserved. This file is offered as-is, without any |
29 | # warranty. | 29 | # warranty. |
30 | 30 | ||
31 | #serial 17 | 31 | #serial 22 |
32 | 32 | ||
33 | AC_DEFUN([AX_COUNT_CPUS],[dnl | 33 | AC_DEFUN([AX_COUNT_CPUS],[dnl |
34 | AC_REQUIRE([AC_CANONICAL_HOST])dnl | 34 | AC_REQUIRE([AC_CANONICAL_HOST])dnl |
@@ -38,43 +38,48 @@ | |||
38 | 38 | ||
39 | # Try generic methods | 39 | # Try generic methods |
40 | 40 | ||
41 | # 'getconf' is POSIX utility, '_SC_NPROCESSORS_ONLN' is optional | 41 | # 'getconf' is POSIX utility, but '_NPROCESSORS_ONLN' and |
42 | CPU_COUNT=`getconf _NPROCESSORS_ONLN 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+'` || CPU_COUNT="0" | 42 | # 'NPROCESSORS_ONLN' are platform-specific |
43 | AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[# empty]],[dnl | 43 | command -v getconf >/dev/null 2>&1 && \ |
44 | CPU_COUNT=`getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null` || CPU_COUNT="0" | ||
45 | AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null || ! command -v nproc >/dev/null 2>&1]],[[: # empty]],[dnl | ||
44 | # 'nproc' is part of GNU Coreutils and is widely available | 46 | # 'nproc' is part of GNU Coreutils and is widely available |
45 | CPU_COUNT=`OMP_NUM_THREADS='' nproc 2>/dev/null` || CPU_COUNT=`nproc 2>/dev/null` || CPU_COUNT="0" | 47 | CPU_COUNT=`OMP_NUM_THREADS='' nproc 2>/dev/null` || CPU_COUNT=`nproc 2>/dev/null` || CPU_COUNT="0" |
46 | ])dnl | 48 | ])dnl |
47 | 49 | ||
48 | AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[# empty]],[dnl | 50 | AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[: # empty]],[dnl |
49 | # Try platform-specific preferred methods | 51 | # Try platform-specific preferred methods |
50 | AS_CASE([[$host_os]],dnl | 52 | AS_CASE([[$host_os]],dnl |
51 | [[*linux*]],[[CPU_COUNT=`lscpu -p 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+,' -c` || CPU_COUNT="0"]],dnl | 53 | [[*linux*]],[[CPU_COUNT=`lscpu -p 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+,' -c` || CPU_COUNT="0"]],dnl |
52 | [[*darwin*]],[[CPU_COUNT=`sysctl -n hw.logicalcpu 2>/dev/null` || CPU_COUNT="0"]],dnl | 54 | [[*darwin*]],[[CPU_COUNT=`sysctl -n hw.logicalcpu 2>/dev/null` || CPU_COUNT="0"]],dnl |
53 | [[freebsd*]],[[CPU_COUNT=`sysctl -n kern.smp.cpus 2>/dev/null` || CPU_COUNT="0"]],dnl | 55 | [[freebsd*]],[[command -v sysctl >/dev/null 2>&1 && CPU_COUNT=`sysctl -n kern.smp.cpus 2>/dev/null` || CPU_COUNT="0"]],dnl |
54 | [[solaris*]],[[CPU_COUNT=`psrinfo 2>/dev/null | $EGREP -e '^@<:@0-9@:>@.*on-line' -c 2>/dev/null` || CPU_COUNT="0"]],dnl | 56 | [[netbsd*]], [[command -v sysctl >/dev/null 2>&1 && CPU_COUNT=`sysctl -n hw.ncpuonline 2>/dev/null` || CPU_COUNT="0"]],dnl |
57 | [[solaris*]],[[command -v psrinfo >/dev/null 2>&1 && CPU_COUNT=`psrinfo 2>/dev/null | $EGREP -e '^@<:@0-9@:>@.*on-line' -c 2>/dev/null` || CPU_COUNT="0"]],dnl | ||
55 | [[mingw*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl | 58 | [[mingw*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl |
56 | [[msys*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl | 59 | [[msys*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]],dnl |
57 | [[cygwin*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]]dnl | 60 | [[cygwin*]],[[CPU_COUNT=`ls -qpU1 /proc/registry/HKEY_LOCAL_MACHINE/HARDWARE/DESCRIPTION/System/CentralProcessor/ 2>/dev/null | $EGREP -e '^@<:@0-9@:>@+/' -c` || CPU_COUNT="0"]]dnl |
58 | )dnl | 61 | )dnl |
59 | ])dnl | 62 | ])dnl |
60 | 63 | ||
61 | AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[# empty]],[dnl | 64 | AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null || ! command -v sysctl >/dev/null 2>&1]],[[: # empty]],[dnl |
62 | # Try less preferred generic method | 65 | # Try less preferred generic method |
63 | # 'hw.ncpu' exist on many platforms, but not on GNU/Linux | 66 | # 'hw.ncpu' exist on many platforms, but not on GNU/Linux |
64 | CPU_COUNT=`sysctl -n hw.ncpu 2>/dev/null` || CPU_COUNT="0" | 67 | CPU_COUNT=`sysctl -n hw.ncpu 2>/dev/null` || CPU_COUNT="0" |
65 | ])dnl | 68 | ])dnl |
66 | 69 | ||
67 | AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[# empty]],[dnl | 70 | AS_IF([[test "$CPU_COUNT" -gt "0" 2>/dev/null]],[[: # empty]],[dnl |
68 | # Try platform-specific fallback methods | 71 | # Try platform-specific fallback methods |
69 | # They can be less accurate and slower then preferred methods | 72 | # They can be less accurate and slower then preferred methods |
70 | AS_CASE([[$host_os]],dnl | 73 | AS_CASE([[$host_os]],dnl |
71 | [[*linux*]],[[CPU_COUNT=`$EGREP -e '^processor' -c /proc/cpuinfo 2>/dev/null` || CPU_COUNT="0"]],dnl | 74 | [[*linux*]],[[CPU_COUNT=`$EGREP -e '^processor' -c /proc/cpuinfo 2>/dev/null` || CPU_COUNT="0"]],dnl |
72 | [[*darwin*]],[[CPU_COUNT=`system_profiler SPHardwareDataType 2>/dev/null | $EGREP -i -e 'number of cores:'|cut -d : -f 2 -s|tr -d ' '` || CPU_COUNT="0"]],dnl | 75 | [[*darwin*]],[[CPU_COUNT=`system_profiler SPHardwareDataType 2>/dev/null | $EGREP -i -e 'number of cores:'|cut -d : -f 2 -s|tr -d ' '` || CPU_COUNT="0"]],dnl |
73 | [[freebsd*]],[[CPU_COUNT=`dmesg 2>/dev/null| $EGREP -e '^cpu@<:@0-9@:>@+: '|sort -u|$EGREP -e '^' -c` || CPU_COUNT="0"]],dnl | 76 | [[freebsd*]],[[CPU_COUNT=`dmesg 2>/dev/null| $EGREP -e '^cpu@<:@0-9@:>@+: '|sort -u|$EGREP -e '^' -c` || CPU_COUNT="0"]],dnl |
74 | [[solaris*]],[[CPU_COUNT=`kstat -m cpu_info -s state -p 2>/dev/null | $EGREP -c -e 'on-line'` || \ | 77 | [[netbsd*]], [[CPU_COUNT=`command -v cpuctl >/dev/null 2>&1 && cpuctl list 2>/dev/null| $EGREP -e '^@<:@0-9@:>@+ .* online ' -c` || \ |
78 | CPU_COUNT=`dmesg 2>/dev/null| $EGREP -e '^cpu@<:@0-9@:>@+ at'|sort -u|$EGREP -e '^' -c` || CPU_COUNT="0"]],dnl | ||
79 | [[solaris*]],[[command -v kstat >/dev/null 2>&1 && CPU_COUNT=`kstat -m cpu_info -s state -p 2>/dev/null | $EGREP -c -e 'on-line'` || \ | ||
75 | CPU_COUNT=`kstat -m cpu_info 2>/dev/null | $EGREP -c -e 'module: cpu_info'` || CPU_COUNT="0"]],dnl | 80 | CPU_COUNT=`kstat -m cpu_info 2>/dev/null | $EGREP -c -e 'module: cpu_info'` || CPU_COUNT="0"]],dnl |
76 | [[mingw*]],[AS_IF([[CPU_COUNT=`reg query 'HKLM\\Hardware\\Description\\System\\CentralProcessor' 2>/dev/null | $EGREP -e '\\\\@<:@0-9@:>@+$' -c`]],dnl | 81 | [[mingw*]],[AS_IF([[CPU_COUNT=`reg query 'HKLM\\Hardware\\Description\\System\\CentralProcessor' 2>/dev/null | $EGREP -e '\\\\@<:@0-9@:>@+$' -c`]],dnl |
77 | [[# empty]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]])],dnl | 82 | [[: # empty]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]])],dnl |
78 | [[msys*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]],dnl | 83 | [[msys*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]],dnl |
79 | [[cygwin*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]]dnl | 84 | [[cygwin*]],[[test "$NUMBER_OF_PROCESSORS" -gt "0" 2>/dev/null && CPU_COUNT="$NUMBER_OF_PROCESSORS"]]dnl |
80 | )dnl | 85 | )dnl |
diff --git a/m4/ax_have_epoll.m4 b/m4/ax_have_epoll.m4 index 07ceb49f..9d9bc873 100644 --- a/m4/ax_have_epoll.m4 +++ b/m4/ax_have_epoll.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # =========================================================================== | 1 | # =========================================================================== |
2 | # http://www.gnu.org/software/autoconf-archive/ax_have_epoll.html | 2 | # https://www.gnu.org/software/autoconf-archive/ax_have_epoll.html |
3 | # =========================================================================== | 3 | # =========================================================================== |
4 | # | 4 | # |
5 | # SYNOPSIS | 5 | # SYNOPSIS |
@@ -42,7 +42,7 @@ | |||
42 | # and this notice are preserved. This file is offered as-is, without any | 42 | # and this notice are preserved. This file is offered as-is, without any |
43 | # warranty. | 43 | # warranty. |
44 | 44 | ||
45 | #serial 10 | 45 | #serial 11 |
46 | 46 | ||
47 | AC_DEFUN([AX_HAVE_EPOLL], [dnl | 47 | AC_DEFUN([AX_HAVE_EPOLL], [dnl |
48 | ax_have_epoll_cppflags="${CPPFLAGS}" | 48 | ax_have_epoll_cppflags="${CPPFLAGS}" |
diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 index 4c4051ea..5fbf9fe0 100644 --- a/m4/ax_pthread.m4 +++ b/m4/ax_pthread.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # =========================================================================== | 1 | # =========================================================================== |
2 | # http://www.gnu.org/software/autoconf-archive/ax_pthread.html | 2 | # https://www.gnu.org/software/autoconf-archive/ax_pthread.html |
3 | # =========================================================================== | 3 | # =========================================================================== |
4 | # | 4 | # |
5 | # SYNOPSIS | 5 | # SYNOPSIS |
@@ -67,7 +67,7 @@ | |||
67 | # Public License for more details. | 67 | # Public License for more details. |
68 | # | 68 | # |
69 | # You should have received a copy of the GNU General Public License along | 69 | # You should have received a copy of the GNU General Public License along |
70 | # with this program. If not, see <http://www.gnu.org/licenses/>. | 70 | # with this program. If not, see <https://www.gnu.org/licenses/>. |
71 | # | 71 | # |
72 | # As a special exception, the respective Autoconf Macro's copyright owner | 72 | # As a special exception, the respective Autoconf Macro's copyright owner |
73 | # gives unlimited permission to copy, distribute and modify the configure | 73 | # gives unlimited permission to copy, distribute and modify the configure |
@@ -82,7 +82,7 @@ | |||
82 | # modified version of the Autoconf Macro, you may extend this special | 82 | # modified version of the Autoconf Macro, you may extend this special |
83 | # exception to the GPL to apply to your modified version as well. | 83 | # exception to the GPL to apply to your modified version as well. |
84 | 84 | ||
85 | #serial 23 | 85 | #serial 24 |
86 | 86 | ||
87 | AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) | 87 | AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) |
88 | AC_DEFUN([AX_PTHREAD], [ | 88 | AC_DEFUN([AX_PTHREAD], [ |
diff --git a/m4/ax_require_defined.m4 b/m4/ax_require_defined.m4 index cae11112..17c3eab7 100644 --- a/m4/ax_require_defined.m4 +++ b/m4/ax_require_defined.m4 | |||
@@ -1,5 +1,5 @@ | |||
1 | # =========================================================================== | 1 | # =========================================================================== |
2 | # http://www.gnu.org/software/autoconf-archive/ax_require_defined.html | 2 | # https://www.gnu.org/software/autoconf-archive/ax_require_defined.html |
3 | # =========================================================================== | 3 | # =========================================================================== |
4 | # | 4 | # |
5 | # SYNOPSIS | 5 | # SYNOPSIS |
@@ -30,7 +30,7 @@ | |||
30 | # and this notice are preserved. This file is offered as-is, without any | 30 | # and this notice are preserved. This file is offered as-is, without any |
31 | # warranty. | 31 | # warranty. |
32 | 32 | ||
33 | #serial 1 | 33 | #serial 2 |
34 | 34 | ||
35 | AC_DEFUN([AX_REQUIRE_DEFINED], [dnl | 35 | AC_DEFUN([AX_REQUIRE_DEFINED], [dnl |
36 | m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) | 36 | m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])]) |