Skip to content

Commit 51cd66d

Browse files
authored
Merge pull request #10106 from BrianAker/fix/remove-unused-m4
Remove unused m4 macros and update AX_PTHREAD
2 parents abfff1e + dd84a70 commit 51cd66d

4 files changed

Lines changed: 6 additions & 105 deletions

File tree

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ CFLAGS="$CFLAGS $C_EXTRA_FLAGS $C_FLAGS"
2525
AC_PROG_CC
2626
AM_PROG_CC_C_O
2727
AC_CANONICAL_HOST
28-
AC_CANONICAL_TARGET
2928
AC_CONFIG_MACRO_DIR([m4])
3029

3130
AM_INIT_AUTOMAKE([1.13.4 -Wall -Werror -Wno-portability foreign tar-ustar subdir-objects no-define color-tests])

m4/ax_check_library.m4

Lines changed: 0 additions & 95 deletions
This file was deleted.

m4/ax_pthread.m4

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
# modified version of the Autoconf Macro, you may extend this special
8888
# exception to the GPL to apply to your modified version as well.
8989

90-
#serial 30
90+
#serial 31
9191

9292
AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
9393
AC_DEFUN([AX_PTHREAD], [
94-
AC_REQUIRE([AC_CANONICAL_TARGET])
94+
AC_REQUIRE([AC_CANONICAL_HOST])
9595
AC_REQUIRE([AC_PROG_CC])
9696
AC_REQUIRE([AC_PROG_SED])
9797
AC_LANG_PUSH([C])
@@ -158,7 +158,7 @@ ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --
158158
# --thread-safe: KAI C++
159159
# pthread-config: use pthread-config program (for GNU Pth library)
160160
161-
case $target_os in
161+
case $host_os in
162162
163163
freebsd*)
164164
@@ -248,7 +248,7 @@ AS_IF([test "x$ax_pthread_clang" = "xyes"],
248248
# definitions is, on some systems, a strong hint that pthreads support is
249249
# correctly enabled
250250
251-
case $target_os in
251+
case $host_os in
252252
darwin* | hpux* | linux* | osf* | solaris*)
253253
ax_pthread_check_macro="_REENTRANT"
254254
;;
@@ -450,7 +450,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
450450
AC_CACHE_CHECK([whether more special flags are required for pthreads],
451451
[ax_cv_PTHREAD_SPECIAL_FLAGS],
452452
[ax_cv_PTHREAD_SPECIAL_FLAGS=no
453-
case $target_os in
453+
case $host_os in
454454
solaris*)
455455
ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
456456
;;
@@ -480,7 +480,7 @@ if test "x$ax_pthread_ok" = "xyes"; then
480480
481481
# More AIX lossage: compile with *_r variant
482482
if test "x$GCC" != "xyes"; then
483-
case $target_os in
483+
case $host_os in
484484
aix*)
485485
AS_CASE(["x/$CC"],
486486
[x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],

m4/require_canonical.m4

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)