Get rid of more defines, say our version on command line tools, also say our copyright

Did not modify PSOutputDev.cc output as PS is too fragile

7 files changed, 14 insertions, 7 deletions

diff --git a/utils/pdffonts.cc b/utils/pdffonts.cc
index 7691d7eb..39fcf24f 100644
--- a/utils/pdffonts.cc
+++ b/utils/pdffonts.cc
@@ -92,7 +92,8 @@ int main(int argc, char *argv[]) {
   // parse args
   ok = parseArgs(argDesc, &argc, argv);
   if (!ok || argc != 2 || printVersion || printHelp) {
-    fprintf(stderr, "pdffonts version %s\n", xpdfVersion);
+    fprintf(stderr, "pdffonts version %s\n", PACKAGE_VERSION);
+    fprintf(stderr, "%s\n", popplerCopyright);
     fprintf(stderr, "%s\n", xpdfCopyright);
     if (!printVersion) {
       printUsage("pdffonts", "<PDF-file>", argDesc);
diff --git a/utils/pdfimages.cc b/utils/pdfimages.cc
index febbdea6..3d5ac8d9 100644
--- a/utils/pdfimages.cc
+++ b/utils/pdfimages.cc
@@ -78,7 +78,8 @@ int main(int argc, char *argv[]) {
   // parse args
   ok = parseArgs(argDesc, &argc, argv);
   if (!ok || argc != 3 || printVersion || printHelp) {
-    fprintf(stderr, "pdfimages version %s\n", xpdfVersion);
+    fprintf(stderr, "pdfimages version %s\n", PACKAGE_VERSION);
+    fprintf(stderr, "%s\n", popplerCopyright);
     fprintf(stderr, "%s\n", xpdfCopyright);
     if (!printVersion) {
       printUsage("pdfimages", "<PDF-file> <image-root>", argDesc);
diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
index 71ce3a88..9e924fde 100644
--- a/utils/pdfinfo.cc
+++ b/utils/pdfinfo.cc
@@ -99,7 +99,8 @@ int main(int argc, char *argv[]) {
   // parse args
   ok = parseArgs(argDesc, &argc, argv);
   if (!ok || (argc != 2 && !printEnc) || printVersion || printHelp) {
-    fprintf(stderr, "pdfinfo version %s\n", xpdfVersion);
+    fprintf(stderr, "pdfinfo version %s\n", PACKAGE_VERSION);
+    fprintf(stderr, "%s\n", popplerCopyright);
     fprintf(stderr, "%s\n", xpdfCopyright);
     if (!printVersion) {
       printUsage("pdfinfo", "<PDF-file>", argDesc);
diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 392f3362..6a783667 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -130,7 +130,8 @@ int main(int argc, char *argv[]) {
   // parse args
   ok = parseArgs(argDesc, &argc, argv);
   if (!ok || argc < 2 || argc > 3 || printHelp || printVersion) {
-    fprintf(stderr, "pdftohtml version %s http://pdftohtml.sourceforge.net/, based on Xpdf version %s\n", "0.36", xpdfVersion);
+    fprintf(stderr, "pdftohtml version %s\n", PACKAGE_VERSION);
+    fprintf(stderr, "%s\n", popplerCopyright);
     fprintf(stderr, "%s\n", "Copyright 1999-2003 Gueorgui Ovtcharov and Rainer Dorsch");
     fprintf(stderr, "%s\n\n", xpdfCopyright);
     if (!printVersion) {
diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc
index 4d32e6b7..34602f70 100644
--- a/utils/pdftoppm.cc
+++ b/utils/pdftoppm.cc
@@ -142,7 +142,8 @@ int main(int argc, char *argv[]) {
     ok = gFalse;
   }
   if (!ok || argc > 3 || printVersion || printHelp) {
-    fprintf(stderr, "pdftoppm version %s\n", xpdfVersion);
+    fprintf(stderr, "pdftoppm version %s\n", PACKAGE_VERSION);
+    fprintf(stderr, "%s\n", popplerCopyright);
     fprintf(stderr, "%s\n", xpdfCopyright);
     if (!printVersion) {
       printUsage("pdftoppm", "[PDF-file [PPM-file-prefix]]", argDesc);
diff --git a/utils/pdftops.cc b/utils/pdftops.cc
index 69562a2c..a1af9aa9 100644
--- a/utils/pdftops.cc
+++ b/utils/pdftops.cc
@@ -170,7 +170,8 @@ int main(int argc, char *argv[]) {
   // parse args
   ok = parseArgs(argDesc, &argc, argv);
   if (!ok || argc < 2 || argc > 3 || printVersion || printHelp) {
-    fprintf(stderr, "pdftops version %s\n", xpdfVersion);
+    fprintf(stderr, "pdftops version %s\n", PACKAGE_VERSION);
+    fprintf(stderr, "%s\n", popplerCopyright);
     fprintf(stderr, "%s\n", xpdfCopyright);
     if (!printVersion) {
       printUsage("pdftops", "<PDF-file> [<PS-file>]", argDesc);
diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc
index b6f885b7..6731b9b3 100644
--- a/utils/pdftotext.cc
+++ b/utils/pdftotext.cc
@@ -107,7 +107,8 @@ int main(int argc, char *argv[]) {
   // parse args
   ok = parseArgs(argDesc, &argc, argv);
   if (!ok || (argc < 2 && !printEnc) || argc > 3 || printVersion || printHelp) {
-    fprintf(stderr, "pdftotext version %s\n", xpdfVersion);
+    fprintf(stderr, "pdftotext version %s\n", PACKAGE_VERSION);
+    fprintf(stderr, "%s\n", popplerCopyright);
     fprintf(stderr, "%s\n", xpdfCopyright);
     if (!printVersion) {
       printUsage("pdftotext", "<PDF-file> [<text-file>]", argDesc);