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

efreet: require edbus2 

SVN revision: 78867
This commit is contained in:
Sebastian Dransfeld 2012-11-02 14:01:55 +00:00
parent 98ce0b7076
commit 124beafa67
3 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/efreet/Makefile.am
View File

@ -76,14 +76,12 @@ endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc
if HAVE_EFREETD
if HAVE_DBUSSERVICEDIR
servicedir = @dbusservicedir@
else
servicedir = $(datadir)/dbus-1/services
endif
service_DATA = org.enlightenment.Efreet.service
endif
EXTRA_DIST = \
AUTHORS \

35
legacy/efreet/configure.ac
View File

@ -172,28 +172,17 @@ AC_SUBST(EFL_EFREET_BUILD)
AC_SUBST(EFL_EFREET_MIME_BUILD)
AC_SUBST(EFL_EFREET_TRASH_BUILD)
service=""
have_efreetd=""
PKG_CHECK_MODULES([EFREETD],
[
eina >= 1.7.99
ecore >= 1.7.99
ecore-file >= 1.7.99
edbus2 >= 1.7.99
],
[
have_efreetd="yes"
service="org.enlightenment.Efreet.service"
requirement_efreet="edbus2 ${requirement_efreet}"
],
[have_efreetd="no"])
AM_CONDITIONAL([HAVE_DBUSSERVICEDIR], [! test "x${dbusservicedir}" = "x"])
AM_CONDITIONAL([HAVE_EFREETD], [test "x${have_efreetd}" = "xyes"])
requirement_efreet="ecore-file >= 1.6.99 ecore >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 ${requirement_efreet}"
]
)
requirement_efreet="ecore-file >= 1.6.99 ecore >= 1.6.99 eet >= 1.6.99 eina >= 1.6.99 edbus2 >= 1.7.99 ${requirement_efreet}"
PKG_CHECK_MODULES(EFREET, [${requirement_efreet}])
PKG_CHECK_MODULES(EINA, [eina >= 1.6.99])
AM_CONDITIONAL([HAVE_DBUSSERVICEDIR], [! test "x${dbusservicedir}" = "x"])
### Checks for header files
@ -276,7 +265,7 @@ src/tests/data/Makefile
src/tests/data/sub/Makefile
src/tests/compare/Makefile
$po_makefile_in
$service
org.enlightenment.Efreet.service
])
@ -296,14 +285,12 @@ echo " Specification compliance:"
echo " Strict.............: ${enable_strict_spec}"
echo " Sloppy.............: ${enable_sloppy_spec}"
echo
if test "x${have_efreetd}" = "xyes"; then
if test "x$dbusservicedir" = "xyes"; then
echo " DBus services dir....: ${dbusservicedir}"
echo
else
echo " DBus services dir....: $(datadir)/dbus-1/services"
echo
fi
if test "x$dbusservicedir" = "xyes"; then
echo " DBus services dir....: ${dbusservicedir}"
echo
else
echo " DBus services dir....: ${datadir}/dbus-1/services"
echo
fi
echo " Tests................: ${enable_tests}"
echo " Coverage.............: ${enable_coverage}"

2
legacy/efreet/src/bin/Makefile.am
View File

@ -28,7 +28,6 @@ $(top_builddir)/src/lib/libefreet.la \
efreet_icon_cache_create_SOURCES = \
efreet_icon_cache_create.c
if HAVE_EFREETD
bin_PROGRAMS = \
efreetd
@ -42,5 +41,4 @@ efreetd_dbus.h \
efreetd_dbus.c \
efreetd_cache.h \
efreetd_cache.c
endif