summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2010-03-30 15:20:07 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2010-03-30 15:20:07 +0100
commitb40320d48325674a21081155c7a917a5b9e7b473 (patch)
treeef6aa455a319cb1e159b72f7cbc723f2870d1a77 /m4
parent890042bc927d3ccb561b4814ae2befee7ecdd2d8 (diff)
build: make autotools put its m4 files into m4/ instead of common/m4/
This is how we do it in the other modules, and gets rid of the annoying dirty status for common when doing git status (at least once you clean out the old files from there).
Diffstat (limited to 'm4')
-rw-r--r--m4/.gitignore36
-rw-r--r--m4/Makefile.am1
-rw-r--r--m4/check-checks.m440
3 files changed, 77 insertions, 0 deletions
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 000000000..588dd023d
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,36 @@
+codeset.m4
+gettext.m4
+glibc*.m4
+iconv.m4
+intdiv0.m4
+intl.m4
+intldir.m4
+intlmacosx.m4
+intmax.m4
+inttypes-pri.m4
+inttypes.m4
+inttypes_h.m4
+isc-posix.m4
+lcmessage.m4
+lib-ld.m4
+lib-link.m4
+lib-prefix.m4
+libtool.m4
+lock.m4
+longlong.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+lt~obsolete.m4
+nls.m4
+po.m4
+printf-posix.m4
+progtest.m4
+size_max.m4
+stdint_h.m4
+uintmax_t.m4
+ulonglong.m4
+visibility.m4
+wchar_t.m4
+wint_t.m4
+xsize.m4
diff --git a/m4/Makefile.am b/m4/Makefile.am
new file mode 100644
index 000000000..af864e3bb
--- /dev/null
+++ b/m4/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.m4)
diff --git a/m4/check-checks.m4 b/m4/check-checks.m4
new file mode 100644
index 000000000..cd996ce44
--- /dev/null
+++ b/m4/check-checks.m4
@@ -0,0 +1,40 @@
+dnl Check for things that check needs/wants and that we don't check for already
+dnl AM_GST_CHECK_CHECKS()
+
+AC_DEFUN([AG_GST_CHECK_CHECKS],
+[
+AC_MSG_NOTICE([Running check unit test framework checks now...])
+
+CHECK_MAJOR_VERSION=0
+CHECK_MINOR_VERSION=9
+CHECK_MICRO_VERSION=8
+CHECK_VERSION=$CHECK_MAJOR_VERSION.$CHECK_MINOR_VERSION.$CHECK_MICRO_VERSION
+
+AC_SUBST(CHECK_MAJOR_VERSION)
+AC_SUBST(CHECK_MINOR_VERSION)
+AC_SUBST(CHECK_MICRO_VERSION)
+AC_SUBST(CHECK_VERSION)
+
+dnl Checks for header files and declarations
+AC_CHECK_HEADERS([unistd.h sys/wait.h sys/time.h])
+
+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")
+
+])