fix missing linkage with -lrt for shm_open users.
strange that nobody except hdante noticed this before, but it was missing linkage with -lrt in libemotion (due generic being static) and ecore_evas/extn. SVN revision: 83007
This commit is contained in:
parent
eb7abae5c5
commit
ee3575e8c8
|
@ -563,6 +563,10 @@ EFL_ADD_LIBS([ESCAPE], [-llv2 -lm -lnet -lsysmodule -liberty])
|
||||||
EFL_LIB_END_OPTIONAL([Escape])
|
EFL_LIB_END_OPTIONAL([Escape])
|
||||||
#### End of Escape
|
#### End of Escape
|
||||||
|
|
||||||
|
EFL_CHECK_FUNC([SHM], [shm_open])
|
||||||
|
SHM_LIBS="${requirements_libs_shm}"
|
||||||
|
AC_SUBST([SHM_LIBS])
|
||||||
|
|
||||||
AC_SUBST([DL_LIBS])
|
AC_SUBST([DL_LIBS])
|
||||||
AC_SUBST([DL_INTERNAL_LIBS])
|
AC_SUBST([DL_INTERNAL_LIBS])
|
||||||
#### End of Platform-dependent
|
#### End of Platform-dependent
|
||||||
|
@ -1525,7 +1529,7 @@ AC_CHECK_FUNCS([siglongjmp])
|
||||||
AC_CHECK_LIB([m], [lround], [AC_DEFINE([HAVE_LROUND], [1], [C99 lround function exists])])
|
AC_CHECK_LIB([m], [lround], [AC_DEFINE([HAVE_LROUND], [1], [C99 lround function exists])])
|
||||||
|
|
||||||
if test "x${want_evas_image_loader_generic}" = "xyes" || test "x${want_evas_cserve2}" = "xyes" ; then
|
if test "x${want_evas_image_loader_generic}" = "xyes" || test "x${want_evas_cserve2}" = "xyes" ; then
|
||||||
EFL_CHECK_FUNC([EVAS], [shm_open])
|
EFL_ADD_LIBS([EVAS], [${requirements_libs_shm}])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# cserve2 only works on Linux so far.
|
# cserve2 only works on Linux so far.
|
||||||
|
@ -1538,8 +1542,7 @@ if test "x${want_evas_cserve2}" = "xyes"; then
|
||||||
if test "x${ac_cv_header_sys_epoll_h}" = "xno" || test "x${ac_cv_header_sys_inotify_h}" = "xno" || test "x${ac_cv_header_sys_signalfd_h}" = "xno"; then
|
if test "x${ac_cv_header_sys_epoll_h}" = "xno" || test "x${ac_cv_header_sys_inotify_h}" = "xno" || test "x${ac_cv_header_sys_signalfd_h}" = "xno"; then
|
||||||
want_evas_cserve2="no"
|
want_evas_cserve2="no"
|
||||||
else
|
else
|
||||||
EFL_CHECK_FUNC([EVAS_CSERVE2_SLAVE], [shm_open])
|
EVAS_CSERVE2_SLAVE_LIBS="${EFL_COV_LIBS} ${EFL_LIBS} ${requirements_libs_shm}"
|
||||||
EVAS_CSERVE2_SLAVE_LIBS="${EFL_COV_LIBS} ${EFL_LIBS} ${requirements_libs_evas_cserve2_slave}"
|
|
||||||
AC_SUBST([EVAS_CSERVE2_SLAVE_LIBS])
|
AC_SUBST([EVAS_CSERVE2_SLAVE_LIBS])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -47,7 +47,17 @@ AC_DEFUN([EMOTION_MODULE_DEP_CHECK_GSTREAMER],
|
||||||
|
|
||||||
dnl use: EMOTION_MODULE_DEP_CHECK_GENERIC(want_static)
|
dnl use: EMOTION_MODULE_DEP_CHECK_GENERIC(want_static)
|
||||||
dnl where want_engine = yes or static
|
dnl where want_engine = yes or static
|
||||||
AC_DEFUN([EMOTION_MODULE_DEP_CHECK_GENERIC], [])
|
AC_DEFUN([EMOTION_MODULE_DEP_CHECK_GENERIC],
|
||||||
|
[dnl
|
||||||
|
if test "$1" = "static"; then
|
||||||
|
EFL_ADD_LIBS([EMOTION], [${requirements_libs_shm}])
|
||||||
|
else
|
||||||
|
EMOTION_MODULE_GENERIC_CFLAGS=""
|
||||||
|
EMOTION_MODULE_GENERIC_LIBS="${requirements_libs_shm}"
|
||||||
|
AC_SUBST([EMOTION_MODULE_GENERIC_CFLAGS])
|
||||||
|
AC_SUBST([EMOTION_MODULE_GENERIC_LIBS])
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
dnl use: EMOTION_MODULE(name, want_engine)
|
dnl use: EMOTION_MODULE(name, want_engine)
|
||||||
dnl
|
dnl
|
||||||
|
|
|
@ -41,7 +41,8 @@ modules_ecore_evas_engines_extn_module_la_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/modules/evas/engines/buffer
|
-I$(top_srcdir)/src/modules/evas/engines/buffer
|
||||||
modules_ecore_evas_engines_extn_module_la_LIBADD = \
|
modules_ecore_evas_engines_extn_module_la_LIBADD = \
|
||||||
@USE_ECORE_EVAS_LIBS@ \
|
@USE_ECORE_EVAS_LIBS@ \
|
||||||
@USE_ECORE_IPC_LIBS@
|
@USE_ECORE_IPC_LIBS@ \
|
||||||
|
@SHM_LIBS@
|
||||||
modules_ecore_evas_engines_extn_module_la_DEPENDENCIES = \
|
modules_ecore_evas_engines_extn_module_la_DEPENDENCIES = \
|
||||||
@USE_ECORE_EVAS_INTERNAL_LIBS@ \
|
@USE_ECORE_EVAS_INTERNAL_LIBS@ \
|
||||||
@USE_ECORE_IPC_INTERNAL_LIBS@
|
@USE_ECORE_IPC_INTERNAL_LIBS@
|
||||||
|
|
|
@ -99,10 +99,13 @@ emotionmodulegeneric_LTLIBRARIES = modules/emotion/generic/module.la
|
||||||
modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
|
modules_emotion_generic_module_la_SOURCES = $(EMOTION_GENERIC_SOURCES)
|
||||||
modules_emotion_generic_module_la_CPPFLAGS = \
|
modules_emotion_generic_module_la_CPPFLAGS = \
|
||||||
@EMOTION_CFLAGS@ \
|
@EMOTION_CFLAGS@ \
|
||||||
|
@EMOTION_MODULE_GENERIC_CFLAGS@ \
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
|
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\"
|
||||||
modules_emotion_generic_module_la_LIBADD = @USE_EMOTION_LIBS@
|
modules_emotion_generic_module_la_LIBADD = \
|
||||||
|
@USE_EMOTION_LIBS@ \
|
||||||
|
@EMOTION_MODULE_GENERIC_LIBS@
|
||||||
modules_emotion_generic_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
|
modules_emotion_generic_module_la_DEPENDENCIES = @USE_EMOTION_INTERNAL_LIBS@
|
||||||
modules_emotion_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
|
modules_emotion_generic_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
|
||||||
modules_emotion_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
|
modules_emotion_generic_module_la_LIBTOOLFLAGS = --tag=disable-static
|
||||||
|
|
Loading…
Reference in New Issue