enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

eeze: handle all version back as we did in 1.7. hopefuly.

This commit is contained in:
Cedric BAIL 2013-03-06 23:07:39 +09:00
parent 2ee27ec6d5
commit 238e5951bb
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -3134,18 +3134,33 @@ EFL_OPTIONAL_DEPEND_PKG([EEZE], [${want_libmount}],
[EEZE_MOUNT], [mount >= 2.18.0])
EFL_ADD_FEATURE([EEZE], [libmount], [${have_eeze_mount}])
PKG_CHECK_EXISTS([mount < 2.19.0],
[have_libmount_old="yes"],
[have_libmount_old="no"])
AC_MSG_CHECKING([Use old libmount API (before 2.19.0)])
AC_MSG_RESULT([${have_libmount_old}])
PKG_CHECK_EXISTS([mount == 2.19.0],
[have_libmount_219="yes"],
[have_libmount_219="no"])
AC_MSG_CHECKING([Use libmount 2.19.0 API])
AC_MSG_RESULT([${have_libmount_219}])
PKG_CHECK_EXISTS([mount > 2.19.0],
[have_libmount_new="yes"],
[have_libmount_new="no"])
AC_MSG_CHECKING([Use new libmount API (older that 2.19.0)])
AC_MSG_CHECKING([Use new libmount API (older than 2.19.0)])
AC_MSG_RESULT([${have_libmount_new}])
AM_CONDITIONAL([EEZE_LIBMOUNT_NEW], [test "x${have_libmount_new}" = "xyes"])
if test "x${have_libmount_new}" = "xno"; then
AM_CONDITIONAL([EEZE_LIBMOUNT_AFTER_219],
[test "x${have_libmount_new}" = "xyes"])
if test "x${have_libmount_old}" = "xyes"; then
AC_DEFINE_UNQUOTED([OLD_LIBMOUNT], [1], [using first version of libmount])
fi
AM_CONDITIONAL([EEZE_NOLIBMOUNT], [test "x${have_eeze_mount}" = "xno"])
AM_CONDITIONAL([EEZE_LIBMOUNT_BEFORE_219],
[test "x${have_libmount_old}" = "xyes"])
AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${have_eeze_mount}" = "xno"])
## modules
if test "${want_tizen}" = "yes"; then

10
src/Makefile_Eeze.am
View File

@ -30,13 +30,15 @@ lib/eeze/eeze_udev_syspath.c \
lib/eeze/eeze_udev_walk.c \
lib/eeze/eeze_udev_watch.c
if EEZE_NOLIBMOUNT
lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount.c
if HAVE_EEZE_MOUNT
if EEZE_LIBMOUNT_BEFORE_219
lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_old.c
else
if EEZE_LIBMOUNT_NEW
if EEZE_LIBMOUNT_AFTER_219
lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_new.c
else
lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount_old.c
lib_eeze_libeeze_la_SOURCES += lib/eeze/eeze_disk_libmount.c
endif
endif
endif