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:
Thomas Vander Stichele 2005-10-15 15:01:39 +00:00
parent 08479555e5
commit e3e695a537
10 changed files with 45 additions and 6 deletions

View file

@ -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>
* configure.ac:

View file

@ -379,6 +379,8 @@ AC_HEADER_STDC
dnl Check for 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 ***
@ -394,6 +396,7 @@ AC_CHECK_FUNCS([fsetpos])
dnl check for mmap()
AC_FUNC_MMAP
AM_CONDITIONAL(HAVE_MMAP, test "x$HAVE_MMAP" = "xyes")
dnl common/m4/gst-mcsc.m4
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"
AC_SUBST(GST_OBJ_CFLAGS)
AC_SUBST(GST_OBJ_LIBS)
AC_SUBST(GST_OBJ_LDFLAGS)
dnl GST_PLUGIN_LDFLAGS
dnl LDFLAGS for plugins; include GST_ALL_LDFLAGS

View file

@ -6,13 +6,19 @@
plugin_LTLIBRARIES = libgstelements.la
if HAVE_SYS_SOCKET_H
GSTFDSRC = gstfdsrc.c
else
GSTFDSRC =
endif
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
libgstelements_la_SOURCES = \
gstbufferstore.c \
gstcapsfilter.c \
gstfakesrc.c \
gstfakesink.c \
gstfdsrc.c \
$(GSTFDRSRC) \
gstfilesink.c \
gstfilesrc.c \
gstidentity.c \
@ -37,3 +43,4 @@ noinst_HEADERS = \
gsttee.h \
gsttypefindelement.h
EXTRA_DIST = gstfdsrc.c

View file

@ -51,7 +51,7 @@ static struct _elements_entry _elements[] = {
{"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
{"fakesrc", GST_RANK_NONE, gst_fake_src_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},
#endif
{"filesrc", GST_RANK_NONE, gst_file_src_get_type},

View file

@ -1,12 +1,15 @@
plugin_LTLIBRARIES = libgstindexers.la
# file index uses xml
if GST_DISABLE_LOADSAVE
GST_LOADSAVE_SRC =
else
GST_LOADSAVE_SRC = gstfileindex.c
endif
if HAVE_MMAP
else
GST_LOADSAVE_SRC =
endif
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)

View file

@ -30,7 +30,9 @@ plugin_init (GstPlugin * plugin)
gboolean res = TRUE;
res &= gst_mem_index_plugin_init (plugin);
#ifdef HAVE_MMAP
res &= gst_file_index_plugin_init (plugin);
#endif
return res;
}

View file

@ -6,13 +6,19 @@
plugin_LTLIBRARIES = libgstelements.la
if HAVE_SYS_SOCKET_H
GSTFDSRC = gstfdsrc.c
else
GSTFDSRC =
endif
libgstelements_la_DEPENDENCIES = ../libgstreamer-@GST_MAJORMINOR@.la
libgstelements_la_SOURCES = \
gstbufferstore.c \
gstcapsfilter.c \
gstfakesrc.c \
gstfakesink.c \
gstfdsrc.c \
$(GSTFDRSRC) \
gstfilesink.c \
gstfilesrc.c \
gstidentity.c \
@ -37,3 +43,4 @@ noinst_HEADERS = \
gsttee.h \
gsttypefindelement.h
EXTRA_DIST = gstfdsrc.c

View file

@ -51,7 +51,7 @@ static struct _elements_entry _elements[] = {
{"capsfilter", GST_RANK_NONE, gst_capsfilter_get_type},
{"fakesrc", GST_RANK_NONE, gst_fake_src_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},
#endif
{"filesrc", GST_RANK_NONE, gst_file_src_get_type},

View file

@ -1,12 +1,15 @@
plugin_LTLIBRARIES = libgstindexers.la
# file index uses xml
if GST_DISABLE_LOADSAVE
GST_LOADSAVE_SRC =
else
GST_LOADSAVE_SRC = gstfileindex.c
endif
if HAVE_MMAP
else
GST_LOADSAVE_SRC =
endif
libgstindexers_la_SOURCES = gstindexers.c gstmemindex.c $(GST_LOADSAVE_SRC)
libgstindexers_la_CFLAGS = $(GST_OBJ_CFLAGS)
libgstindexers_la_LIBADD = $(GST_OBJ_LIBS)

View file

@ -30,7 +30,9 @@ plugin_init (GstPlugin * plugin)
gboolean res = TRUE;
res &= gst_mem_index_plugin_init (plugin);
#ifdef HAVE_MMAP
res &= gst_file_index_plugin_init (plugin);
#endif
return res;
}