Changeset d16193 in git

Timestamp:

Mar 29, 2000, 3:20:47 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

251a2ac0b5cc0fbe92de78d4a127f1c0444023f2

Parents:

5f0f1960b9dc9e0ab74285a56dfb1f98c44422a6

Message:

* fixed texi2html integration


git-svn-id: file:///usr/local/Singular/svn/trunk@4226 2c84dea3-7e68-4137-9b89-c4e89433aadc

Files:

• configure (modified) (59 diffs)
• configure.in (modified) (2 diffs)

configure

@@ -1224 +1224 @@
 fi
 
-if test -d Texi2html; then
-if test -r ${T2H_HOME}/texi2html.init; then
-TEXI2HTML=`pwd`/Texi2html/texi2html.pl
-else
-TEXI2HTML=`pwd`/Texi2html/texi2html
-fi
-
-else
-echo "configure: warning: could not find Texi2html/texi2html HTML generation might fail" 1>&2
-# Extract the first word of "texi2html", so it can be a program name with args.
-set dummy texi2html; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1239: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_TEXI2HTML'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$TEXI2HTML"; then
-  ac_cv_prog_TEXI2HTML="$TEXI2HTML" # Let the user override the test.
-else
-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_TEXI2HTML="texi2html"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-TEXI2HTML="$ac_cv_prog_TEXI2HTML"
-if test -n "$TEXI2HTML"; then
-  echo "$ac_t""$TEXI2HTML" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-if test "$ac_cv_prog_LATEX2HTML" = latex2html; then
-  TEXI2HTML_OPTS="-l2h"
-fi
-
 
 # expand prefix and pass it to subsequent configures
@@ -1310 +1267 @@
 # check for AIX
 echo $ac_n "checking whether _AIX is defined""... $ac_c" 1>&6
-echo "configure:1313: checking whether _AIX is defined" >&5
+echo "configure:1270: checking whether _AIX is defined" >&5
 if eval "test \"`echo '$''{'ac_cv_is_aix'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1318 "configure"
+#line 1275 "configure"
 #include "confdefs.h"
 #ifdef _AIX
@@ -1341 +1298 @@
 
 echo $ac_n "checking for atof in -lm""... $ac_c" 1>&6
-echo "configure:1344: checking for atof in -lm" >&5
+echo "configure:1301: checking for atof in -lm" >&5
 ac_lib_var=`echo m'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1349 +1306 @@
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1352 "configure"
+#line 1309 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1360 +1317 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1388 +1345 @@
 
 echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6
-echo "configure:1391: checking for socket in -lbsd" >&5
+echo "configure:1348: checking for socket in -lbsd" >&5
 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1396 +1353 @@
 LIBS="-lbsd  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1399 "configure"
+#line 1356 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1407 +1364 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1435 +1392 @@
 
 echo $ac_n "checking for listen in -lsocket""... $ac_c" 1>&6
-echo "configure:1438: checking for listen in -lsocket" >&5
+echo "configure:1395: checking for listen in -lsocket" >&5
 ac_lib_var=`echo socket'_'listen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1443 +1400 @@
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1446 "configure"
+#line 1403 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1454 +1411 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1482 +1439 @@
 
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1485: checking for gethostbyname in -lnsl" >&5
+echo "configure:1442: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1490 +1447 @@
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1493 "configure"
+#line 1450 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1501 +1458 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1529 +1486 @@
 
 echo $ac_n "checking for mpq_init in -lgmp""... $ac_c" 1>&6
-echo "configure:1532: checking for mpq_init in -lgmp" >&5
+echo "configure:1489: checking for mpq_init in -lgmp" >&5
 ac_lib_var=`echo gmp'_'mpq_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1537 +1494 @@
 LIBS="-lgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1540 "configure"
+#line 1497 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1548 +1505 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1576 +1533 @@
 
 echo $ac_n "checking for mpz_init in -lsmallgmp""... $ac_c" 1>&6
-echo "configure:1579: checking for mpz_init in -lsmallgmp" >&5
+echo "configure:1536: checking for mpz_init in -lsmallgmp" >&5
 ac_lib_var=`echo smallgmp'_'mpz_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1584 +1541 @@
 LIBS="-lsmallgmp  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1587 "configure"
+#line 1544 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1595 +1552 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1623 +1580 @@
 
 echo $ac_n "checking for IMP_PutGmpInt in -lMP""... $ac_c" 1>&6
