From 8bd17d5da8aafef61d9f2966cf18b7e70d7747e4 Mon Sep 17 00:00:00 2001 From: zunda Date: Wed, 18 Oct 2023 08:42:58 -1000 Subject: [PATCH] Run autoupdate on Ubuntu 22.04 This makes it possible to build the library on newer systems like Ubuntu 22.04: $ autoreconf $ automake --add-missing $ libtoolize $ autoreconf $ ./configure $ make --- configure.ac | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index c4ef27ab..1be004cb 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ m4_define([__MAJOR_VERSION], [4])dnl m4_define([__MINOR_VERSION], [1])dnl m4_define([__MICRO_VERSION], [1])dnl m4_define([__VERSION], [__MAJOR_VERSION.__MINOR_VERSION.__MICRO_VERSION])dnl -AC_INIT(QRencode, __VERSION) +AC_INIT([QRencode],[__VERSION]) MAJOR_VERSION=__MAJOR_VERSION MINOR_VERSION=__MINOR_VERSION @@ -26,14 +26,22 @@ AM_INIT_AUTOMAKE AC_DISABLE_STATIC AC_C_CONST AC_C_INLINE -AC_HEADER_STDC +m4_warn([obsolete], +[The preprocessor macro `STDC_HEADERS' is obsolete. + Except in unusual embedded environments, you can safely include all + ISO C90 headers unconditionally.])dnl +# 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 + AC_CHECK_HEADERS(sys/time.h) LT_INIT AC_PROG_CC AM_PROG_CC_C_O AC_PROG_INSTALL -AC_PROG_LIBTOOL +LT_INIT PKG_PROG_PKG_CONFIG case "${target}" in @@ -61,8 +69,7 @@ if test x$ac_cv_lib_pthread_pthread_mutex_init = xyes ; then fi AC_ARG_WITH(png, - [AC_HELP_STRING([--without-png], - [disable PNG support])], + [AS_HELP_STRING([--without-png],[disable PNG support])], [with_png=$withval], [with_png=yes]) dnl --with-tools