Add missing AH_TEMPLATE entries for autoheader compatibility

The AC_DEFINE macros for HAVE_LROUND, HAVE_LLROUND, HAVE_NAN,
HAVE_FMIN, HAVE_FMAX, and UINT64_T_AND_ULONG_SAME lack AH_TEMPLATE
declarations, causing autoheader to fail with newer autoconf versions.
Add the corresponding AH_TEMPLATE calls so autoheader can generate
proper config.h.in templates.

Also add the missing #undef entries to the hand-maintained config.h.in
to match.
This commit is contained in:
sailor001 2026-06-24 14:55:07 +08:00
parent 78750c51d0
commit cc5a2a9b3b
2 changed files with 12 additions and 1 deletions

View File

@ -35,8 +35,13 @@
# undef HAVE_LIBZ
# undef HAVE_LIBBZ2
# undef HAVE_LROUND
# undef HAVE_LLROUND
# undef HAVE_NAN
# undef HAVE_FMIN
# undef HAVE_FMAX
# undef HAVE_SYS_WAIT_H
# undef WORDS_BIGENDIAN
# undef UINT64_T_AND_ULONG_SAME
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>

View File

@ -368,6 +368,11 @@ AC_CHECK_FUNCS(fopen64)
# systems we may need to use the compiler in C99 mode to get a definition.
# autoconf >= 2.70 will enable C99 if it is available. For older autoconf
# versions, we requested C99 mode earlier with AC_PROG_CC_C99.
AH_TEMPLATE([HAVE_LROUND], [Define if lround is available])
AH_TEMPLATE([HAVE_LLROUND], [Define if llround is available])
AH_TEMPLATE([HAVE_NAN], [Define if nan is available])
AH_TEMPLATE([HAVE_FMIN], [Define if fmin is available])
AH_TEMPLATE([HAVE_FMAX], [Define if fmax is available])
AC_SEARCH_LIBS([lround], [m], [AC_DEFINE([HAVE_LROUND], [1])])
AC_SEARCH_LIBS([llround], [m], [AC_DEFINE([HAVE_LLROUND], [1])])
AC_SEARCH_LIBS([nan], [m], [AC_DEFINE([HAVE_NAN], [1])])
@ -397,7 +402,8 @@ uint64_t uival = 1;
result &= check(uival);
return !result;]])],
[AC_MSG_RESULT(no)],
[AC_DEFINE([UINT64_T_AND_ULONG_SAME], [1]) AC_MSG_RESULT(yes)])
[AH_TEMPLATE([UINT64_T_AND_ULONG_SAME], [Define if uint64_t and unsigned long are the same type])
AC_DEFINE([UINT64_T_AND_ULONG_SAME], [1]) AC_MSG_RESULT(yes)])
# Linker option used when compiling the target
AX_LD_RDYNAMIC