bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efreet: Fixed build break without edbus2. Patch by vtorri. 

Thanks a lot vtorri!
I tested this with/without edbus2.

SVN revision: 78302
This commit is contained in:
Daniel Juyung Seo 2012-10-21 08:09:05 +00:00
parent cacd9955ab
commit c204c6c2c2
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
legacy/efreet/Makefile.am
View File

@ -61,23 +61,29 @@ if HAVE_PO
SUBDIRS += po
MAINTAINERCLEANFILES += \
po/boldquot.sed \
po/en@boldquot.header \
po/en@quot.header \
po/insert-header.sin \
po/Makefile.in.in* \
po/Makevars.template \
po/quot.sed \
po/remove-potcdate.sin \
po/Rules-quot*
po/boldquot.sed \
po/en@boldquot.header \
po/en@quot.header \
po/insert-header.sin \
po/Makefile.in.in* \
po/Makevars.template \
po/quot.sed \
po/remove-potcdate.sin \
po/Rules-quot*
endif
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc
servicedir = $(dbusservicedir)
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 \

43
legacy/efreet/configure.ac
View File

@ -126,6 +126,12 @@ fi
#AM_CONDITIONAL(DEFAULT_VISIBILITY, test "x$enable_hidden_visibility" != "xyes")
AM_CONDITIONAL(DEFAULT_VISIBILITY, false)
AC_ARG_WITH([dbus-services],
[AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES],
[specify a directory to store dbus service files.])],
[dbusservicedir=$withval]
[dbusservicedir]="")
### Checks for programs
AC_PROG_CC
@ -168,25 +174,21 @@ AC_SUBST(EFL_EFREET_TRASH_BUILD)
service=""
have_efreetd=""
dbusservicedir=""
PKG_CHECK_MODULES(EFREETD, [
eina >= 1.7.99
ecore >= 1.7.99
ecore-file >= 1.7.99
edbus2 >= 1.7.99
], [
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}"
dbusservicedir=${datadir}/dbus-1/services
AC_ARG_WITH([dbus-services],
AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES], [specify a directory to store dbus service files.]),
[ dbusservicedir=$withval ]
)
],
[have_efreetd="no"])
], [
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}"
@ -294,9 +296,14 @@ echo " Specification compliance:"
echo " Strict.............: ${enable_strict_spec}"
echo " Sloppy.............: ${enable_sloppy_spec}"
echo
if test "x$have_efreetd" = "xyes"; then
echo " DBus services dir....: ${dbusservicedir}"
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
fi
echo " Tests................: ${enable_tests}"
echo " Coverage.............: ${enable_coverage}"