[evolution-ews/wip/cmake] Use ${PROJECT_NAME}-config.h unconditionally in the sources

From: Milan Crha <mcrha src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution-ews/wip/cmake] Use ${PROJECT_NAME}-config.h unconditionally in the sources
Date: Wed, 5 Oct 2016 17:18:14 +0000 (UTC)
commit ee7aeae0a6776e4fa7e3d9300efe5f1d13300e17
Author: Milan Crha <mcrha redhat com>
Date:   Wed Oct 5 19:18:26 2016 +0200

    Use ${PROJECT_NAME}-config.h unconditionally in the sources

 CMakeLists.txt                                     |    8 ++----
 config.h.in                                        |    2 +-
 src/addressbook/e-book-backend-ews-factory.c       |    4 +--
 src/addressbook/e-book-backend-ews.c               |    4 +--
 src/addressbook/ews-oab-decoder.c                  |    4 +--
 src/addressbook/ews-oab-decompress.c               |    4 +--
 src/addressbook/mspack/oab-decompress.c            |    4 +--
 src/calendar/e-cal-backend-ews-factory.c           |    4 +--
 src/calendar/e-cal-backend-ews-utils.c             |    4 +--
 src/calendar/e-cal-backend-ews.c                   |    4 +--
 src/camel/camel-ews-folder.c                       |    4 +--
 src/camel/camel-ews-private.h                      |    4 +--
 src/camel/camel-ews-provider.c                     |    4 +--
 src/camel/camel-ews-store-summary.c                |   23 +++++++++++++++++--
 src/camel/camel-ews-store-summary.h                |   19 ++++++++++++++++
 src/camel/camel-ews-store.c                        |    4 +--
 src/camel/camel-ews-summary.c                      |    4 +--
 src/camel/camel-ews-transport.c                    |    4 +--
 src/camel/camel-ews-utils.c                        |    4 +--
 src/collection/e-ews-backend-factory.c             |    4 +--
 src/collection/e-ews-backend.c                     |    4 +--
 src/collection/module-ews-backend.c                |    4 +--
 src/configuration/e-book-config-ews.c              |    4 +--
 src/configuration/e-cal-config-ews.c               |    4 +--
 src/configuration/e-ews-config-ui-extension.c      |    4 +--
 src/configuration/e-ews-config-utils.c             |    4 +--
 src/configuration/e-ews-edit-folder-permissions.c  |    4 +--
 src/configuration/e-ews-ooo-notificator.c          |    4 +--
 src/configuration/e-ews-search-user.c              |    4 +--
 src/configuration/e-ews-subscribe-foreign-folder.c |    4 +--
 src/configuration/e-mail-config-ews-autodiscover.c |    4 +--
 src/configuration/e-mail-config-ews-backend.c      |    4 +--
 .../e-mail-config-ews-delegates-page.c             |    4 +--
 .../e-mail-config-ews-folder-sizes-page.c          |    4 +--
 src/configuration/e-mail-config-ews-gal.c          |    4 +--
 src/configuration/e-mail-config-ews-notebook.c     |    4 +--
 .../e-mail-config-ews-oal-combo-box.c              |    4 +--
 src/configuration/e-mail-config-ews-ooo-page.c     |    4 +--
 src/configuration/module-ews-configuration.c       |    4 +--
 src/server/camel-ews-settings.c                    |    4 +--
 src/server/e-ews-camel-common.c                    |    4 +--
 src/server/e-ews-connection-utils.c                |    4 +--
 src/server/e-ews-connection.c                      |    4 +--
 src/server/e-ews-debug.c                           |    4 +--
 src/server/e-ews-folder.c                          |    4 +--
 src/server/e-ews-item-change.c                     |    4 +--
 src/server/e-ews-item.c                            |    4 +--
 src/server/e-ews-message.c                         |    4 +--
 src/server/e-ews-notification.c                    |    4 +--
 src/server/e-ews-oof-settings.c                    |    4 +--
 src/server/e-ews-query-to-restriction.c            |    4 +--
 src/server/e-soap-message.c                        |   17 ++++++++++++--
 src/server/e-soap-response.c                       |   17 ++++++++++++--
 src/server/e-soup-auth-negotiate.c                 |    4 +--
 src/server/e-source-ews-folder.c                   |    4 +--
 src/server/ews-errors.c                            |   19 +++++++++++++--
 tests/ews-test-common.c                            |    4 +--
 57 files changed, 137 insertions(+), 168 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f83016..c4ab9b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.0)
 cmake_policy(VERSION 3.0)
 
