mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-29 07:12:36 +00:00
configure.ac: check for some headers
Original commit message from CVS: * configure.ac: check for some headers * gst/elements/Makefile.am: * gst/elements/gstelements.c: don't compile fdsrc without sys/socket.h * gst/indexers/Makefile.am: * gst/indexers/gstindexers.c: (plugin_init): don't compile fileindex without mmap
This commit is contained in:
parent
08479555e5
commit
e3e695a537
10 changed files with 45 additions and 6 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
2005-10-15 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
|
||||||
|
* configure.ac:
|
||||||
|
check for some headers
|
||||||
|
* gst/elements/Makefile.am:
|
||||||
|
* gst/elements/gstelements.c:
|
||||||
|
don't compile fdsrc without sys/socket.h
|
||||||
|
* gst/indexers/Makefile.am:
|
||||||
|
* gst/indexers/gstindexers.c: (plugin_init):
|
||||||
|
don't compile fileindex without mmap
|
||||||
|
|
||||||
2005-10-15 Thomas Vander Stichele <thomas at apestaart dot org>
|
2005-10-15 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
|
||||||
* configure.ac:
|
* configure.ac:
|
||||||
|
|
|
@ -379,6 +379,8 @@ AC_HEADER_STDC
|
||||||
|
|
||||||
dnl Check for ucontext.h
|
dnl Check for ucontext.h
|
||||||
AC_CHECK_HEADERS([ucontext.h])
|
AC_CHECK_HEADERS([ucontext.h])
|
||||||
|
AC_CHECK_HEADERS([sys/socket.h])
|
||||||
|
AM_CONDITIONAL(HAVE_SYS_SOCKET_H, test "x$HAVE_SYS_SOCKET_H" = "xyes")
|
||||||
|
|
||||||
dnl *** checks for library functions ***
|
dnl *** checks for library functions ***
|
||||||
|
|
||||||
|
@ -394,6 +396,7 @@ AC_CHECK_FUNCS([fsetpos])
|
||||||
|
|
||||||
dnl check for mmap()
|
dnl check for mmap()
|
||||||
AC_FUNC_MMAP
|
AC_FUNC_MMAP
|
||||||
|
AM_CONDITIONAL(HAVE_MMAP, test "x$HAVE_MMAP" = "xyes")
|
||||||
|
|
||||||
dnl common/m4/gst-mcsc.m4
|
dnl common/m4/gst-mcsc.m4
|
||||||
dnl check for makecontext and define HAVE_MAKECONTEXT if we have it
|
dnl check for makecontext and define HAVE_MAKECONTEXT if we have it
|
||||||
|
@ -595,6 +598,7 @@ GST_OBJ_LIBS="\$(top_builddir)/gst/libgstreamer-$GST_MAJORMINOR.la \$(GST_ALL_LI
|
||||||
GST_OBJ_LDFLAGS="$GST_LT_LDFLAGS $GST_ALL_LDFLAGS"
|
GST_OBJ_LDFLAGS="$GST_LT_LDFLAGS $GST_ALL_LDFLAGS"
|
||||||
AC_SUBST(GST_OBJ_CFLAGS)
|
AC_SUBST(GST_OBJ_CFLAGS)
|
||||||
AC_SUBST(GST_OBJ_LIBS)
|
AC_SUBST(GST_OBJ_LIBS)
|
||||||
|
AC_SUBST(GST_OBJ_LDFLAGS)
|
||||||
|
|
||||||
dnl GST_PLUGIN_LDFLAGS
|
dnl GST_PLUGIN_LDFLAGS
|
||||||
dnl LDFLAGS for plugins; include GST_ALL_LDFLAGS
|
dnl LDFLAGS for plugins; include GST_ALL_LDFLAGS
|
||||||
|
|
|
@ -6,13 +6,19 @@
|
||||||
|
|
||||||
plugin_LTLIBRARIES = libgstelements.la
|
plugin_LTLIBRARIES = libgstelements.la
|
||||||
|
|
||||||
|
if HAVE_SYS_SOCKET_H
|
||||||
|
GSTFDSRC = gstfdsrc.c
|
||||||
|
else
|
||||||
|
GSTFDSRC =
|
||||||
|
endif
|
||||||
|
|
||||||
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
|
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
|
||||||
libgstelements_la_SOURCES = \
|
libgstelements_la_SOURCES = \
|
||||||
gstbufferstore.c \
|
gstbufferstore.c \
|
||||||
gstcapsfilter.c \
|
gstcapsfilter.c \
|
||||||
gstfakesrc.c \
|
gstfakesrc.c \
|
||||||
gstfakesink.c \
|
gstfakesink.c \
|
||||||
gstfdsrc.c \
|
$(GSTFDRSRC) \
|
||||||
gstfilesink.c \
|
gstfilesink.c \
|
||||||
gstfilesrc.c \
|
gstfilesrc.c \
|
||||||
gstidentity.c \
|
gstidentity.c \
|
||||||
|
@ -37,3 +43,4 @@ noinst_HEADERS = \
|
||||||
gsttee.h \
|
gsttee.h \
|
||||||
gsttypefindelement.h
|
gsttypefindelement.h
|
||||||
|
|
||||||
|
EXTRA_DIST = gstfdsrc.c
|
||||||
|
|
|
@ -51,7 +51,7 @@ static struct _elements_entry _elements[] = {
|
||||||
{"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
|
{"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
|
||||||
{"fakesrc", GST_RANK_NONE, gst_fake_src_get_type},
|
{"fakesrc", GST_RANK_NONE, gst_fake_src_get_type},
|
||||||
{"fakesink", GST_RANK_NONE, gst_fake_sink_get_type},
|
{"fakesink", GST_RANK_NONE, gst_fake_sink_get_type},
|
||||||
#ifndef HAVE_WIN32
|
#ifdef HAVE_SYS_SOCKET_H
|
||||||
{"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type},
|
{"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type},
|
||||||
#endif
|
#endif
|
||||||
{"filesrc", GST_RANK_NONE, gst_file_src_get_type},
|
{"filesrc", GST_RANK_NONE, gst_file_src_get_type},
|
||||||
|
|
|
@ -1,12 +1,15 @@
|
||||||
plugin_LTLIBRARIES = libgstindexers.la
|
plugin_LTLIBRARIES = libgstindexers.la
|
||||||
|
|
||||||
# file index uses xml
|
# file index uses xml
|
||||||
if GST_DISABLE_LOADSAVE
|
if GST_DISABLE_LOADSAVE
|
||||||
GST_LOADSAVE_SRC =
|
GST_LOADSAVE_SRC =
|
||||||
else
|
else
|
||||||
GST_LOADSAVE_SRC = gstfileindex.c
|
GST_LOADSAVE_SRC = gstfileindex.c
|
||||||
endif
|
endif
|
||||||
|
if HAVE_MMAP
|
||||||
|
|
||||||
|
else
|
||||||
|
GST_LOADSAVE_SRC =
|
||||||
|
endif
|
||||||
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
|
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
|
||||||
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
|
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
|
||||||
|
|
|
@ -30,7 +30,9 @@ plugin_init (GstPlugin * plugin)
|
||||||
gboolean res = TRUE;
|
gboolean res = TRUE;
|
||||||
|
|
||||||
res &= gst_mem_index_plugin_init (plugin);
|
res &= gst_mem_index_plugin_init (plugin);
|
||||||
|
#ifdef HAVE_MMAP
|
||||||
res &= gst_file_index_plugin_init (plugin);
|
res &= gst_file_index_plugin_init (plugin);
|
||||||
|
#endif
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,13 +6,19 @@
|
||||||
|
|
||||||
plugin_LTLIBRARIES = libgstelements.la
|
plugin_LTLIBRARIES = libgstelements.la
|
||||||
|
|
||||||
|
if HAVE_SYS_SOCKET_H
|
||||||
|
GSTFDSRC = gstfdsrc.c
|
||||||
|
else
|
||||||
|
GSTFDSRC =
|
||||||
|
endif
|
||||||
|
|
||||||
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
|
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
|
||||||
libgstelements_la_SOURCES = \
|
libgstelements_la_SOURCES = \
|
||||||
gstbufferstore.c \
|
gstbufferstore.c \
|
||||||
gstcapsfilter.c \
|
gstcapsfilter.c \
|
||||||
gstfakesrc.c \
|
gstfakesrc.c \
|
||||||
gstfakesink.c \
|
gstfakesink.c \
|
||||||
gstfdsrc.c \
|
$(GSTFDRSRC) \
|
||||||
gstfilesink.c \
|
gstfilesink.c \
|
||||||
gstfilesrc.c \
|
gstfilesrc.c \
|
||||||
gstidentity.c \
|
gstidentity.c \
|
||||||
|
@ -37,3 +43,4 @@ noinst_HEADERS = \
|
||||||
gsttee.h \
|
gsttee.h \
|
||||||
gsttypefindelement.h
|
gsttypefindelement.h
|
||||||
|
|
||||||
|
EXTRA_DIST = gstfdsrc.c
|
||||||
|
|
|
@ -51,7 +51,7 @@ static struct _elements_entry _elements[] = {
|
||||||
{"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
|
{"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
|
||||||
{"fakesrc", GST_RANK_NONE, gst_fake_src_get_type},
|
{"fakesrc", GST_RANK_NONE, gst_fake_src_get_type},
|
||||||
{"fakesink", GST_RANK_NONE, gst_fake_sink_get_type},
|
{"fakesink", GST_RANK_NONE, gst_fake_sink_get_type},
|
||||||
#ifndef HAVE_WIN32
|
#ifdef HAVE_SYS_SOCKET_H
|
||||||
{"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type},
|
{"fdsrc", GST_RANK_NONE, gst_fdsrc_get_type},
|
||||||
#endif
|
#endif
|
||||||
{"filesrc", GST_RANK_NONE, gst_file_src_get_type},
|
{"filesrc", GST_RANK_NONE, gst_file_src_get_type},
|
||||||
|
|
|
@ -1,12 +1,15 @@
|
||||||
plugin_LTLIBRARIES = libgstindexers.la
|
plugin_LTLIBRARIES = libgstindexers.la
|
||||||
|
|
||||||
# file index uses xml
|
# file index uses xml
|
||||||
if GST_DISABLE_LOADSAVE
|
if GST_DISABLE_LOADSAVE
|
||||||
GST_LOADSAVE_SRC =
|
GST_LOADSAVE_SRC =
|
||||||
else
|
else
|
||||||
GST_LOADSAVE_SRC = gstfileindex.c
|
GST_LOADSAVE_SRC = gstfileindex.c
|
||||||
endif
|
endif
|
||||||
|
if HAVE_MMAP
|
||||||
|
|
||||||
|
else
|
||||||
|
GST_LOADSAVE_SRC =
|
||||||
|
endif
|
||||||
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
|
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
|
||||||
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||||
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
|
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)
|
||||||
|
|
|
@ -30,7 +30,9 @@ plugin_init (GstPlugin * plugin)
|
||||||
gboolean res = TRUE;
|
gboolean res = TRUE;
|
||||||
|
|
||||||
res &= gst_mem_index_plugin_init (plugin);
|
res &= gst_mem_index_plugin_init (plugin);
|
||||||
|
#ifdef HAVE_MMAP
|
||||||
res &= gst_file_index_plugin_init (plugin);
|
res &= gst_file_index_plugin_init (plugin);
|
||||||
|
#endif
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue