[passepartout] pass no-define to automake

[Sven Herzberg <herzi src gnome org>]

commit ecb72dc706d5bc449f26aa394636e87cc19c92c8
Author: Sven Herzberg <herzi lanedo com>
Date:   Thu Apr 30 10:16:21 2009 +0200

    pass no-define to automake
    
    * configure.ac: pase no-define to automake
    * src/pptout/aboutdialog.cc,
    * src/pptout/document/document.cc,
    * src/pptout/main.cc,
    * src/pptout/widget/programs.cc,
    * src/xml2ps/main.cc: replace VERSION by PACKAGE_VERSION
---
 configure.ac                    |    2 +-
 src/pptout/aboutdialog.cc       |    4 ++--
 src/pptout/document/document.cc |    4 ++--
 src/pptout/main.cc              |    4 ++--
 src/pptout/widget/programs.cc   |    4 ++--
 src/xml2ps/main.cc              |    4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure.ac b/configure.ac
index c88528f..a8d70e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 AC_INIT([Passepartout],[0.8-PRE],[http://bugzilla.gnome.org/simple-bug-guide.cgi?product=passepartout])
 AC_CONFIG_SRCDIR([src/xml2ps/blockcontainer.cc])
 
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-define])
 
 AC_CONFIG_HEADERS([src/defines.h])
 
diff --git a/src/pptout/aboutdialog.cc b/src/pptout/aboutdialog.cc
index 2c77ff7..0739e1d 100644
--- a/src/pptout/aboutdialog.cc
+++ b/src/pptout/aboutdialog.cc
@@ -2,7 +2,7 @@
 // Copyright (C) 2002 - 2004, Fredrik Arnerup & Rasmus Kaj, See COPYING
 ///
 #include "aboutdialog.h"
-#include "defines.h"
+#include "defines.h" // PACKAGE_VERSION
 
 #include <glib/gi18n.h>
 #include "widget/wmisc.h"
@@ -57,7 +57,7 @@ AboutDialog::AboutDialog()
   // FIXME: set_mailing_list (mail_address);
   set_name (_("Passepartout"));
   set_translator_credits (_("translator-credits"));
-  set_version (VERSION);
+  set_version (PACKAGE_VERSION);
   set_url_hook (ptr_fun(about_uri_cb));
   set_website ("http://www.stacken.kth.se/project/pptout/";);
 }
diff --git a/src/pptout/document/document.cc b/src/pptout/document/document.cc
index 700b21c..39d89a4 100644
--- a/src/pptout/document/document.cc
+++ b/src/pptout/document/document.cc
@@ -15,7 +15,7 @@
 #include "document.h"
 #include "fileerrors.h"
 #include "page.h"
-#include "defines.h" // VERSION
+#include "defines.h" // PACKAGE_VERSION
 #include "textstream.h"
 #include "xml2ps/psstream.hh"
 #include "util/stringutil.h"
@@ -602,7 +602,7 @@ void Document::print(std::ostream& out, int first_page, int last_page,
     //      << "%%Title: " << basename(filename) << '\n'
       << "%%CreationDate: " << std::ctime(&the_time)
     // ctime seems to add a newline
-      << "%%Creator: Passepartout " << std::string(VERSION)
+      << "%%Creator: Passepartout " << std::string(PACKAGE_VERSION)
       << " by Fredrik Arnerup & Rasmus Kaj\n";
 
   if(true) // perhaps the user is into cloak and dagger stuff ...
diff --git a/src/pptout/main.cc b/src/pptout/main.cc
index 8e8fd77..6198121 100644
--- a/src/pptout/main.cc
+++ b/src/pptout/main.cc
@@ -8,7 +8,7 @@
 #include "util/tempfile.h"
 #include "util/cmdline.h"
 #include "widget/errordialog.h"
-#include "defines.h" // VERSION
+#include "defines.h" // PACKAGE_VERSION
 
 #ifdef HAVE_GNOME
 #include <libgnomevfs/gnome-vfs.h>
@@ -83,7 +83,7 @@ int main(int argc, char *argv[]) {
 		  << "\": " << err.what() << std::endl;
 	}
       } else if(option == o_version) {
-	warning << "Passepartout " << std::string(VERSION) << std::endl;
+	warning << "Passepartout " << std::string(PACKAGE_VERSION) << std::endl;
 	return 0;
       } else if(option == o_verbose) {
 	verbose.active = true;
diff --git a/src/pptout/widget/programs.cc b/src/pptout/widget/programs.cc
index 5a447e5..38b0b00 100644
--- a/src/pptout/widget/programs.cc
+++ b/src/pptout/widget/programs.cc
@@ -3,7 +3,7 @@
 ///
 #include "programs.h"
 #include "usererror.h"
-#include "defines.h" // VERSION, HAVE_GNOME
+#include "defines.h" // PACKAGE_VERSION, HAVE_GNOME
 #include "util/warning.h"
 #include "util/filesys.h"
 
@@ -46,7 +46,7 @@ void Programs::open_docs() {
     url = "file://" + url;
   else
     url = "http://www.stacken.kth.se/project/pptout/doc/"; 
-      + std::string(VERSION)
+      + std::string(PACKAGE_VERSION)
       + "/passepartout.html";
   open_url(url);
 }
diff --git a/src/xml2ps/main.cc b/src/xml2ps/main.cc
index d4577c2..abf66f7 100644
--- a/src/xml2ps/main.cc
+++ b/src/xml2ps/main.cc
@@ -7,7 +7,7 @@
 #include "util/stringutil.h"
 #include "util/cmdline.h"
 #include <stdexcept>
-#include "defines.h" // VERSION
+#include "defines.h" // PACKAGE_VERSION
 
 static const std::string w_hdr("xml2ps Warning: "),
   e_hdr("xml2ps ERROR: ");
@@ -89,7 +89,7 @@ int main(int argc, char* argv[]) {
 	cmdline.print_usage(std::cout);
 	return 0;
       } else if(option == o_version) {
-	std::cout << "xml2ps " << std::string(VERSION) << std::endl;
+	std::cout << "xml2ps " << std::string(PACKAGE_VERSION) << std::endl;
 	return 0;
       }
     }