mirror of
https://github.com/wesnoth/wesnoth
synced 2025-04-29 18:23:17 +00:00
Address bug #10839.
This commit is contained in:
parent
8e1f96522a
commit
c5d91aff48
16
configure.ac
16
configure.ac
@ -60,6 +60,20 @@ AM_INIT_AUTOMAKE([1.9 tar-ustar foreign])
|
|||||||
AM_GNU_GETTEXT([external])
|
AM_GNU_GETTEXT([external])
|
||||||
AC_PROG_RANLIB
|
AC_PROG_RANLIB
|
||||||
|
|
||||||
|
#######################################################################
|
||||||
|
# Require GCC 4.x
|
||||||
|
#######################################################################
|
||||||
|
|
||||||
|
set -- `g++ --version`
|
||||||
|
GCC_VERSION=$3
|
||||||
|
parts=`echo $GCC_VERSION | tr '.' ' '`
|
||||||
|
set $parts
|
||||||
|
GCC_MAJOR_VERSION=$1
|
||||||
|
if test $GCC_MAJOR_VERSION -lt 4
|
||||||
|
then
|
||||||
|
AC_MSG_ERROR([*** G++ major version $GCC_MAJOR_VERSION is too old.])
|
||||||
|
fi
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
# Configuration options #
|
# Configuration options #
|
||||||
#######################################################################
|
#######################################################################
|
||||||
@ -135,7 +149,7 @@ if test "x$optipng" = "xyes"
|
|||||||
then
|
then
|
||||||
AC_PATH_PROGS([OPTIPNG_BIN], [optipng], [none])
|
AC_PATH_PROGS([OPTIPNG_BIN], [optipng], [none])
|
||||||
if test \( "x$OPTIPNG_BIN" = "xnone" \) -a \( "x$optipng" = xyes \); then
|
if test \( "x$OPTIPNG_BIN" = "xnone" \) -a \( "x$optipng" = xyes \); then
|
||||||
AC_MSG_ERROR([*** You must instsll the optipng utility before building with --optipng.])
|
AC_MSG_ERROR([*** You must install the optipng utility before building with --optipng.])
|
||||||
else
|
else
|
||||||
echo "****************************************"
|
echo "****************************************"
|
||||||
echo "*** optipng support enabled ***"
|
echo "*** optipng support enabled ***"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user