[Xfce4-commits] <postler:master> Advise the compiler to always include config.h first

[Christian Dywan]

Updating branch refs/heads/master
         to cf5429d7a267aa253db33b17f0a784cc6f4d3085 (commit)
       from 8e59981845b5723a954273ad3885fa2903f1c56e (commit)

commit cf5429d7a267aa253db33b17f0a784cc6f4d3085
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Jun 21 21:35:29 2010 +0200

    Advise the compiler to always include config.h first
    
    This is a slightly more elegant solution for the case where
    Vala fails to include config.h before gi18n.h.
    
    The -include switch works with clang and gcc.

 postler/postler-accounts.vala   |    2 --
 postler/postler-app.vala        |    2 --
 postler/postler-bureau.vala     |    2 --
 postler/postler-composer.vala   |    2 --
 postler/postler-content.vala    |    2 --
 postler/postler-folders.vala    |    2 --
 postler/postler-menuaction.vala |    2 --
 postler/postler-messages.vala   |    2 --
 postler/postler-reader.vala     |    2 --
 wscript                         |    2 +-
 10 files changed, 1 insertions(+), 19 deletions(-)

diff --git a/postler/postler-accounts.vala b/postler/postler-accounts.vala
index 2ce38e8..c37577c 100644
--- a/postler/postler-accounts.vala
+++ b/postler/postler-accounts.vala
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-const string GETTEXT_PACKAGE_ACCOUNTS = Config.GETTEXT_PACKAGE;
-
 namespace Postler {
     public enum AccountType {
         MAILDIR,
diff --git a/postler/postler-app.vala b/postler/postler-app.vala
index 5e19ec8..b64bc03 100644
--- a/postler/postler-app.vala
+++ b/postler/postler-app.vala
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-const string GETTEXT_PACKAGE_APP = Config.GETTEXT_PACKAGE;
-
 namespace Postler {
     const string STOCK_ADDRESSBOOK = "stock_addressbook";
     const string STOCK_EMBLEM_DRAFT = "emblem-draft";
diff --git a/postler/postler-bureau.vala b/postler/postler-bureau.vala
index 9a6427f..5f30aff 100644
--- a/postler/postler-bureau.vala
+++ b/postler/postler-bureau.vala
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-const string GETTEXT_PACKAGE_BUREAU = Config.GETTEXT_PACKAGE;
-
 public class Postler.Bureau : Gtk.Window {
     Accounts accounts = new Accounts ();
 
diff --git a/postler/postler-composer.vala b/postler/postler-composer.vala
index 81efdfb..241dc89 100644
--- a/postler/postler-composer.vala
+++ b/postler/postler-composer.vala
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-const string GETTEXT_PACKAGE_COMPOSER = Config.GETTEXT_PACKAGE;
-
 public class Postler.Composer : Gtk.Window {
     Accounts accounts = new Accounts ();
 
diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 64ba595..fa38fb4 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-const string GETTEXT_PACKAGE_CONTENT = Config.GETTEXT_PACKAGE;
-
 struct Postler.EmoticonMapping {
     public string token;
     public string icon_name;
diff --git a/postler/postler-folders.vala b/postler/postler-folders.vala
index 1c9df89..35df0d0 100644
--- a/postler/postler-folders.vala
+++ b/postler/postler-folders.vala
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-const string GETTEXT_PACKAGE_FOLDERS = Config.GETTEXT_PACKAGE;
-
 struct Postler.MailFolder {
     public string name;
     public string stock_id;
diff --git a/postler/postler-menuaction.vala b/postler/postler-menuaction.vala
index 74d2a39..876e67d 100644
--- a/postler/postler-menuaction.vala
+++ b/postler/postler-menuaction.vala
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-const string GETTEXT_PACKAGE_MENUACTION = Config.GETTEXT_PACKAGE;
-
 public class Postler.MenuAction : Gtk.Action {
     Gtk.ToolItem toolitem;
 
diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala
index be993af..b0cfa72 100644
--- a/postler/postler-messages.vala
+++ b/postler/postler-messages.vala
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-const string GETTEXT_PACKAGE_MESSAGES = Config.GETTEXT_PACKAGE;
-
 public class Postler.Messages : Gtk.TreeView {
     Accounts accounts;
     Gtk.TreeStore store;
diff --git a/postler/postler-reader.vala b/postler/postler-reader.vala
index de122ea..b552f57 100644
--- a/postler/postler-reader.vala
+++ b/postler/postler-reader.vala
@@ -9,8 +9,6 @@
  See the file COPYING for the full license text.
 */
 
-const string GETTEXT_PACKAGE_READER = Config.GETTEXT_PACKAGE;
-
 public class Postler.Reader {
     static bool verbose = false;
     static string module = null;
diff --git a/wscript b/wscript
index 1a04b72..8345016 100644
--- a/wscript
+++ b/wscript
@@ -129,7 +129,7 @@ def configure (conf):
     conf.define ('GETTEXT_PACKAGE', APPNAME)
 
     conf.write_config_header ('config.h')
-    conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H')
+    conf.env.append_value ('CCFLAGS', '-DHAVE_CONFIG_H -include config.h'.split ())
     debug_level = Options.options.debug_level
     compiler = conf.env['CC_NAME']
     if debug_level != '' and compiler != 'gcc':