Skip to content

Commit dd9e71b

Browse files
author
Cristy
committed
latest autoconf configuration files
1 parent a8006c4 commit dd9e71b

File tree

6 files changed

+1183
-826
lines changed

6 files changed

+1183
-826
lines changed

aclocal.m4

+13-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1515
m4_ifndef([AC_AUTOCONF_VERSION],
1616
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17-
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
18-
[m4_warning([this file was generated for autoconf 2.71.
17+
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
18+
[m4_warning([this file was generated for autoconf 2.72.
1919
You have another version of autoconf. It may work, but is not guaranteed to.
2020
If you have problems, you may need to regenerate the build system entirely.
2121
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
@@ -68,15 +68,21 @@ m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
6868
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
6969
])dnl PKG_PREREQ
7070

71-
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
72-
dnl ----------------------------------
71+
dnl PKG_PROG_PKG_CONFIG([MIN-VERSION], [ACTION-IF-NOT-FOUND])
72+
dnl ---------------------------------------------------------
7373
dnl Since: 0.16
7474
dnl
7575
dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
7676
dnl first found in the path. Checks that the version of pkg-config found
7777
dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
7878
dnl used since that's the first version where most current features of
7979
dnl pkg-config existed.
80+
dnl
81+
dnl If pkg-config is not found or older than specified, it will result
82+
dnl in an empty PKG_CONFIG variable. To avoid widespread issues with
83+
dnl scripts not checking it, ACTION-IF-NOT-FOUND defaults to aborting.
84+
dnl You can specify [PKG_CONFIG=false] as an action instead, which would
85+
dnl result in pkg-config tests failing, but no bogus error messages.
8086
AC_DEFUN([PKG_PROG_PKG_CONFIG],
8187
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
8288
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -97,6 +103,9 @@ if test -n "$PKG_CONFIG"; then
97103
AC_MSG_RESULT([no])
98104
PKG_CONFIG=""
99105
fi
106+
fi
107+
if test -z "$PKG_CONFIG"; then
108+
m4_default([$2], [AC_MSG_ERROR([pkg-config not found])])
100109
fi[]dnl
101110
])dnl PKG_PROG_PKG_CONFIG
102111

config.guess

+43-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/sh
22
# Attempt to guess a canonical system name.
3-
# Copyright 1992-2023 Free Software Foundation, Inc.
3+
# Copyright 1992-2024 Free Software Foundation, Inc.
44

55
# shellcheck disable=SC2006,SC2268 # see below for rationale
66

7-
timestamp='2023-06-23'
7+
timestamp='2024-01-01'
88

99
# This file is free software; you can redistribute it and/or modify it
1010
# under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ version="\
6060
GNU config.guess ($timestamp)
6161
6262
Originally written by Per Bothner.
63-
Copyright 1992-2023 Free Software Foundation, Inc.
63+
Copyright 1992-2024 Free Software Foundation, Inc.
6464
6565
This is free software; see the source for copying conditions. There is NO
6666
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -155,20 +155,26 @@ Linux|GNU|GNU/*)
155155

156156
set_cc_for_build
157157
cat <<-EOF > "$dummy.c"
158+
#if defined(__ANDROID__)
159+
LIBC=android
160+
#else
158161
#include <features.h>
159162
#if defined(__UCLIBC__)
160163
LIBC=uclibc
161164
#elif defined(__dietlibc__)
162165
LIBC=dietlibc
163166
#elif defined(__GLIBC__)
164167
LIBC=gnu
168+
#elif defined(__LLVM_LIBC__)
169+
LIBC=llvm
165170
#else
166171
#include <stdarg.h>
167172
/* First heuristic to detect musl libc. */
168173
#ifdef __DEFINED_va_list
169174
LIBC=musl
170175
#endif
171176
#endif
177+
#endif
172178
EOF
173179
cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
174180
eval "$cc_set_libc"
@@ -904,7 +910,7 @@ EOF
904910
fi
905911
;;
906912
*:FreeBSD:*:*)
907-
UNAME_PROCESSOR=`/usr/bin/uname -p`
913+
UNAME_PROCESSOR=`uname -p`
908914
case $UNAME_PROCESSOR in
909915
amd64)
910916
UNAME_PROCESSOR=x86_64 ;;
@@ -976,7 +982,27 @@ EOF
976982
GUESS=$UNAME_MACHINE-unknown-minix
977983
;;
978984
aarch64:Linux:*:*)
979-
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
985+
set_cc_for_build
986+
CPU=$UNAME_MACHINE
987+
LIBCABI=$LIBC
988+
if test "$CC_FOR_BUILD" != no_compiler_found; then
989+
ABI=64
990+
sed 's/^ //' << EOF > "$dummy.c"
991+
#ifdef __ARM_EABI__
992+
#ifdef __ARM_PCS_VFP
993+
ABI=eabihf
994+
#else
995+
ABI=eabi
996+
#endif
997+
#endif
998+
EOF
999+
cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
1000+
eval "$cc_set_abi"
1001+
case $ABI in
1002+
eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
1003+
esac
1004+
fi
1005+
GUESS=$CPU-unknown-linux-$LIBCABI
9801006
;;
9811007
aarch64_be:Linux:*:*)
9821008
UNAME_MACHINE=aarch64_be
@@ -1042,6 +1068,15 @@ EOF
10421068
k1om:Linux:*:*)
10431069
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
10441070
;;
1071+
kvx:Linux:*:*)
1072+
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
1073+
;;
1074+
kvx:cos:*:*)
1075+
GUESS=$UNAME_MACHINE-unknown-cos
1076+
;;
1077+
kvx:mbr:*:*)
1078+
GUESS=$UNAME_MACHINE-unknown-mbr
1079+
;;
10451080
loongarch32:Linux:*:* | loongarch64:Linux:*:*)
10461081
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
10471082
;;
@@ -1560,6 +1595,9 @@ EOF
15601595
*:Unleashed:*:*)
15611596
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
15621597
;;
1598+
*:Ironclad:*:*)
1599+
GUESS=$UNAME_MACHINE-unknown-ironclad
1600+
;;
15631601
esac
15641602

15651603
# Do we have a guess based on uname results?

config.h.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/* Define to 1 if you have the <string.h> header file. */
2525
#undef HAVE_STRING_H
2626

27-
/* Define to 1 if you have the `sysconf' function. */
27+
/* Define to 1 if you have the 'sysconf' function. */
2828
#undef HAVE_SYSCONF
2929

3030
/* Define to 1 if you have the <sys/stat.h> header file. */
@@ -57,10 +57,10 @@
5757
/* Define to the version of this package. */
5858
#undef PACKAGE_VERSION
5959

60-
/* Define to 1 if all of the C90 standard headers exist (not just the ones
60+
/* Define to 1 if all of the C89 standard headers exist (not just the ones
6161
required in a freestanding environment). This macro is provided for
6262
backward compatibility; new code need not use it. */
6363
#undef STDC_HEADERS
6464

65-
/* Define to `unsigned int' if <sys/types.h> does not define. */
65+
/* Define as 'unsigned int' if <stddef.h> doesn't define. */
6666
#undef size_t

0 commit comments

Comments
 (0)