# Note: Makefile is built automatically from Makefile.in
#
-# $Id: GNUmakefile.in,v 1.214 2013/01/09 15:08:51 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.215 2013/01/10 11:03:31 fabiankeil Exp $
#
# Written by and Copyright (C) 2001-2013 members of the
# Privoxy team. http://www.privoxy.org/
CHOWN = chown
CHGRP = chgrp
GROUPS = groups
-WDUMP = env -u LANG LC_ALL=C @WDUMP@ -dump
-WDUMP_UTF8 = @WDUMP@ -dump
+W3M_DUMP = env -u LANG LC_ALL=C @W3M@ -dump
+W3M_DUMP_UTF8 = @W3M@ -dump
JADECAT = @JADECAT@
JADEBIN = @JADEBIN@
DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html
# readme page and INSTALL file
dok-readme: dok-release
cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\
- $(WDUMP) tmp.html > ../../README ;\
+ $(W3M_DUMP) tmp.html > ../../README ;\
$(DB)-notoc -V nochunks install.sgml > tmp.html &&\
- $(WDUMP) tmp.html > ../../INSTALL ;\
+ $(W3M_DUMP) tmp.html > ../../INSTALL ;\
$(RM) tmp.*
# index.sgml is used to create both the Home Page, and a local index
## Make AUTHORS file
dok-authors:
- cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP_UTF8) \
+ cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(W3M_DUMP_UTF8) \
tmp.html > ../../AUTHORS && $(RM) tmp.html
# Set doc entities for VERSION and CODE_STATUS in sgml docs. Toggle content
# announce: dok-release
# mkdir -p $(DOC_TMP)
# cd $(DOC_TMP) && cp -f ../announce.sgml . && $(DB) -iannounce-big announce.sgml &&\
-# mv -f index.html announce.html && $(WDUMP) announce.html > announce.txt
+# mv -f index.html announce.html && $(W3M_DUMP) announce.html > announce.txt
# cd $(DOC_TMP) && $(DB) announce.sgml &&\
-# mv -f index.html announce-mini.html && $(WDUMP) announce-mini.html > announce-mini.txt &&\
+# mv -f index.html announce-mini.html && $(W3M_DUMP) announce-mini.html > announce-mini.txt &&\
# mv -f *html *txt ../../..
# rm -fr $(DOC_TMP)
# NOTE: This will require some hand editing.
config-file: dok-release
cd doc/source && $(DB)-notoc -iconfig-file -V nochunks config.sgml > __tmp.html &&\
- $(WDUMP) -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
+ $(W3M_DUMP) -cols 67 __tmp.html > ../../config && $(RM) __tmp.*
$(PERL) -i.bak utils/prepare-configfile.pl config
$(RM) *.bak
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl $Id: configure.in,v 1.175 2012/12/09 12:27:01 fabiankeil Exp $
+dnl $Id: configure.in,v 1.176 2013/01/06 11:06:23 fabiankeil Exp $
dnl
dnl Written by and Copyright (C) 2001-2010 the
dnl Privoxy team. http://www.privoxy.org/
dnl AutoConf Initialization
dnl =================================================================
-AC_REVISION($Revision: 1.175 $)
+AC_REVISION($Revision: 1.176 $)
AC_INIT(jcc.c)
if test ! -f config.h.in; then
fi
AC_SUBST(WIN_ONLY)
-dnl Checking which text html browser we have available
if test $dodk != no; then
- AC_CHECK_PROGS(WDUMP,w3m lynx links,false)
- if test "$WDUMP" = false; then
- AC_MSG_WARN(You need some kind of text browser to build documentation \(w3m, lynx and links are supported\))
+ AC_CHECK_PROGS(W3M, w3m, false)
+ if test "$W3M" = false; then
+ AC_MSG_WARN(You need w3m to build text documentation.)
fi
if test $DB2HTML = false; then
dnl We need to clean the variable, otherwise AC_CHECK_PROGS
AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false)
fi
fi
-AC_SUBST(WDUMP)
+AC_SUBST(W3M)
AC_SUBST(DB2HTML)
dnl If we use rpm, we need to check where %_topdir is