-echo "configure:1626: checking for IMP_PutGmpInt in -lMP" >&5
+echo "configure:1583: checking for IMP_PutGmpInt in -lMP" >&5
 ac_lib_var=`echo MP'_'IMP_PutGmpInt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1631 +1588 @@
 LIBS="-lMP  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1634 "configure"
+#line 1591 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1642 +1599 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1670 +1627 @@
 
 echo $ac_n "checking for MPT_GetTree in -lMPT""... $ac_c" 1>&6
-echo "configure:1673: checking for MPT_GetTree in -lMPT" >&5
+echo "configure:1630: checking for MPT_GetTree in -lMPT" >&5
 ac_lib_var=`echo MPT'_'MPT_GetTree | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1678 +1635 @@
 LIBS="-lMPT  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1681 "configure"
+#line 1638 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1689 +1646 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1717 +1674 @@
 
 echo $ac_n "checking for atof in -lsingcf""... $ac_c" 1>&6
-echo "configure:1720: checking for atof in -lsingcf" >&5
+echo "configure:1677: checking for atof in -lsingcf" >&5
 ac_lib_var=`echo singcf'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1725 +1682 @@
 LIBS="-lsingcf  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1728 "configure"
+#line 1685 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1736 +1693 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1764 +1721 @@
 
 echo $ac_n "checking for atof in -lsingfac""... $ac_c" 1>&6
-echo "configure:1767: checking for atof in -lsingfac" >&5
+echo "configure:1724: checking for atof in -lsingfac" >&5
 ac_lib_var=`echo singfac'_'atof | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
@@ -1772 +1729 @@
 LIBS="-lsingfac  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1775 "configure"
+#line 1732 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -1783 +1740 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
@@ -1815 +1772 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1818: checking for $ac_hdr" >&5
+echo "configure:1775: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1823 "configure"
+#line 1780 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1997 +1954 @@
 
 echo $ac_n "checking which tmp dir to use""... $ac_c" 1>&6
-echo "configure:2000: checking which tmp dir to use" >&5
+echo "configure:1957: checking which tmp dir to use" >&5
 if test "${with_tmpdir+set}" = set && test -d ${with_tmpdir}; then
   if (echo "${with_tmpdir}" | egrep "\." >/dev/null 2>&1)
@@ -2014 +1971 @@
 if test "${with_perl5+set}" != set; then
   echo $ac_n "checking for perl5""... $ac_c" 1>&6
-echo "configure:2017: checking for perl5" >&5
+echo "configure:1974: checking for perl5" >&5
     if eval "test \"`echo '$''{'ac_cv_prog_perl5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2051 +2008 @@
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2054: checking for $ac_word" >&5
+echo "configure:2011: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PERL5'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2088 +2045 @@
 
 echo $ac_n "checking whether to configure and build gmp lib""... $ac_c" 1>&6
-echo "configure:2091: checking whether to configure and build gmp lib" >&5
+echo "configure:2048: checking whether to configure and build gmp lib" >&5
 if test "$enable_gmp" != yes && test "$enable_gmp" != no; then
   if test "$ac_gmp_ok" != yes && test -d gmp; then
@@ -2114 +2071 @@
 
 echo $ac_n "checking whether to configure and build smallgmp lib""... $ac_c" 1>&6
-echo "configure:2117: checking whether to configure and build smallgmp lib" >&5
+echo "configure:2074: checking whether to configure and build smallgmp lib" >&5
 if test "$enable_smallgmp" != yes && test "$enable_smallgmp" != no; then
   if test "$ac_smallgmp_ok" != yes && test "$ac_gmp_ok" != yes && \
@@ -2153 +2110 @@
 
 echo $ac_n "checking whether to configure and build MP lib""... $ac_c" 1>&6
-echo "configure:2156: checking whether to configure and build MP lib" >&5
+echo "configure:2113: checking whether to configure and build MP lib" >&5
 if test "$enable_MP" != yes && test "$enable_MP" != no; then
   if test "$with_MP" != no && test "$ac_MP_ok" != yes && test -d MP && \
@@ -2182 +2139 @@
   
 echo $ac_n "checking whether to configure and build factory lib""... $ac_c" 1>&6
-echo "configure:2185: checking whether to configure and build factory lib" >&5
+echo "configure:2142: checking whether to configure and build factory lib" >&5
 if test "$enable_factory" != yes && test "$enable_factory" != no; then
   if test "$with_factory" != no && test "$ac_factory_ok" != yes && \
@@ -2207 +2164 @@
 
 echo $ac_n "checking whether to configure and build libfac lib""... $ac_c" 1>&6
-echo "configure:2210: checking whether to configure and build libfac lib" >&5
+echo "configure:2167: checking whether to configure and build libfac lib" >&5
 if test "$enable_libfac" != yes && test "$enable_libfac" != no; then
   if test "$with_libfac" != no && test "$ac_libfac_ok" != yes && \
@@ -2237 +2194 @@
 
 echo $ac_n "checking whether to configure and build sgroup lib""... $ac_c" 1>&6
