Browse Source

* only add dbdigest when USESQL=YES

peter 22 years ago
parent
commit
46a9df017c
2 changed files with 7 additions and 3 deletions
  1. 3 1
      tests/Makefile
  2. 4 2
      tests/Makefile.fpc

+ 3 - 1
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/06]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/10/05]
 #
 default: allexectests
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@@ -1426,12 +1426,14 @@ endif
 ifneq ($(TESTCOMSPECRES),)
 NOCOMSPEC=1
 endif
+ifeq ($(USESQL),YES)
 ifndef DBDIGEST
 DBDIGEST=./dbdigest$(EXEEXT)
 DIGESTDEP+=$(DBDIGEST)
 $(DBDIGEST) : units utils/dbdigest.pp utils/teststr.pp utils/testu.pp utils/dbtests.pp
 	$(FPC) -n -Fuunits -Fu../packages/base/mysql -FE. utils/dbdigest.pp
 endif
+endif
 ifndef DIGEST
 DIGEST=./digest$(EXEEXT)
 DIGESTDEP+=$(DIGEST)

+ 4 - 2
tests/Makefile.fpc

@@ -84,6 +84,7 @@ endif
 #
 # Digest program
 #
+ifeq ($(USESQL),YES)
 ifndef DBDIGEST
 DBDIGEST=./dbdigest$(EXEEXT)
 DIGESTDEP+=$(DBDIGEST)
@@ -91,6 +92,7 @@ DIGESTDEP+=$(DBDIGEST)
 $(DBDIGEST) : units utils/dbdigest.pp utils/teststr.pp utils/testu.pp utils/dbtests.pp
         $(FPC) -n -Fuunits -Fu../packages/base/mysql -FE. utils/dbdigest.pp
 endif
+endif
 
 ifndef DIGEST
 DIGEST=./digest$(EXEEXT)
@@ -260,9 +262,9 @@ info :
         @echo "  onlyknown - run only known bugs"
         @echo "  onlygraph - run only graph tests"
         @echo "  onlyinteractive - run only interactive tests"
-	@echo Done using FPC=$(FPC)
+        @echo Done using FPC=$(FPC)
 ifdef COMSPEC
-	@echo And using COMSPEC=$(COMSPEC)
+        @echo And using COMSPEC=$(COMSPEC)
 endif
 
 override DATESUFFIX:=$(shell $(DATE) +%Y.%m.%d)