From: Joel Rosdahl <joel@rosdahl.net>
Date: Fri, 16 Jul 2010 15:08:15 +0000 (+0200)
Subject: Merge branch 'unittest'
X-Git-Tag: v3.1~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8809f726abc578016b50abb94c7df9049c0a7ff6;p=thirdparty%2Fccache.git

Merge branch 'unittest'

* unittest:
  Regenerate test/suites.h on Makefile updates
  Add CHECK macros for ARGS
  Improve CHECK_{STR,UNS,INT}_EQ macros
  Let basedir("foo") return "."
  Add framework for tests written in C
  Split the main function into a separate compilation unit
  Simplify getopt_long() usage
  Add args_init_from_string function
  Add stats_get_pending() function
  Include all dependency files in .deps to make it work with sources in subdirs

Conflicts:
	configure.ac
---

8809f726abc578016b50abb94c7df9049c0a7ff6
diff --cc configure.ac
index 8753be9f9,9f495adfb..cc6959cc9
--- a/configure.ac
+++ b/configure.ac
@@@ -171,7 -171,8 +171,8 @@@ AC_HEADER_DIREN
  AC_HEADER_TIME
  AC_HEADER_SYS_WAIT
  
 -AC_CHECK_HEADERS(ctype.h pwd.h stdlib.h string.h strings.h sys/time.h)
 +AC_CHECK_HEADERS(ctype.h pwd.h stdlib.h string.h strings.h sys/time.h sys/mman.h)
+ AC_CHECK_HEADERS(sys/ioctl.h termios.h)
  
  AC_CHECK_FUNCS(asprintf)
  AC_CHECK_FUNCS(gethostname)