wip

Change-Id: I334a0df706cdf7a916ad70d6a463fe7f9b30b058
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Conflicts:
	src/bin/Makefile.mk

diff --git a/configure.ac b/configure.ac
index da9b3af7bd48914c23f6786c5c4446e810c99b9a..bbd7576179190c1d0b78e5db224fb021d6efadff 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -267,7 +267,8 @@ AS_IF([test "x$want_systemd" != "xno"],
 
 AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x${have_systemd_daemon}" = "xyes"])
 AC_SUBST([HAVE_SYSTEMD_DAEMON])
-AS_IF([test "x${have_systemd_daemon}" = "xyes"], AC_DEFINE([HAVE_SYSTEMD_DAEMON], 1, [Have libsystemd-daemon or libsystemd]))
+AS_IF([test "x${have_systemd_daemon}" = "xyes"],
+        AC_DEFINE_UNQUOTED([HAVE_SYSTEMD_DAEMON], [1], [Have libsystemd-daemon or libsystemd]))
 
 execinfo_libs=""
 AC_CHECK_HEADERS([execinfo.h], [have_execinfo="yes"], [have_execinfo="no"])

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 64881fc5c52b06e0ba71315718e640fe8a3da1ae..b90bb8b7e2ba039f31d7abe49c0302640f364b75 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -404,7 +404,7 @@ src/bin/e_main.c \
 $(enlightenment_src)
 
 src_bin_enlightenment_LDFLAGS = -export-dynamic
-src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WL_DRM_LIBS@ @WAYLAND_EGL_LIBS@ -lm @SHM_OPEN_LIBS@ @ECORE_X_LIBS@
+src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @LIBSYSTEMD_DAEMON_LIBS@ @LIBSYSTEMD_LIBS@ @WL_DRM_LIBS@ @WAYLAND_EGL_LIBS@ -lm @SHM_OPEN_LIBS@ @ECORE_X_LIBS@
 if HAVE_WAYLAND_TBM
 src_bin_enlightenment_LDADD += @WAYLAND_TBM_LIBS@ @ECORE_DRM_LIBS@
 endif