From dd77e42e91994af4f4f3afc8c049e9fe4ddc430d Mon Sep 17 00:00:00 2001
From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?=
 =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= <lrn1986@gmail.com>
Date: Fri, 18 Dec 2009 21:26:01 +0000
Subject: [PATCH] check: update autotools and docs stuff for new check version

---
 check-checks.m4                       | 21 +++++++++++++++++++--
 configure.ac                          |  1 +
 docs/libs/gstreamer-libs-sections.txt |  5 +++++
 libs/gst/check/libcheck/Makefile.am   |  9 ++++++++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/check-checks.m4 b/check-checks.m4
index 366c26f..cd996ce 100644
--- a/check-checks.m4
+++ b/check-checks.m4
@@ -15,9 +15,26 @@ AC_SUBST(CHECK_MINOR_VERSION)
 AC_SUBST(CHECK_MICRO_VERSION)
 AC_SUBST(CHECK_VERSION)
 
-# Checks for header files.
+dnl Checks for header files and declarations
+AC_CHECK_HEADERS([unistd.h sys/wait.h sys/time.h])
 
-# Create _stdint.h in the top-level directory
+AC_CHECK_FUNCS([localtime_r])
+
+
+dnl Create _stdint.h in the top-level directory
 AX_CREATE_STDINT_H
 
+dnl Disable subunit support for the time being
+enable_subunit=false
+
+if test xfalse = x"$enable_subunit"; then
+ENABLE_SUBUNIT="0"
+else
+ENABLE_SUBUNIT="1"
+fi
+AC_SUBST(ENABLE_SUBUNIT)
+AC_DEFINE_UNQUOTED(ENABLE_SUBUNIT, $ENABLE_SUBUNIT, [Subunit protocol result output])
+
+AM_CONDITIONAL(SUBUNIT, test x"$enable_subunit" != "xfalse")
+
 ])
diff --git a/configure.ac b/configure.ac
index 6e1685b..645ea1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -532,6 +532,7 @@ fi
 AC_SUBST(GST_DISABLE_XML_DEFINE)
 
 dnl building of unit test libraries
+dnl FIXME: disable gstcheck if we don't have pthread
 AC_ARG_ENABLE(check,
   AC_HELP_STRING([--disable-check], [disable building unit test libraries]),
   [
diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt
index 9c5bb45..151ca73 100644
--- a/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@ -887,6 +887,7 @@ log_srunner_end
 log_srunner_start
 log_suite_end
 log_suite_start
+log_test_start
 log_test_end
 mark_point
 pack
@@ -907,6 +908,9 @@ srunner_open_lfile
 srunner_open_xmlfile
 srunner_register_lfun
 stdout_lfun
+subunit_lfun
+tcase_add_exit_test
+tcase_add_loop_exit_test
 tcase_add_loop_test
 tcase_add_loop_test_raise_signal
 tcase_add_test
@@ -915,6 +919,7 @@ teardown_messaging
 tr_create
 tr_fprint
 tr_reset
+tr_short_str
 tr_str
 tr_xmlprint
 upack
diff --git a/libs/gst/check/libcheck/Makefile.am b/libs/gst/check/libcheck/Makefile.am
index 57bf1cf..e7465e3 100644
--- a/libs/gst/check/libcheck/Makefile.am
+++ b/libs/gst/check/libcheck/Makefile.am
@@ -27,5 +27,12 @@ HFILES =\
 noinst_HEADERS = $(HFILES)
 
 libcheckinternal_la_SOURCES	= $(CFILES) $(HFILES)
-libcheckinternal_la_LIBADD	= 
 
+# define HAVE_PTHREAD here as well so we keep changes to the code to a minimum
+if HAVE_PTHREAD_H
+libcheckinternal_la_CFLAGS	= -D_GNU_SOURCE -DHAVE_PTHREAD
+libcheckinternal_la_LIBADD	= -lpthread
+else
+libcheckinternal_la_CFLAGS	= -D_GNU_SOURCE
+libcheckinternal_la_LIBADD	=
+endif
-- 
2.7.4