From 359d8350507b18ad16b3d5c36236d58f5c82a556 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Thu, 19 Jan 2006 01:24:42 +0100 Subject: [PATCH] Handle the logic for util/scanner in the Makefile; less CONFIG_* variables --- Makefile.config.in | 1 - configure.in | 6 ------ src/util/Makefile | 3 ++- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Makefile.config.in b/Makefile.config.in index c83fccf7..85386320 100644 --- a/Makefile.config.in +++ b/Makefile.config.in @@ -144,7 +144,6 @@ CONFIG_OS_UNIX = @CONFIG_OS_UNIX@ CONFIG_OS_WIN32 = @CONFIG_OS_WIN32@ CONFIG_OWN_LIBC = @CONFIG_OWN_LIBC@ CONFIG_POD2HTML = @CONFIG_POD2HTML@ -CONFIG_SCANNER = @CONFIG_SCANNER@ CONFIG_SCRIPTING = @CONFIG_SCRIPTING@ CONFIG_SCRIPTING_GUILE = @CONFIG_SCRIPTING_GUILE@ CONFIG_SCRIPTING_LUA = @CONFIG_SCRIPTING_LUA@ diff --git a/configure.in b/configure.in index 48b52614..2ef54920 100644 --- a/configure.in +++ b/configure.in @@ -1247,12 +1247,6 @@ fi AC_SUBST(CONFIG_SHA1) -if test "$CONFIG_CSS" = yes || test "$CONFIG_DOM" = yes; -then - EL_CONFIG(CONFIG_SCANNER, [Built-in scanner]) -fi -AC_SUBST(CONFIG_SCANNER) - AC_ARG_ENABLE(weehoofooboomookerchoo, [ Also check out the features.conf file for more information about features! diff --git a/src/util/Makefile b/src/util/Makefile index e0ea7cf8..727a8a8b 100644 --- a/src/util/Makefile +++ b/src/util/Makefile @@ -7,7 +7,8 @@ not = $(if $(findstring yes,$(1)),no,yes) OBJS-$(CONFIG_DEBUG) += memdebug.o OBJS-$(CONFIG_MD5) += md5.o -OBJS-$(CONFIG_SCANNER) += scanner.o +OBJS-$(CONFIG_CSS) += scanner.o +OBJS-$(CONFIG_DOM) += scanner.o OBJS-$(CONFIG_SHA1) += sha1.o OBJS-$(call not,$(CONFIG_SMALL)) += fastfind.o