X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure.in;h=9ead0560fc33ece2a29b252609a4e5ef7acfd46a;hb=57aa29909cfed52179822fbbfd1bfab86bc0e12d;hp=b9c1b444e3db6ab2ea4281f0a405c9ce03e6e4d1;hpb=734a597393f1fe7367c1f78ab6ce07fb8db1e767;p=privoxy.git

diff --git a/configure.in b/configure.in
index b9c1b444..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.33 2002/03/05 17:31:11 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,14 @@ 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
 dnl Revision 1.33  2002/03/05 17:31:11  morcego
 dnl Search for docbook.dsl. Should solve portability problems for SuSe.
 dnl
@@ -247,11 +255,26 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.33 $)
+AC_REVISION($Revision: 1.35 $)
 AC_INIT(jcc.c)
 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
+])
 
 dnl =================================================================
 dnl Application version number
@@ -363,6 +386,17 @@ 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.
@@ -392,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\))
@@ -415,8 +449,11 @@ AC_CHECK_PROGS(JADEBIN,jade openjade,false)
 AC_SUBST(JADEBIN)
 
 dnl Checking for the docbook.dsl stylesheet file
-DKPREFIX=none
-AC_CHECK_FILE(/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl,DKPREFIX=/usr/share/sgml/docbook/dsssl-stylesheets,AC_CHECK_FILE(/usr/share/sgml/docbkdsl/html/docbook.dsl,DKPREFIX=/usr/share/sgml/docbkdsl))
+if test $dodk = yes; then
+	if test $DKPREFIX = none; then
+		AC_CHECK_FILE(/usr/share/sgml/docbook/dsssl-stylesheets/html/docbook.dsl,DKPREFIX=/usr/share/sgml/docbook/dsssl-stylesheets,AC_CHECK_FILE(/usr/share/sgml/docbkdsl/html/docbook.dsl,DKPREFIX=/usr/share/sgml/docbkdsl))
+	fi
+fi
 AC_SUBST(DKPREFIX)
 
 dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS