* Added better pkg-config and subunit support

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@631 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/NEWS b/NEWS
index d02c8349e2b7b12aea8d81682b89f88dab0c6169..84ac3c692f04bfd684fbcccf6eda0c460d60be78 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 In development.
 
+* Added better pkg-config and subunit support, patch #3417041 on SF.
+
 * Make tests/test_vars.in bourne shell compatible, bug #3472578 on SF.
 
 * Added ck_ prefix to mutex_lock variable, to avoid name clash on Solaris.

diff --git a/check.pc.in b/check.pc.in
index 0d84bf6b92b46f863f2795b78172cfe0f7ffa34a..f23110e421c48a505d4f751048aaf0f1fdb3a989 100644 (file)
--- a/check.pc.in
+++ b/check.pc.in
@@ -7,5 +7,7 @@ Name: Check
 Description: A unit test framework for C
 URL: http://check.sourceforge.net
 Version: @VERSION@
+Requires.private: @LIBSUBUNIT_PC@
 Libs: -L${libdir} -lcheck
-Cflags: -I${includedir}
+Libs.private: @GCOV_LIBS@ @PTHREAD_LIBS@ @LIBS@
+Cflags: -I${includedir} @PTHREAD_CFLAGS@

diff --git a/configure.ac b/configure.ac
index 25994369bf710df3a6dd6e95fd204911d9716642..b3ec836127a2bac3368672d4468f20fc050811ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -131,40 +131,25 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([fcntl.h stddef.h stdint.h stdlib.h string.h sys/time.h unistd.h])
 
-if test xfalse != x"$enable_subunit"; then
-AC_CHECK_LIB(subunit, subunit_test_start, ,
-[case "$enable_subunit" in
- autodetect)
-   enable_subunit=false
-   ;;
- true)
-   AC_MSG_ERROR([libsubunit is required for subunit protocol support. The homepage for subunit is https://launchpad.net/subunit/])
-   ;;
- esac
-])
-fi
-if test xfalse != x"$enable_subunit"; then
-AC_CHECK_HEADER([subunit/child.h], ,
-[case "$enable_subunit" in
- autodetect)
-   enable_subunit=false
-   ;;
- true)
-   AC_MSG_ERROR([The header subunit/child.h could not be succesfully included and is required for subunit protocol support. The homepage for subunit is https://launchpad.net/subunit/])
-   ;;
- esac
-])
-fi
+AS_IF([test x"$enable_subunit" != "xfalse" && test x"$enable_subunit" != "xtrue"], [
+       PKG_CHECK_EXISTS([libsubunit], [:], [enable_subunit=false])
+       ])
+AS_IF([test x"$enable_subunit" != "xfalse"], [
+       PKG_CHECK_MODULES([LIBSUBUNIT], [libsubunit])
+       ])
 if test xfalse = x"$enable_subunit"; then
 ENABLE_SUBUNIT="0"
+LIBSUBUNIT_PC=""
 else
 ENABLE_SUBUNIT="1"
+LIBSUBUNIT_PC="libsubunit"
 fi
 AC_SUBST(ENABLE_SUBUNIT)
+AC_SUBST([LIBSUBUNIT_PC])
 AC_DEFINE_UNQUOTED(ENABLE_SUBUNIT, $ENABLE_SUBUNIT, [Subunit protocol result output])
 
 AM_CONDITIONAL(SUBUNIT, test x"$enable_subunit" != "xfalse")
-
+       
 
 
 # Checks for typedefs, structures, and compiler characteristics.

diff --git a/src/Makefile.am b/src/Makefile.am
index da781be6b1d23d011b634686ec507acd43ddaba7..b1e3f7d9ed6862aab10a0c622b1685f905072e3e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ include_HEADERS         = check.h
 
 EXTRA_DIST             = check.h.in
 
-AM_CFLAGS              = @GCOV_CFLAGS@ @PTHREAD_CFLAGS@
+AM_CFLAGS              = @GCOV_CFLAGS@ @PTHREAD_CFLAGS@ $(LIBSUBUNIT_CFLAGS)
 
 CFILES =\
        check.c         \
@@ -39,11 +39,11 @@ $(EXPORT_SYM): check.h.in
 libcheck_la_DEPENDENCIES= $(EXPORT_SYM)
 libcheck_la_LDFLAGS    = -no-undefined -export-symbols $(EXPORT_SYM)
 libcheck_la_SOURCES    = $(CFILES) $(HFILES)
-libcheck_la_LIBADD     = @GCOV_LIBS@ @PTHREAD_LIBS@ $(top_builddir)/lib/libcompat.la
+libcheck_la_LIBADD     = @GCOV_LIBS@ @PTHREAD_LIBS@ $(LIBSUBUNIT_LIBS) $(top_builddir)/lib/libcompat.la
 
 libcheckinternal_la_LDFLAGS     = -no-undefined
 libcheckinternal_la_SOURCES    = $(CFILES) $(HFILES)
-libcheckinternal_la_LIBADD     = @GCOV_LIBS@ @PTHREAD_LIBS@ $(top_builddir)/lib/libcompat.la
+libcheckinternal_la_LIBADD     = @GCOV_LIBS@ @PTHREAD_LIBS@ $(LIBSUBUNIT_LIBS) $(top_builddir)/lib/libcompat.la
 
 CLEANFILES     = *~ *.gcno $(EXPORT_SYM)