mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-27 12:49:35 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Re-order commands in autogen.sh

Browse Source 
This avoids an unnecessary reconfiguration when running

    ./autogen.sh && ./configure && make

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2019-05-28 10:26:57 +02:00 committed by zdenop
parent 8615e6e36c
commit 591110ecac
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
autogen.sh
View File

@ -13,8 +13,9 @@
# better deal with the GNU autotools, specifically:
#
# aclocal
# autoheader
# libtoolize
# autoconf
# autoheader
# automake
#
# The whole thing is quite complex...
@ -87,26 +88,7 @@ echo "Running $LIBTOOLIZE"
$LIBTOOLIZE -f -c || bail_out
$LIBTOOLIZE --automake || bail_out
# --- Step 3: Generate config.h.in from:
# . configure.ac (look for AM_CONFIG_HEADER tag or AC_CONFIG_HEADER tag)
echo "Running autoheader"
autoheader -f || bail_out
# --- Step 4: Generate Makefile.in, src/Makefile.in, and a whole bunch of
# files in config (config.guess, config.sub, depcomp,
# install-sh, missing, mkinstalldirs) plus COPYING and
# INSTALL from:
# . Makefile.am
# . src/Makefile.am
#
# Using --add-missing --copy makes sure that, if these files are missing,
# they are copied from the system so they can be used in a distribution.
echo "Running automake --add-missing --copy"
automake --add-missing --copy --warnings=all || bail_out
# --- Step 5: Generate configure and include/miaconfig.h from:
# --- Step 3: Generate configure and include/miaconfig.h from:
# . configure.ac
#
@ -120,6 +102,25 @@ if grep -q PKG_CHECK_MODULES configure; then
bail_out
fi
# --- Step 4: Generate config.h.in from:
# . configure.ac (look for AM_CONFIG_HEADER tag or AC_CONFIG_HEADER tag)
echo "Running autoheader"
autoheader -f || bail_out
# --- Step 5: Generate Makefile.in, src/Makefile.in, and a whole bunch of
# files in config (config.guess, config.sub, depcomp,
# install-sh, missing, mkinstalldirs) plus COPYING and
# INSTALL from:
# . Makefile.am
# . src/Makefile.am
#
# Using --add-missing --copy makes sure that, if these files are missing,
# they are copied from the system so they can be used in a distribution.
echo "Running automake --add-missing --copy"
automake --add-missing --copy --warnings=all || bail_out
echo ""
echo "All done."
echo "To build the software now, do something like:"