parent
98ce0b7076
commit
124beafa67
|
@ -76,14 +76,12 @@ endif
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc
|
pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc
|
||||||
|
|
||||||
if HAVE_EFREETD
|
|
||||||
if HAVE_DBUSSERVICEDIR
|
if HAVE_DBUSSERVICEDIR
|
||||||
servicedir = @dbusservicedir@
|
servicedir = @dbusservicedir@
|
||||||
else
|
else
|
||||||
servicedir = $(datadir)/dbus-1/services
|
servicedir = $(datadir)/dbus-1/services
|
||||||
endif
|
endif
|
||||||
service_DATA = org.enlightenment.Efreet.service
|
service_DATA = org.enlightenment.Efreet.service
|
||||||
endif
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
AUTHORS \
|
AUTHORS \
|
||||||
|
|
|
@ -172,28 +172,17 @@ AC_SUBST(EFL_EFREET_BUILD)
|
||||||
AC_SUBST(EFL_EFREET_MIME_BUILD)
|
AC_SUBST(EFL_EFREET_MIME_BUILD)
|
||||||
AC_SUBST(EFL_EFREET_TRASH_BUILD)
|
AC_SUBST(EFL_EFREET_TRASH_BUILD)
|
||||||
|
|
||||||
service=""
|
|
||||||
have_efreetd=""
|
|
||||||
PKG_CHECK_MODULES([EFREETD],
|
PKG_CHECK_MODULES([EFREETD],
|
||||||
[
|
[
|
||||||
eina >= 1.7.99
|
eina >= 1.7.99
|
||||||
ecore >= 1.7.99
|
ecore >= 1.7.99
|
||||||
ecore-file >= 1.7.99
|
ecore-file >= 1.7.99
|
||||||
edbus2 >= 1.7.99
|
edbus2 >= 1.7.99
|
||||||
],
|
]
|
||||||
[
|
)
|
||||||
have_efreetd="yes"
|
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}"
|
||||||
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}"
|
|
||||||
PKG_CHECK_MODULES(EFREET, [${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
|
### Checks for header files
|
||||||
|
|
||||||
|
@ -276,7 +265,7 @@ src/tests/data/Makefile
|
||||||
src/tests/data/sub/Makefile
|
src/tests/data/sub/Makefile
|
||||||
src/tests/compare/Makefile
|
src/tests/compare/Makefile
|
||||||
$po_makefile_in
|
$po_makefile_in
|
||||||
$service
|
org.enlightenment.Efreet.service
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
|
@ -296,14 +285,12 @@ echo " Specification compliance:"
|
||||||
echo " Strict.............: ${enable_strict_spec}"
|
echo " Strict.............: ${enable_strict_spec}"
|
||||||
echo " Sloppy.............: ${enable_sloppy_spec}"
|
echo " Sloppy.............: ${enable_sloppy_spec}"
|
||||||
echo
|
echo
|
||||||
if test "x${have_efreetd}" = "xyes"; then
|
if test "x$dbusservicedir" = "xyes"; then
|
||||||
if test "x$dbusservicedir" = "xyes"; then
|
echo " DBus services dir....: ${dbusservicedir}"
|
||||||
echo " DBus services dir....: ${dbusservicedir}"
|
echo
|
||||||
echo
|
else
|
||||||
else
|
echo " DBus services dir....: ${datadir}/dbus-1/services"
|
||||||
echo " DBus services dir....: $(datadir)/dbus-1/services"
|
echo
|
||||||
echo
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
echo " Tests................: ${enable_tests}"
|
echo " Tests................: ${enable_tests}"
|
||||||
echo " Coverage.............: ${enable_coverage}"
|
echo " Coverage.............: ${enable_coverage}"
|
||||||
|
|
|
@ -28,7 +28,6 @@ $(top_builddir)/src/lib/libefreet.la \
|
||||||
efreet_icon_cache_create_SOURCES = \
|
efreet_icon_cache_create_SOURCES = \
|
||||||
efreet_icon_cache_create.c
|
efreet_icon_cache_create.c
|
||||||
|
|
||||||
if HAVE_EFREETD
|
|
||||||
bin_PROGRAMS = \
|
bin_PROGRAMS = \
|
||||||
efreetd
|
efreetd
|
||||||
|
|
||||||
|
@ -42,5 +41,4 @@ efreetd_dbus.h \
|
||||||
efreetd_dbus.c \
|
efreetd_dbus.c \
|
||||||
efreetd_cache.h \
|
efreetd_cache.h \
|
||||||
efreetd_cache.c
|
efreetd_cache.c
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue