mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

shm: Fix configure check and clean up Makefile

Browse source
This commit is contained in:
Sebastian Dröge 2012-11-28 13:10:47 +01:00
parent 1c973536b9
commit 3be147046d
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -685,7 +685,6 @@ AG_GST_CHECK_FEATURE(SHM, [POSIX shared memory source and sink], shm, [
if test "x$HAVE_SYS_SOCKET_H" = "xyes"; then if test "x$HAVE_SYS_SOCKET_H" = "xyes"; then
case $host in case $host in
*-darwin* | *-macos10*) *-darwin* | *-macos10*)
AM_CONDITIONAL([HAVE_OSX], true)
AC_DEFINE(HAVE_OSX,[1],[Apple Mac OS X operating system detected]) AC_DEFINE(HAVE_OSX,[1],[Apple Mac OS X operating system detected])
HAVE_SHM=yes HAVE_SHM=yes
;; ;;
@ -695,6 +694,7 @@ AG_GST_CHECK_FEATURE(SHM, [POSIX shared memory source and sink], shm, [
#include <sys/socket.h> #include <sys/socket.h>
]), ]),
HAVE_SHM=no) HAVE_SHM=no)
AC_SUBST(SHM_LIBS, "-lrt")
;; ;;
esac esac
else else

9
sys/shm/Makefile.am
View file

@ -2,13 +2,8 @@ plugin_LTLIBRARIES = libgstshm.la
libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c libgstshm_la_SOURCES = shmpipe.c shmalloc.c gstshm.c gstshmsrc.c gstshmsink.c
libgstshm_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB libgstshm_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) -DSHM_PIPE_USE_GLIB
libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) libgstshm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstshm_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(SHM_LIBS)
if HAVE_OSX
libgstshm_la_LIBADD =
else
libgstshm_la_LIBADD = -lrt
endif
libgstshm_la_LIBTOOLFLAGS = --tag=disable-static libgstshm_la_LIBTOOLFLAGS = --tag=disable-static