X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure.in;h=0b4de0a2ec4c654c1a90a2195814b2d6693a162c;hb=17733b62b31ff476531e054b6fcf553eb8fb107b;hp=3194fe60d45cef35170821a5a0ae44a87359abb1;hpb=21ea098609f18d524ca41b90b48d037f0703e04e;p=privoxy.git

diff --git a/configure.in b/configure.in
index 3194fe60..0b4de0a2 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.174 2012/10/12 11:17:48 fabiankeil Exp $
+dnl $Id: configure.in,v 1.180 2013/03/20 11:25:52 fabiankeil Exp $
 dnl
 dnl Written by and Copyright (C) 2001-2010 the
 dnl Privoxy team. http://www.privoxy.org/
@@ -32,7 +32,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.174 $)
+AC_REVISION($Revision: 1.180 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -78,7 +78,7 @@ dnl =================================================================
 
 VERSION_MAJOR=3
 VERSION_MINOR=0
-VERSION_POINT=20
+VERSION_POINT=22
 CODE_STATUS="UNRELEASED"
 
 dnl CODE_STATUS can be "alpha", "beta", "stable" or "UNRELEASED",
@@ -211,12 +211,14 @@ else
                     AC_MSG_RESULT($with_group)
                     $BGROUPS $USER >/dev/null
                     if test $? -eq 0 ; then
-                    # FIXME: this fails if valid group, but not first group
-                    # listed.
-                      if test "$with_group" != "`$BGROUPS $USER | sed 's/.*: //' 2>/dev/null |$AWK '{print $1}'`" ; then
+                      for i in `$BGROUPS $USER | sed 's/.*: //' 2>/dev/null`; do
+                        if test "x$i" = "x$with_group" ; then
+                          GROUP=$with_group
+                          break
+                        fi
+                      done
+                      if test "x$GROUP" != "x$with_group" ; then
                         AC_MSG_ERROR(The given value '$withval' does not match group entry)
-                      else
-                        GROUP=$with_group;
                       fi
                     else
                       AC_MSG_ERROR(There is no group entry for user '$USER')
@@ -316,11 +318,10 @@ else
 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
@@ -329,7 +330,7 @@ if test $dodk != no; then
 		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