backport: re PR libgomp/30546 (build fail in libgomp when building from SVN because makeinfo is missing)

2007-02-07  Daniel Franke  <franke.daniel@gmail.com>

        Backport from mainline:
	2007-01-31  Daniel Franke <franke.daniel@gmail.com>

	PR libgomp/30546
	* acx.m4 (ACX_PROG_CHECK_VER): Locate a program and check that its
	version is acceptable.

From-SVN: r121661
This commit is contained in:
Daniel Franke
2007-02-06 13:48:11 -05:00
committed by Daniel Franke
parent be742a2b7c
commit f5847978cb
2 changed files with 36 additions and 0 deletions

View File

@@ -1,3 +1,12 @@
2007-02-07 Daniel Franke <franke.daniel@gmail.com>
Backport from mainline:
2007-01-31 Daniel Franke <franke.daniel@gmail.com>
PR libgomp/30546
* acx.m4 (ACX_PROG_CHECK_VER): Locate a program and check that its
version is acceptable.
2006-12-04 Eric Botcazou <ebotcazou@libertysurf.fr>
* tls.m4 (GCC_CHECK_TLS): Do not test TLS with static linking

View File

@@ -489,3 +489,30 @@ else
AC_MSG_RESULT(pre-installed)
fi
fi])
dnl Locate a program and check that its version is acceptable.
dnl dnl ACX_PROG_CHECK_VER(var, name, version-switch,
dnl dnl version-extract-regexp, version-glob)
AC_DEFUN([ACX_CHECK_PROG_VER],[
AC_CHECK_PROG([$1], [$2], [$2])
if test -n "[$]$1"; then
# Found it, now check the version.
AC_CACHE_CHECK([for modern $2],
[gcc_cv_prog_$2_modern],
[ac_prog_version=`eval [$]$1 $3 2>&1 |
sed -n 's/^.*patsubst([[$4]],/,\/).*$/\1/p'`
[case $ac_prog_version in
'') gcc_cv_prog_$2_modern=no;;
$5) gcc_cv_prog_$2_modern=yes;;
*) gcc_cv_prog_$2_modern=no;;
esac]
if test $gcc_cv_prog_$2_modern = no; then
$1="${CONFIG_SHELL-/bin/sh} $ac_aux_dir/missing $2"
fi
])
else
gcc_cv_prog_$2_modern=no
fi
])