* Added check.pc.in for pkg-config support

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

diff --git a/AUTHORS b/AUTHORS
index 1d0292ee27c188ddb8a25023f577b0bb5c56b1e7..d6ee6cdb7d4855ed23f5ffa638ebb7795b77c63b 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,7 +12,9 @@ Patches:     Bernhard Reiter (configure issues)
             Lucas Di Pentima and Cesar Ballardini (signals)
             Chris Pickett (GNU Build System update)
              Robert Lemmen (gcov description in manual)
+            Loic Martin (AM_PATH_CHECK patch)
+            Ross Burton (pkg-config patch)
 
-Anybody who contributed more than a couple lines of code to Check is
+Anybody who has contributed code to Check or Check's build system is
 considered an author.  Send patches to this file to
 <check-devel@lists.sourceforge.net>.

diff --git a/Makefile.am b/Makefile.am
index e738086a36b99f23dc7ac4eac983f84397729629..5339d954569d4cf853b60f7c0897f16e2dd3153e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,13 +8,13 @@ AM_MAKEINFOFLAGS = -I$(top_srcdir)/doc/example
 
 ## what to clean
 
-CLEANFILES=*~\
+CLEANFILES = *~\
        $(PACKAGE)-$(VERSION).tar.gz\
        ChangeLog.bak
 
 ## what additional things to distribute
 
-EXTRA_DIST= ChangeLogOld $(m4data_DATA)
+EXTRA_DIST = ChangeLogOld $(m4data_DATA) $(pcdata_DATA)
 
 ## install docs
 docdir = $(datadir)/doc/$(PACKAGE)
@@ -24,5 +24,9 @@ doc_DATA = SVNChangeLog ChangeLog ChangeLogOld NEWS README COPYING.LESSER
 m4datadir = $(datadir)/aclocal
 m4data_DATA = check.m4
 
+## install check.pc
+pcdata_DATA = check.pc
+pcdatadir = $(libdir)/pkgconfig
+
 ChangeLog:
        svn log -v $(top_srcdir) > SVNChangeLog

diff --git a/check.m4 b/check.m4
index 531460d9b68995e7dff80ea1b4df607a90455483..af4170e07a16f7b40d5b2436af11978b5761dc64 100644 (file)
--- a/check.m4
+++ b/check.m4
@@ -4,6 +4,8 @@ dnl
 
 AC_DEFUN([AM_PATH_CHECK],
 [
+  AC_MSG_WARN([[AM_PATH_CHECK() is deprecated]])
+  AC_MSG_WARN([[use PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) instead]])
   AC_ARG_WITH([check],
   [  --with-check=PATH       prefix where check is installed [default=auto]])
  

diff --git a/check.pc.in b/check.pc.in
new file mode 100644 (file)
index 0000000..0d84bf6
--- /dev/null
+++ b/check.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Check
+Description: A unit test framework for C
+URL: http://check.sourceforge.net
+Version: @VERSION@
+Libs: -L${libdir} -lcheck
+Cflags: -I${includedir}

diff --git a/configure.ac b/configure.ac
index 94c07907b5fec78ee35723d30d078eecade3e66c..538f5e5c41a5b717c8390fdd2c5e7b90d0ac5328 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,8 +98,9 @@ AC_CHECK_FUNCS([alarm gettimeofday localtime_r memmove memset putenv setenv strd
 # Output files
 AC_CONFIG_HEADERS([config.h])
 
-AC_CONFIG_FILES([Makefile
-                 doc/Makefile
+AC_CONFIG_FILES([check.pc
+                 Makefile
+                doc/Makefile
                  src/check.h
                  src/Makefile
                  tests/Makefile])