Build break! After this commit, efreet fails to build if there is no edbus2. http://pastebin.com/DESGhnwh
Can you fix this? Daniel Juyung Seo (SeoZ) On Sun, Oct 21, 2012 at 1:53 PM, Enlightenment SVN <[email protected]> wrote: > Log: > efreet: Add dbus efreet daemon > > Not working yet. > > Author: englebass > Date: 2012-10-20 21:53:23 -0700 (Sat, 20 Oct 2012) > New Revision: 78294 > Trac: http://trac.enlightenment.org/e/changeset/78294 > > Added: > trunk/efreet/org.enlightenment.Efreet.service.in > trunk/efreet/src/bin/efreetd.c trunk/efreet/src/bin/efreetd.h > trunk/efreet/src/bin/efreetd_cache.c trunk/efreet/src/bin/efreetd_cache.h > trunk/efreet/src/bin/efreetd_dbus.c trunk/efreet/src/bin/efreetd_dbus.h > trunk/efreet/src/lib/efreet_copy.h > Modified: > trunk/efreet/.gitignore trunk/efreet/Makefile.am trunk/efreet/configure.ac > trunk/efreet/src/bin/Makefile.am > trunk/efreet/src/bin/efreet_desktop_cache_create.c > trunk/efreet/src/bin/efreet_icon_cache_create.c > > Modified: trunk/efreet/.gitignore > =================================================================== > --- trunk/efreet/.gitignore 2012-10-21 04:53:18 UTC (rev 78293) > +++ trunk/efreet/.gitignore 2012-10-21 04:53:23 UTC (rev 78294) > @@ -40,12 +40,14 @@ > /missing > src/bin/efreet_desktop_cache_create > src/bin/efreet_icon_cache_create > +src/bin/efreetd > src/tests/compare/efreet_alloc > src/tests/compare/efreet_menu_alloc > src/tests/efreet_cache_test > src/tests/efreet_icon_cache_dump > src/tests/efreet_spec_test > src/tests/efreet_test > +src/tests/efreet_user_dir > /m4/codeset.m4 > /m4/gettext.m4 > /m4/glibc21.m4 > @@ -150,3 +152,4 @@ > /po/*.gmo > /po/stamp-po > /stamp-h1 > +/org.enlightenment.Efreet.service > > Modified: trunk/efreet/Makefile.am > =================================================================== > --- trunk/efreet/Makefile.am 2012-10-21 04:53:18 UTC (rev 78293) > +++ trunk/efreet/Makefile.am 2012-10-21 04:53:23 UTC (rev 78294) > @@ -76,6 +76,9 @@ > pkgconfigdir = $(libdir)/pkgconfig > pkgconfig_DATA = efreet.pc efreet-mime.pc efreet-trash.pc > > +servicedir = $(dbusservicedir) > +service_DATA = org.enlightenment.Efreet.service > + > EXTRA_DIST = \ > AUTHORS \ > COPYING \ > > Modified: trunk/efreet/configure.ac > =================================================================== > --- trunk/efreet/configure.ac 2012-10-21 04:53:18 UTC (rev 78293) > +++ trunk/efreet/configure.ac 2012-10-21 04:53:23 UTC (rev 78294) > @@ -166,11 +166,33 @@ > AC_SUBST(EFL_EFREET_MIME_BUILD) > 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 > +], [ > + 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" > +]) > +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(EINA, [eina >= 1.6.99]) > > - > ### Checks for header files > > AC_CHECK_HEADERS([netinet/in.h arpa/inet.h]) > @@ -234,6 +256,7 @@ > fi > > AC_SUBST(requirement_efreet) > +AC_SUBST(dbusservicedir) > > AC_OUTPUT([ > efreet.spec > @@ -251,6 +274,7 @@ > src/tests/data/sub/Makefile > src/tests/compare/Makefile > $po_makefile_in > +$service > ]) > > > @@ -270,6 +294,10 @@ > echo " Strict.............: ${enable_strict_spec}" > echo " Sloppy.............: ${enable_sloppy_spec}" > echo > +if test "x$have_efreetd" = "xyes"; then > + echo " DBus services dir....: ${dbusservicedir}" > + echo > +fi > echo " Tests................: ${enable_tests}" > echo " Coverage.............: ${enable_coverage}" > echo > > Modified: trunk/efreet/src/bin/Makefile.am > =================================================================== > --- trunk/efreet/src/bin/Makefile.am 2012-10-21 04:53:18 UTC (rev 78293) > +++ trunk/efreet/src/bin/Makefile.am 2012-10-21 04:53:23 UTC (rev 78294) > @@ -27,3 +27,20 @@ > > efreet_icon_cache_create_SOURCES = \ > efreet_icon_cache_create.c > + > +if HAVE_EFREETD > +bin_PROGRAMS = \ > +efreetd > + > +efreetd_LDADD = \ > +$(top_builddir)/src/lib/libefreet.la \ > +@EFREETD_LIBS@ > + > +efreetd_SOURCES = \ > +efreetd.c \ > +efreetd_dbus.h \ > +efreetd_dbus.c \ > +efreetd_cache.h \ > +efreetd_cache.c > +endif > + > > Modified: trunk/efreet/src/bin/efreet_desktop_cache_create.c > =================================================================== > --- trunk/efreet/src/bin/efreet_desktop_cache_create.c 2012-10-21 04:53:18 > UTC (rev 78293) > +++ trunk/efreet/src/bin/efreet_desktop_cache_create.c 2012-10-21 04:53:23 > UTC (rev 78294) > @@ -507,6 +507,7 @@ > if (changed) c = 'c'; > if (write(tmpfd, &c, 1) != 1) perror("write"); > close(tmpfd); > + printf("%c\n", c); > } > > EINA_LIST_FREE(systemdirs, dir) > > Modified: trunk/efreet/src/bin/efreet_icon_cache_create.c > =================================================================== > --- trunk/efreet/src/bin/efreet_icon_cache_create.c 2012-10-21 04:53:18 > UTC (rev 78293) > +++ trunk/efreet/src/bin/efreet_icon_cache_create.c 2012-10-21 04:53:23 > UTC (rev 78294) > @@ -1128,6 +1128,7 @@ > if (changed) c = 'c'; > if (write(tmpfd, &c, 1) != 1) perror("write"); > close(tmpfd); > + printf("%c\n", c); > } > > INF("done"); > > > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_sfd2d_oct > _______________________________________________ > enlightenment-svn mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_sfd2d_oct _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
