forked from enlightenment/efl
eeze's mount shouldn't be optional.
eeze is just used on linux, where libmount exists and then we shouldn't make this an option so we can rely on eeze's mount being there. (the code keeps the #ifdef's for a while, in case we need to revert that later) SVN revision: 82901
This commit is contained in:
parent
9463885e78
commit
fadeb72831
21
configure.ac
21
configure.ac
|
@ -2987,18 +2987,6 @@ AC_ARG_ENABLE([tizen],
|
||||||
],
|
],
|
||||||
[want_tizen="no"])
|
[want_tizen="no"])
|
||||||
|
|
||||||
AC_ARG_ENABLE([mount],
|
|
||||||
[AC_HELP_STRING([--disable-mount],
|
|
||||||
[disable mount support (libmount). @<:@default=enabled@:>@])],
|
|
||||||
[
|
|
||||||
if test "x${enableval}" = "xyes" ; then
|
|
||||||
want_mount="yes"
|
|
||||||
else
|
|
||||||
want_mount="no"
|
|
||||||
fi
|
|
||||||
],
|
|
||||||
[want_mount="yes"])
|
|
||||||
|
|
||||||
AC_ARG_WITH([mount],
|
AC_ARG_WITH([mount],
|
||||||
[AS_HELP_STRING([--with-mount], [specify mount bin @<:@default=detect@:>@])],
|
[AS_HELP_STRING([--with-mount], [specify mount bin @<:@default=detect@:>@])],
|
||||||
[with_eeze_mount=$withval], [with_eeze_mount="detect"])
|
[with_eeze_mount=$withval], [with_eeze_mount="detect"])
|
||||||
|
@ -3017,12 +3005,12 @@ AC_ARG_WITH([eject],
|
||||||
EFL_INTERNAL_DEPEND_PKG([EEZE], [eina])
|
EFL_INTERNAL_DEPEND_PKG([EEZE], [eina])
|
||||||
EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore])
|
EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore])
|
||||||
EFL_INTERNAL_DEPEND_PKG([EEZE], [eo])
|
EFL_INTERNAL_DEPEND_PKG([EEZE], [eo])
|
||||||
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-file])
|
EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-file])
|
||||||
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [ecore-con])
|
EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-con])
|
||||||
EFL_OPTIONAL_INTERNAL_DEPEND_PKG([EEZE], [${want_mount}], [eet])
|
EFL_INTERNAL_DEPEND_PKG([EEZE], [eet])
|
||||||
|
|
||||||
EFL_DEPEND_PKG([EEZE], [UDEV], [libudev >= 148])
|
EFL_DEPEND_PKG([EEZE], [UDEV], [libudev >= 148])
|
||||||
EFL_OPTIONAL_DEPEND_PKG([EEZE], [${want_mount}], [EEZE_MOUNT], [mount >= 2.20.0])
|
EFL_DEPEND_PKG([EEZE], [EEZE_MOUNT], [mount >= 2.20.0])
|
||||||
|
|
||||||
## modules
|
## modules
|
||||||
if test "${want_tizen}" = "yes"; then
|
if test "${want_tizen}" = "yes"; then
|
||||||
|
@ -3061,7 +3049,6 @@ AC_DEFINE_UNQUOTED([EEZE_EJECT_BIN], ["$with_eeze_eject"], [eject bin to use])
|
||||||
|
|
||||||
EFL_LIB_END_OPTIONAL([Eeze])
|
EFL_LIB_END_OPTIONAL([Eeze])
|
||||||
|
|
||||||
AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${want_mount}" = "xyes"])
|
|
||||||
AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "x${want_tizen}" = "xyes"])
|
AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "x${want_tizen}" = "xyes"])
|
||||||
#### End of Eeze
|
#### End of Eeze
|
||||||
|
|
||||||
|
|
|
@ -9,31 +9,27 @@ installed_eezemainheadersdir = $(includedir)/eeze-@VMAJ@
|
||||||
dist_installed_eezemainheaders_DATA = \
|
dist_installed_eezemainheaders_DATA = \
|
||||||
lib/eeze/Eeze.h \
|
lib/eeze/Eeze.h \
|
||||||
lib/eeze/Eeze_Net.h \
|
lib/eeze/Eeze_Net.h \
|
||||||
lib/eeze/Eeze_Sensor.h
|
lib/eeze/Eeze_Sensor.h \
|
||||||
|
lib/eeze/Eeze_Disk.h
|
||||||
|
|
||||||
# libeeze.la
|
# libeeze.la
|
||||||
lib_eeze_libeeze_la_SOURCES = \
|
lib_eeze_libeeze_la_SOURCES = \
|
||||||
|
lib/eeze/eeze_disk.c \
|
||||||
|
lib/eeze/eeze_disk_libmount_new.c \
|
||||||
|
lib/eeze/eeze_disk_mount.c \
|
||||||
|
lib/eeze/eeze_disk_private.h \
|
||||||
|
lib/eeze/eeze_disk_udev.c \
|
||||||
lib/eeze/eeze_main.c \
|
lib/eeze/eeze_main.c \
|
||||||
lib/eeze/eeze_net.c \
|
lib/eeze/eeze_net.c \
|
||||||
lib/eeze/eeze_net_private.h \
|
lib/eeze/eeze_net_private.h \
|
||||||
|
lib/eeze/eeze_sensor.c \
|
||||||
|
lib/eeze/eeze_sensor_private.h \
|
||||||
lib/eeze/eeze_udev_find.c \
|
lib/eeze/eeze_udev_find.c \
|
||||||
lib/eeze/eeze_udev_private.h \
|
|
||||||
lib/eeze/eeze_udev_private.c \
|
lib/eeze/eeze_udev_private.c \
|
||||||
|
lib/eeze/eeze_udev_private.h \
|
||||||
lib/eeze/eeze_udev_syspath.c \
|
lib/eeze/eeze_udev_syspath.c \
|
||||||
lib/eeze/eeze_udev_walk.c \
|
lib/eeze/eeze_udev_walk.c \
|
||||||
lib/eeze/eeze_udev_watch.c \
|
lib/eeze/eeze_udev_watch.c
|
||||||
lib/eeze/eeze_sensor_private.h \
|
|
||||||
lib/eeze/eeze_sensor.c
|
|
||||||
|
|
||||||
if HAVE_EEZE_MOUNT
|
|
||||||
dist_installed_eezemainheaders_DATA += lib/eeze/Eeze_Disk.h
|
|
||||||
lib_eeze_libeeze_la_SOURCES += \
|
|
||||||
lib/eeze/eeze_disk.c \
|
|
||||||
lib/eeze/eeze_disk_udev.c \
|
|
||||||
lib/eeze/eeze_disk_mount.c \
|
|
||||||
lib/eeze/eeze_disk_private.h \
|
|
||||||
lib/eeze/eeze_disk_libmount_new.c
|
|
||||||
endif
|
|
||||||
|
|
||||||
lib_eeze_libeeze_la_CPPFLAGS = \
|
lib_eeze_libeeze_la_CPPFLAGS = \
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
|
@ -86,7 +82,6 @@ bin_eeze_eeze_sensor_test_CPPFLAGS = @EEZE_CFLAGS@
|
||||||
bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
|
bin_eeze_eeze_sensor_test_LDADD = @USE_EEZE_LIBS@
|
||||||
bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
|
bin_eeze_eeze_sensor_test_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
|
||||||
|
|
||||||
if HAVE_EEZE_MOUNT
|
|
||||||
bin_PROGRAMS += \
|
bin_PROGRAMS += \
|
||||||
bin/eeze/eeze_mount \
|
bin/eeze/eeze_mount \
|
||||||
bin/eeze/eeze_umount \
|
bin/eeze/eeze_umount \
|
||||||
|
@ -114,7 +109,6 @@ bin/eeze/eeze_scanner.h
|
||||||
bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@
|
bin_eeze_eeze_scanner_CPPFLAGS = @EEZE_CFLAGS@
|
||||||
bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@
|
bin_eeze_eeze_scanner_LDADD = @USE_EEZE_LIBS@
|
||||||
bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
|
bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
|
||||||
endif
|
|
||||||
|
|
||||||
setuid_root_mode = a=rx,u+xs
|
setuid_root_mode = a=rx,u+xs
|
||||||
install-data-hook::
|
install-data-hook::
|
||||||
|
|
Loading…
Reference in New Issue