null+****@clear*****
null+****@clear*****
2011年 11月 18日 (金) 16:23:19 JST
Kouhei Sutou 2011-11-18 07:23:19 +0000 (Fri, 18 Nov 2011)
New Revision: 7dae049fc4b74d609fb63c1046d0bc47582705e6
Log:
remove needless GLIB_REQUIRED subst.
Modified files:
configure.ac
Modified: configure.ac (+9 -12)
===================================================================
--- configure.ac 2011-11-18 07:16:51 +0000 (6f3a3f0)
+++ configure.ac 2011-11-18 07:23:19 +0000 (49b451c)
@@ -580,25 +580,22 @@ AC_ARG_ENABLE(benchmark,
[don't build benchmark programs.])],,
[enable_benchmark="yes"])
if test "x$enable_benchmark" = "xno"; then
- ac_benchmark_available="no"
+ benchmark_available="no"
else
+ REQUIRED_GLIB_VERSION=2.8.0
m4_ifdef([AM_PATH_GLIB_2_0],
- [
- GLIB_REQUIRED=2.8.0
- AC_SUBST(GLIB_REQUIRED)
- AM_PATH_GLIB_2_0($GLIB_REQUIRED,
- [ac_benchmark_available="yes"],
- [ac_benchmark_available="no"],
- [gobject gthread])
- ],
- [ac_benchmark_available="no"])
+ [AM_PATH_GLIB_2_0($REQURED_GLIB_VERSION,
+ [benchmark_available="yes"],
+ [benchmark_available="no"],
+ [gobject gthread])],
+ [benchmark_available="no"])
AC_MSG_CHECKING(for benchmark availablity)
AC_MSG_RESULT($ac_benchmark_available)
fi
-if test "$ac_benchmark_available" = "yes"; then
+if test "$benchmark_available" = "yes"; then
AC_DEFINE(WITH_BENCHMARK, 1, [Define to 1 if benchamrk is available])
fi
-AM_CONDITIONAL([WITH_BENCHMARK], [test "$ac_benchmark_available" = "yes"])
+AM_CONDITIONAL([WITH_BENCHMARK], [test "$benchmark_available" = "yes"])
# check Ruby for HTTP test
ac_cv_ruby_available="no"