Skip to content

Commit 6b250b5

Browse files
stweilstweil
committed
Remove autoconf-archive dependency
It creates much confusion and causes many issue reports, so let us drop this dependency. The two new files in the m4/ directory are current copies from GitHub (https://github.com/autoconf-archive/autoconf-archive/). Signed-off-by: Stefan Weil <[email protected]>
1 parent 5b14121 commit 6b250b5

File tree

5 files changed

+91
-9
lines changed

5 files changed

+91
-9
lines changed

‎INSTALL.GIT.md

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ You need Leptonica 1.74.2 (minimum) for Tesseract 4.0x.
1010

1111
Known dependencies for training tools (excluding leptonica):
1212
* compiler with c++11 support
13-
* autoconf-archive
1413
* automake
1514
* pkg-config
1615
* pango-devel

‎autogen.sh

-7
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,6 @@ automake --add-missing --copy --warnings=all || bail_out
113113
echo "Running autoconf"
114114
autoconf || bail_out
115115

116-
if grep -q AX_CHECK_COMPILE_FLAG configure; then
117-
# The generated configure is invalid because autoconf-archive is unavailable.
118-
rm configure
119-
echo "Missing autoconf-archive. Check the build requirements."
120-
bail_out
121-
fi
122-
123116
if grep -q PKG_CHECK_MODULES configure; then
124117
# The generated configure is invalid because pkg-config is unavailable.
125118
rm configure

‎m4/ax_check_compile_flag.m4

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# ===========================================================================
2+
# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
3+
# ===========================================================================
4+
#
5+
# SYNOPSIS
6+
#
7+
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
8+
#
9+
# DESCRIPTION
10+
#
11+
# Check whether the given FLAG works with the current language's compiler
12+
# or gives an error. (Warnings, however, are ignored)
13+
#
14+
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
15+
# success/failure.
16+
#
17+
# If EXTRA-FLAGS is defined, it is added to the current language's default
18+
# flags (e.g. CFLAGS) when the check is done. The check is thus made with
19+
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
20+
# force the compiler to issue an error when a bad flag is given.
21+
#
22+
# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
23+
#
24+
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
25+
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
26+
#
27+
# LICENSE
28+
#
29+
# Copyright (c) 2008 Guido U. Draheim <[email protected]>
30+
# Copyright (c) 2011 Maarten Bosmans <[email protected]>
31+
#
32+
# Copying and distribution of this file, with or without modification, are
33+
# permitted in any medium without royalty provided the copyright notice
34+
# and this notice are preserved. This file is offered as-is, without any
35+
# warranty.
36+
37+
#serial 6
38+
39+
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
40+
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
41+
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
42+
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
43+
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
44+
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
45+
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
46+
[AS_VAR_SET(CACHEVAR,[yes])],
47+
[AS_VAR_SET(CACHEVAR,[no])])
48+
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
49+
AS_VAR_IF(CACHEVAR,yes,
50+
[m4_default([$2], :)],
51+
[m4_default([$3], :)])
52+
AS_VAR_POPDEF([CACHEVAR])dnl
53+
])dnl AX_CHECK_COMPILE_FLAGS

‎m4/ax_split_version.m4

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# ===========================================================================
2+
# https://www.gnu.org/software/autoconf-archive/ax_split_version.html
3+
# ===========================================================================
4+
#
5+
# SYNOPSIS
6+
#
7+
# AX_SPLIT_VERSION
8+
#
9+
# DESCRIPTION
10+
#
11+
# Splits a version number in the format MAJOR.MINOR.POINT into its
12+
# separate components.
13+
#
14+
# Sets the variables.
15+
#
16+
# LICENSE
17+
#
18+
# Copyright (c) 2008 Tom Howard <[email protected]>
19+
#
20+
# Copying and distribution of this file, with or without modification, are
21+
# permitted in any medium without royalty provided the copyright notice
22+
# and this notice are preserved. This file is offered as-is, without any
23+
# warranty.
24+
25+
#serial 10
26+
27+
AC_DEFUN([AX_SPLIT_VERSION],[
28+
AC_REQUIRE([AC_PROG_SED])
29+
AX_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'`
30+
AX_MINOR_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
31+
AX_POINT_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'`
32+
AC_MSG_CHECKING([Major version])
33+
AC_MSG_RESULT([$AX_MAJOR_VERSION])
34+
AC_MSG_CHECKING([Minor version])
35+
AC_MSG_RESULT([$AX_MINOR_VERSION])
36+
AC_MSG_CHECKING([Point version])
37+
AC_MSG_RESULT([$AX_POINT_VERSION])
38+
])

‎snap/snapcraft.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ parts:
1919
source: .
2020
plugin: autotools
2121
build-packages:
22-
- autoconf-archive
2322
- pkg-config
2423
- libpng12-dev
2524
- libjpeg8-dev

0 commit comments

Comments
 (0)