* automake.in (handle_texinfo_helper): Use the user definition

of TEXINFO_TEX before checking for cygnus or AC_CONFIG_AUX_DIR.
* tests/txinfo22.test: New file.
* tests/Makefile.am (TESTS): Add txinfo22.test.
Report from Tom Tromey.

diff --git a/ChangeLog b/ChangeLog
index 8637256f9793a38597e9b561e320113872ce8272..96a77ecbc1049d3d862c8ed7368e1191c406fce0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
+2003-08-05  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * automake.in (handle_texinfo_helper): Use the user definition
+       of TEXINFO_TEX before checking for cygnus or AC_CONFIG_AUX_DIR.
+       * tests/txinfo22.test: New file.
+       * tests/Makefile.am (TESTS): Add txinfo22.test.
+       Report from Tom Tromey.
+
 2003-08-03  Raja R Harinath  <harinath@acm.org>
- 
+
        * lib/Automake/Variable.pm (@EXPORT): Remove
        traverse_variable_recursively and
        require_variables_for_variable.

diff --git a/automake.in b/automake.in
index 2c3e150911f52a2d7f8c783116ba5caaab78e311..464305315187c90b690199c580eb6ea2abfaec95 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -3063,7 +3063,14 @@ sub handle_texinfo_helper ($)
   # Handle location of texinfo.tex.
   my $need_texi_file = 0;
   my $texinfodir;
-  if ($options{'cygnus'})
+  if (var ('TEXINFO_TEX'))
+    {
+      # The user defined TEXINFO_TEX so assume he knows what he is
+      # doing.
+      $texinfodir = ('$(srcdir)/'
+                    . dirname (variable_value ('TEXINFO_TEX')));
+    }
+  elsif ($options{'cygnus'})
     {
       $texinfodir = '$(top_srcdir)/../texinfo';
       define_variable ('TEXINFO_TEX', "$texinfodir/texinfo.tex", INTERNAL);
@@ -3074,13 +3081,6 @@ sub handle_texinfo_helper ($)
       define_variable ('TEXINFO_TEX', "$texinfodir/texinfo.tex", INTERNAL);
       $need_texi_file = 2; # so that we require_conf_file later
     }
-  elsif (var ('TEXINFO_TEX'))
-    {
-      # The user defined TEXINFO_TEX so assume he knows what he is
-      # doing.
-      $texinfodir = ('$(srcdir)/'
-                    . dirname (variable_value ('TEXINFO_TEX')));
-    }
   else
     {
       $texinfodir = '$(srcdir)';

diff --git a/tests/Makefile.am b/tests/Makefile.am
index e8e73d1045267b2525869bbec654c50535edce23..11fb3f585896be07d71bcea7606c3dc7978bca69 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -453,6 +453,7 @@ txinfo18.test \
 txinfo19.test \
 txinfo20.test \
 txinfo21.test \
+txinfo22.test \
 transform.test \
 unused.test \
 vars.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 81a0b6e49f49ac0dfa7fece844788aa269cf8e86..d11cdb9cdf632c1d46f3d59b568c024d86b310da 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -564,6 +564,7 @@ txinfo18.test \
 txinfo19.test \
 txinfo20.test \
 txinfo21.test \
+txinfo22.test \
 transform.test \
 unused.test \
 vars.test \

diff --git a/tests/txinfo22.test b/tests/txinfo22.test
new file mode 100755 (executable)
index 0000000..5f62e83
--- /dev/null
+++ b/tests/txinfo22.test
@@ -0,0 +1,64 @@
+#! /bin/sh
+# Copyright (C) 2003  Free Software Foundation, Inc.
+#
+# This file is part of GNU Automake.
+#
+# GNU Automake is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU Automake is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Automake; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# Make sure the user can override TEXINFO_TEX.
+# Report from Tom Tromey.
+
+required='makeinfo tex'
+. ./defs || exit 1
+
+set -e
+
+cat >>configure.in <<END
+AC_CONFIG_AUX_DIR(aux)
+AC_OUTPUT
+END
+
+cat > Makefile.am << 'END'
+TEXINFO_TEX = tex/texinfo.tex
+info_TEXINFOS = main.texi
+sure_it_exists:
+       test -f $(TEXINFO_TEX)
+END
+
+cat > main.texi << 'END'
+\input texinfo
+@setfilename main.info
+@settitle main
+@node Top
+Hello walls.
+@bye
+END
+
+mkdir aux
+mkdir tex
+cp $testsrcdir/../lib/texinfo.tex tex
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+$AUTOCONF
+
+test ! -f texinfo.tex
+test ! -f aux/texinfo.tex
+test -f tex/texinfo.tex
+
+./configure
+$MAKE sure_it_exists
+$MAKE distcheck