* V2 parser errors now set appropriate mime types for the encapsulated packet

[third_party/subunit] / configure.ac

diff --git a/configure.ac b/configure.ac
index cf3dd1cfb7256acd6ec4e42c195797439f57c662..146660af2948c18242171cd0e3299e2bb137f37e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
-AC_DEFUN([SUBUNIT_MAJOR_VERSION], [0])
-AC_DEFUN([SUBUNIT_MINOR_VERSION], [0])
-AC_DEFUN([SUBUNIT_MICRO_VERSION], [2])
-AC_DEFUN([SUBUNIT_VERSION],
-[SUBUNIT_MAJOR_VERSION.SUBUNIT_MINOR_VERSION.SUBUNIT_MICRO_VERSION])
+m4_define([SUBUNIT_MAJOR_VERSION], [0])
+m4_define([SUBUNIT_MINOR_VERSION], [0])
+m4_define([SUBUNIT_MICRO_VERSION], [15])
+m4_define([SUBUNIT_VERSION],
+m4_defn([SUBUNIT_MAJOR_VERSION]).m4_defn([SUBUNIT_MINOR_VERSION]).m4_defn([SUBUNIT_MICRO_VERSION]))
 AC_PREREQ([2.59])
 AC_INIT([subunit], [SUBUNIT_VERSION], [subunit-dev@lists.launchpad.net])
 AC_CONFIG_SRCDIR([c/lib/child.c])
@@ -18,11 +18,27 @@ AC_SUBST([SUBUNIT_MICRO_VERSION])
 AC_SUBST([SUBUNIT_VERSION])
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
+AC_PROG_CXX
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_LIBTOOL
 AM_PATH_PYTHON
+
+AS_IF([test "$GCC" = "yes"],
+      [
+  SUBUNIT_CFLAGS="-Wall -Werror -Wextra -Wstrict-prototypes "
+  SUBUNIT_CFLAGS="$SUBUNIT_CFLAGS -Wmissing-prototypes -Wwrite-strings "
+  SUBUNIT_CFLAGS="$SUBUNIT_CFLAGS -Wno-variadic-macros "
+  SUBUNIT_CXXFLAGS="-Wall -Werror -Wextra -Wwrite-strings -Wno-variadic-macros"
+      ])
+
+AM_CFLAGS="$SUBUNIT_CFLAGS -I\$(top_srcdir)/c/include"
+AM_CXXFLAGS="$SUBUNIT_CXXFLAGS -I\$(top_srcdir)/c/include"
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_CXXFLAGS)
+
 # Checks for libraries.
 
 # Checks for header files.
@@ -46,11 +62,14 @@ AC_FUNC_REALLOC
 # Easier memory management.
 # C unit testing.
 PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+# C++ unit testing.
+PKG_CHECK_MODULES([CPPUNIT], [cppunit])
 
 # Output files
 AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([libsubunit.pc
+                libcppunit_subunit.pc
                  Makefile
                 perl/Makefile.PL
                  ])