[7690] texi2any compare versino of loaded odules

[gavinsmith0123]

Revision: 7690
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7690
Author:   gavin
Date:     2017-03-19 14:38:59 -0400 (Sun, 19 Mar 2017)
Log Message:
-----------
texi2any compare versino of loaded odules

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/texi2any.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-03-19 18:17:39 UTC (rev 7689)
+++ trunk/ChangeLog     2017-03-19 18:38:59 UTC (rev 7690)
@@ -1,5 +1,10 @@
 2017-03-19  Gavin Smith  <address@hidden>
 
+       * tp/texi2any.pl: Compare version of this file and the version
+       of loaded modules.  If they differ, abort.
+
+2017-03-19  Gavin Smith  <address@hidden>
+
        * tp: Run maintain/change_perl_modules.sh.
 
 2017-03-12  Gavin Smith  <address@hidden>

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2017-03-19 18:17:39 UTC (rev 7689)
+++ trunk/tp/texi2any.pl        2017-03-19 18:38:59 UTC (rev 7690)
@@ -277,6 +277,21 @@
     $configured_version = $Texinfo::Parser::VERSION;
   }
 }
+
+# Compare the version of this file with the version of the modules
+# it is using.  If they are different, don't go any further.  This
+# can happen if multiple versions of texi2any are installed under a
+# different names, e.g. with the --program-suffix option to 'configure'.
+# The version in Common.pm is checked because that file has been present
+# since Texinfo 5.0 (the first release with texi2any in Perl).
+if ($configured_version ne $Texinfo::Common::VERSION
+    and $configured_version ne $Texinfo::Common::VERSION."+dev") {
+  warn "This is texi2any $configured_version but modules ".
+       "for texi2any $Texinfo::Common::VERSION found!\n";
+  die "Your installation of Texinfo is broken; aborting.\n";
+}
+
+
 my $configured_package = '@PACKAGE@';
 $configured_package = 'Texinfo' if ($configured_package eq '@' . 'PACKAGE@');
 my $configured_name = '@PACKAGE_NAME@';