Remove qpdf.cc version check

Remove comparison of qpdf CLI version with library. With almost all
the functionality moving into the library, this check is no longer
meaningful.

3 files changed, 0 insertions, 36 deletions

diff --git a/README-maintainer b/README-maintainer
index 3f85a684..31634229 100644
--- a/README-maintainer
+++ b/README-maintainer
@@ -223,7 +223,6 @@ RELEASE PREPARATION
     * configure.ac
     * libqpdf/QPDF.cc
     * manual/conf.py
-    * qpdf/qpdf.cc
     `make_dist` verifies this consistency.
 
   * Update release notes in manual. Look at diffs and ChangeLog.
diff --git a/make_dist b/make_dist
index 56dccb92..dbbab032 100755
--- a/make_dist
+++ b/make_dist
@@ -64,7 +64,6 @@ cd($tmpdir);
 my $config_version = get_version_from_configure();
 my $code_version = get_version_from_source();
 my $doc_version = get_version_from_manual();
-my $cli_version = get_version_from_cli();
 
 my $version_error = 0;
 if ($version ne $config_version)
@@ -82,11 +81,6 @@ if ($version ne $doc_version)
     print "$whoami: doc version = $doc_version\n";
     $version_error = 1;
 }
-if ($version ne $cli_version)
-{
-    print "$whoami: qpdf.cc version = $cli_version\n";
-    $version_error = 1;
-}
 if ($version_error)
 {
     die "$whoami: version numbers are not consistent\n";
@@ -157,22 +151,6 @@ sub get_version_from_manual
     $doc_version;
 }
 
-sub get_version_from_cli
-{
-    my $fh = safe_open("qpdf/qpdf.cc");
-    my $cli_version = 'unknown';
-    while (<$fh>)
-    {
-        if (m/expected_version = \"([^\"]+)\"/)
-        {
-            $cli_version = $1;
-            last;
-        }
-    }
-    $fh->close();
-    $cli_version;
-}
-
 sub safe_open
 {
     my $file = shift;
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc
index a7613af9..202fb751 100644
--- a/qpdf/qpdf.cc
+++ b/qpdf/qpdf.cc
@@ -24,8 +24,6 @@ static int constexpr EXIT_CORRECT_PASSWORD = 3;
 
 static char const* whoami = 0;
 
-static std::string expected_version = "10.5.0";
-
 class ArgParser
 {
   public:
@@ -445,17 +443,6 @@ ArgParser::argPositional(char* arg)
 void
 ArgParser::argVersion()
 {
-    if (expected_version != QPDF::QPDFVersion())
-    {
-        std::cerr << "***\n"
-                  << "WARNING: qpdf CLI from version " << expected_version
-                  << " is using library version " << QPDF::QPDFVersion()
-                  << ".\n"
-                  << "This probably means you have multiple versions of qpdf installed\n"
-                  << "and don't have your library path configured correctly.\n"
-                  << "***"
-                  << std::endl;
-    }
     std::cout
         << whoami << " version " << QPDF::QPDFVersion() << std::endl
         << "Run " << whoami << " --copyright to see copyright and license information."