From fc6653abdd34b1dc58fba783a8aff79dc30d9f53 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Tue, 27 Mar 2001 06:57:37 +0000 Subject: [PATCH] be more flexible with a lack of -ldb on a system (just skip test 010). --- 010 | 2 ++ configure.in | 21 +++++++-------------- include/builddefs.in | 1 + src/Makefile | 6 +++++- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/010 b/010 index d9e1d14e..74ffefce 100755 --- a/010 +++ b/010 @@ -65,6 +65,8 @@ _filter_dbtest() . ./common.rc . ./common.filter +[ -x $here/src/dbtest ] || _notrun "dbtest was not built for this platform" + # real QA test starts here cd $TEST_DIR $here/src/dbtest -l 5 -n 3000 | _filter_dbtest diff --git a/configure.in b/configure.in index ad2be9df..3863e9da 100644 --- a/configure.in +++ b/configure.in @@ -180,21 +180,14 @@ libacl="/usr/lib/libacl.a" AC_SUBST(libacl) dnl Checks for GNU database manager header and library. -AC_CHECK_HEADER(gdbm.h,, [ - echo - echo 'FATAL ERROR: could not find a valid GNU database manager header.' - echo 'Install either the gdbm-devel (rpm) or the libgdbmg1-dev (deb) package.' - exit 1 -]) -AC_CHECK_LIB(gdbm, gdbm_open,, [ - echo - echo 'FATAL ERROR: could not find a valid GNU database manager library.' - echo 'Install either the gdbm-devel (rpm) or the libgdbmg1-dev (deb) package.' - exit 1 -]) -libgdbm="/usr/lib/libgdbm.a" +libgdbm="" +have_db=true +AC_CHECK_HEADER(gdbm/ndbm.h,, [ have_db=false ]) +if test $have_db = "true" -a -f /usr/lib/libgdbm.a; then + libgdbm="/usr/lib/libgdbm.a" +fi AC_SUBST(libgdbm) - +AC_SUBST(have_db) dnl alternate root and usr prefixes test -z "$ROOT_PREFIX" && ROOT_PREFIX="" diff --git a/include/builddefs.in b/include/builddefs.in index 707a9ce5..22c3b021 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -45,6 +45,7 @@ LIBATTR = @libattr@ LIBGDBM = @libgdbm@ LIBUUID = @libuuid@ LIBHANDLE = @libhdl@ +HAVE_DB = @have_db@ CPPFLAGS = -I/usr/include/xfs -I/usr/include/attr BUILDRULES = $(TOPDIR)/include/buildrules diff --git a/src/Makefile b/src/Makefile index 104ea380..061ef20f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -33,9 +33,13 @@ TOPDIR = .. include $(TOPDIR)/include/builddefs -TARGETS = alloc bstat dbtest devzero dirstress fault feature fsstress \ +TARGETS = alloc bstat devzero dirstress fault feature fsstress \ fill fill2 holes ioctl loggen lstat64 nametest permname \ randholes truncfile usemem runas +ifeq ($(HAVE_DB), true) +TARGETS += dbtest +endif + CFILES = $(TARGETS:=.c) random.c HFILES = global.h LDIRT = $(TARGETS) -- 2.30.2