From: Daiki Ueno <ueno@gnu.org>
Date: Fri, 10 Jan 2025 08:39:18 +0000 (+0900)
Subject: configure: run autoupdate
X-Git-Tag: 3.8.9~8^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=516f48bfbf33d111e4fcd310541baa8f160067ae;p=thirdparty%2Fgnutls.git

configure: run autoupdate

This fixes the warnings generated by autoupdate:

  configure.ac:55: warning: AC_PROG_CC_C99 is obsolete; use AC_PROG_CC

  configure.ac:139: warning: The preprocessor macro `STDC_HEADERS' is obsolete.
    Except in unusual embedded environments, you can safely include all
    ISO C90 headers unconditionally.

Signed-off-by: Daiki Ueno <ueno@gnu.org>
---

diff --git a/configure.ac b/configure.ac
index ba9b92c779..02064ea071 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,10 +18,10 @@ dnl Process this file with autoconf to produce a configure script.
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-AC_PREREQ(2.64)
+AC_PREREQ([2.71])
 
 dnl when updating version also update LT_REVISION in m4/hooks.m4
-AC_INIT([GnuTLS], [3.8.8], [bugs@gnutls.org])
+AC_INIT([GnuTLS],[3.8.8],[bugs@gnutls.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIRS([m4 src/gl/m4 lib/unistring/m4])
 AC_CANONICAL_HOST
@@ -52,11 +52,11 @@ AC_USE_SYSTEM_EXTENSIONS
 
 #
 # Require C99 support
-#    
-AC_PROG_CC_C99
-if test "$ac_cv_prog_cc_c99" = "no"; then
-  AC_MSG_WARN([[Compiler does not support C99. It may not be able to compile the project.]])
-fi
+#
+AS_CASE([$ac_prog_cc_stdc],
+  [c11 | c99], [AC_DEFINE([C99_MACROS], 1, [C99 macros are supported])],
+  [AC_MSG_WARN([[Compiler does not support C99. It may not be able to compile the project.]])]
+)
 
 AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = yes)
 
@@ -137,7 +137,11 @@ AC_SUBST(NUMBER_VERSION, `printf "0x%02x%02x%02x" $MAJOR_VERSION $MINOR_VERSION
 
 dnl C and C++ capabilities
 AC_C_INLINE
-AC_HEADER_STDC
+# Autoupdate added the next two lines to ensure that your configure
+# script's behavior did not change.  They are probably safe to remove.
+AC_CHECK_INCLUDES_DEFAULT
+AC_PROG_EGREP
+
 
 # For the C++ code
 AC_ARG_ENABLE(cxx,
diff --git a/lib/errors.c b/lib/errors.c
index 47bb601fad..5571cc027e 100644
--- a/lib/errors.c
+++ b/lib/errors.c
@@ -22,9 +22,7 @@
 
 #include "gnutls_int.h"
 #include "errors.h"
-#ifdef STDC_HEADERS
 #include <stdarg.h>
-#endif
 #include "str.h"
 
 #define ERROR_ENTRY(desc, name) { desc, #name, name }
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index ae50938d81..ff66e33b53 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -129,21 +129,6 @@ LIBTASN1_MINIMUM=4.9
     GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libtasn1"
   fi
 
-  AC_MSG_CHECKING([whether C99 macros are supported])
-  AC_TRY_COMPILE(,
-  [
-    #define test_mac(...)
-    int z,y,x;
-    test_mac(x,y,z);
-    return 0;
-  ], [
-    AC_DEFINE([C99_MACROS], 1, [C99 macros are supported])
-    AC_MSG_RESULT(yes)
-  ], [
-    AC_MSG_RESULT(no)
-    AC_MSG_WARN([C99 macros not supported. This may affect compiling.])
-  ])
-
   ac_strict_der_time=yes
   AC_MSG_CHECKING([whether to disable strict DER time encodings for backwards compatibility])
   AC_ARG_ENABLE(strict-der-time,