-echo "configure:2240: checking whether to configure and build sgroup lib" >&5
+echo "configure:2197: checking whether to configure and build sgroup lib" >&5
 if test "$enable_sgroup" = yes; then
   if test ! -d sgroup; then
@@ -2257 +2214 @@
 
 echo $ac_n "checking whether to build mpr and use mtrack""... $ac_c" 1>&6
-echo "configure:2260: checking whether to build mpr and use mtrack" >&5
+echo "configure:2217: checking whether to build mpr and use mtrack" >&5
 if test -d mpr && test "$ac_cv_singuname" = ix86-Linux && test "$enable_mtrack" != no; then
   echo "$ac_t""yes" 1>&6
@@ -2272 +2229 @@
 
 echo $ac_n "checking whether to configure and build Singular""... $ac_c" 1>&6
-echo "configure:2275: checking whether to configure and build Singular" >&5
+echo "configure:2232: checking whether to configure and build Singular" >&5
 if test "$enable_Singular" != yes && test "$enable_Singular" != no; then
   if test "$with_Singular" != no && test -d Singular; then
@@ -2298 +2255 @@
 
 echo $ac_n "checking whether to configure and build Texinfo""... $ac_c" 1>&6
-echo "configure:2301: checking whether to configure and build Texinfo" >&5
+echo "configure:2258: checking whether to configure and build Texinfo" >&5
 if test "$enable_Texinfo" != no && test -d Texinfo; then
   echo "$ac_t""yes" 1>&6
@@ -2320 +2277 @@
 set dummy makeinfo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2323: checking for $ac_word" >&5
+echo "configure:2280: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2350 +2307 @@
 set dummy texi2dvi; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2353: checking for $ac_word" >&5
+echo "configure:2310: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TEXI2DVI'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2380 +2337 @@
 set dummy texindex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2383: checking for $ac_word" >&5
+echo "configure:2340: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TEXINDEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2410 +2367 @@
 
 
-echo $ac_n "checking whether to build Texi2html""... $ac_c" 1>&6
-echo "configure:2414: checking whether to build Texi2html" >&5
+echo $ac_n "checking whether to configure and build Texi2html""... $ac_c" 1>&6
+echo "configure:2371: checking whether to configure and build Texi2html" >&5
 if test "$enable_Texi2html" != no && test -d Texi2html; then
  echo "$ac_t""yes" 1>&6
+ CONFIG_SUBDIRS="$CONFIG_SUBDIRS Texi2html"
  BUILD_SUBDIRS="$BUILD_SUBDIRS Texi2html"
  if test "$enable_Texi2html" != yes; then
    ac_configure_args="$ac_configure_args --enable-Texi2html"
  fi
+ TEXI2HTML=${bindir}/texi2html
+ 
 else
  echo "$ac_t""no" 1>&6
-fi
+ # Extract the first word of "texi2html", so it can be a program name with args.
+set dummy texi2html; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2386: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_TEXI2HTML'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$TEXI2HTML"; then
+  ac_cv_prog_TEXI2HTML="$TEXI2HTML" # Let the user override the test.
+else
+  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_TEXI2HTML="texi2html"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+TEXI2HTML="$ac_cv_prog_TEXI2HTML"
+if test -n "$TEXI2HTML"; then
+  echo "$ac_t""$TEXI2HTML" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+if test "${TEXI2HTML+set}" != set; then
+echo "configure: warning: texi2html not found. HTML doc generation will fail" 1>&2
+fi
+if test "$ac_cv_prog_LATEX2HTML" = latex2html; then
+  TEXI2HTML_OPTS="-l2h"
+fi
+
+
 
 echo $ac_n "checking whether to build doc""... $ac_c" 1>&6
-echo "configure:2426: checking whether to build doc" >&5
+echo "configure:2424: checking whether to build doc" >&5
 if test "$enable_doc" != no && test -d doc; then
  echo "$ac_t""yes" 1>&6
@@ -2437 +2435 @@
 
 echo $ac_n "checking whether to build emacs""... $ac_c" 1>&6
-echo "configure:2440: checking whether to build emacs" >&5
+echo "configure:2438: checking whether to build emacs" >&5
 if test "$enable_doc" = yes && test "$enable_emacs" != no && test -d emacs; then
  echo "$ac_t""yes" 1>&6
@@ -2449 +2447 @@
 
 echo $ac_n "checking which apint package to use""... $ac_c" 1>&6
-echo "configure:2452: checking which apint package to use" >&5
+echo "configure:2450: checking which apint package to use" >&5
 if test "$with_apint" = gmp; then
   if test "$ac_gmp_ok" = yes || test "$enable_gmp" = yes; then
