check: fix issues with 'make distcheck'
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 16 Jul 2009 23:46:32 +0000 (00:46 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Thu, 6 Aug 2009 16:27:24 +0000 (17:27 +0100)
Seems to work now, at least on *nix. One of the configure checks
caused these weird issues - but which one?

Makefile.am
check-checks.m4
libs/gst/check/libcheck/check_pack.c

index 6cb5819..ea49921 100644 (file)
@@ -29,6 +29,7 @@ include $(top_srcdir)/common/win32.mak
 
 EXTRA_DIST = \
        gstreamer.spec gstreamer.spec.in \
+       check-checks.m4 \
        gst-element-check.m4.in \
        configure.ac autogen.sh depcomp \
        MAINTAINERS ABOUT-NLS RELEASE gstreamer.doap \
@@ -36,6 +37,8 @@ EXTRA_DIST = \
 
 CLEANFILES = gst-element-check-@GST_MAJORMINOR@.m4
 
+DISTCLEANFILES = _stdint.h
+
 include $(top_srcdir)/common/release.mak
 include $(top_srcdir)/common/po.mak
 
index f9ddc34..73f37df 100644 (file)
@@ -15,31 +15,9 @@ AC_SUBST(CHECK_MINOR_VERSION)
 AC_SUBST(CHECK_MICRO_VERSION)
 AC_SUBST(CHECK_VERSION)
 
-# Checks for programs.
-AC_PROG_AWK
-
 # Checks for header files.
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS_ONCE([unistd.h fcntl.h stddef.h stdint.h stdlib.h string.h sys/time.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
 
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(long, 4)
+# Create _stdint.h in the top-level directory
+AX_CREATE_STDINT_H
 
-# Checks for library functions.
-AC_FUNC_FORK
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([alarm gettimeofday localtime_r memmove memset putenv setenv strdup strerror strrchr strstr])
-AC_REPLACE_FUNCS([strsignal])
 ])
index 69e3066..395a66b 100644 (file)
@@ -28,9 +28,7 @@
 #include <unistd.h>
 #endif
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
-#endif
+#include "_stdint.h"
 
 #include "check.h"
 #include "check_error.h"