public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
From: mornfall@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2 test/unit/Makefile.in ./configure.in
Date: Sun, 11 Dec 2011 15:15:00 -0000 [thread overview]
Message-ID: <20111211151558.5758.qmail@sourceware.org> (raw)
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: mornfall@sourceware.org 2011-12-11 15:15:58
Modified files:
test/unit : Makefile.in
. : configure.in
Log message:
Use pkg-config to look for CUnit (needed for systems where it's not on the
standard include path).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/unit/Makefile.in.diff?cvsroot=lvm2&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/configure.in.diff?cvsroot=lvm2&r1=1.176&r2=1.177
--- LVM2/test/unit/Makefile.in 2011/11/23 12:21:42 1.3
+++ LVM2/test/unit/Makefile.in 2011/12/11 15:15:57 1.4
@@ -19,12 +19,13 @@
TARGETS = run
include $(top_builddir)/make.tmpl
-LDFLAGS += -ldevmapper -lcunit
-
ifeq ("$(TESTING)", "yes")
+LDFLAGS += -ldevmapper @CUNIT_LIBS@
+CFLAGS += @CUNIT_CFLAGS@
+
all: unit
-endif
unit: $(TARGETS)
@echo Running unit tests
LD_LIBRARY_PATH=$(top_builddir)/libdm ./$(TARGETS)
+endif
--- LVM2/configure.in 2011/11/21 10:40:21 1.176
+++ LVM2/configure.in 2011/12/11 15:15:57 1.177
@@ -759,10 +759,7 @@
AC_MSG_RESULT($TESTING)
if test "$TESTING" = yes; then
- AC_CHECK_HEADER([CUnit/Basic.h], have_cunit=yes, have_cunit=no)
- if test "$have_cunit" = "no"; then
- AC_MSG_ERROR([CUnit is required for unit testing])
- fi
+ PKG_CHECK_MODULES(CUNIT, cunit >= 2.0)
fi
################################################################################
@@ -1391,6 +1388,8 @@
AC_SUBST(UDEV_PC)
AC_SUBST(UDEV_RULES)
AC_SUBST(UDEV_SYNC)
+AC_SUBST(CUNIT_LIBS)
+AC_SUBST(CUNIT_CFLAGS)
AC_SUBST(WRITE_INSTALL)
AC_SUBST(DMEVENTD_PIDFILE)
AC_SUBST(interface)
reply other threads:[~2011-12-11 15:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111211151558.5758.qmail@sourceware.org \
--to=mornfall@sourceware.org \
--cc=lvm-devel@redhat.com \
--cc=lvm2-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).