forked from enlightenment/efl
efl: remove option to enable old EET format.
It's disabled. If user wants to enable, give -DEET_OLD_EET_FILE_FORMAT=1 to CFLAGS. SVN revision: 77790
This commit is contained in:
parent
cca6952abf
commit
f963219626
26
configure.ac
26
configure.ac
|
@ -631,30 +631,6 @@ AC_MSG_NOTICE([Eet checks])
|
||||||
|
|
||||||
EFL_ENABLE_BIN([eet])
|
EFL_ENABLE_BIN([eet])
|
||||||
|
|
||||||
# Old eet file format support
|
|
||||||
|
|
||||||
AC_ARG_ENABLE(old-eet-file-format,
|
|
||||||
[AC_HELP_STRING(
|
|
||||||
[--disable-old-eet-file-format],
|
|
||||||
[disable old eet file format support @<:@default=enabled@:>@])],
|
|
||||||
[
|
|
||||||
if test "x${enableval}" = "xyes" ; then
|
|
||||||
old_eet_file_format="yes"
|
|
||||||
else
|
|
||||||
old_eet_file_format="no"
|
|
||||||
fi
|
|
||||||
],
|
|
||||||
[old_eet_file_format="yes"])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to support old eet file format])
|
|
||||||
AC_MSG_RESULT([${old_eet_file_format}])
|
|
||||||
|
|
||||||
if test "x${old_eet_file_format}" = "xyes" ; then
|
|
||||||
AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 1, [support old eet file format])
|
|
||||||
else
|
|
||||||
AC_DEFINE(EET_OLD_EET_FILE_FORMAT, 0, [support old eet file format])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_ARG_WITH([crypto],
|
AC_ARG_WITH([crypto],
|
||||||
[AC_HELP_STRING([--with-crypto=CRYPTO],
|
[AC_HELP_STRING([--with-crypto=CRYPTO],
|
||||||
[use the predefined build crypto, one of:
|
[use the predefined build crypto, one of:
|
||||||
|
@ -1024,8 +1000,6 @@ echo "Eet"
|
||||||
echo
|
echo
|
||||||
echo " Secure layer.........: ${build_crypto}"
|
echo " Secure layer.........: ${build_crypto}"
|
||||||
echo
|
echo
|
||||||
echo " Old eet file format..: ${old_eet_file_format}"
|
|
||||||
echo
|
|
||||||
echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
|
echo " Tests................: make check (Coverage: ${_efl_enable_coverage})"
|
||||||
echo " Examples.............: make examples"
|
echo " Examples.............: make examples"
|
||||||
echo " installation.......: make install-examples"
|
echo " installation.......: make install-examples"
|
||||||
|
|
|
@ -1042,7 +1042,7 @@ eet_internal_read2(Eet_File *ef)
|
||||||
return ef;
|
return ef;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if EET_OLD_EET_FILE_FORMAT
|
#ifdef EET_OLD_EET_FILE_FORMAT
|
||||||
static Eet_File *
|
static Eet_File *
|
||||||
eet_internal_read1(Eet_File *ef)
|
eet_internal_read1(Eet_File *ef)
|
||||||
{
|
{
|
||||||
|
@ -1224,7 +1224,7 @@ eet_internal_read1(Eet_File *ef)
|
||||||
return ef;
|
return ef;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* if EET_OLD_EET_FILE_FORMAT */
|
#endif /* ifdef EET_OLD_EET_FILE_FORMAT */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* this should only be called when the cache lock is already held
|
* this should only be called when the cache lock is already held
|
||||||
|
@ -1245,11 +1245,11 @@ eet_internal_read(Eet_File *ef)
|
||||||
|
|
||||||
switch (ntohl(*data))
|
switch (ntohl(*data))
|
||||||
{
|
{
|
||||||
#if EET_OLD_EET_FILE_FORMAT
|
#ifdef EET_OLD_EET_FILE_FORMAT
|
||||||
case EET_MAGIC_FILE:
|
case EET_MAGIC_FILE:
|
||||||
return eet_internal_read1(ef);
|
return eet_internal_read1(ef);
|
||||||
|
|
||||||
#endif /* if EET_OLD_EET_FILE_FORMAT */
|
#endif /* ifdef EET_OLD_EET_FILE_FORMAT */
|
||||||
case EET_MAGIC_FILE2:
|
case EET_MAGIC_FILE2:
|
||||||
return eet_internal_read2(ef);
|
return eet_internal_read2(ef);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue