Diff of /configure [078234] .. [3bd4dd]  Maximize  Restore

Switch to side-by-side view

--- a/configure
+++ b/configure
@@ -19,7 +19,7 @@
 #   configure +fhs		(follow FHS: use /var/cache/man)
 #   configure +fsstnd		(follow FSSTND: use /var/catman)
 #
-LANGUAGES="cs,da,de,el,en,es,fi,fr,hr,it,ja,ko,nl,pl,pt,ro,sl"
+LANGUAGES="cs,da,de,el,en,es,fi,fr,hr,it,ja,ko,nl,pl,pt,ro,ru,sl"
 LANGOPT="+lang {$LANGUAGES|all|none}"
 #
 # Some people prefer "-irs", but probably only when they have a broken setup.
@@ -211,6 +211,7 @@
 fi
 
 CC=${CC-cc}
+BUILD_CC=${BUILD_CC-${CC}}
 INSTALL=${INSTALL-install}
 INCLUDEDIR=${INCLUDEDIR-/usr/include}
 
@@ -346,17 +347,6 @@
 fi
 rm -f conftest
 
-echo $n "Testing whether grep needs -s or -q ... " $c
-ogrep=`echo hoi | grep -s hoi`
-if [ -z "$ogrep" ]
-then
-	grepsilent=s
-else
-	grepsilent=q
-fi
-echo "-$grepsilent"
-
-
 # Ask the installer where various things are located.
 # (A separate variable is needed since various shells do
 # word-splitting at different moments, which means that
@@ -445,7 +435,7 @@
 
   FILTERS="pager cmp cat awk"
 else
-  for i in nroff groff geqn gtbl col vgrind grefer grap gpic more less cmp cat awk gawk mawk
+  for i in nroff groff geqn gtbl col vgrind grefer grap gpic more less lynx cmp cat awk gawk mawk
   do
     eval F$i="missing"
     for j in $DEFPATH
@@ -508,6 +498,14 @@
   else
     pager="$Fless $DEFAULTLESSOPT"
   fi
+  if test $Flynx = "missing"
+  then
+    browser=$pager
+    htmlpager=$Fcat
+  else
+    browser="$Flynx"
+    htmlpager="$Flynx -dump"
+  fi
   if test $Fawk = "missing"
   then
     Fawk="$Fgawk"
@@ -520,7 +518,7 @@
   cat="$Fcat"
   awk="$Fawk"
 
-  FILTERS="troff nroff jnroff eqn neqn jneqn tbl col vgrind refer grap pic pager cmp cat awk"
+  FILTERS="troff nroff jnroff eqn neqn jneqn tbl col vgrind refer grap pic pager browser htmlpager cmp cat awk"
 fi
 
 # Note: older nroff gives an error message for -c
@@ -953,7 +951,7 @@
 
 # What sections do we anticipate?
 
-tmpsections="1 8 2 3 4 5 6 7 9 tcl n l p o"
+tmpsections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
 
 if [ x$default = x ]; then
   echo ""
@@ -1276,6 +1274,7 @@
   sed -e '
 s,@version@,$version,
 s,@CC@,$CC,
+s,@BUILD_CC@,$BUILD_CC,
 s,@INSTALL@,$INSTALL,
 s,@DEFS@,$DEFS,
 s,@LIBS@,$LIBS,
@@ -1304,6 +1303,8 @@
 s,@compress_ext@,$compress_ext,
 s,@decompress@,$decompress,
 s,@pager@,$pager,
+s,@browser@,$browser,
+s,@htmlpager@,$htmlpager,
 s,@cmp@,$cmp,
 s,@cat@,$cat,
 s,@awk@,$awk,
@@ -1327,7 +1328,6 @@
 s,@man_config_dir@,$man_config_dir,
 s,@man_config_file@,$man_config_file,
 s,@manpathoption@,$manpathoption,
-s,@grepsilent@,$grepsilent,
 s/@sections@/$sections/
 ' $infile.in >> $infile
 done

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks