commit 31e4a18e28e1da74a841090accb675dba87af4d8 Author: Daniel Swanson Date: Tue Jun 8 18:49:01 2021 -0500 drop pcre as a dependency diff --git a/configure.ac b/configure.ac index 1cc4491..7965f13 100644 --- a/configure.ac +++ b/configure.ac @@ -69,27 +69,8 @@ fi AC_CHECK_FUNCS(strcasecmp) -if test x$(uname) != xDarwin; -then -AC_CHECK_HEADER(pcreposix.h, - AC_CHECK_LIB(pcre, pcre_fullinfo,[ - LIBS="$LIBS -lpcreposix -lpcre" - no_comp_check=yes], - AC_MSG_ERROR([*** unable to locate pcre library ***])), - AC_MSG_ERROR([*** unable to locate pcreposix.h include file ***])) - -AC_CHECK_HEADER(pcrecpp.h, - AC_CHECK_LIB(pcrecpp,pcre_compile,[ - LIBS="$LIBS -lpcrecpp" - no_comp_check=yes], - AC_MSG_ERROR([*** unable to locate pcrecpp library ***])), - AC_MSG_ERROR([*** unable to locate pcrecpp.h include file ***])) -fi - - PKG_CHECK_MODULES(LTTOOLBOX, [lttoolbox >= 3.5.3], CPPFLAGS="$CPPFLAGS $LTTOOLBOX_CFLAGS"; LIBS="$LIBS $LTTOOLBOX_LIBS") PKG_CHECK_MODULES(LIBXML2, [libxml-2.0 >= 2.6.17], CPPFLAGS="$CPPFLAGS $LIBXML2_CFLAGS"; LIBS="$LIBS $LIBXML2_LIBS") -PKG_CHECK_MODULES(PCRE, [libpcre >= 6.4], CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS"; LIBS="$LIBS $PCRE_LIBS") PKG_CHECK_MODULES(ICU, [icu-i18n, icu-io, icu-uc], CPPFLAGS="$CPPFLAGS $ICU_CFLAGS"; LIBS="$LIBS $ICU_LIBS") AC_C_BIGENDIAN diff --git a/m4/ax_check_icu.m4 b/m4/ax_check_icu.m4 deleted file mode 100644 index 0137afd..0000000 --- a/m4/ax_check_icu.m4 +++ /dev/null @@ -1,117 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_check_icu.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CHECK_ICU(version, action-if, action-if-not) -# -# DESCRIPTION -# -# Defines ICU_LIBS, ICU_CFLAGS, ICU_CXXFLAGS. See icu-config(1) man page. -# -# LICENSE -# -# Copyright (c) 2008 Akos Maroy -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 7 - -AU_ALIAS([AC_CHECK_ICU], [AX_CHECK_ICU]) -AC_DEFUN([AX_CHECK_ICU], [ - succeeded=no - - if test -z "$ICU_CONFIG"; then - AC_PATH_PROG(ICU_CONFIG, icu-config, no) - fi - - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - - if test "$ICU_CONFIG" = "no" && test "$PKG_CONFIG" = "no" ; then - echo "*** Neither icu-config nor pkg-config could not be found. Make sure either is" - echo "*** in your path, and that taglib is properly installed." - echo "*** Or see https://ibm.com/software/globalization/icu/" - fi - - if test "$ICU_CONFIG" != "no" ; then - ICU_VERSION=`$ICU_CONFIG --version` - AC_MSG_CHECKING(for ICU >= $1 via icu-config) - VERSION_CHECK=`expr $ICU_VERSION \>\= $1` - if test "$VERSION_CHECK" = "1" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING(ICU_CPPFLAGS) - ICU_CPPFLAGS=`$ICU_CONFIG --cppflags` - AC_MSG_RESULT($ICU_CPPFLAGS) - - AC_MSG_CHECKING(ICU_CFLAGS) - ICU_CFLAGS=`$ICU_CONFIG --cflags` - AC_MSG_RESULT($ICU_CFLAGS) - - AC_MSG_CHECKING(ICU_CXXFLAGS) - ICU_CXXFLAGS=`$ICU_CONFIG --cxxflags` - AC_MSG_RESULT($ICU_CXXFLAGS) - - AC_MSG_CHECKING(ICU_LIBS) - ICU_LIBS=`$ICU_CONFIG --ldflags` - AC_MSG_RESULT($ICU_LIBS) - else - ICU_CPPFLAGS="" - ICU_CFLAGS="" - ICU_CXXFLAGS="" - ICU_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - ifelse([$3], ,echo "can't find ICU >= $1 via icu-config",) - fi - fi - - if test "$succeeded" != "yes" && test "$PKG_CONFIG" != "no" ; then - AC_MSG_CHECKING(for ICU >= $1 via pkg-config) - if $PKG_CONFIG --atleast-version=$1 icu-i18n ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING(ICU_CPPFLAGS) - ICU_CPPFLAGS=`$PKG_CONFIG --variable=CPPFLAGS icu-i18n` - AC_MSG_RESULT($ICU_CPPFLAGS) - - AC_MSG_CHECKING(ICU_CFLAGS) - ICU_CFLAGS=`$PKG_CONFIG --variable=CFLAGS icu-i18n` - AC_MSG_RESULT($ICU_CFLAGS) - - AC_MSG_CHECKING(ICU_CXXFLAGS) - ICU_CXXFLAGS=`$PKG_CONFIG --variable=CXXFLAGS icu-i18n` - AC_MSG_RESULT($ICU_CXXFLAGS) - - AC_MSG_CHECKING(ICU_LIBS) - ICU_LIBS=`$PKG_CONFIG --libs icu-i18n` - AC_MSG_RESULT($ICU_LIBS) - else - ICU_CPPFLAGS="" - ICU_CFLAGS="" - ICU_CXXFLAGS="" - ICU_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - ifelse([$3], ,echo "can't find ICU >= $1 via pkg-config",) - fi - fi - - if test "$succeeded" = "yes"; then - AC_SUBST(ICU_CPPFLAGS) - AC_SUBST(ICU_CFLAGS) - AC_SUBST(ICU_CXXFLAGS) - AC_SUBST(ICU_LIBS) - ifelse([$2], , :, [$2]) - else - ifelse([$3], , AC_MSG_ERROR([Library requirements (ICU) not met.]), [$3]) - fi -])