@@ -2473 +2471 @@
 
 echo $ac_n "checking whether to use with MP""... $ac_c" 1>&6
-echo "configure:2476: checking whether to use with MP" >&5
+echo "configure:2474: checking whether to use with MP" >&5
 if test "$with_MP" = yes; then
   if test "$ac_MP_ok" = yes || test "$enable_MP" = yes; then
@@ -2492 +2490 @@
 
 echo $ac_n "checking whether to use with factory""... $ac_c" 1>&6
-echo "configure:2495: checking whether to use with factory" >&5
+echo "configure:2493: checking whether to use with factory" >&5
 if test "$with_factory" = yes; then
   if test "$ac_factory_ok" = yes || test "$enable_factory" = yes; then
@@ -2511 +2509 @@
   
 echo $ac_n "checking whether to use with libfac""... $ac_c" 1>&6
-echo "configure:2514: checking whether to use with libfac" >&5
+echo "configure:2512: checking whether to use with libfac" >&5
 if test "$with_libfac" = yes; then
   if test "$ac_libfac_ok" = yes || test "$enable_libfac" = yes; then
@@ -2531 +2529 @@
 
 echo $ac_n "checking whether to use with mtrack""... $ac_c" 1>&6
-echo "configure:2534: checking whether to use with mtrack" >&5
+echo "configure:2532: checking whether to use with mtrack" >&5
 if test "$with_mtrack" != no && test "$with_mtrack" != yes; then
   if test "$enable_mtrack" = yes; then
@@ -2551 +2549 @@
 
 echo $ac_n "checking whether to use with Singular""... $ac_c" 1>&6
-echo "configure:2554: checking whether to use with Singular" >&5
+echo "configure:2552: checking whether to use with Singular" >&5
 if test "$with_Singular" != no && test "$with_Singular" != yes; then
   if test "$enable_Singular" = yes; then
@@ -2611 +2609 @@
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:2614: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:2612: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
@@ -2803 +2801 @@
 s%@LATEX2HTML@%$LATEX2HTML%g
 s%@LN_S@%$LN_S%g
-s%@TEXI2HTML@%$TEXI2HTML%g
-s%@TEXI2HTML_OPTS@%$TEXI2HTML_OPTS%g
 s%@SINGULAR@%$SINGULAR%g
 s%@TMP_DIR@%$TMP_DIR%g
@@ -2811 +2807 @@
 s%@MAKEINFO@%$MAKEINFO%g
 s%@TEXINDEX@%$TEXINDEX%g
+s%@TEXI2HTML@%$TEXI2HTML%g
+s%@TEXI2HTML_OPTS@%$TEXI2HTML_OPTS%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@SUBDIRS@%$SUBDIRS%g

configure.in

@@ -87 +87 @@
 AC_CHECK_PROG(LATEX2HTML, latex2html, latex2html)
 AC_PROG_LN_S
-if test -d Texi2html; then
-if test -r ${T2H_HOME}/texi2html.init; then
-TEXI2HTML=`pwd`/Texi2html/texi2html.pl
-else
-TEXI2HTML=`pwd`/Texi2html/texi2html
-fi
-AC_SUBST(TEXI2HTML)
-else
-AC_MSG_WARN(could not find Texi2html/texi2html HTML generation might fail)
-AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html)
-fi
-if test "$ac_cv_prog_LATEX2HTML" = latex2html; then
-  TEXI2HTML_OPTS="-l2h"
-fi
-AC_SUBST(TEXI2HTML_OPTS)
 
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
@@ -567 +552 @@
 
 
-AC_MSG_CHECKING(whether to build Texi2html)
+AC_MSG_CHECKING(whether to configure and build Texi2html)
 if test "$enable_Texi2html" != no && test -d Texi2html; then
  AC_MSG_RESULT(yes)
+ CONFIG_SUBDIRS="$CONFIG_SUBDIRS Texi2html"
  BUILD_SUBDIRS="$BUILD_SUBDIRS Texi2html"
  if test "$enable_Texi2html" != yes; then
    ac_configure_args="$ac_configure_args --enable-Texi2html"
  fi
+ TEXI2HTML=${bindir}/texi2html
+ AC_SUBST(TEXI2HTML)
 else
  AC_MSG_RESULT(no)
-fi
+ AC_CHECK_PROG(TEXI2HTML, texi2html, texi2html)
+fi
+
+if test "${TEXI2HTML+set}" != set; then
+AC_MSG_WARN(texi2html not found. HTML doc generation will fail)
+fi
+if test "$ac_cv_prog_LATEX2HTML" = latex2html; then
+  TEXI2HTML_OPTS="-l2h"
+fi
+AC_SUBST(TEXI2HTML_OPTS)
+
 
 AC_MSG_CHECKING(whether to build doc)