mirror of
https://github.com/tesseract-ocr/tesseract.git
synced 2024-11-27 12:49:35 +08:00
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 <sw@weilnetz.de>
This commit is contained in:
parent
5b14121449
commit
6b250b5812
@ -10,7 +10,6 @@ You need Leptonica 1.74.2 (minimum) for Tesseract 4.0x.
|
|||||||
|
|
||||||
Known dependencies for training tools (excluding leptonica):
|
Known dependencies for training tools (excluding leptonica):
|
||||||
* compiler with c++11 support
|
* compiler with c++11 support
|
||||||
* autoconf-archive
|
|
||||||
* automake
|
* automake
|
||||||
* pkg-config
|
* pkg-config
|
||||||
* pango-devel
|
* pango-devel
|
||||||
|
@ -113,13 +113,6 @@ automake --add-missing --copy --warnings=all || bail_out
|
|||||||
echo "Running autoconf"
|
echo "Running autoconf"
|
||||||
autoconf || bail_out
|
autoconf || bail_out
|
||||||
|
|
||||||
if grep -q AX_CHECK_COMPILE_FLAG configure; then
|
|
||||||
# The generated configure is invalid because autoconf-archive is unavailable.
|
|
||||||
rm configure
|
|
||||||
echo "Missing autoconf-archive. Check the build requirements."
|
|
||||||
bail_out
|
|
||||||
fi
|
|
||||||
|
|
||||||
if grep -q PKG_CHECK_MODULES configure; then
|
if grep -q PKG_CHECK_MODULES configure; then
|
||||||
# The generated configure is invalid because pkg-config is unavailable.
|
# The generated configure is invalid because pkg-config is unavailable.
|
||||||
rm configure
|
rm configure
|
||||||
|
53
m4/ax_check_compile_flag.m4
Normal file
53
m4/ax_check_compile_flag.m4
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
# ===========================================================================
|
||||||
|
# https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
|
||||||
|
# ===========================================================================
|
||||||
|
#
|
||||||
|
# SYNOPSIS
|
||||||
|
#
|
||||||
|
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
|
||||||
|
#
|
||||||
|
# DESCRIPTION
|
||||||
|
#
|
||||||
|
# Check whether the given FLAG works with the current language's compiler
|
||||||
|
# or gives an error. (Warnings, however, are ignored)
|
||||||
|
#
|
||||||
|
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
|
||||||
|
# success/failure.
|
||||||
|
#
|
||||||
|
# If EXTRA-FLAGS is defined, it is added to the current language's default
|
||||||
|
# flags (e.g. CFLAGS) when the check is done. The check is thus made with
|
||||||
|
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
|
||||||
|
# force the compiler to issue an error when a bad flag is given.
|
||||||
|
#
|
||||||
|
# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
|
||||||
|
#
|
||||||
|
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
|
||||||
|
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
|
||||||
|
#
|
||||||
|
# LICENSE
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
|
||||||
|
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
|
||||||
|
#
|
||||||
|
# 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 6
|
||||||
|
|
||||||
|
AC_DEFUN([AX_CHECK_COMPILE_FLAG],
|
||||||
|
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
|
||||||
|
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
|
||||||
|
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
|
||||||
|
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
|
||||||
|
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
|
||||||
|
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
|
||||||
|
[AS_VAR_SET(CACHEVAR,[yes])],
|
||||||
|
[AS_VAR_SET(CACHEVAR,[no])])
|
||||||
|
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
|
||||||
|
AS_VAR_IF(CACHEVAR,yes,
|
||||||
|
[m4_default([$2], :)],
|
||||||
|
[m4_default([$3], :)])
|
||||||
|
AS_VAR_POPDEF([CACHEVAR])dnl
|
||||||
|
])dnl AX_CHECK_COMPILE_FLAGS
|
38
m4/ax_split_version.m4
Normal file
38
m4/ax_split_version.m4
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
# ===========================================================================
|
||||||
|
# https://www.gnu.org/software/autoconf-archive/ax_split_version.html
|
||||||
|
# ===========================================================================
|
||||||
|
#
|
||||||
|
# SYNOPSIS
|
||||||
|
#
|
||||||
|
# AX_SPLIT_VERSION
|
||||||
|
#
|
||||||
|
# DESCRIPTION
|
||||||
|
#
|
||||||
|
# Splits a version number in the format MAJOR.MINOR.POINT into its
|
||||||
|
# separate components.
|
||||||
|
#
|
||||||
|
# Sets the variables.
|
||||||
|
#
|
||||||
|
# LICENSE
|
||||||
|
#
|
||||||
|
# Copyright (c) 2008 Tom Howard <tomhoward@users.sf.net>
|
||||||
|
#
|
||||||
|
# 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 10
|
||||||
|
|
||||||
|
AC_DEFUN([AX_SPLIT_VERSION],[
|
||||||
|
AC_REQUIRE([AC_PROG_SED])
|
||||||
|
AX_MAJOR_VERSION=`echo "$VERSION" | $SED 's/\([[^.]][[^.]]*\).*/\1/'`
|
||||||
|
AX_MINOR_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
|
||||||
|
AX_POINT_VERSION=`echo "$VERSION" | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'`
|
||||||
|
AC_MSG_CHECKING([Major version])
|
||||||
|
AC_MSG_RESULT([$AX_MAJOR_VERSION])
|
||||||
|
AC_MSG_CHECKING([Minor version])
|
||||||
|
AC_MSG_RESULT([$AX_MINOR_VERSION])
|
||||||
|
AC_MSG_CHECKING([Point version])
|
||||||
|
AC_MSG_RESULT([$AX_POINT_VERSION])
|
||||||
|
])
|
@ -19,7 +19,6 @@ parts:
|
|||||||
source: .
|
source: .
|
||||||
plugin: autotools
|
plugin: autotools
|
||||||
build-packages:
|
build-packages:
|
||||||
- autoconf-archive
|
|
||||||
- pkg-config
|
- pkg-config
|
||||||
- libpng12-dev
|
- libpng12-dev
|
||||||
- libjpeg8-dev
|
- libjpeg8-dev
|
||||||
|
Loading…
Reference in New Issue
Block a user