From 05745b6f1ef29c5cd45e0b9d1b9514679a1582d2 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 28 Feb 2011 15:45:13 +0000 Subject: [PATCH] elementary: fix another DSO build issue. SVN revision: 57420 --- legacy/elementary/configure.ac | 6 ++++++ legacy/elementary/src/bin/Makefile.am | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/legacy/elementary/configure.ac b/legacy/elementary/configure.ac index a9de6dc48b..ba6852a0f0 100644 --- a/legacy/elementary/configure.ac +++ b/legacy/elementary/configure.ac @@ -212,6 +212,12 @@ PKG_CHECK_MODULES([ELEMENTARY], ] ) +PKG_CHECK_MODULES([ELEMENTARY_BIN], + [ + eina >= 1.0.0 + ] +) + requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}" have_elementary_x="no" diff --git a/legacy/elementary/src/bin/Makefile.am b/legacy/elementary/src/bin/Makefile.am index 24ae592ab4..c0286c0b78 100644 --- a/legacy/elementary/src/bin/Makefile.am +++ b/legacy/elementary/src/bin/Makefile.am @@ -95,13 +95,19 @@ test_ctxpopup.c \ test_bubble.c \ test_store.c -elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @my_libs@ @ELEMENTARY_EFREET_LIBS@ +elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \ + @ELEMENTARY_EWEATHER_LIBS@ \ + @my_libs@ @ELEMENTARY_EFREET_LIBS@ \ + @ELEMENTARY_BIN_LIBS@ elementary_test_LDFLAGS = elementary_config_SOURCES = \ config.c -elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EFREET_LIBS@ +elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \ + @ELEMENTARY_EWEATHER_LIBS@ \ + @ELEMENTARY_EFREET_LIBS@ \ + @ELEMENTARY_BIN_LIBS@ elementary_config_LDFLAGS = if BUILD_QUICKLAUNCH