aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2014-09-23 09:02:28 -0400
committerChris Michael <cp.michael@samsung.com>2014-09-23 15:31:12 -0400
commita0b54c0c43103cdfd383e7bf0743974e9d203ee7 (patch)
treec718f1c7e69807606fe724e31380f081ab6a4ebf
parenteeze: Add cases for backlight and leds in get_syspath_from_watch. (diff)
downloadefl-a0b54c0c43103cdfd383e7bf0743974e9d203ee7.tar.gz
ecore-drm: Move Eeze above Ecore_Drm
Summary: Ecore_Drm is going to be using Eeze for udev functionality, so we need to check for Eeze deps before Ecore_Drm @fix Signed-off-by: Chris Michael <cp.michael@samsung.com>
-rw-r--r--configure.ac234
1 files changed, 117 insertions, 117 deletions
diff --git a/configure.ac b/configure.ac
index ac8ae99298..2059db040c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2899,6 +2899,123 @@ EFL_LIB_END([Eldbus])
#### End of Eldbus
+#### Eeze
+have_libmount_new="no"
+have_libmount_old="no"
+have_eeze_mount="no"
+
+EFL_LIB_START_OPTIONAL([Eeze], [test "${have_linux}" = "yes"])
+
+### Additional options to configure
+AC_ARG_WITH([mount],
+ [AS_HELP_STRING([--with-mount], [specify mount bin @<:@default=detect@:>@])],
+ [with_eeze_mount=$withval], [with_eeze_mount="detect"])
+AC_ARG_WITH([umount],
+ [AS_HELP_STRING([--with-umount], [specify umount bin @<:@default=detect@:>@])],
+ [with_eeze_umount=$withval], [with_eeze_umount="detect"])
+AC_ARG_WITH([eject],
+ [AS_HELP_STRING([--with-eject], [specify eject bin @<:@default=detect@:>@])],
+ [with_eeze_eject=$withval], [with_eeze_eject="detect"])
+
+### Default values
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([EEZE], [eina])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [eo])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-file])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-con])
+EFL_INTERNAL_DEPEND_PKG([EEZE], [eet])
+
+EFL_DEPEND_PKG([EEZE], [UDEV], [libudev >= 148])
+
+AC_ARG_ENABLE([libmount],
+ [AS_HELP_STRING([--disable-libmount],[disable libmount support. @<:@default=enabled@:>@])],
+ [
+ if test "x${enableval}" = "xyes" ; then
+ want_libmount="yes"
+ else
+ want_libmount="no"
+ CFOPT_WARNING="xyes"
+ fi
+ ],
+ [want_libmount="yes"])
+
+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 (newer than 2.19.0)])
+AC_MSG_RESULT([${have_libmount_new}])
+
+if test "x${have_libmount_old}" = "xyes"; then
+ AC_DEFINE_UNQUOTED([OLD_LIBMOUNT], [1], [using first version of libmount])
+fi
+
+## modules
+if test "${want_tizen}" = "yes"; then
+ PKG_CHECK_MODULES([TIZEN_SENSOR], [capi-system-sensor >= 0.1.17])
+fi
+EFL_ADD_FEATURE([EEZE], [tizen])
+
+EFL_EVAL_PKGS([EEZE])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Checks for binaries
+if test "x$with_eeze_mount" = "xdetect"; then
+ AC_PATH_PROG([with_eeze_mount], [mount], [])
+fi
+AC_DEFINE_UNQUOTED([EEZE_MOUNT_BIN], ["$with_eeze_mount"], [mount bin to use])
+
+if test "x$with_eeze_umount" = "xdetect";then
+ AC_PATH_PROG([with_eeze_umount], [umount], [])
+fi
+AC_DEFINE_UNQUOTED([EEZE_UNMOUNT_BIN], ["$with_eeze_umount"], [umount bin to use])
+
+if test "x$with_eeze_eject" = "xdetect";then
+ AC_PATH_PROG([with_eeze_eject], [eject], [])
+fi
+AC_DEFINE_UNQUOTED([EEZE_EJECT_BIN], ["$with_eeze_eject"], [eject bin to use])
+
+EFL_LIB_END_OPTIONAL([Eeze])
+
+AM_CONDITIONAL([EEZE_LIBMOUNT_AFTER_219],
+ [test "x${have_libmount_new}" = "xyes"])
+AM_CONDITIONAL([EEZE_LIBMOUNT_BEFORE_219],
+ [test "x${have_libmount_old}" = "xyes"])
+AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${have_eeze_mount}" = "xyes"])
+AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "x${want_tizen}" = "xyes"])
+#### End of Eeze
+
+
#### Ecore_Drm
EFL_LIB_START_OPTIONAL([Ecore_Drm], [test "${want_drm}" = "yes"])
@@ -3574,123 +3691,6 @@ EFL_LIB_END_OPTIONAL([Ecore_Imf_Evas])
#### End of Ecore_Imf_Evas
-#### Eeze
-have_libmount_new="no"
-have_libmount_old="no"
-have_eeze_mount="no"
-
-EFL_LIB_START_OPTIONAL([Eeze], [test "${have_linux}" = "yes"])
-
-### Additional options to configure
-AC_ARG_WITH([mount],
- [AS_HELP_STRING([--with-mount], [specify mount bin @<:@default=detect@:>@])],
- [with_eeze_mount=$withval], [with_eeze_mount="detect"])
-AC_ARG_WITH([umount],
- [AS_HELP_STRING([--with-umount], [specify umount bin @<:@default=detect@:>@])],
- [with_eeze_umount=$withval], [with_eeze_umount="detect"])
-AC_ARG_WITH([eject],
- [AS_HELP_STRING([--with-eject], [specify eject bin @<:@default=detect@:>@])],
- [with_eeze_eject=$withval], [with_eeze_eject="detect"])
-
-### Default values
-
-### Checks for programs
-
-### Checks for libraries
-EFL_INTERNAL_DEPEND_PKG([EEZE], [eina])
-EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore])
-EFL_INTERNAL_DEPEND_PKG([EEZE], [eo])
-EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-file])
-EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-con])
-EFL_INTERNAL_DEPEND_PKG([EEZE], [eet])
-
-EFL_DEPEND_PKG([EEZE], [UDEV], [libudev >= 148])
-
-AC_ARG_ENABLE([libmount],
- [AS_HELP_STRING([--disable-libmount],[disable libmount support. @<:@default=enabled@:>@])],
- [
- if test "x${enableval}" = "xyes" ; then
- want_libmount="yes"
- else
- want_libmount="no"
- CFOPT_WARNING="xyes"
- fi
- ],
- [want_libmount="yes"])
-
-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 (newer than 2.19.0)])
-AC_MSG_RESULT([${have_libmount_new}])
-
-if test "x${have_libmount_old}" = "xyes"; then
- AC_DEFINE_UNQUOTED([OLD_LIBMOUNT], [1], [using first version of libmount])
-fi
-
-## modules
-if test "${want_tizen}" = "yes"; then
- PKG_CHECK_MODULES([TIZEN_SENSOR], [capi-system-sensor >= 0.1.17])
-fi
-EFL_ADD_FEATURE([EEZE], [tizen])
-
-EFL_EVAL_PKGS([EEZE])
-
-### Checks for header files
-
-### Checks for types
-
-### Checks for structures
-
-### Checks for compiler characteristics
-
-### Checks for linker characteristics
-
-### Checks for library functions
-
-### Checks for binaries
-if test "x$with_eeze_mount" = "xdetect"; then
- AC_PATH_PROG([with_eeze_mount], [mount], [])
-fi
-AC_DEFINE_UNQUOTED([EEZE_MOUNT_BIN], ["$with_eeze_mount"], [mount bin to use])
-
-if test "x$with_eeze_umount" = "xdetect";then
- AC_PATH_PROG([with_eeze_umount], [umount], [])
-fi
-AC_DEFINE_UNQUOTED([EEZE_UNMOUNT_BIN], ["$with_eeze_umount"], [umount bin to use])
-
-if test "x$with_eeze_eject" = "xdetect";then
- AC_PATH_PROG([with_eeze_eject], [eject], [])
-fi
-AC_DEFINE_UNQUOTED([EEZE_EJECT_BIN], ["$with_eeze_eject"], [eject bin to use])
-
-EFL_LIB_END_OPTIONAL([Eeze])
-
-AM_CONDITIONAL([EEZE_LIBMOUNT_AFTER_219],
- [test "x${have_libmount_new}" = "xyes"])
-AM_CONDITIONAL([EEZE_LIBMOUNT_BEFORE_219],
- [test "x${have_libmount_old}" = "xyes"])
-AM_CONDITIONAL([HAVE_EEZE_MOUNT], [test "x${have_eeze_mount}" = "xyes"])
-AM_CONDITIONAL([HAVE_EEZE_TIZEN], [test "x${want_tizen}" = "xyes"])
-#### End of Eeze
-
-
#### Ecore_Evas
EFL_LIB_START_OPTIONAL([Ecore_Evas], [test "x${build_gui}" = "xyes"])