From: mal0rd Date: Mon, 27 May 2002 23:26:34 +0000 (+0000) Subject: Made doc-generation configuration automatic. X-Git-Tag: v_3_1_archive_branchpoint~273 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=25948b073495baf0ad639352113b6ec722da11ed Made doc-generation configuration automatic. References to DB2HTML were removed, not used. --with-docbook now only needed if in odd path. --- diff --git a/GNUmakefile.in b/GNUmakefile.in index 5237aaea..5aed5937 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.105 2002/05/25 22:48:19 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.106 2002/05/26 04:55:11 mal0rd Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -81,7 +81,6 @@ WDUMP = @WDUMP@ -dump JADECAT = @JADECAT@ JADEBIN = @JADEBIN@ DB = $(JADEBIN) $(JADECAT) -ihtml -t sgml -D.. -d ldp.dsl\#html -DB2HTML = @DB2HTML@ MAN2HTML = @MAN2HTML@ G2H_CMD = groff -mandoc -Thtml TARGET_OS = @host@ @@ -96,7 +95,7 @@ GROUP = @GROUP@ # Program to do LF->CRLF # -# The sed version should be the most portable, but it doesn't for for me, +# The sed version should be the most portable, but it doesn't work for me, # the other two do. FIXME. # - Jon #DOSFILTER = $(SED) -e $$'s,$$,\r,' @@ -210,7 +209,8 @@ all: $(PROGRAM) ############################################################################# .PHONY: all inifiles redhat-dist redhat-upload solaris-dist suse-dist \ suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \ -install conectiva-spec conectiva-dist conectiva-upload +install conectiva-spec conectiva-dist conectiva-upload debian-dist \ +debian-upload ensure-wdump ensure-jadebin ensure-dkprefix ############################################################################# @@ -542,8 +542,33 @@ tarball-clean: # ############################################################################# +# 3 checks to make sure docs will be generated +ensure-wdump: +ifeq (@WDUMP@,false) + @$(ECHO) + @$(ECHO) "Cannot build docs; one of w3m, links, or lynx must be installed." + @$(ECHO) "You should install the appropriate package and rerun ./configure" + @exit 1 +endif + +ensure-jadebin: +ifeq (@JADEBIN@,false) + @$(ECHO) + @$(ECHO) "Cannot build docs; one of openjade or jade must be installed" + @$(ECHO) "You should install the appropriate package and rerun ./configure" + @exit 1 +endif + +ensure-dkprefix: +ifeq (@DKPREFIX@,false) + @$(ECHO) + @$(ECHO) "Cannot build docs; cannot find docbook-dsssl stylesheets" + @$(ECHO) "You should install the appropriate package and rerun ./configure" + @exit 1 +endif + # developer manual -dok-devel: +dok-devel: ensure-dkprefix ensure-jadebin ensure-wdump $(RM) doc/webserver/developer-manual/*.html $(RM) -r doc/source/developer-manual mkdir -p doc/text doc/source/developer-manual @@ -551,7 +576,7 @@ dok-devel: cd doc/source && $(DB) -V nochunks developer-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/developer-manual.txt && $(RM) -r tmp.html developer-manual # user manual -dok-user: +dok-user: ensure-dkprefix ensure-jadebin ensure-wdump $(RM) doc/webserver/user-manual/*.html $(RM) -r doc/source/user-manual/ mkdir -p doc/text doc/source/user-manual @@ -559,7 +584,7 @@ dok-user: cd doc/source && $(DB) -V nochunks user-manual.sgml > tmp.html && $(WDUMP) tmp.html > ../text/user-manual.txt && $(RM) -r tmp.html user-manual # faq -dok-faq: +dok-faq: ensure-dkprefix ensure-jadebin ensure-wdump $(RM) doc/webserver/faq/*.html $(RM) -r doc/source/faq mkdir -p doc/text doc/source/faq @@ -578,12 +603,12 @@ else endif # readme page -dok-readme: +dok-readme: ensure-dkprefix ensure-jadebin ensure-wdump cd doc/source && $(DB)-notoc -V nochunks readme.sgml > tmp.html &&\ $(WDUMP) tmp.html > ../../README && $(RM) -r tmp.html # webserver files -dok-webserver: +dok-webserver: ensure-dkprefix ensure-jadebin cd doc/source/webserver && $(DB)-notoc -V nochunks index.sgml > ../../webserver/index.html $(PERL) -pi.bak -e 's/..\/p_doc.css/p_doc.css/;\ s/<\/HEAD/\n<\/HEAD/;\ @@ -592,7 +617,7 @@ dok-webserver: doc/webserver/index.html && $(RM) doc/source/webserver/*.bak # Main documentation target. -dok: dok-release dok-devel dok-user dok-faq dok-readme dok-webserver dok-authors +dok: dok-devel dok-release dok-user dok-faq dok-readme dok-webserver dok-authors @$(ECHO) Documentation created. # @@ -619,12 +644,12 @@ groff2html: $(G2H_CMD) ./privoxy.1 | $(SED) -e 's@@@' > doc/webserver/man-page/privoxy-man-page.html ## Make README -redhat-readme: +redhat-readme: ensure-dkprefix ensure-jadebin ensure-wdump cd doc/source && $(DB) -V nochunks readme.sgml > tmp.html && $(WDUMP) \ tmp.html > ../../README && $(RM) -r tmp.html ## Make AUTHORS file -dok-authors: +dok-authors: ensure-dkprefix ensure-jadebin ensure-wdump cd doc/source && $(DB) -V nochunks authors.sgml > tmp.html && $(WDUMP) \ tmp.html > ../../AUTHORS && $(RM) tmp.html @@ -846,6 +871,9 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.106 2002/05/26 04:55:11 mal0rd +# Added debian-dist and debian-upload targets. Also documented usage. +# # Revision 1.105 2002/05/25 22:48:19 hal9 # Add -notoc to README build (per oes's dsl magic). # diff --git a/configure.in b/configure.in index 381b1b0f..c9f84414 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.68 2002/05/25 16:54:54 jongfoster Exp $ +dnl $Id: configure.in,v 1.69 2002/05/25 18:11:49 jongfoster Exp $ dnl dnl Written by and Copyright (C) 2001, 2002 the SourceForge dnl Privoxy team. http://www.privoxy.org/ @@ -28,6 +28,10 @@ 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.69 2002/05/25 18:11:49 jongfoster +dnl Wahay!!! 3.0.x has branched! +dnl New development version is 3.1.1 alpha +dnl dnl Revision 1.68 2002/05/25 16:54:54 jongfoster dnl Detect if the compiler supports -pthread. dnl Hopefully this will fix bug 560442. (I don't have a HP PA-RISC @@ -370,7 +374,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.68 $) +AC_REVISION($Revision: 1.69 $) AC_INIT(jcc.c) if test ! -f config.h.in; then @@ -387,29 +391,26 @@ fi AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST -dodk=auto -DKPREFIX=none AC_ARG_WITH(docbook, dnl - --with-docbook=[[yes|no|directory]] - Enable docbook documentation creation - (default = yes, for gnu and linux),[dnl -case "$with_docbook" in -yes) dodk=yes;; -no) dodk=no;; -*) - dodk=no - DKPREFIX=$withval - ;; -esac -]) -DB2HTML=false -AC_ARG_WITH(db2html, dnl - --with-db2html= - Set the location of the docbook to html converter - (default = search),[dnl -DB2HTML=$withval + --with-docbook= + Set the location of the dsssl stylesheet + (default = search),[dnl +DKPREFIX=$withval ]) +dnl NOT USED? +dnl DB2HTML=false +dnl AC_ARG_WITH(db2html, dnl +dnl --with-db2html= +dnl Set the location of the docbook to html converter +dnl (default = search),[dnl +dnl DB2HTML=$withval +dnl ]) +dnl if ! test -x $DB2HTML; then +dnl DB2HTML="" +dnl fi + + dnl ================================================================= dnl Application version number dnl ================================================================= @@ -546,17 +547,6 @@ else fi fi -if test $dodk = auto; then - dodk=no - if test $target_type = unix; then - case "$host_os" in - linux* | gnu*) - dodk=yes - ;; - esac - fi -fi - dnl Decide what to do based on target_type dnl Note: PTHREAD_LIB is always set, even if pthread is disabled. dnl This is because we don't know yet whether pthread is enabled. @@ -585,33 +575,18 @@ else fi AC_SUBST(WIN_ONLY) -dnl Checking which text html browser we have avaliable -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\)) - fi - if test $DB2HTML = false; then - dnl We need to clean the variable, otherwise AC_CHECK_PROGS - dnl will fail - DB2HTML="" - AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false) - fi -fi +dnl Check for a text browser that supports -dump +AC_CHECK_PROGS(WDUMP,w3m lynx links,false) AC_SUBST(WDUMP) -AC_SUBST(DB2HTML) -dnl If we use rpm, we need to check where %_topdir is -AC_CHECK_PROGS(RPMBIN,rpm,false) -if test $RPMBIN != false; then - RPM_BASE=`rpm --eval "%{_topdir}"` - if test "$RPM_BASE" = ""; then - RPM_BASE=/usr/src/redhat - fi -fi -AC_SUBST(RPM_BASE) +dnl NOT USED? +dnl Check for a docbook -> HTML converter +dnl AC_CHECK_PROGS(DB2HTML,db2html docbook2html,false) +dnl AC_SUBST(DB2HTML) dnl Check for jade, so we can build the documentation +dnl Openjade is preferred according to docs, but jade +dnl is *much* faster. AC_CHECK_PROGS(JADEBIN,jade openjade,false) AC_SUBST(JADEBIN) @@ -621,33 +596,45 @@ AC_SUBST(MAN2HTML) dnl Checking for the docbook.dsl stylesheet file dnl It is still not portable (directory slash) +DKPREFIXCOPY=$DKPREFIX +DKPREFIX=false +for i in $DKPREFIXCOPY /usr/share/sgml/docbook/stylesheet/dsssl/modular \ + /usr/share/sgml/docbook/dsssl-stylesheets /usr/share/sgml/docbkdsl \ + /usr/share/sgml/docbook-dsssl; do + echo -n "checking for $i/html/docbook.dsl..." + if test -f $i/html/docbook.dsl; then + echo "yes" + DKPREFIX=$i + break + else + echo "no" + fi +done +AC_SUBST(DKPREFIX) + JADECAT="" -if test $dodk = yes; then - if test $DKPREFIX = none; then - for i in /usr/share/sgml/docbook/dsssl-stylesheets /usr/share/sgml/docbkdsl /usr/share/sgml/docbook-dsssl; do - echo -n "checking for $i/html/docbook.dsl..." - if test -f $i/html/docbook.dsl; then - echo "yes" - DKPREFIX=$i - break - else - echo "no" - fi - done -# where are the catalogs? - for i in /usr/share/sgml/CATALOG.docbk30 /usr/share/sgml/CATALOG.docbk31; do - echo -n "checking for $i..." - if test -f $i; then - echo "yes" - JADECAT="$JADECAT -c $i" - else - echo "no" - fi - done - fi -fi +dnl where are the catalogs? +for i in /usr/share/sgml/CATALOG.docbk30 \ + /usr/share/sgml/CATALOG.docbk31; do + echo -n "checking for $i..." + if test -f $i; then + echo "yes" + JADECAT="$JADECAT -c $i" + else + echo "no" + fi +done AC_SUBST(JADECAT) -AC_SUBST(DKPREFIX) + +dnl If we use rpm, we need to check where %_topdir is +AC_CHECK_PROGS(RPMBIN,rpm,false) +if test $RPMBIN != false; then + RPM_BASE=`rpm --eval "%{_topdir}"` + if test "$RPM_BASE" = ""; then + RPM_BASE=/usr/src/redhat + fi +fi +AC_SUBST(RPM_BASE) dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS old_CFLAGS_nospecial=$CFLAGS diff --git a/debian/changelog b/debian/changelog index d7642604..762e63fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +privoxy (3.1.1-alpha-1) unstable; urgency=low + + * Removed build dependency on w3m. + * Removed ./configure argument for docbook, moving the path to the + configure.in. + + -- Devin Bayer Mon, 27 May 2002 13:29:34 -0400 + privoxy (3.1.1-alpha-0) unstable; urgency=low * Added debian-dist and debian-upload targets to the top level makefile. @@ -6,7 +14,7 @@ privoxy (3.1.1-alpha-0) unstable; urgency=low * Removed build dependency on docbook, leaving generation of docs to another target or makefile. - -- Devin John Bayer Sat, 25 May 2002 22:49:30 -0400 + -- Devin Bayer Sat, 25 May 2002 22:49:30 -0400 privoxy (2.9.15-beta-0) unstable; urgency=low diff --git a/debian/control b/debian/control index 50464505..252ec514 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: privoxy Section: web Priority: optional Maintainer: Roland Rosenfeld -Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev, w3m +Build-Depends: debhelper (>> 3.0.0), autoconf, libpcre3-dev Standards-Version: 3.5.6 Package: privoxy diff --git a/debian/rules b/debian/rules index 0602dfc5..8ec4a576 100755 --- a/debian/rules +++ b/debian/rules @@ -28,10 +28,9 @@ configure-stamp: autoheader autoconf - env CFLAGS=$(CFLAGS) WDUMP=w3m \ + env CFLAGS=$(CFLAGS) \ ./configure --prefix=/usr --sysconfdir=/etc \ - --mandir=/usr/share/man $(WITHDEBUG) \ - --with-docbook=/usr/share/sgml/docbook/stylesheet/dsssl/modular + --mandir=/usr/share/man $(WITHDEBUG) touch configure-stamp build: build-stamp @@ -112,10 +111,9 @@ binary-arch: build install dh_md5sums dh_builddeb -# Use this target on Debian because we need to make sure configure -# was run with docbook's correct path (see configure-stamp above) +# Single step doc building on debian debian-dok: configure-stamp $(MAKE) dok binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure +.PHONY: build clean binary-indep binary-arch binary install configure debian-dok