* use a m4 macro for checking benchmark libraries and
check the libraries only if benchmarking is enabled * add extra dist files to be able to configure eina with autogen.sh and also add .spec files SVN revision: 41203
This commit is contained in:
parent
c94a92a174
commit
b38a118162
|
@ -26,7 +26,19 @@ AUTHORS \
|
|||
COPYING \
|
||||
OLD-COPYING.PLAIN \
|
||||
README \
|
||||
$(pkgconfig_DATA)
|
||||
$(pkgconfig_DATA) \
|
||||
autogen.sh \
|
||||
eina-0.pc.in \
|
||||
eina.spec \
|
||||
eina.spec.in \
|
||||
m4/efl_benchmark.m4 \
|
||||
m4/efl_coverage.m4 \
|
||||
m4/efl_cpu.m4 \
|
||||
m4/efl_doxygen.m4 \
|
||||
m4/efl_pthread.m4 \
|
||||
m4/efl_tests.m4 \
|
||||
m4/eina_bench.m4 \
|
||||
m4/eina_check.m4
|
||||
|
||||
.PHONY: doc coverage benchmark
|
||||
|
||||
|
|
|
@ -156,66 +156,6 @@ case "$host_os" in
|
|||
;;
|
||||
esac
|
||||
|
||||
# Glib library for comparison in the benchmark
|
||||
|
||||
have_glib="no"
|
||||
want_glib="yes"
|
||||
|
||||
AC_ARG_ENABLE(glib,
|
||||
[AC_HELP_STRING([--disable-glib], [disable benchmarking against glib])],
|
||||
[want_glib=${enableval}]
|
||||
)
|
||||
|
||||
if test "x${enable_benchmark}" = "xyes" -a "x${want_glib}" = "xyes"; then
|
||||
PKG_CHECK_MODULES([GLIB],
|
||||
[glib-2.0],
|
||||
[have_glib="yes"],
|
||||
[have_glib="no"]
|
||||
)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(EINA_HAVE_GLIB, test "x${have_glib}" = "xyes")
|
||||
|
||||
# Evas library for comparison in the benchmark
|
||||
|
||||
have_evas="no"
|
||||
want_evas="yes"
|
||||
|
||||
AC_ARG_ENABLE(evas,
|
||||
[AC_HELP_STRING([--disable-evas], [disable benchmarking against evas])],
|
||||
[want_evas=${enableval}]
|
||||
)
|
||||
|
||||
if test "x${enable_benchmark}" = "xyes" -a "x${want_evas}" = "xyes"; then
|
||||
PKG_CHECK_MODULES([EVAS],
|
||||
[evas],
|
||||
[have_evas="yes"],
|
||||
[have_evas="no"]
|
||||
)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(EINA_HAVE_EVAS, test "x${have_evas}" = "xyes")
|
||||
|
||||
# Ecore library for comparison in the benchmark
|
||||
|
||||
have_ecore="no"
|
||||
want_ecore="yes"
|
||||
|
||||
AC_ARG_ENABLE(ecore,
|
||||
[AC_HELP_STRING([--disable-ecore], [disable benchmarking against ecore])],
|
||||
[want_ecore=${enableval}]
|
||||
)
|
||||
|
||||
if test "x${enable_benchmark}" = "xyes" -a "x${want_ecore}" = "xyes"; then
|
||||
PKG_CHECK_MODULES([ECORE],
|
||||
[ecore],
|
||||
[have_ecore="yes"],
|
||||
[have_ecore="no"]
|
||||
)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(EINA_HAVE_ECORE, test "x${have_ecore}" = "xyes")
|
||||
|
||||
# Check if we want to benchmark on real data
|
||||
enable_benchmark_e17="no"
|
||||
AC_ARG_ENABLE([e17],
|
||||
|
@ -394,7 +334,9 @@ EINA_CHECK_MODULE([pass-through], [yes], [pass through])
|
|||
EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"])
|
||||
EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"])
|
||||
EFL_CHECK_BENCHMARK([enable_benchmark="yes"], [enable_benchmark="no"])
|
||||
|
||||
EINA_BENCH_MODULE([evas], [${enable_benchmark}], [evas], [enable_benchmark_evas="yes"], [enable_benchmark_evas="no"])
|
||||
EINA_BENCH_MODULE([ecore], [${enable_benchmark}], [ecore], [enable_benchmark_ecore="yes"], [enable_benchmark_ecore="no"])
|
||||
EINA_BENCH_MODULE([glib], [${enable_benchmark}], [glib-2.0], [enable_benchmark_glib="yes"], [enable_benchmark_glib="no"])
|
||||
|
||||
### Create the .pc.in file according to the major version
|
||||
#cat > ${srcdir}/eina-${VMAJ}.pc.in << EOF
|
||||
|
@ -457,9 +399,9 @@ echo " Tests................: ${enable_tests}"
|
|||
echo " Coverage.............: ${enable_coverage}"
|
||||
echo " Benchmark............: ${enable_benchmark}"
|
||||
if test "x${enable_benchmark}" = "xyes" ; then
|
||||
echo " Glib...............: ${have_glib}"
|
||||
echo " Evas...............: ${have_evas}"
|
||||
echo " Ecore..............: ${have_ecore}"
|
||||
echo " Glib...............: ${enable_benchmark_glib}"
|
||||
echo " Evas...............: ${enable_benchmark_evas}"
|
||||
echo " Ecore..............: ${enable_benchmark_ecore}"
|
||||
echo " E17 real data......: ${enable_benchmark_e17}"
|
||||
fi
|
||||
echo
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
dnl use: EINA_BENCH_MODULE(foo-bar, have_bench, pkg_file [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
|
||||
AC_DEFUN([EINA_BENCH_MODULE],
|
||||
[
|
||||
m4_pushdef([UP], m4_translit([$1], [-a-z], [_A-Z]))dnl
|
||||
m4_pushdef([DOWN], m4_translit([$1], [-A-Z], [_a-z]))dnl
|
||||
|
||||
want_module="$2"
|
||||
have_module="no"
|
||||
|
||||
AC_ARG_ENABLE([$1],
|
||||
[AC_HELP_STRING([--disable-benchmark-$1], [disable benchmarking against ]DOWN[ @<:@default=yes@:>@])],
|
||||
[
|
||||
if test "x${enableval}" = "xyes" ; then
|
||||
enable_module="yes"
|
||||
else
|
||||
enable_module="no"
|
||||
fi
|
||||
],
|
||||
[enable_module="yes"])
|
||||
|
||||
if test "x${enable_module}" = "xyes" -a "x${want_module}" = "xyes"; then
|
||||
PKG_CHECK_MODULES([]UP[], [$3], [have_module="yes"], [have_module="no"])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL([EINA_HAVE_]UP[], [test "x${have_module}" = "xyes"])
|
||||
|
||||
if test "x${have_module}" = "xyes" ; then
|
||||
ifelse([$4], , :, [$4])
|
||||
else
|
||||
ifelse([$5], , :, [$5])
|
||||
fi
|
||||
|
||||
m4_popdef([UP])
|
||||
m4_popdef([DOWN])
|
||||
])
|
|
@ -19,8 +19,7 @@ AC_ARG_ENABLE([$1],
|
|||
fi
|
||||
fi
|
||||
],
|
||||
[enable_module="yes"]
|
||||
)
|
||||
[enable_module="yes"])
|
||||
|
||||
have_module="no"
|
||||
if test "x${enable_module}" = "xyes" -o "x${enable_module}" = "xstatic" ; then
|
||||
|
|
Loading…
Reference in New Issue