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

diff --git a/ChangeLog b/ChangeLog
index 52ad266..3e80328 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
 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:
          reorganize
          clean up
          document more

diff --git a/configure.ac b/configure.ac
index bfa3001..44db172 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/gst/elements/Makefile.am b/gst/elements/Makefile.am
index 3010de3..9392721 100644 (file)
--- a/gst/elements/Makefile.am
+++ b/gst/elements/Makefile.am
@@ -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

diff --git a/gst/elements/gstelements.c b/gst/elements/gstelements.c
index b532717..e352209 100644 (file)
--- a/gst/elements/gstelements.c
+++ b/gst/elements/gstelements.c
@@ -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},

diff --git a/gst/indexers/Makefile.am b/gst/indexers/Makefile.am
index c98c167..c7cb86f 100644 (file)
--- a/gst/indexers/Makefile.am
+++ b/gst/indexers/Makefile.am
@@ -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)

diff --git a/gst/indexers/gstindexers.c b/gst/indexers/gstindexers.c
index 2e45116..01384e0 100644 (file)
--- a/gst/indexers/gstindexers.c
+++ b/gst/indexers/gstindexers.c
@@ -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;
 }

diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 3010de3..9392721 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -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

diff --git a/plugins/elements/gstelements.c b/plugins/elements/gstelements.c
index b532717..e352209 100644 (file)
--- a/plugins/elements/gstelements.c
+++ b/plugins/elements/gstelements.c
@@ -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},

diff --git a/plugins/indexers/Makefile.am b/plugins/indexers/Makefile.am
index c98c167..c7cb86f 100644 (file)
--- a/plugins/indexers/Makefile.am
+++ b/plugins/indexers/Makefile.am
@@ -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)

diff --git a/plugins/indexers/gstindexers.c b/plugins/indexers/gstindexers.c
index 2e45116..01384e0 100644 (file)
--- a/plugins/indexers/gstindexers.c
+++ b/plugins/indexers/gstindexers.c
@@ -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;
 }