-project(evolution
+project(evolution-ews
        VERSION 3.23.1
        LANGUAGES C CXX)
 set(PROJECT_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-ews";)
@@ -182,10 +182,8 @@ else(WIN32)
        set(privsolibdir "${privlibdir}")
 endif(WIN32)
 
-# Generate the config.h file
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
-
-add_definitions(-DHAVE_CONFIG_H=1)
+# Generate the ${PROJECT_NAME}-config.h file
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config.h)
 
 print_build_options()
 
diff --git a/config.h.in b/config.h.in
index 926fad6..20f57d9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-/* config.h generated by CMake */
+/* @PROJECT_NAME@-config.h generated by CMake */
 
 /* Name of the package */
 #define PACKAGE "@PROJECT_NAME@"
diff --git a/src/addressbook/e-book-backend-ews-factory.c b/src/addressbook/e-book-backend-ews-factory.c
index 188081c..d91a7da 100644
--- a/src/addressbook/e-book-backend-ews-factory.c
+++ b/src/addressbook/e-book-backend-ews-factory.c
@@ -21,9 +21,7 @@
  * Authors: Chris Toshok <toshok ximian com>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <glib/gi18n-lib.h>
 
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 4be2b8e..be30279 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -20,9 +20,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/addressbook/ews-oab-decoder.c b/src/addressbook/ews-oab-decoder.c
index ff11eb2..9920922 100644
--- a/src/addressbook/ews-oab-decoder.c
+++ b/src/addressbook/ews-oab-decoder.c
@@ -19,9 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/src/addressbook/ews-oab-decompress.c b/src/addressbook/ews-oab-decompress.c
index 757ec0e..65c6293 100644
--- a/src/addressbook/ews-oab-decompress.c
+++ b/src/addressbook/ews-oab-decompress.c
@@ -20,9 +20,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <glib.h>
 #include "ews-oab-decompress.h"
diff --git a/src/addressbook/mspack/oab-decompress.c b/src/addressbook/mspack/oab-decompress.c
index 5161e6c..31b67ab 100644
--- a/src/addressbook/mspack/oab-decompress.c
+++ b/src/addressbook/mspack/oab-decompress.c
@@ -20,9 +20,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <sys/types.h>
 #include <stdlib.h>
diff --git a/src/calendar/e-cal-backend-ews-factory.c b/src/calendar/e-cal-backend-ews-factory.c
index c816029..2f4b979 100644
--- a/src/calendar/e-cal-backend-ews-factory.c
+++ b/src/calendar/e-cal-backend-ews-factory.c
@@ -5,9 +5,7 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
index 8925217..dbee3c9 100644
--- a/src/calendar/e-cal-backend-ews-utils.c
+++ b/src/calendar/e-cal-backend-ews-utils.c
@@ -15,9 +15,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 84fe34a..db51e0b 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -18,9 +18,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <sys/types.h>
diff --git a/src/camel/camel-ews-folder.c b/src/camel/camel-ews-folder.c
index 431fceb..7675a6a 100644
--- a/src/camel/camel-ews-folder.c
+++ b/src/camel/camel-ews-folder.c
@@ -28,9 +28,7 @@ This needs to be rewritten with a lot of functions cleaned up.
 There are a lot of places where code is unneccesarily duplicated,
 which needs to be better organized via functions */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/camel/camel-ews-private.h b/src/camel/camel-ews-private.h
index d54eb0a..177532c 100644
--- a/src/camel/camel-ews-private.h
+++ b/src/camel/camel-ews-private.h
@@ -25,9 +25,7 @@
 /* need a way to configure and save this data, if this header is to
  * be installed.  For now, dont install it */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #ifdef ENABLE_THREADS
 #define CAMEL_EWS_FOLDER_LOCK(f, l) \
diff --git a/src/camel/camel-ews-provider.c b/src/camel/camel-ews-provider.c
index 5efd5e6..ed445f2 100644
--- a/src/camel/camel-ews-provider.c
+++ b/src/camel/camel-ews-provider.c
@@ -24,9 +24,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 
diff --git a/src/camel/camel-ews-store-summary.c b/src/camel/camel-ews-store-summary.c
index e672cd7..ad9bbfa 100644
--- a/src/camel/camel-ews-store-summary.c
+++ b/src/camel/camel-ews-store-summary.c
@@ -1,6 +1,23 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "evolution-ews-config.h"
 
 #include <glib.h>
 #include <glib/gstdio.h>
diff --git a/src/camel/camel-ews-store-summary.h b/src/camel/camel-ews-store-summary.h
index 54770fb..0ae13e3 100644
--- a/src/camel/camel-ews-store-summary.h
+++ b/src/camel/camel-ews-store-summary.h
@@ -1,3 +1,22 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
 #ifndef CAMEL_EWS_STORE_SUMMARY_H
 #define CAMEL_EWS_STORE_SUMMARY_H
 
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index f4618ca..b15d151 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -23,9 +23,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <errno.h>
 #include <stdio.h>
diff --git a/src/camel/camel-ews-summary.c b/src/camel/camel-ews-summary.c
index 36e52d8..9df6ca8 100644
--- a/src/camel/camel-ews-summary.c
+++ b/src/camel/camel-ews-summary.c
@@ -23,9 +23,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/camel/camel-ews-transport.c b/src/camel/camel-ews-transport.c
index dc10007..05f396e 100644
--- a/src/camel/camel-ews-transport.c
+++ b/src/camel/camel-ews-transport.c
@@ -22,9 +22,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 
diff --git a/src/camel/camel-ews-utils.c b/src/camel/camel-ews-utils.c
index b0e7e77..5f05603 100644
--- a/src/camel/camel-ews-utils.c
+++ b/src/camel/camel-ews-utils.c
@@ -18,9 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <unistd.h>
diff --git a/src/collection/e-ews-backend-factory.c b/src/collection/e-ews-backend-factory.c
index fbec43b..e10bf7c 100644
--- a/src/collection/e-ews-backend-factory.c
+++ b/src/collection/e-ews-backend-factory.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-ews-backend-factory.h"
 
diff --git a/src/collection/e-ews-backend.c b/src/collection/e-ews-backend.c
index 07ab145..ef47c93 100644
--- a/src/collection/e-ews-backend.c
+++ b/src/collection/e-ews-backend.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-ews-backend.h"
 
diff --git a/src/collection/module-ews-backend.c b/src/collection/module-ews-backend.c
index 23dbeb3..8bfac43 100644
--- a/src/collection/module-ews-backend.c
+++ b/src/collection/module-ews-backend.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <glib/gi18n-lib.h>
 
diff --git a/src/configuration/e-book-config-ews.c b/src/configuration/e-book-config-ews.c
index 6d9cd52..a2ebfd1 100644
--- a/src/configuration/e-book-config-ews.c
+++ b/src/configuration/e-book-config-ews.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-book-config-ews.h"
 
diff --git a/src/configuration/e-cal-config-ews.c b/src/configuration/e-cal-config-ews.c
index dfb7ea3..e1868d5 100644
--- a/src/configuration/e-cal-config-ews.c
+++ b/src/configuration/e-cal-config-ews.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-cal-config-ews.h"
 
diff --git a/src/configuration/e-ews-config-ui-extension.c b/src/configuration/e-ews-config-ui-extension.c
index ca2a814..ba07dd6 100644
--- a/src/configuration/e-ews-config-ui-extension.c
+++ b/src/configuration/e-ews-config-ui-extension.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
diff --git a/src/configuration/e-ews-config-utils.c b/src/configuration/e-ews-config-utils.c
index 604a9be..c7b9684 100644
--- a/src/configuration/e-ews-config-utils.c
+++ b/src/configuration/e-ews-config-utils.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <unistd.h>
diff --git a/src/configuration/e-ews-edit-folder-permissions.c 
b/src/configuration/e-ews-edit-folder-permissions.c
index 110582b..52c4767 100644
--- a/src/configuration/e-ews-edit-folder-permissions.c
+++ b/src/configuration/e-ews-edit-folder-permissions.c
@@ -21,9 +21,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
diff --git a/src/configuration/e-ews-ooo-notificator.c b/src/configuration/e-ews-ooo-notificator.c
index 07ce754..d8dac0e 100644
--- a/src/configuration/e-ews-ooo-notificator.c
+++ b/src/configuration/e-ews-ooo-notificator.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-ews-ooo-notificator.h"
 #include "camel/camel-ews-store.h"
diff --git a/src/configuration/e-ews-search-user.c b/src/configuration/e-ews-search-user.c
index 1eff8ed..ef89b54 100644
--- a/src/configuration/e-ews-search-user.c
+++ b/src/configuration/e-ews-search-user.c
@@ -21,9 +21,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
diff --git a/src/configuration/e-ews-subscribe-foreign-folder.c 
b/src/configuration/e-ews-subscribe-foreign-folder.c
index feeea71..e0e79b3 100644
--- a/src/configuration/e-ews-subscribe-foreign-folder.c
+++ b/src/configuration/e-ews-subscribe-foreign-folder.c
@@ -21,9 +21,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
diff --git a/src/configuration/e-mail-config-ews-autodiscover.c 
b/src/configuration/e-mail-config-ews-autodiscover.c
index ef9d8ab..c3f9824 100644
--- a/src/configuration/e-mail-config-ews-autodiscover.c
+++ b/src/configuration/e-mail-config-ews-autodiscover.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-mail-config-ews-autodiscover.h"
 
diff --git a/src/configuration/e-mail-config-ews-backend.c b/src/configuration/e-mail-config-ews-backend.c
index 6819118..e36b7ea 100644
--- a/src/configuration/e-mail-config-ews-backend.c
+++ b/src/configuration/e-mail-config-ews-backend.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-mail-config-ews-backend.h"
 
diff --git a/src/configuration/e-mail-config-ews-delegates-page.c 
b/src/configuration/e-mail-config-ews-delegates-page.c
index 894f150..a9a9b2d 100644
--- a/src/configuration/e-mail-config-ews-delegates-page.c
+++ b/src/configuration/e-mail-config-ews-delegates-page.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <unistd.h>
diff --git a/src/configuration/e-mail-config-ews-folder-sizes-page.c 
b/src/configuration/e-mail-config-ews-folder-sizes-page.c
index 9eeb228..af1346a 100644
--- a/src/configuration/e-mail-config-ews-folder-sizes-page.c
+++ b/src/configuration/e-mail-config-ews-folder-sizes-page.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
diff --git a/src/configuration/e-mail-config-ews-gal.c b/src/configuration/e-mail-config-ews-gal.c
index 8aced2c..6668d01 100644
--- a/src/configuration/e-mail-config-ews-gal.c
+++ b/src/configuration/e-mail-config-ews-gal.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-mail-config-ews-gal.h"
 
diff --git a/src/configuration/e-mail-config-ews-notebook.c b/src/configuration/e-mail-config-ews-notebook.c
index 0249cc8..252cee1 100644
--- a/src/configuration/e-mail-config-ews-notebook.c
+++ b/src/configuration/e-mail-config-ews-notebook.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-mail-config-ews-notebook.h"
 
diff --git a/src/configuration/e-mail-config-ews-oal-combo-box.c 
b/src/configuration/e-mail-config-ews-oal-combo-box.c
index a70d6a3..7e7119d 100644
--- a/src/configuration/e-mail-config-ews-oal-combo-box.c
+++ b/src/configuration/e-mail-config-ews-oal-combo-box.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <mail/e-mail-config-service-page.h>
 
diff --git a/src/configuration/e-mail-config-ews-ooo-page.c b/src/configuration/e-mail-config-ews-ooo-page.c
index 42231a6..4b6e152 100644
--- a/src/configuration/e-mail-config-ews-ooo-page.c
+++ b/src/configuration/e-mail-config-ews-ooo-page.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <unistd.h>
diff --git a/src/configuration/module-ews-configuration.c b/src/configuration/module-ews-configuration.c
index f24ca56..0fd659d 100644
--- a/src/configuration/module-ews-configuration.c
+++ b/src/configuration/module-ews-configuration.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <glib/gi18n-lib.h>
 
diff --git a/src/server/camel-ews-settings.c b/src/server/camel-ews-settings.c
index 2e40679..bee5f6b 100644
--- a/src/server/camel-ews-settings.c
+++ b/src/server/camel-ews-settings.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "camel-ews-settings.h"
 
diff --git a/src/server/e-ews-camel-common.c b/src/server/e-ews-camel-common.c
index 6c63737..ebdb529 100644
--- a/src/server/e-ews-camel-common.c
+++ b/src/server/e-ews-camel-common.c
@@ -18,9 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <glib/gi18n-lib.h>
 #include <glib/gstdio.h>
diff --git a/src/server/e-ews-connection-utils.c b/src/server/e-ews-connection-utils.c
index a9180b9..ae6435a 100644
--- a/src/server/e-ews-connection-utils.c
+++ b/src/server/e-ews-connection-utils.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index d3b5665..27d527e 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -19,9 +19,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/server/e-ews-debug.c b/src/server/e-ews-debug.c
index 48b9b70..96fe0a4 100644
--- a/src/server/e-ews-debug.c
+++ b/src/server/e-ews-debug.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-ews-debug.h"
 #include "e-ews-message.h"
diff --git a/src/server/e-ews-folder.c b/src/server/e-ews-folder.c
index aecce5c..c7dccae 100644
--- a/src/server/e-ews-folder.c
+++ b/src/server/e-ews-folder.c
@@ -19,9 +19,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
diff --git a/src/server/e-ews-item-change.c b/src/server/e-ews-item-change.c
index f560de8..4f827f9 100644
--- a/src/server/e-ews-item-change.c
+++ b/src/server/e-ews-item-change.c
@@ -19,9 +19,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-soap-message.h"
 #include "e-soap-response.h"
diff --git a/src/server/e-ews-item.c b/src/server/e-ews-item.c
index fc29072..701e9dd 100644
--- a/src/server/e-ews-item.c
+++ b/src/server/e-ews-item.c
@@ -18,9 +18,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <errno.h>
diff --git a/src/server/e-ews-message.c b/src/server/e-ews-message.c
index 8c015b0..e0aaaf9 100644
--- a/src/server/e-ews-message.c
+++ b/src/server/e-ews-message.c
@@ -21,9 +21,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <libsoup/soup-uri.h>
diff --git a/src/server/e-ews-notification.c b/src/server/e-ews-notification.c
index 7b5abf6..da63d01 100644
--- a/src/server/e-ews-notification.c
+++ b/src/server/e-ews-notification.c
@@ -16,9 +16,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 
diff --git a/src/server/e-ews-oof-settings.c b/src/server/e-ews-oof-settings.c
index d6b2463..fc504e5 100644
--- a/src/server/e-ews-oof-settings.c
+++ b/src/server/e-ews-oof-settings.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-ews-oof-settings.h"
 
diff --git a/src/server/e-ews-query-to-restriction.c b/src/server/e-ews-query-to-restriction.c
index bd682b4..1042c5f 100644
--- a/src/server/e-ews-query-to-restriction.c
+++ b/src/server/e-ews-query-to-restriction.c
@@ -19,9 +19,7 @@
  * USA
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
diff --git a/src/server/e-soap-message.c b/src/server/e-soap-message.c
index 5628077..58f6394 100644
--- a/src/server/e-soap-message.c
+++ b/src/server/e-soap-message.c
@@ -1,11 +1,22 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <libedataserver/eds-version.h>
 
diff --git a/src/server/e-soap-response.c b/src/server/e-soap-response.c
index 939e283..29b9e22 100644
--- a/src/server/e-soap-response.c
+++ b/src/server/e-soap-response.c
@@ -1,11 +1,22 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <libedataserver/eds-version.h>
 
diff --git a/src/server/e-soup-auth-negotiate.c b/src/server/e-soup-auth-negotiate.c
index a0ed8fe..060efdf 100644
--- a/src/server/e-soup-auth-negotiate.c
+++ b/src/server/e-soup-auth-negotiate.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
 
diff --git a/src/server/e-source-ews-folder.c b/src/server/e-source-ews-folder.c
index 461048d..ccd79ef 100644
--- a/src/server/e-source-ews-folder.c
+++ b/src/server/e-source-ews-folder.c
@@ -16,9 +16,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include "e-source-ews-folder.h"
 
diff --git a/src/server/ews-errors.c b/src/server/ews-errors.c
index 4e4a0f4..35a05a3 100644
--- a/src/server/ews-errors.c
+++ b/src/server/ews-errors.c
@@ -1,6 +1,19 @@
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ */
+
+#include "evolution-ews-config.h"
 
 #include "ews-errors.h"
 
diff --git a/tests/ews-test-common.c b/tests/ews-test-common.c
index 9d7c1a0..eefd704 100644
--- a/tests/ews-test-common.c
+++ b/tests/ews-test-common.c
@@ -19,9 +19,7 @@
  *    Vadim Rutkovsky <vrutkovs redhat com>
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-ews-config.h"
 
 #include <string.h>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]