X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=84392fd4fe407442f563b469e3fa41b4b09019a4;hb=refs%2Fheads%2Fmaster;hp=4edc425fde77c72b918f3bfb54ed42cbc1392c8b;hpb=5cac23de1963880d8fb3aed4be47ec2894cf520c;p=miniexpect.git diff --git a/configure.ac b/configure.ac index 4edc425..84392fd 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # miniexpect -# Copyright (C) 2014 Red Hat Inc. +# Copyright (C) 2014-2022 Red Hat Inc. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -15,7 +15,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -AC_INIT([miniexpect],[1.0]) +AC_INIT([miniexpect],[1.1]) AM_INIT_AUTOMAKE(foreign) dnl NB: Do not [quote] this parameter. @@ -24,6 +24,9 @@ AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. AC_CONFIG_MACRO_DIR([m4]) +dnl Enable system extensions (_GNU_SOURCE etc). +AC_USE_SYSTEM_EXTENSIONS + AM_PROG_LIBTOOL dnl Check for basic C environment. @@ -36,14 +39,26 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant]) AM_PROG_CC_C_O -dnl Enable system extensions (_GNU_SOURCE etc). -AC_USE_SYSTEM_EXTENSIONS - dnl Check support for 64 bit file offsets. AC_SYS_LARGEFILE -dnl The only dependency is libpcre (Perl Compatible Regular Expressions). -PKG_CHECK_MODULES([PCRE], [libpcre]) +dnl The only dependency is libpcre2 (Perl Compatible Regular Expressions). +PKG_CHECK_MODULES([PCRE2], [libpcre2-8]) + +dnl Optional for building the manual page. This is part of Perl. +AC_CHECK_PROG([POD2MAN], [pod2man], [pod2man], [no]) +AM_CONDITIONAL([HAVE_POD2MAN], [test "x$POD2MAN" != "xno"]) + +dnl Optional for checking for memory errors. +AC_CHECK_PROG([VALGRIND], [valgrind], [valgrind], [no]) +AS_IF([test "x$VALGRIND" != "xno"],[ + VG='$(VALGRIND) --leak-check=full --show-leak-kinds=all --error-exitcode=119 --trace-children=no' +],[ + dnl Valgrind is not installed, so give a clear error if + dnl the user tries 'make check-valgrind'. + VG=ERROR_VALGRIND_IS_NOT_INSTALLED +]) +AC_SUBST([VG]) dnl Produce output files. AC_CONFIG_HEADERS([config.h])