merge : remove useless CONDITIONALs and make eet build optional; eina is always built
SVN revision: 77026
This commit is contained in:
parent
58f5ec5047
commit
851975dbcc
|
@ -58,7 +58,11 @@ if HAVE_WINDOWS
|
|||
pkgconfig_DATA += evil.pc
|
||||
endif
|
||||
|
||||
pkgconfig_DATA += eina.pc eet.pc
|
||||
pkgconfig_DATA += eina.pc
|
||||
|
||||
if EFL_BUILD_EET
|
||||
pkgconfig_DATA += eet.pc
|
||||
endif
|
||||
|
||||
|
||||
.PHONY: doc benchmark examples install-examples
|
||||
|
@ -94,7 +98,9 @@ if EFL_ENABLE_COVERAGE
|
|||
@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
|
||||
endif
|
||||
@./src/tests/eina/eina_suite$(EXEEXT)
|
||||
if EFL_BUILD_EET
|
||||
@./src/tests/eet/eet_suite$(EXEEXT)
|
||||
endif
|
||||
if EFL_ENABLE_COVERAGE
|
||||
@$(MAKE) $(AM_MAKEFLAGS) lcov-report
|
||||
endif
|
||||
|
|
20
configure.ac
20
configure.ac
|
@ -196,6 +196,9 @@ AM_CONDITIONAL([HAVE_WINDOWS], [test "x${have_windows}" = "xyes"])
|
|||
|
||||
#### Additional options to configure
|
||||
|
||||
EFL_ENABLE_LIB([eet], [yes])
|
||||
|
||||
|
||||
# Assert or fail.
|
||||
|
||||
AC_ARG_ENABLE([assert],
|
||||
|
@ -782,6 +785,10 @@ EINA_CHECK_MODULE([one-big], [${enable_one_big}], [one big])
|
|||
|
||||
#### Eet
|
||||
|
||||
efl_have_eet="no"
|
||||
|
||||
if test "x${efl_want_build_eet}" = "xyes" ; then
|
||||
|
||||
AC_MSG_NOTICE([Eet checks])
|
||||
|
||||
### Default values
|
||||
|
@ -1123,6 +1130,14 @@ esac
|
|||
|
||||
### Checks for library functions
|
||||
|
||||
### Check availability
|
||||
|
||||
if test "x${efl_lib_zlib}" = ""xyes" && test "x${efl_lib_libjpeg}" = ""xyes" ; then
|
||||
efl_have_eet="yes"
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
#### End of Eet
|
||||
|
||||
|
||||
|
@ -1246,6 +1261,9 @@ echo " Fixed bitmap.......: ${enable_fixed_bitmap}"
|
|||
echo " One big............: ${enable_one_big}"
|
||||
echo " Pass through.......: ${enable_pass_through}"
|
||||
echo
|
||||
if test "x${efl_have_eet}" = "xno" ; then
|
||||
echo "Eet....................: no"
|
||||
else
|
||||
echo "Eet"
|
||||
echo
|
||||
echo " Secure layer.........: ${secure_layer}"
|
||||
|
@ -1259,6 +1277,7 @@ echo
|
|||
echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
|
||||
echo " Examples.............: make examples"
|
||||
echo " installation.......: make install-examples"
|
||||
fi
|
||||
echo
|
||||
echo "Compilation............: make (or gmake)"
|
||||
echo " CPPFLAGS.............: $CPPFLAGS"
|
||||
|
@ -1269,4 +1288,3 @@ echo
|
|||
echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
|
||||
echo " prefix...............: $prefix"
|
||||
echo
|
||||
|
||||
|
|
|
@ -18,8 +18,8 @@ have_[]m4_defn([DOWN])="yes"
|
|||
|
||||
dnl configure option
|
||||
|
||||
AC_ARG_ENABLE([$1],
|
||||
[AC_HELP_STRING([--disable-$1], [disable building of ]DOWN)],
|
||||
AC_ARG_ENABLE([binary-$1],
|
||||
[AC_HELP_STRING([--disable-binary-$1], [disable building of ]DOWN[ binary])],
|
||||
[
|
||||
if test "x${enableval}" = "xyes" ; then
|
||||
have_[]m4_defn([DOWN])="yes"
|
||||
|
@ -37,8 +37,6 @@ fi
|
|||
|
||||
AC_SUBST(UP[]_PRG)
|
||||
|
||||
AM_CONDITIONAL(BUILD_[]UP, test "x$have_[]m4_defn([DOWN])" = "xyes")
|
||||
|
||||
AS_IF([test "x$have_[]m4_defn([DOWN])" = "xyes"], [$2], [$3])
|
||||
|
||||
])
|
||||
|
|
|
@ -8,7 +8,6 @@ dnl Macro that checks for a compiler flag availability
|
|||
dnl
|
||||
dnl EFL_CHECK_COMPILER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
|
||||
dnl AC_SUBST : EFL_CFLAGS (EFL being replaced by its value)
|
||||
dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
|
||||
|
||||
AC_DEFUN([EFL_CHECK_COMPILER_FLAG],
|
||||
[
|
||||
|
@ -39,8 +38,6 @@ fi
|
|||
AC_ARG_VAR(UPEFL[_CFLAGS], [preprocessor flags for $2])
|
||||
AC_SUBST(UPEFL[_CFLAGS])
|
||||
|
||||
AM_CONDITIONAL([EFL_HAVE]UP, [test "x${have_flag}" = "xyes"])
|
||||
|
||||
m4_popdef([UP])
|
||||
m4_popdef([UPEFL])
|
||||
])
|
||||
|
@ -60,7 +57,6 @@ dnl Macro that checks for a linker flag availability
|
|||
dnl
|
||||
dnl EFL_CHECK_LINKER_FLAG(EFL, FLAG[, ACTION-IF-FOUND[ ,ACTION-IF-NOT-FOUND]])
|
||||
dnl AC_SUBST : EFL_LIBS (EFL being replaced by its value)
|
||||
dnl AM_CONDITIONAL : EFL_HAVE_FLAG (FLAG being replaced by its value)
|
||||
|
||||
AC_DEFUN([EFL_CHECK_LINKER_FLAG],
|
||||
[
|
||||
|
@ -88,8 +84,6 @@ fi
|
|||
AC_ARG_VAR(UPEFL[_LIBS], [preprocessor flags for $2])
|
||||
AC_SUBST(UPEFL[_LIBS])
|
||||
|
||||
AM_CONDITIONAL([EFL_HAVE]UP, [test "x${have_flag}" = "xyes"])
|
||||
|
||||
m4_popdef([UP])
|
||||
m4_popdef([UPEFL])
|
||||
])
|
||||
|
|
|
@ -8,4 +8,8 @@ SUBDIRS += evil
|
|||
|
||||
endif
|
||||
|
||||
if EFL_BUILD_EET
|
||||
|
||||
SUBDIRS += eet
|
||||
|
||||
endif
|
||||
|
|
|
@ -4,8 +4,12 @@ SUBDIRS = eina eet
|
|||
|
||||
examples:
|
||||
@$(MAKE) $(AM_MAKEFLAGS) -C eina examples
|
||||
if EFL_BUILD_EET
|
||||
@$(MAKE) $(AM_MAKEFLAGS) -C eet examples
|
||||
endif
|
||||
|
||||
install-examples:
|
||||
@$(MAKE) $(AM_MAKEFLAGS) -C eina install-examples
|
||||
if EFL_BUILD_EET
|
||||
@$(MAKE) $(AM_MAKEFLAGS) -C eet install-examples
|
||||
endif
|
||||
|
|
|
@ -8,4 +8,10 @@ SUBDIRS += evil
|
|||
|
||||
endif
|
||||
|
||||
SUBDIRS += eina eet
|
||||
SUBDIRS += eina
|
||||
|
||||
if EFL_BUILD_EET
|
||||
|
||||
SUBDIRS += eet
|
||||
|
||||
endif
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
SUBDIRS = eina eet
|
||||
SUBDIRS = eina
|
||||
|
||||
if EFL_BUILD_EET
|
||||
|
||||
SUBDIRS += eet
|
||||
|
||||
endif
|
||||
|
|
Loading…
Reference in New Issue