From: morcego Date: Wed, 6 Mar 2002 23:50:36 +0000 (+0000) Subject: Will not test for a text browser if we are not using docbook. X-Git-Tag: v_2_9_12~144 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=0c23a618d5329fde36809d32054664039aabbd7a Will not test for a text browser if we are not using docbook. --- diff --git a/configure b/configure index 85daac92..8f3c42e5 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh -# From configure.in Revision: 1.34 +# From configure.in Revision: 1.35 # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. @@ -619,8 +619,8 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 -dodk=dump -DKPREFIX="none" +dodk=auto +DKPREFIX=none # Check whether --with-docbook or --without-docbook was given. if test "${with_docbook+set}" = set; then withval="$with_docbook" @@ -1117,7 +1117,7 @@ else fi fi -if test $dodk = dump; then +if test $dodk = auto; then dodk = no if test $target_type = unix; then case "$host_os" in @@ -1156,7 +1156,7 @@ else fi -if test $target_type = unix; then +if test $dodk != no; then for ac_prog in w3m lynx links do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/configure.in b/configure.in index 06cbf68d..9ead0560 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.34 2002/03/06 20:57:00 morcego Exp $ +dnl $Id: configure.in,v 1.35 2002/03/06 21:55:52 morcego Exp $ dnl dnl Written by and Copyright (C) 2001 the SourceForge dnl IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,11 @@ dnl or write to the Free Software Foundation, Inc., 59 dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log: configure.in,v $ +dnl Revision 1.35 2002/03/06 21:55:52 morcego +dnl New configure option: --with-docbook=(yes|no|directory) +dnl Preliminary new platform detection code included. Will work with the +dnl old one for now. No use just trowing it away +dnl dnl Revision 1.34 2002/03/06 20:57:00 morcego dnl Fixing detection of stylesheets on SuSe. dnl @@ -250,13 +255,13 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.34 $) +AC_REVISION($Revision: 1.35 $) AC_INIT(jcc.c) AC_CONFIG_HEADER(config.h) AC_CANONICAL_HOST -dodk=dump -DKPREFIX="none" +dodk=auto +DKPREFIX=none AC_ARG_WITH(docbook, dnl --with-docbook=[[yes|no|directory]] Enable docbook documentation creation @@ -381,7 +386,7 @@ else fi fi -if test $dodk = dump; then +if test $dodk = auto; then dodk = no if test $target_type = unix; then case "$host_os" in @@ -421,7 +426,7 @@ fi AC_SUBST(WIN_ONLY) dnl Checking which text html browser we have avaliable -if test $target_type = unix; then +if test $dodk != no; then AC_CHECK_PROGS(WDUMP,w3m lynx links,false) if test "$WDUMP" = false; then AC_MSG_ERROR(You need some kind of text browser to continue \(w3m, lynx and links are supported\))