X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=51d1db138c58b96e86677fa43cccea74c6eae396;hp=435017a94711a0eadbcd6b80f34a61ed513b187b;hb=338493a4d2247ce0021acbd073fe6baef97a97b1;hpb=8cf4267e59676eef748fe267e74baf3e05e3c9f1

diff --git a/configure.in b/configure.in
index 435017a9..51d1db13 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.28 2002/02/27 15:02:38 oes Exp $
+dnl $Id: configure.in,v 1.32 2002/03/05 14:07:43 morcego Exp $
 dnl 
 dnl Written by and Copyright (C) 2001 the SourceForge
 dnl IJBSWA team.  http://ijbswa.sourceforge.net
@@ -28,6 +28,19 @@ 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.32  2002/03/05 14:07:43  morcego
+dnl configure now detects rpm topdir, and change GNUmakefile acordingly
+dnl    (based on sugestion by Sarantis Paskalis)
+dnl
+dnl Revision 1.31  2002/03/05 13:43:28  morcego
+dnl Checking for text browser, so redhat-dok can work.
+dnl
+dnl Revision 1.30  2002/03/04 17:58:01  oes
+dnl Deleted _DEBUG and PID_FILE_PATH
+dnl
+dnl Revision 1.29  2002/02/28 14:20:53  oes
+dnl Fixed detection of gethost*_r functions on Solaris
+dnl
 dnl Revision 1.28  2002/02/27 15:02:38  oes
 dnl Incremented version number
 dnl
@@ -231,7 +244,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.28 $)
+AC_REVISION($Revision: 1.32 $)
 AC_INIT(jcc.c)
 AC_CONFIG_HEADER(config.h)
 AC_CANONICAL_HOST
@@ -265,12 +278,6 @@ AC_DEFINE_UNQUOTED(VERSION_POINT,${VERSION_POINT})
 AC_DEFINE_UNQUOTED(VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_POINT}")
 AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}")
 
-dnl =================================================================
-dnl pid file only for unix 
-dnl =================================================================
-dnl 
-PID_FILE_PATH="\"/etc/junkbuster"\"
-
 dnl =================================================================
 dnl Checks for programs needed to build.
 dnl =================================================================
@@ -305,7 +312,6 @@ AC_ARG_WITH(debug,
 			CFLAGS="-g"
 		      fi
 		   fi
-                   CFLAGS="$CFLAGS -D_DEBUG"
                 fi
         ],
 	[
@@ -382,6 +388,33 @@ else
 fi
 AC_SUBST(WIN_ONLY)
 
+dnl Checking which text html browser we have avaliable
+if test $target_type = unix; 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
+fi
+AC_SUBST(WDUMP)
+
+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 Check for jade, so we can build the documentation
+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,/usr/share/sgml/docbkdsl))
+AC_SUBST(DKPREFIX)
 
 dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS
 old_CFLAGS_nospecial=$CFLAGS
@@ -831,9 +864,6 @@ dnl in the Makefile
 CFLAGS=$old_CFLAGS_nospecial
 AC_SUBST(SPECIAL_CFLAGS)
 
-AC_SUBST(PID_FILE_PATH)
-AC_DEFINE_UNQUOTED(PID_FILE_PATH,${PID_FILE_PATH})
-
 AC_SUBST(PTHREAD_LIB)
 
 AC_OUTPUT(GNUmakefile)