diff --git a/legacy/emotion/m4/emotion_check.m4 b/legacy/emotion/m4/emotion_check.m4 index ebd7e7e320..f70a2c3bcf 100644 --- a/legacy/emotion/m4/emotion_check.m4 +++ b/legacy/emotion/m4/emotion_check.m4 @@ -172,6 +172,34 @@ AC_ARG_ENABLE(generic-[]DOWN, ], [enable_module="auto"]) +SHM_OPEN_LIBS="" +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[ +#include +#include +#include + ]], + [[ +int fd; +fd = shm_open("/", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); +shm_unlink("/"); + ]])], + [ + have_shm_open="yes" + AC_DEFINE(HAVE_SHM_OPEN, 1, [Have shm_open() call]) + SHM_OPEN_LIBS="-lrt" + ], + [have_shm_open="no"]) +AC_SUBST(SHM_OPEN_LIBS) + +AC_MSG_CHECKING([shm_open]) +AC_MSG_RESULT([${have_shm_open}]) + +if test "x{have_shm_open)" != "xyes"; then + enable_generic="no" +fi + if test "x${enable_generic}" != "xyes" && test "x${enable_generic}" != "xstatic"; then if test "x${enable_module}" = "xyes"; then AC_MSG_WARN([Generic module is disabled, force disable of Generic Player $1]) diff --git a/legacy/emotion/src/edje_external/Makefile.am b/legacy/emotion/src/edje_external/Makefile.am index bd92c54234..9b36fafd4f 100644 --- a/legacy/emotion/src/edje_external/Makefile.am +++ b/legacy/emotion/src/edje_external/Makefile.am @@ -13,6 +13,6 @@ pkgdir = $(libdir)/edje/modules/emotion/$(MODULE_EDJE) pkg_LTLIBRARIES = module.la module_la_SOURCES = emotion.c -module_la_LIBADD = $(top_builddir)/src/lib/libemotion.la @EDJE_EXTERNAL_LIBS@ +module_la_LIBADD = @EMOTION_LIBS@ $(top_builddir)/src/lib/libemotion.la @EDJE_EXTERNAL_LIBS@ module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/legacy/emotion/src/modules/generic/Makefile.am b/legacy/emotion/src/modules/generic/Makefile.am index 0e6455972f..04fbab540c 100644 --- a/legacy/emotion/src/modules/generic/Makefile.am +++ b/legacy/emotion/src/modules/generic/Makefile.am @@ -22,7 +22,7 @@ includesdir = $(includedir)/emotion-@VMAJ@ noinst_HEADERS = emotion_generic.h em_generic_la_SOURCES = emotion_generic.c -em_generic_la_LIBADD = $(top_builddir)/src/lib/libemotion.la +em_generic_la_LIBADD = @EMOTION_LIBS@ @SHM_OPEN_LIBS@ $(top_builddir)/src/lib/libemotion.la em_generic_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version em_generic_la_LIBTOOLFLAGS = --tag=disable-static em_generic_la_DEPENDENCIES = emotion_generic.h Emotion_Generic_Plugin.h diff --git a/legacy/emotion/src/modules/gstreamer/Makefile.am b/legacy/emotion/src/modules/gstreamer/Makefile.am index fef825e756..367251096f 100644 --- a/legacy/emotion/src/modules/gstreamer/Makefile.am +++ b/legacy/emotion/src/modules/gstreamer/Makefile.am @@ -26,7 +26,7 @@ emotion_alloc.c \ emotion_fakeeos.c \ emotion_convert.c -gstreamer_la_LIBADD = @ECORE_X_LIBS@ @GSTREAMER_LIBS@ @GSTREAMER_INTERFACE_LIBS@ $(top_builddir)/src/lib/libemotion.la +gstreamer_la_LIBADD = @EMOTION_LIBS@ @ECORE_X_LIBS@ @GSTREAMER_LIBS@ @GSTREAMER_INTERFACE_LIBS@ $(top_builddir)/src/lib/libemotion.la gstreamer_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version gstreamer_la_LIBTOOLFLAGS = --tag=disable-static gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/legacy/emotion/src/modules/xine/Makefile.am b/legacy/emotion/src/modules/xine/Makefile.am index 455e3932bf..baf8fecab5 100644 --- a/legacy/emotion/src/modules/xine/Makefile.am +++ b/legacy/emotion/src/modules/xine/Makefile.am @@ -23,7 +23,7 @@ xine_la_SOURCES = \ emotion_xine.c \ emotion_xine.h \ emotion_xine_vo_out.c -xine_la_LIBADD = @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread +xine_la_LIBADD = @EMOTION_LIBS@ @XINE_LIBS@ $(top_builddir)/src/lib/libemotion.la -lpthread xine_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version xine_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/legacy/ethumb/configure.ac b/legacy/ethumb/configure.ac index 060b6aab2a..c7b23ee313 100644 --- a/legacy/ethumb/configure.ac +++ b/legacy/ethumb/configure.ac @@ -127,6 +127,7 @@ PKG_CHECK_MODULES(ECORE, [ecore >= 1.0.0]) PKG_CHECK_MODULES(ECORE_EVAS, [ecore-evas >= 1.0.0]) PKG_CHECK_MODULES(ECORE_FILE, [ecore-file >= 1.0.0 ]) PKG_CHECK_MODULES(EDJE, [edje >= 1.0.0]) +PKG_CHECK_MODULES(EET, [eet >= 1.4.0]) EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) requirement_ethumb="eina >= 1.0.0 evas >= 1.0.0 ecore >= 1.0.0 ecore-evas >= 1.0.0 ecore-file >= 1.0.0 edje >= 1.0.0" diff --git a/legacy/ethumb/src/lib/client/Makefile.am b/legacy/ethumb/src/lib/client/Makefile.am index 9111f04369..e7faae213d 100644 --- a/legacy/ethumb/src/lib/client/Makefile.am +++ b/legacy/ethumb/src/lib/client/Makefile.am @@ -5,6 +5,7 @@ AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/src/lib \ @EFL_ETHUMB_CLIENT_BUILD@ \ +@ECORE_CFLAGS@ \ @EDBUS_CFLAGS@ \ @EINA_CFLAGS@ @@ -16,6 +17,7 @@ lib_LTLIBRARIES = libethumb_client.la libethumb_client_la_SOURCES = ethumb_client.c libethumb_client_la_LIBADD = \ $(top_builddir)/src/lib/libethumb.la \ +@ECORE_LIBS@ \ @EDBUS_LIBS@ \ @EINA_LIBS@ libethumb_client_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ diff --git a/legacy/ethumb/src/plugins/emotion/Makefile.am b/legacy/ethumb/src/plugins/emotion/Makefile.am index 495a9a3790..0c4565f0ee 100644 --- a/legacy/ethumb/src/plugins/emotion/Makefile.am +++ b/legacy/ethumb/src/plugins/emotion/Makefile.am @@ -15,6 +15,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/plugins/emotion \ -DPLUGINSDIR=\"$(pluginsdir)\" \ +@ECORE_EVAS_CFLAGS@ \ +@EET_CFLAGS@ \ @EFL_ETHUMB_BUILD@ \ @EVAS_CFLAGS@ \ @EINA_CFLAGS@ \ @@ -27,6 +29,8 @@ pkg_LTLIBRARIES = emotion.la emotion_la_SOURCES = emotion.c emotion_la_LIBADD = \ $(top_builddir)/src/lib/libethumb.la \ +@ECORE_EVAS_LIBS@ \ +@EET_LIBS@ \ @EMOTION_LIBS@ \ @EDJE_LIBS@ \ @ECORE_FILE_LIBS@ \ diff --git a/legacy/evas/src/modules/engines/software_generic/Makefile.am b/legacy/evas/src/modules/engines/software_generic/Makefile.am index 0a83e68cc2..e605dace61 100644 --- a/legacy/evas/src/modules/engines/software_generic/Makefile.am +++ b/legacy/evas/src/modules/engines/software_generic/Makefile.am @@ -20,7 +20,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = $(SOFTWARE_GENERIC_SOURCES) -module_la_LIBADD = @EINA_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/legacy/evas/src/modules/engines/wayland_egl/Makefile.am b/legacy/evas/src/modules/engines/wayland_egl/Makefile.am index 100614f364..9234b33855 100644 --- a/legacy/evas/src/modules/engines/wayland_egl/Makefile.am +++ b/legacy/evas/src/modules/engines/wayland_egl/Makefile.am @@ -18,7 +18,7 @@ WAYLAND_EGL_SOURCES = \ evas_engine.c \ evas_wl_main.c -WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la +WAYLAND_EGL_LIBADD = @FREETYPE_LIBS@ @GL_EET_LIBS@ @EINA_LIBS@ @evas_engine_wayland_egl_libs@ @dlopen_libs@ $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la includes_HEADERS = Evas_Engine_Wayland_Egl.h includesdir = $(includedir)/evas-@VMAJ@ diff --git a/legacy/evas/src/modules/loaders/bmp/Makefile.am b/legacy/evas/src/modules/loaders/bmp/Makefile.am index 9cded273ec..0a04790fe1 100644 --- a/legacy/evas/src/modules/loaders/bmp/Makefile.am +++ b/legacy/evas/src/modules/loaders/bmp/Makefile.am @@ -18,7 +18,7 @@ pkg_LTLIBRARIES = module.la module_la_SOURCES = evas_image_load_bmp.c -module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libevas.la +module_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ -lm $(top_builddir)/src/lib/libevas.la module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static