[evolution-data-server/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-data-server/wip/cmake] Use ${PROJECT_NAME}-config.h unconditionally in the sources
- Date: Wed, 5 Oct 2016 15:09:16 +0000 (UTC)
commit 659a08e1b8df2e7a01a222a6347d6d0a7060c8cb
Author: Milan Crha <mcrha redhat com>
Date: Wed Oct 5 17:09:18 2016 +0200
Use ${PROJECT_NAME}-config.h unconditionally in the sources
CMakeLists.txt | 6 +---
.../backends/file/e-book-backend-file-factory.c | 2 +-
.../file/e-book-backend-file-migrate-bdb.c | 2 +-
addressbook/backends/file/e-book-backend-file.c | 2 +-
.../google/e-book-backend-google-factory.c | 2 +-
.../backends/google/e-book-backend-google.c | 3 +-
addressbook/backends/google/e-book-google-utils.c | 3 +-
.../backends/ldap/e-book-backend-ldap-factory.c | 4 +--
addressbook/backends/ldap/e-book-backend-ldap.c | 4 +--
.../webdav/e-book-backend-webdav-factory.c | 2 +-
.../backends/webdav/e-book-backend-webdav.c | 2 +-
.../libebook-contacts/e-book-contacts-types.c | 4 +--
addressbook/libebook-contacts/e-book-query.c | 6 ++--
addressbook/libebook-contacts/e-contact.c | 4 +--
.../libebook-contacts/e-phone-number-private.cpp | 4 +--
addressbook/libebook-contacts/e-phone-number.c | 4 +--
addressbook/libebook/e-book-client-cursor.c | 4 +--
addressbook/libebook/e-book-client-view.c | 4 +--
addressbook/libebook/e-book-client.c | 4 +--
addressbook/libebook/e-book.c | 3 +-
addressbook/libebook/e-destination.c | 3 +-
addressbook/libedata-book/e-book-backend-cache.c | 4 +--
.../libedata-book/e-book-backend-db-cache.c | 3 +-
addressbook/libedata-book/e-book-backend-factory.c | 3 +-
.../libedata-book/e-book-backend-sqlitedb-test.c | 3 +-
addressbook/libedata-book/e-book-backend-summary.c | 4 +--
addressbook/libedata-book/e-book-backend.c | 2 +-
.../libedata-book/e-data-book-cursor-sqlite.c | 4 +--
addressbook/libedata-book/e-data-book-cursor.c | 4 +--
addressbook/libedata-book/e-data-book-direct.c | 4 +--
addressbook/libedata-book/e-data-book-factory.c | 3 +-
addressbook/libedata-book/e-data-book-view.c | 4 +--
addressbook/libedata-book/e-data-book.c | 4 +--
.../libedata-book/e-subprocess-book-factory.c | 4 +--
.../evolution-addressbook-factory-subprocess.c | 4 +--
.../backends/caldav/e-cal-backend-caldav-factory.c | 2 +-
calendar/backends/caldav/e-cal-backend-caldav.c | 3 +-
.../contacts/e-cal-backend-contacts-factory.c | 2 +-
.../backends/contacts/e-cal-backend-contacts.c | 4 +--
calendar/backends/file/e-cal-backend-file-events.c | 4 +--
.../backends/file/e-cal-backend-file-factory.c | 2 +-
calendar/backends/file/e-cal-backend-file-todos.c | 4 +--
calendar/backends/file/e-cal-backend-file.c | 4 +--
.../backends/gtasks/e-cal-backend-gtasks-factory.c | 2 +-
calendar/backends/gtasks/e-cal-backend-gtasks.c | 4 +--
.../backends/http/e-cal-backend-http-factory.c | 2 +-
calendar/backends/http/e-cal-backend-http.c | 3 +-
.../weather/e-cal-backend-weather-factory.c | 2 +-
calendar/backends/weather/e-cal-backend-weather.c | 3 +-
calendar/libecal/e-cal-check-timezones.c | 4 +--
calendar/libecal/e-cal-client-view.c | 4 +--
calendar/libecal/e-cal-client.c | 4 +--
calendar/libecal/e-cal-component.c | 3 +-
calendar/libecal/e-cal-recur.c | 4 +--
calendar/libecal/e-cal-util.c | 3 +-
calendar/libecal/e-cal-view.c | 4 +--
calendar/libecal/e-cal.c | 4 +--
calendar/libedata-cal/e-cal-backend-cache.c | 4 +--
calendar/libedata-cal/e-cal-backend-factory.c | 3 +-
calendar/libedata-cal/e-cal-backend-intervaltree.c | 4 +--
calendar/libedata-cal/e-cal-backend-sexp.c | 4 +--
calendar/libedata-cal/e-cal-backend-store.c | 4 ++-
calendar/libedata-cal/e-cal-backend-sync.c | 4 +--
calendar/libedata-cal/e-cal-backend-util.c | 4 +--
calendar/libedata-cal/e-cal-backend.c | 2 +-
calendar/libedata-cal/e-data-cal-factory.c | 3 +-
calendar/libedata-cal/e-data-cal-view.c | 4 +--
calendar/libedata-cal/e-data-cal.c | 4 +--
calendar/libedata-cal/e-subprocess-cal-factory.c | 4 +--
.../evolution-calendar-factory-subprocess.c | 3 +-
camel/camel-block-file.c | 4 +--
camel/camel-certdb.c | 4 +--
camel/camel-charset-map.c | 4 +--
camel/camel-cipher-context.c | 4 +--
camel/camel-data-cache.c | 4 +--
camel/camel-data-wrapper.c | 4 +--
camel/camel-db.c | 8 +++---
camel/camel-debug.c | 4 +--
camel/camel-file-utils.c | 4 +--
camel/camel-filter-driver.c | 4 +--
camel/camel-filter-search.c | 4 +--
camel/camel-folder-search.c | 4 +--
camel/camel-folder-summary.c | 4 +--
camel/camel-folder-thread.c | 4 +--
camel/camel-folder.c | 4 +--
camel/camel-gpg-context.c | 4 +--
camel/camel-gpg-photo-saver.c | 4 +--
camel/camel-iconv.c | 4 +--
camel/camel-index-control.c | 4 +--
camel/camel-index.c | 4 +--
camel/camel-junk-filter.c | 4 +-
camel/camel-lock-client.c | 4 +--
camel/camel-lock.c | 4 +--
camel/camel-medium.c | 4 +--
camel/camel-mime-filter-bestenc.c | 4 +--
camel/camel-mime-filter-canon.c | 4 +--
camel/camel-mime-filter-charset.c | 4 +--
camel/camel-mime-filter-enriched.c | 4 +--
camel/camel-mime-filter-from.c | 4 +--
camel/camel-mime-filter-gzip.c | 4 +--
camel/camel-mime-filter-linewrap.c | 4 +--
camel/camel-mime-filter-pgp.c | 4 +--
camel/camel-mime-filter-progress.c | 4 +--
camel/camel-mime-filter-tohtml.c | 4 +--
camel/camel-mime-filter-windows.c | 4 +--
camel/camel-mime-filter-yenc.c | 4 +--
camel/camel-mime-message.c | 4 +--
camel/camel-mime-part-utils.c | 4 +--
camel/camel-mime-part.c | 4 +--
camel/camel-mime-utils.c | 4 +--
camel/camel-movemail.c | 4 +--
camel/camel-msgport.c | 4 +--
camel/camel-multipart-encrypted.c | 4 +--
camel/camel-multipart-signed.c | 4 +--
camel/camel-multipart.c | 4 +--
camel/camel-net-utils.c | 4 +--
camel/camel-network-service.c | 4 +--
camel/camel-object.c | 4 +--
camel/camel-offline-folder.c | 4 +--
camel/camel-offline-store.c | 4 +--
camel/camel-operation.c | 2 +-
camel/camel-partition-table.c | 4 +--
camel/camel-provider.c | 4 +--
camel/camel-sasl-anonymous.c | 4 +--
camel/camel-sasl-cram-md5.c | 4 +--
camel/camel-sasl-digest-md5.c | 4 +--
camel/camel-sasl-gssapi.c | 4 +--
camel/camel-sasl-login.c | 4 +--
camel/camel-sasl-ntlm.c | 4 +--
camel/camel-sasl-plain.c | 4 +--
camel/camel-sasl-popb4smtp.c | 4 +--
camel/camel-sasl.c | 4 +--
camel/camel-search-private.c | 4 +--
camel/camel-search-sql-sexp.c | 4 +--
camel/camel-service.c | 4 +--
camel/camel-session.c | 4 +--
camel/camel-sexp.c | 3 +-
camel/camel-smime-context.c | 4 +--
camel/camel-store-summary.c | 4 +--
camel/camel-store.c | 4 +--
camel/camel-stream-buffer.c | 4 +--
camel/camel-stream-filter.c | 4 +--
camel/camel-stream-fs.c | 4 +--
camel/camel-stream-mem.c | 4 +--
camel/camel-stream-null.c | 4 +--
camel/camel-stream-process.c | 4 +--
camel/camel-stream.c | 5 ++-
camel/camel-string-utils.c | 4 +--
camel/camel-subscribable.c | 5 ++-
camel/camel-text-index.c | 4 +--
camel/camel-transport.c | 4 +--
camel/camel-trie.c | 4 +--
camel/camel-uid-cache.c | 4 +--
camel/camel-url-scanner.c | 4 +--
camel/camel-url.c | 4 +--
camel/camel-utf8.c | 4 +--
camel/camel-vee-data-cache.c | 4 +--
camel/camel-vee-folder.c | 4 +--
camel/camel-vee-store.c | 4 +--
camel/camel-vee-summary.c | 4 +--
camel/camel-vtrash-folder.c | 4 +--
camel/camel-win32.h | 4 +--
camel/camel.c | 4 +--
camel/providers/imapx/camel-imapx-command.c | 5 ++-
camel/providers/imapx/camel-imapx-conn-manager.c | 4 +--
camel/providers/imapx/camel-imapx-folder.c | 4 +--
camel/providers/imapx/camel-imapx-input-stream.c | 5 ++-
camel/providers/imapx/camel-imapx-job.c | 5 +--
camel/providers/imapx/camel-imapx-provider.c | 4 +--
camel/providers/imapx/camel-imapx-search.c | 4 +--
camel/providers/imapx/camel-imapx-server.c | 4 +--
camel/providers/imapx/camel-imapx-store-summary.c | 4 +--
camel/providers/imapx/camel-imapx-store.c | 4 +--
camel/providers/imapx/camel-imapx-summary.c | 4 +--
camel/providers/imapx/camel-imapx-utils.c | 4 +--
camel/providers/local/camel-local-folder.c | 4 +--
camel/providers/local/camel-local-private.c | 4 +--
camel/providers/local/camel-local-private.h | 4 +--
camel/providers/local/camel-local-provider.c | 4 +--
camel/providers/local/camel-local-store.c | 4 +--
camel/providers/local/camel-local-summary.c | 4 +--
camel/providers/local/camel-maildir-folder.c | 4 +--
camel/providers/local/camel-maildir-store.c | 4 +--
camel/providers/local/camel-maildir-summary.c | 4 +--
camel/providers/local/camel-mbox-folder.c | 4 +--
camel/providers/local/camel-mbox-store.c | 4 +--
camel/providers/local/camel-mbox-summary.c | 4 +--
camel/providers/local/camel-mh-folder.c | 4 +--
camel/providers/local/camel-mh-store.c | 4 +--
camel/providers/local/camel-mh-summary.c | 4 +--
camel/providers/local/camel-spool-folder.c | 4 +--
camel/providers/local/camel-spool-store.c | 4 +--
camel/providers/local/camel-spool-summary.c | 4 +--
camel/providers/nntp/camel-nntp-folder.c | 4 +--
camel/providers/nntp/camel-nntp-private.h | 4 +--
camel/providers/nntp/camel-nntp-provider.c | 4 +--
camel/providers/nntp/camel-nntp-store-summary.c | 4 +--
camel/providers/nntp/camel-nntp-store.c | 4 +--
camel/providers/nntp/camel-nntp-stream.c | 4 +--
camel/providers/nntp/camel-nntp-summary.c | 4 +--
camel/providers/pop3/camel-pop3-engine.c | 4 +--
camel/providers/pop3/camel-pop3-folder.c | 4 +--
camel/providers/pop3/camel-pop3-provider.c | 4 +--
camel/providers/pop3/camel-pop3-store.c | 4 +--
camel/providers/pop3/camel-pop3-stream.c | 4 +--
camel/providers/sendmail/camel-sendmail-provider.c | 4 +--
.../providers/sendmail/camel-sendmail-transport.c | 4 +--
camel/providers/smtp/camel-smtp-provider.c | 4 +--
camel/providers/smtp/camel-smtp-transport.c | 4 +--
camel/tests/lib/camel-test.h | 2 +-
camel/tests/lib/session.c | 4 +--
camel/tests/misc/rfc2047.c | 4 +--
camel/tests/misc/split.c | 3 +-
camel/tests/misc/test1.c | 2 +-
camel/tests/misc/test2.c | 2 +-
camel/tests/misc/url-scan.c | 4 +--
camel/tests/misc/url.c | 2 +-
camel/tests/misc/utf7.c | 2 +-
camel/tests/smime/pgp-mime.c | 4 +--
camel/tests/smime/pgp.c | 4 +--
camel/tests/smime/pkcs7.c | 2 +-
config.h.in | 2 +-
libebackend/e-backend-factory.c | 6 ++--
libebackend/e-backend.c | 3 +-
libebackend/e-cache-reaper.c | 2 +
libebackend/e-collection-backend.c | 5 ++-
libebackend/e-data-factory.c | 5 ++-
libebackend/e-db3-utils.c | 2 +-
libebackend/e-dbhash.c | 2 +-
libebackend/e-dbus-server.c | 6 +++-
libebackend/e-file-cache.c | 3 +-
libebackend/e-offline-listener.c | 4 +--
libebackend/e-offline-listener.h | 4 ---
.../e-server-side-source-credentials-provider.c | 4 +--
libebackend/e-server-side-source.c | 7 +++--
libebackend/e-source-registry-server.c | 9 ++++---
libebackend/e-sqlite3-vfs.c | 3 +-
libebackend/e-subprocess-factory.c | 4 +--
libebackend/e-user-prompter-server-extension.c | 4 +--
libebackend/e-user-prompter-server.c | 4 +--
libebackend/e-user-prompter.c | 4 +--
libedataserver/e-alphabet-index-private.cpp | 4 +--
libedataserver/e-cancellable-locks.c | 4 +--
libedataserver/e-categories.c | 4 +--
libedataserver/e-client.c | 4 +--
libedataserver/e-collator.c | 4 +--
libedataserver/e-credentials.c | 4 +--
libedataserver/e-data-server-util.c | 2 +-
libedataserver/e-debug-log.c | 3 +-
libedataserver/e-extensible.c | 4 +--
libedataserver/e-extension.c | 4 +--
libedataserver/e-free-form-exp.c | 4 +--
libedataserver/e-iterator.c | 2 +-
libedataserver/e-list-iterator.c | 2 +-
libedataserver/e-list.c | 2 +-
libedataserver/e-module.c | 4 +--
libedataserver/e-network-monitor.c | 4 +--
libedataserver/e-proxy.c | 4 +--
libedataserver/e-secret-store.c | 4 +--
libedataserver/e-sexp.c | 4 +--
libedataserver/e-soup-auth-bearer.c | 4 +--
libedataserver/e-soup-ssl-trust.c | 4 +--
libedataserver/e-source-collection.c | 7 +++--
libedataserver/e-source-contacts.c | 4 +--
.../e-source-credentials-provider-impl-google.c | 4 +--
.../e-source-credentials-provider-impl-password.c | 4 +--
.../e-source-credentials-provider-impl.c | 4 +--
libedataserver/e-source-credentials-provider.c | 4 +--
libedataserver/e-source-ldap.c | 4 +--
libedataserver/e-source-local.c | 4 +--
libedataserver/e-source-mail-composition.c | 4 +--
libedataserver/e-source-mail-signature.c | 5 ++-
libedataserver/e-source-proxy.c | 5 ++-
libedataserver/e-source-registry.c | 23 ++++++++++---------
libedataserver/e-source-weather.c | 4 +--
libedataserver/e-source-webdav.c | 4 +--
libedataserver/e-source.c | 7 +++--
libedataserver/e-time-utils.c | 7 ++---
libedataserver/e-transliterator-private.cpp | 4 +--
libedataserver/e-url.c | 3 +-
libedataserver/e-webdav-discover.c | 4 +--
libedataserver/e-xml-hash-utils.c | 2 +-
libedataserver/e-xml-utils.c | 2 +-
libedataserverui/e-cell-renderer-color.c | 4 +--
.../e-credentials-prompter-impl-google.c | 4 +--
.../e-credentials-prompter-impl-password.c | 4 +--
libedataserverui/e-credentials-prompter-impl.c | 4 +--
libedataserverui/e-credentials-prompter.c | 4 +--
libedataserverui/e-trust-prompt.c | 4 +--
libedataserverui/e-webdav-discover-widget.c | 4 +--
modules/cache-reaper/module-cache-reaper.c | 4 +--
modules/gnome-online-accounts/e-goa-client.c | 4 +--
.../gnome-online-accounts/e-goa-password-based.c | 4 +--
modules/gnome-online-accounts/goaewsclient.c | 3 +-
.../gnome-online-accounts/module-credentials-goa.c | 4 +--
.../module-gnome-online-accounts.c | 3 +-
modules/google-backend/module-google-backend.c | 3 +-
modules/outlook-backend/module-outlook-backend.c | 3 +-
modules/owncloud-backend/module-owncloud-backend.c | 4 +--
modules/secret-monitor/module-secret-monitor.c | 2 +
modules/trust-prompt/module-trust-prompt.c | 4 +--
modules/trust-prompt/trust-prompt-gtk.c | 4 +--
.../e-signon-session-password.c | 5 ++-
.../module-credentials-uoa.c | 4 +--
.../module-ubuntu-online-accounts.c | 3 +-
modules/ubuntu-online-accounts/uoa-utils.c | 5 ++-
modules/yahoo-backend/module-yahoo-backend.c | 3 +-
.../evolution-addressbook-factory.c | 3 +-
.../evolution-calendar-factory.c | 3 +-
.../evolution-scan-gconf-tree-xml.c | 3 +-
.../evolution-source-registry-migrate-proxies.c | 3 +-
.../evolution-source-registry.c | 3 +-
.../evolution-user-prompter.c | 3 +-
services/evolution-user-prompter/prompt-user-gtk.c | 4 +--
tests/book-migration/test-migration.c | 2 +-
tests/libebook-contacts/test-phone-number.c | 4 +--
.../client/test-book-client-cursor-operations.c | 2 +-
.../client/test-book-client-custom-summary.c | 2 +-
.../libebook/client/test-book-client-e164-param.c | 3 +-
tests/libedata-book/data-test-utils.c | 4 +--
tests/test-server-utils/e-test-server-utils.c | 4 +--
tools/addressbook-export/addressbook-export.c | 4 +--
322 files changed, 420 insertions(+), 821 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c3b48e4..d77e640 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -888,10 +888,8 @@ if(ENABLE_VALA_BINDINGS)
endif(ENABLE_VALA_BINDINGS)
-# 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/addressbook/backends/file/e-book-backend-file-factory.c
b/addressbook/backends/file/e-book-backend-file-factory.c
index 7ab6a7c..8317544 100644
--- a/addressbook/backends/file/e-book-backend-file-factory.c
+++ b/addressbook/backends/file/e-book-backend-file-factory.c
@@ -19,7 +19,7 @@
* Authors: Chris Toshok <toshok ximian com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-book-backend-file.h"
diff --git a/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
b/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
index a33e91e..38b7a13 100644
--- a/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
+++ b/addressbook/backends/file/e-book-backend-file-migrate-bdb.c
@@ -21,7 +21,7 @@
* Based on work by Nat Friedman, Chris Toshok and Hans Petter Jansson.
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 28eaf63..3bc0e05 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -23,7 +23,7 @@
* Tristan Van Berkom <tristanvb openismus com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/addressbook/backends/google/e-book-backend-google-factory.c
b/addressbook/backends/google/e-book-backend-google-factory.c
index a0ea5d3..68b4d51 100644
--- a/addressbook/backends/google/e-book-backend-google-factory.c
+++ b/addressbook/backends/google/e-book-backend-google-factory.c
@@ -17,7 +17,7 @@
* Authors: Joergen Scheibengruber <joergen.scheibengruber AT googlemail.com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-book-backend-google.h"
diff --git a/addressbook/backends/google/e-book-backend-google.c
b/addressbook/backends/google/e-book-backend-google.c
index fc30395..1284c0e 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -19,7 +19,8 @@
* Philip Withnall <philip tecnocode co uk>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <string.h>
#include <errno.h>
diff --git a/addressbook/backends/google/e-book-google-utils.c
b/addressbook/backends/google/e-book-google-utils.c
index 6544b02..ceb75b0 100644
--- a/addressbook/backends/google/e-book-google-utils.c
+++ b/addressbook/backends/google/e-book-google-utils.c
@@ -19,7 +19,8 @@
* Philip Withnall <philip tecnocode co uk>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <string.h>
#include <errno.h>
diff --git a/addressbook/backends/ldap/e-book-backend-ldap-factory.c
b/addressbook/backends/ldap/e-book-backend-ldap-factory.c
index 2d069a1..f8d36c0 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap-factory.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap-factory.c
@@ -19,9 +19,7 @@
* Authors: Chris Toshok <toshok ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-book-backend-ldap.h"
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 93d5f8a..2940c42 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -22,9 +22,7 @@
#define DEBUG
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <fcntl.h>
diff --git a/addressbook/backends/webdav/e-book-backend-webdav-factory.c
b/addressbook/backends/webdav/e-book-backend-webdav-factory.c
index 5137626..1887ef0 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav-factory.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav-factory.c
@@ -17,7 +17,7 @@
* Authors: Matthias Braun <matze braunis de>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-book-backend-webdav.h"
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c
b/addressbook/backends/webdav/e-book-backend-webdav.c
index 70138a0..97b6750 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -23,7 +23,7 @@
* ETags are saved in the WEBDAV_CONTACT_ETAG field so we know which cached contacts
* are outdated.
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/addressbook/libebook-contacts/e-book-contacts-types.c
b/addressbook/libebook-contacts/e-book-contacts-types.c
index bf04dcf..7d1bfee 100644
--- a/addressbook/libebook-contacts/e-book-contacts-types.c
+++ b/addressbook/libebook-contacts/e-book-contacts-types.c
@@ -12,9 +12,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/addressbook/libebook-contacts/e-book-query.c b/addressbook/libebook-contacts/e-book-query.c
index 3604bae..214ac8e 100644
--- a/addressbook/libebook-contacts/e-book-query.c
+++ b/addressbook/libebook-contacts/e-book-query.c
@@ -31,9 +31,7 @@
* #EBookClientView and #EBookClientCursor interfaces.
**/
-#include "e-book-query.h"
-
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <locale.h>
#include <stdarg.h>
@@ -41,6 +39,8 @@
#include <libedataserver/libedataserver.h>
+#include "e-book-query.h"
+
#ifdef G_OS_WIN32
#ifndef LC_MESSAGES
#define LC_MESSAGES LC_CTYPE
diff --git a/addressbook/libebook-contacts/e-contact.c b/addressbook/libebook-contacts/e-contact.c
index 5ac55e9..dea9dce 100644
--- a/addressbook/libebook-contacts/e-contact.c
+++ b/addressbook/libebook-contacts/e-contact.c
@@ -30,9 +30,7 @@
* vCards in the form of an #EContact for your convenience.
**/
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <ctype.h>
diff --git a/addressbook/libebook-contacts/e-phone-number-private.cpp
b/addressbook/libebook-contacts/e-phone-number-private.cpp
index b539bc4..4c5aebb 100644
--- a/addressbook/libebook-contacts/e-phone-number-private.cpp
+++ b/addressbook/libebook-contacts/e-phone-number-private.cpp
@@ -17,9 +17,7 @@
* Authors: Mathias Hasselmann <mathias openismus com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#ifndef ENABLE_PHONENUMBER
#error Phone number support must be enabled for this file
diff --git a/addressbook/libebook-contacts/e-phone-number.c b/addressbook/libebook-contacts/e-phone-number.c
index 180c39a..88d6807 100644
--- a/addressbook/libebook-contacts/e-phone-number.c
+++ b/addressbook/libebook-contacts/e-phone-number.c
@@ -17,9 +17,7 @@
* Authors: Mathias Hasselmann <mathias openismus com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-phone-number.h"
diff --git a/addressbook/libebook/e-book-client-cursor.c b/addressbook/libebook/e-book-client-cursor.c
index 30a1f2a..7a8b240 100644
--- a/addressbook/libebook/e-book-client-cursor.c
+++ b/addressbook/libebook/e-book-client-cursor.c
@@ -453,9 +453,7 @@
* </refsect2>
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/addressbook/libebook/e-book-client-view.c b/addressbook/libebook/e-book-client-view.c
index be4df5c..01b9049 100644
--- a/addressbook/libebook/e-book-client-view.c
+++ b/addressbook/libebook/e-book-client-view.c
@@ -29,9 +29,7 @@
* to create an #EBookClientView.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/addressbook/libebook/e-book-client.c b/addressbook/libebook/e-book-client.c
index a037605..3fc2091 100644
--- a/addressbook/libebook/e-book-client.c
+++ b/addressbook/libebook/e-book-client.c
@@ -27,9 +27,7 @@
* the addressbook.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <locale.h>
#include <glib/gi18n-lib.h>
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 1412b63..087ef47 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -33,7 +33,8 @@
* Deprecated: 3.2: Use #EBookClient instead.
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <unistd.h>
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index 85d1163..599e4bc 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -29,7 +29,8 @@
* _get_*() functions.
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include "e-destination.h"
#include <stdlib.h>
diff --git a/addressbook/libedata-book/e-book-backend-cache.c
b/addressbook/libedata-book/e-book-backend-cache.c
index f29de05..08cd623 100644
--- a/addressbook/libedata-book/e-book-backend-cache.c
+++ b/addressbook/libedata-book/e-book-backend-cache.c
@@ -25,9 +25,7 @@
*
* The #EBookBackendCache is deprecated, use #EBookSqlite instead.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/addressbook/libedata-book/e-book-backend-db-cache.c
b/addressbook/libedata-book/e-book-backend-db-cache.c
index 0081d0b..943d9bc 100644
--- a/addressbook/libedata-book/e-book-backend-db-cache.c
+++ b/addressbook/libedata-book/e-book-backend-db-cache.c
@@ -26,7 +26,8 @@
* This API is deprecated, use #EBookSqlite instead.
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <stdlib.h>
#include <string.h>
diff --git a/addressbook/libedata-book/e-book-backend-factory.c
b/addressbook/libedata-book/e-book-backend-factory.c
index 49a682b..27f9843 100644
--- a/addressbook/libedata-book/e-book-backend-factory.c
+++ b/addressbook/libedata-book/e-book-backend-factory.c
@@ -26,7 +26,8 @@
* backend types.
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <string.h>
#include "e-book-backend.h"
diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
b/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
index 8eb6062..2a957e9 100644
--- a/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
+++ b/addressbook/libedata-book/e-book-backend-sqlitedb-test.c
@@ -18,7 +18,8 @@
* Authors: Chenthill Palanisamy <pchenthill novell com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <libebook-contacts/libebook-contacts.h>
#include "e-book-backend-sqlitedb.h"
diff --git a/addressbook/libedata-book/e-book-backend-summary.c
b/addressbook/libedata-book/e-book-backend-summary.c
index 2275548..df69281 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -24,9 +24,7 @@
*
* The #EBookBackendSummary is deprecated, use #EBookSqlite instead.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include <sys/types.h>
diff --git a/addressbook/libedata-book/e-book-backend.c b/addressbook/libedata-book/e-book-backend.c
index dce04ce..9efac67 100644
--- a/addressbook/libedata-book/e-book-backend.c
+++ b/addressbook/libedata-book/e-book-backend.c
@@ -29,7 +29,7 @@
* addressbook backends must implement methods on this class.
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/addressbook/libedata-book/e-data-book-cursor-sqlite.c
b/addressbook/libedata-book/e-data-book-cursor-sqlite.c
index 0fbd2ec..084f907 100644
--- a/addressbook/libedata-book/e-data-book-cursor-sqlite.c
+++ b/addressbook/libedata-book/e-data-book-cursor-sqlite.c
@@ -26,9 +26,7 @@
* stores contacts using #EBookSqlite.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n.h>
diff --git a/addressbook/libedata-book/e-data-book-cursor.c b/addressbook/libedata-book/e-data-book-cursor.c
index fc01872..7c8fb5b 100644
--- a/addressbook/libedata-book/e-data-book-cursor.c
+++ b/addressbook/libedata-book/e-data-book-cursor.c
@@ -212,9 +212,7 @@
* </refsect2>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n.h>
diff --git a/addressbook/libedata-book/e-data-book-direct.c b/addressbook/libedata-book/e-data-book-direct.c
index 9df6fb1..776fb4f 100644
--- a/addressbook/libedata-book/e-data-book-direct.c
+++ b/addressbook/libedata-book/e-data-book-direct.c
@@ -31,9 +31,7 @@
* will be created and #EBookBackendClass.configure_direct() will be
* called on the corresponding client side instance.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index 7b247de..ba18068 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -28,7 +28,8 @@
* the #EDataBook layer for server side addressbooks to communicate
* with client side #EBookClient objects.
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <locale.h>
#include <stdlib.h>
#include <string.h>
diff --git a/addressbook/libedata-book/e-data-book-view.c b/addressbook/libedata-book/e-data-book-view.c
index d9b8f8d..3f70c4b 100644
--- a/addressbook/libedata-book/e-data-book-view.c
+++ b/addressbook/libedata-book/e-data-book-view.c
@@ -31,9 +31,7 @@
* which will be delivered to the #EBookClientView
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 9c17cb7..58f2ed9 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -24,9 +24,7 @@
* an #EBookBackend to satisfy client requests.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <locale.h>
#include <unistd.h>
diff --git a/addressbook/libedata-book/e-subprocess-book-factory.c
b/addressbook/libedata-book/e-subprocess-book-factory.c
index ae4beea..406285f 100644
--- a/addressbook/libedata-book/e-subprocess-book-factory.c
+++ b/addressbook/libedata-book/e-subprocess-book-factory.c
@@ -23,9 +23,7 @@
* the communication between #EDataBookFactory and #EBackend
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <locale.h>
#include <stdlib.h>
diff --git a/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
b/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
index e0eaf44..00a6b85 100644
--- a/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
+++ b/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <locale.h>
#include <stdlib.h>
diff --git a/calendar/backends/caldav/e-cal-backend-caldav-factory.c
b/calendar/backends/caldav/e-cal-backend-caldav-factory.c
index 6a54273..1b99c8d 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav-factory.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav-factory.c
@@ -18,7 +18,7 @@
* Authors: Christian Kellner <gicmo gnome org>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-cal-backend-caldav.h"
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 53f7d0e..a36d1dc 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -18,7 +18,8 @@
* Authors: Christian Kellner <gicmo gnome org>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <string.h>
#include <unistd.h>
#include <glib/gstdio.h>
diff --git a/calendar/backends/contacts/e-cal-backend-contacts-factory.c
b/calendar/backends/contacts/e-cal-backend-contacts-factory.c
index 10b1eed..d75aa97 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts-factory.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts-factory.c
@@ -17,7 +17,7 @@
* Authors: Chris Toshok (toshok ximian com)
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-cal-backend-contacts.h"
diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c
b/calendar/backends/contacts/e-cal-backend-contacts.c
index 3187b6e..d2b5708 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -21,9 +21,7 @@
* Gerg� �rdi <cactus cactus rulez org>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/calendar/backends/file/e-cal-backend-file-events.c
b/calendar/backends/file/e-cal-backend-file-events.c
index a29db7e..2687aa1 100644
--- a/calendar/backends/file/e-cal-backend-file-events.c
+++ b/calendar/backends/file/e-cal-backend-file-events.c
@@ -18,9 +18,7 @@
* Rodrigo Moya <rodrigo ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-cal-backend-file-events.h"
diff --git a/calendar/backends/file/e-cal-backend-file-factory.c
b/calendar/backends/file/e-cal-backend-file-factory.c
index 04f5a60..ddf0eb0 100644
--- a/calendar/backends/file/e-cal-backend-file-factory.c
+++ b/calendar/backends/file/e-cal-backend-file-factory.c
@@ -17,7 +17,7 @@
* Authors: Chris Toshok (toshok ximian com)
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-cal-backend-file-events.h"
#include "e-cal-backend-file-journal.h"
diff --git a/calendar/backends/file/e-cal-backend-file-todos.c
b/calendar/backends/file/e-cal-backend-file-todos.c
index 4eaaa3c..86b5285 100644
--- a/calendar/backends/file/e-cal-backend-file-todos.c
+++ b/calendar/backends/file/e-cal-backend-file-todos.c
@@ -18,9 +18,7 @@
* Rodrigo Moya <rodrigo ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-cal-backend-file-todos.h"
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index ec9d4f6..ee0fb89 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -20,9 +20,7 @@
* Jan Brittenson <bson gnu ai mit edu>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include <unistd.h>
diff --git a/calendar/backends/gtasks/e-cal-backend-gtasks-factory.c
b/calendar/backends/gtasks/e-cal-backend-gtasks-factory.c
index 323844f..f7f5ed0 100644
--- a/calendar/backends/gtasks/e-cal-backend-gtasks-factory.c
+++ b/calendar/backends/gtasks/e-cal-backend-gtasks-factory.c
@@ -16,7 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-cal-backend-gtasks.h"
diff --git a/calendar/backends/gtasks/e-cal-backend-gtasks.c b/calendar/backends/gtasks/e-cal-backend-gtasks.c
index b73542a..2a3f35f 100644
--- a/calendar/backends/gtasks/e-cal-backend-gtasks.c
+++ b/calendar/backends/gtasks/e-cal-backend-gtasks.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
#include <gdata/gdata.h>
diff --git a/calendar/backends/http/e-cal-backend-http-factory.c
b/calendar/backends/http/e-cal-backend-http-factory.c
index 611d250..fb77c42 100644
--- a/calendar/backends/http/e-cal-backend-http-factory.c
+++ b/calendar/backends/http/e-cal-backend-http-factory.c
@@ -17,7 +17,7 @@
* Authors: Chris Toshok (toshok ximian com)
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-cal-backend-http.h"
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index 0500bf5..1cb7f13 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -18,7 +18,8 @@
* Authors: Hans Petter Jansson <hpj ximian com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <string.h>
#include <unistd.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/backends/weather/e-cal-backend-weather-factory.c
b/calendar/backends/weather/e-cal-backend-weather-factory.c
index 543426d..d3c8d63 100644
--- a/calendar/backends/weather/e-cal-backend-weather-factory.c
+++ b/calendar/backends/weather/e-cal-backend-weather-factory.c
@@ -17,7 +17,7 @@
* Authors: David Trowbridge <trowbrds cs colorado edu>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-cal-backend-weather.h"
diff --git a/calendar/backends/weather/e-cal-backend-weather.c
b/calendar/backends/weather/e-cal-backend-weather.c
index d33cfa0..3902293 100644
--- a/calendar/backends/weather/e-cal-backend-weather.c
+++ b/calendar/backends/weather/e-cal-backend-weather.c
@@ -17,7 +17,8 @@
* Authors: David Trowbridge <trowbrds cs colorado edu>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/calendar/libecal/e-cal-check-timezones.c b/calendar/libecal/e-cal-check-timezones.c
index 32d067a..32b1818 100644
--- a/calendar/libecal/e-cal-check-timezones.c
+++ b/calendar/libecal/e-cal-check-timezones.c
@@ -16,9 +16,7 @@
* Authors: Patrick Ohly <patrick ohly gmx de>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <libical/ical.h>
diff --git a/calendar/libecal/e-cal-client-view.c b/calendar/libecal/e-cal-client-view.c
index 63b7282..8dcf3da 100644
--- a/calendar/libecal/e-cal-client-view.c
+++ b/calendar/libecal/e-cal-client-view.c
@@ -30,9 +30,7 @@
* to create an #ECalClientView.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c
index bab0090..fe2fca3 100644
--- a/calendar/libecal/e-cal-client.c
+++ b/calendar/libecal/e-cal-client.c
@@ -26,9 +26,7 @@
* the calendar.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
#include <gio/gio.h>
diff --git a/calendar/libecal/e-cal-component.c b/calendar/libecal/e-cal-component.c
index 4b19e0a..8eadd65 100644
--- a/calendar/libecal/e-cal-component.c
+++ b/calendar/libecal/e-cal-component.c
@@ -26,7 +26,8 @@
* or other component in a given calendar.
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/calendar/libecal/e-cal-recur.c b/calendar/libecal/e-cal-recur.c
index cd61d4a..0b0d3d9 100644
--- a/calendar/libecal/e-cal-recur.c
+++ b/calendar/libecal/e-cal-recur.c
@@ -19,9 +19,7 @@
* Authors: Damon Chaplin <damon ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/calendar/libecal/e-cal-util.c b/calendar/libecal/e-cal-util.c
index fdbe6a3..d65dd4e 100644
--- a/calendar/libecal/e-cal-util.c
+++ b/calendar/libecal/e-cal-util.c
@@ -17,7 +17,8 @@
* Authors: Federico Mena-Quintero <federico ximian com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <stdlib.h>
#include <string.h>
#include <glib/gstdio.h>
diff --git a/calendar/libecal/e-cal-view.c b/calendar/libecal/e-cal-view.c
index 072a0fa..5cd7253 100644
--- a/calendar/libecal/e-cal-view.c
+++ b/calendar/libecal/e-cal-view.c
@@ -20,9 +20,7 @@
* Ross Burton <ross linux intel com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include "e-cal.h"
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index fe39615..2b75086 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -31,9 +31,7 @@
* Deprecated: 3.2: Use #ECalClient instead.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <unistd.h>
#include <string.h>
diff --git a/calendar/libedata-cal/e-cal-backend-cache.c b/calendar/libedata-cal/e-cal-backend-cache.c
index 2071abd..a75f8c4 100644
--- a/calendar/libedata-cal/e-cal-backend-cache.c
+++ b/calendar/libedata-cal/e-cal-backend-cache.c
@@ -26,9 +26,7 @@
* This class can be used by backends to store calendar components.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include <glib/gstdio.h>
diff --git a/calendar/libedata-cal/e-cal-backend-factory.c b/calendar/libedata-cal/e-cal-backend-factory.c
index 63dcb0c..2c73cdf 100644
--- a/calendar/libedata-cal/e-cal-backend-factory.c
+++ b/calendar/libedata-cal/e-cal-backend-factory.c
@@ -26,7 +26,8 @@
* backend types.
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <string.h>
#include "e-cal-backend.h"
diff --git a/calendar/libedata-cal/e-cal-backend-intervaltree.c
b/calendar/libedata-cal/e-cal-backend-intervaltree.c
index 17b4f92..b94cea0 100644
--- a/calendar/libedata-cal/e-cal-backend-intervaltree.c
+++ b/calendar/libedata-cal/e-cal-backend-intervaltree.c
@@ -29,9 +29,7 @@
* the start of the interval.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.c b/calendar/libedata-cal/e-cal-backend-sexp.c
index af59070..6786d54 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -24,9 +24,7 @@
* and is used by various backends to implement component filtering and searching.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c
index acde6d7..422492c 100644
--- a/calendar/libedata-cal/e-cal-backend-store.c
+++ b/calendar/libedata-cal/e-cal-backend-store.c
@@ -26,7 +26,7 @@
* This class can be used by backends to store calendar components.
**/
-#include "e-cal-backend-store.h"
+#include "evolution-data-server-config.h"
#include <string.h>
#include <glib/gstdio.h>
@@ -35,6 +35,8 @@
#include "e-cal-backend-intervaltree.h"
+#include "e-cal-backend-store.h"
+
#define E_CAL_BACKEND_STORE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_CAL_BACKEND_STORE, ECalBackendStorePrivate))
diff --git a/calendar/libedata-cal/e-cal-backend-sync.c b/calendar/libedata-cal/e-cal-backend-sync.c
index 76d0e09..0449933 100644
--- a/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/calendar/libedata-cal/e-cal-backend-sync.c
@@ -26,9 +26,7 @@
* abstract backend for easier implementation of calendar backends.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
#include <libedataserver/libedataserver.h>
diff --git a/calendar/libedata-cal/e-cal-backend-util.c b/calendar/libedata-cal/e-cal-backend-util.c
index d2af07e..691f517 100644
--- a/calendar/libedata-cal/e-cal-backend-util.c
+++ b/calendar/libedata-cal/e-cal-backend-util.c
@@ -18,9 +18,7 @@
* Authors: Rodrigo Moya <rodrigo ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/libedata-cal/e-cal-backend.c b/calendar/libedata-cal/e-cal-backend.c
index 62c92c0..18115e8 100644
--- a/calendar/libedata-cal/e-cal-backend.c
+++ b/calendar/libedata-cal/e-cal-backend.c
@@ -24,7 +24,7 @@
* calendar backends must implement methods on this class.
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index 21d5153..810b310 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -31,7 +31,8 @@
* with client side #ECalClient objects.
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <locale.h>
#include <stdlib.h>
#include <string.h>
diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c
index 442a9d8..56a0c1a 100644
--- a/calendar/libedata-cal/e-data-cal-view.c
+++ b/calendar/libedata-cal/e-data-cal-view.c
@@ -32,9 +32,7 @@
* which will be delivered to the #ECalClientView
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 99f234d..5b6722d 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -24,9 +24,7 @@
* an #ECalBackend to satisfy client requests.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <libical/ical.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/libedata-cal/e-subprocess-cal-factory.c
b/calendar/libedata-cal/e-subprocess-cal-factory.c
index 8d94929..c4aa3f4 100644
--- a/calendar/libedata-cal/e-subprocess-cal-factory.c
+++ b/calendar/libedata-cal/e-subprocess-cal-factory.c
@@ -23,9 +23,7 @@
* the communication between #EDataCalFactory and #EBackend
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <locale.h>
#include <stdlib.h>
diff --git a/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
b/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
index 877f6c1..f131f39 100644
--- a/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
+++ b/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <locale.h>
#include <stdlib.h>
#include <glib/gi18n.h>
diff --git a/camel/camel-block-file.c b/camel/camel-block-file.c
index 71f4c4f..92ec24b 100644
--- a/camel/camel-block-file.c
+++ b/camel/camel-block-file.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c
index 0b77c05..31a301b 100644
--- a/camel/camel-certdb.c
+++ b/camel/camel-certdb.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c
index 59ab17e..38f4167 100644
--- a/camel/camel-charset-map.c
+++ b/camel/camel-charset-map.c
@@ -19,9 +19,7 @@
* Dan Winship <danw ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/camel-cipher-context.c b/camel/camel-cipher-context.c
index c20a70a..80bcc6c 100644
--- a/camel/camel-cipher-context.c
+++ b/camel/camel-cipher-context.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index e7c15e0..13615a0 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -18,9 +18,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <sys/types.h>
#include <ctype.h>
diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c
index 2baca21..1da5026 100644
--- a/camel/camel-data-wrapper.c
+++ b/camel/camel-data-wrapper.c
@@ -17,9 +17,7 @@
* Authors: Bertrand Guiheneuf <bertrand helixcode com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <glib/gi18n-lib.h>
diff --git a/camel/camel-db.c b/camel/camel-db.c
index e51f162..dffad32 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -18,10 +18,7 @@
* Srinivasa Ragavan <sragavan novell com>
*/
-#include "camel-db.h"
-#include "camel-string-utils.h"
-
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <ctype.h>
@@ -34,6 +31,9 @@
#include "camel-debug.h"
#include "camel-object.h"
+#include "camel-string-utils.h"
+
+#include "camel-db.h"
/* how long to wait before invoking sync on the file */
#define SYNC_TIMEOUT_SECONDS 5
diff --git a/camel/camel-debug.c b/camel/camel-debug.c
index ddce44e..a0677ab 100644
--- a/camel/camel-debug.c
+++ b/camel/camel-debug.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/camel-file-utils.c b/camel/camel-file-utils.c
index 8206bf3..93f24ee 100644
--- a/camel/camel-file-utils.c
+++ b/camel/camel-file-utils.c
@@ -19,9 +19,7 @@
* Dan Winship <danw ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 7a2bd1e..b0e73b4 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -18,9 +18,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c
index 06173ad..68f0b63 100644
--- a/camel/camel-filter-search.c
+++ b/camel/camel-filter-search.c
@@ -18,9 +18,7 @@
* Michael Zucchi <NotZed Ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
/* POSIX requires <sys/types.h> be included before <regex.h> */
#include <sys/types.h>
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index adbc95a..ffb4add 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -21,9 +21,7 @@
* It implements enough to do basic searches on folders that can provide
* an in-memory summary and a body index. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
/* POSIX requires <sys/types.h> be included before <regex.h> */
#include <sys/types.h>
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index eb46cfe..aec35e3 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdlib.h>
diff --git a/camel/camel-folder-thread.c b/camel/camel-folder-thread.c
index 642a197..277ccea 100644
--- a/camel/camel-folder-thread.c
+++ b/camel/camel-folder-thread.c
@@ -19,9 +19,7 @@
/* TODO: This could probably be made a camel object, but it isn't really required */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index c9a3a71..2b08478 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -18,9 +18,7 @@
* Authors: Bertrand Guiheneuf <bertrand helixcode com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index c7097dc..b539272 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -23,9 +23,7 @@
* gpg:status print gpg status-fd output to stdout
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/camel-gpg-photo-saver.c b/camel/camel-gpg-photo-saver.c
index 7ee29f8..4746a73 100644
--- a/camel/camel-gpg-photo-saver.c
+++ b/camel/camel-gpg-photo-saver.c
@@ -15,9 +15,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
#include <glib/gstdio.h>
diff --git a/camel/camel-iconv.c b/camel/camel-iconv.c
index d3ab956..ed5b2fe 100644
--- a/camel/camel-iconv.c
+++ b/camel/camel-iconv.c
@@ -19,9 +19,7 @@
* Jeffery Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c
index ad2b389..f09b3fe 100644
--- a/camel/camel-index-control.c
+++ b/camel/camel-index-control.c
@@ -14,9 +14,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/camel-index.c b/camel/camel-index.c
index 82c37ae..8af9415 100644
--- a/camel/camel-index.c
+++ b/camel/camel-index.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/camel-junk-filter.c b/camel/camel-junk-filter.c
index 8a058a9..54fa544 100644
--- a/camel/camel-junk-filter.c
+++ b/camel/camel-junk-filter.c
@@ -15,12 +15,12 @@
*
*/
-#include "camel-junk-filter.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include "camel-operation.h"
+#include "camel-junk-filter.h"
G_DEFINE_INTERFACE (CamelJunkFilter, camel_junk_filter, G_TYPE_OBJECT)
diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c
index 012bec3..a08341e 100644
--- a/camel/camel-lock-client.c
+++ b/camel/camel-lock-client.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-lock.c b/camel/camel-lock.c
index 14a13e5..6bbda77 100644
--- a/camel/camel-lock.c
+++ b/camel/camel-lock.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/camel-medium.c b/camel/camel-medium.c
index b518383..dc0d5d0 100644
--- a/camel/camel-medium.c
+++ b/camel/camel-medium.c
@@ -19,9 +19,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/camel-mime-filter-bestenc.c b/camel/camel-mime-filter-bestenc.c
index 6f91f04..1a377ed 100644
--- a/camel/camel-mime-filter-bestenc.c
+++ b/camel/camel-mime-filter-bestenc.c
@@ -16,9 +16,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/camel-mime-filter-canon.c b/camel/camel-mime-filter-canon.c
index 2f188f1..d5a6e84 100644
--- a/camel/camel-mime-filter-canon.c
+++ b/camel/camel-mime-filter-canon.c
@@ -20,9 +20,7 @@
/* canonicalisation filter, used for secure mime incoming and outgoing */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <string.h>
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c
index 78133b1..c3b9d3d 100644
--- a/camel/camel-mime-filter-charset.c
+++ b/camel/camel-mime-filter-charset.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <string.h>
diff --git a/camel/camel-mime-filter-enriched.c b/camel/camel-mime-filter-enriched.c
index bb5dea0..d09b0f9 100644
--- a/camel/camel-mime-filter-enriched.c
+++ b/camel/camel-mime-filter-enriched.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/camel-mime-filter-from.c b/camel/camel-mime-filter-from.c
index 6a02cfb..fa99700 100644
--- a/camel/camel-mime-filter-from.c
+++ b/camel/camel-mime-filter-from.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-mime-filter-gzip.c b/camel/camel-mime-filter-gzip.c
index 7685200..8e8c9e1 100644
--- a/camel/camel-mime-filter-gzip.c
+++ b/camel/camel-mime-filter-gzip.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/camel-mime-filter-linewrap.c b/camel/camel-mime-filter-linewrap.c
index 7c1e72e..790b9fb 100644
--- a/camel/camel-mime-filter-linewrap.c
+++ b/camel/camel-mime-filter-linewrap.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
diff --git a/camel/camel-mime-filter-pgp.c b/camel/camel-mime-filter-pgp.c
index 521bb8e..ac29e26 100644
--- a/camel/camel-mime-filter-pgp.c
+++ b/camel/camel-mime-filter-pgp.c
@@ -21,9 +21,7 @@
/* Strips PGP message headers from the input stream and also performs
* pgp decoding as described in section 7.1 of RFC2440 */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <string.h>
diff --git a/camel/camel-mime-filter-progress.c b/camel/camel-mime-filter-progress.c
index a6056b1..08921f3 100644
--- a/camel/camel-mime-filter-progress.c
+++ b/camel/camel-mime-filter-progress.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/camel-mime-filter-tohtml.c b/camel/camel-mime-filter-tohtml.c
index 50c55ed..07024aa 100644
--- a/camel/camel-mime-filter-tohtml.c
+++ b/camel/camel-mime-filter-tohtml.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/camel-mime-filter-windows.c b/camel/camel-mime-filter-windows.c
index 884b3f8..d2358a1 100644
--- a/camel/camel-mime-filter-windows.c
+++ b/camel/camel-mime-filter-windows.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/camel-mime-filter-yenc.c b/camel/camel-mime-filter-yenc.c
index 0f18f0f..ba87c9e 100644
--- a/camel/camel-mime-filter-yenc.c
+++ b/camel/camel-mime-filter-yenc.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index c877a7a..d41b030 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -20,9 +20,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index 8959a25..9fe0f9e 100644
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.c
@@ -20,9 +20,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 263a041..70b842b 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -20,9 +20,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index c64f54f..7c33fb8 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -18,9 +18,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c
index 746132a..4e00e2e 100644
--- a/camel/camel-movemail.c
+++ b/camel/camel-movemail.c
@@ -18,9 +18,7 @@
* Authors: Dan Winship <danw ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-msgport.c b/camel/camel-msgport.c
index 210315d..26a9cd0 100644
--- a/camel/camel-msgport.c
+++ b/camel/camel-msgport.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <unistd.h>
diff --git a/camel/camel-multipart-encrypted.c b/camel/camel-multipart-encrypted.c
index 312dca9..5853b3e 100644
--- a/camel/camel-multipart-encrypted.c
+++ b/camel/camel-multipart-encrypted.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "camel-multipart-encrypted.h"
diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c
index 0480c61..737131e 100644
--- a/camel/camel-multipart-signed.c
+++ b/camel/camel-multipart-signed.c
@@ -18,9 +18,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index e33f31f..0836b5e 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -18,9 +18,7 @@
* Authors: Bertrand Guiheneuf <bertrand helixcode com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <string.h> /* strlen() */
diff --git a/camel/camel-net-utils.c b/camel/camel-net-utils.c
index 91cfafd..cf56e82 100644
--- a/camel/camel-net-utils.c
+++ b/camel/camel-net-utils.c
@@ -19,9 +19,7 @@
* Chris Toshok <toshok ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/camel-network-service.c b/camel/camel-network-service.c
index df0ca64..5758c5b 100644
--- a/camel/camel-network-service.c
+++ b/camel/camel-network-service.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "camel-network-service.h"
diff --git a/camel/camel-object.c b/camel/camel-object.c
index 1c3a545..ea7a0b8 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/camel-offline-folder.c b/camel/camel-offline-folder.c
index 9d3da37..217515d 100644
--- a/camel/camel-offline-folder.c
+++ b/camel/camel-offline-folder.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj novell com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c
index 2865906..b49b786 100644
--- a/camel/camel-offline-store.c
+++ b/camel/camel-offline-store.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj novell com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index 388f3b6..b160c90 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -15,7 +15,7 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <unistd.h>
diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c
index 2a2b6fe..e51c16b 100644
--- a/camel/camel-partition-table.c
+++ b/camel/camel-partition-table.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-provider.c b/camel/camel-provider.c
index c469270..45d2611 100644
--- a/camel/camel-provider.c
+++ b/camel/camel-provider.c
@@ -22,9 +22,7 @@
/* FIXME: Shouldn't we add a version number to providers ? */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/camel-sasl-anonymous.c b/camel/camel-sasl-anonymous.c
index 2ca3c16..62c1fe0 100644
--- a/camel/camel-sasl-anonymous.c
+++ b/camel/camel-sasl-anonymous.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-sasl-cram-md5.c b/camel/camel-sasl-cram-md5.c
index ae79478..3ca12b6 100644
--- a/camel/camel-sasl-cram-md5.c
+++ b/camel/camel-sasl-cram-md5.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c
index b41d9da..0312ba0 100644
--- a/camel/camel-sasl-digest-md5.c
+++ b/camel/camel-sasl-digest-md5.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c
index b1f919d..08d429d 100644
--- a/camel/camel-sasl-gssapi.c
+++ b/camel/camel-sasl-gssapi.c
@@ -19,9 +19,7 @@
/* If building without Kerberos support, this class is an empty shell. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
diff --git a/camel/camel-sasl-login.c b/camel/camel-sasl-login.c
index 8716783..703805e 100644
--- a/camel/camel-sasl-login.c
+++ b/camel/camel-sasl-login.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index 6c6c18e..4ee5a7d 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <string.h>
diff --git a/camel/camel-sasl-plain.c b/camel/camel-sasl-plain.c
index 7e2b4d2..09b4dd7 100644
--- a/camel/camel-sasl-plain.c
+++ b/camel/camel-sasl-plain.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-sasl-popb4smtp.c b/camel/camel-sasl-popb4smtp.c
index 5843a8f..26ef512 100644
--- a/camel/camel-sasl-popb4smtp.c
+++ b/camel/camel-sasl-popb4smtp.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include <time.h>
diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c
index 9096f88..38a55ce 100644
--- a/camel/camel-sasl.c
+++ b/camel/camel-sasl.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c
index d68d86f..ced34e9 100644
--- a/camel/camel-search-private.c
+++ b/camel/camel-search-private.c
@@ -18,9 +18,7 @@
* Michael Zucchi <NotZed Ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
/* POSIX requires <sys/types.h> be included before <regex.h> */
#include <sys/types.h>
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index 5d98e0e..2ecbf21 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -21,9 +21,7 @@
* It implements enough to do basic searches on folders that can provide
* an in-memory summary and a body index. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/camel-service.c b/camel/camel-service.c
index ee669ff..cc4cac9 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -18,9 +18,7 @@
* Authors: Bertrand Guiheneuf <bertrand helixcode com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/camel-session.c b/camel/camel-session.c
index 10437dd..1c4fcc5 100644
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -20,9 +20,7 @@
* Bertrand Guiheneuf <bertrand helixcode com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/camel-sexp.c b/camel/camel-sexp.c
index 140b6d7..41664c4 100644
--- a/camel/camel-sexp.c
+++ b/camel/camel-sexp.c
@@ -78,7 +78,8 @@
* Execute a sequence. The last function return is the return type.
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index e75aecd..1e18a1d 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -23,9 +23,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#ifdef ENABLE_SMIME
diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c
index 94497f6..23527bc 100644
--- a/camel/camel-store-summary.c
+++ b/camel/camel-store-summary.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 09f2163..4d4f112 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -19,9 +19,7 @@
* Dan Winship <danw ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <string.h>
diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c
index 4ef6d49..7ad8c62 100644
--- a/camel/camel-stream-buffer.c
+++ b/camel/camel-stream-buffer.c
@@ -18,9 +18,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c
index 1430433..9ef6df5 100644
--- a/camel/camel-stream-filter.c
+++ b/camel/camel-stream-filter.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index 389db0a..78045df 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -19,9 +19,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <string.h>
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
index 0120834..e7c2e1d 100644
--- a/camel/camel-stream-mem.c
+++ b/camel/camel-stream-mem.c
@@ -19,9 +19,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-stream-null.c b/camel/camel-stream-null.c
index 24283bd..db75989 100644
--- a/camel/camel-stream-null.c
+++ b/camel/camel-stream-null.c
@@ -18,9 +18,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/camel/camel-stream-process.c b/camel/camel-stream-process.c
index fd3f7c7..c8ab3ac 100644
--- a/camel/camel-stream-process.c
+++ b/camel/camel-stream-process.c
@@ -19,9 +19,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
index 5973f48..3841819 100644
--- a/camel/camel-stream.c
+++ b/camel/camel-stream.c
@@ -18,13 +18,14 @@
* Authors: Bertrand Guiheneuf <bertrand helixcode com>
*/
-#include "camel-stream.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <camel/camel-debug.h>
+#include "camel-stream.h"
+
#define CAMEL_STREAM_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), CAMEL_TYPE_STREAM, CamelStreamPrivate))
diff --git a/camel/camel-string-utils.c b/camel/camel-string-utils.c
index 1fcf510..f362c85 100644
--- a/camel/camel-string-utils.c
+++ b/camel/camel-string-utils.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-subscribable.c b/camel/camel-subscribable.c
index a33c3a8..3ec4f58 100644
--- a/camel/camel-subscribable.c
+++ b/camel/camel-subscribable.c
@@ -15,9 +15,8 @@
*
*/
-#include "camel-subscribable.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include "camel-async-closure.h"
@@ -25,6 +24,8 @@
#include "camel-session.h"
#include "camel-vtrash-folder.h"
+#include "camel-subscribable.h"
+
typedef struct _AsyncContext AsyncContext;
typedef struct _SignalClosure SignalClosure;
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index dbf5f8f..7807753 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/camel-transport.c b/camel/camel-transport.c
index ddde8ea..d83eef0 100644
--- a/camel/camel-transport.c
+++ b/camel/camel-transport.c
@@ -18,9 +18,7 @@
* Authors: Dan Winship <danw ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "camel-address.h"
#include "camel-async-closure.h"
diff --git a/camel/camel-trie.c b/camel/camel-trie.c
index bb414e5..4d9ea9f 100644
--- a/camel/camel-trie.c
+++ b/camel/camel-trie.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c
index 2033894..e6fbc28 100644
--- a/camel/camel-uid-cache.c
+++ b/camel/camel-uid-cache.c
@@ -18,9 +18,7 @@
* Authors: Dan Winship <danw ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/camel-url-scanner.c b/camel/camel-url-scanner.c
index 773c6db..c977e14 100644
--- a/camel/camel-url-scanner.c
+++ b/camel/camel-url-scanner.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/camel-url.c b/camel/camel-url.c
index 5cc477f..b51ed09 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -19,9 +19,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/camel-utf8.c b/camel/camel-utf8.c
index 5c34c11..b2c7420 100644
--- a/camel/camel-utf8.c
+++ b/camel/camel-utf8.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include <sys/types.h>
diff --git a/camel/camel-vee-data-cache.c b/camel/camel-vee-data-cache.c
index ba439e0..b3567e8 100644
--- a/camel/camel-vee-data-cache.c
+++ b/camel/camel-vee-data-cache.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "camel-string-utils.h"
#include "camel-store.h"
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 1c9fcc9..512158d 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -18,9 +18,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c
index 97511cc..c9a8df1 100644
--- a/camel/camel-vee-store.c
+++ b/camel/camel-vee-store.c
@@ -16,9 +16,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-vee-summary.c b/camel/camel-vee-summary.c
index 1d64469..ddd527d 100644
--- a/camel/camel-vee-summary.c
+++ b/camel/camel-vee-summary.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c
index 7362009..b8eef41 100644
--- a/camel/camel-vtrash-folder.c
+++ b/camel/camel-vtrash-folder.c
@@ -18,9 +18,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/camel-win32.h b/camel/camel-win32.h
index 99b726b..d906054 100644
--- a/camel/camel-win32.h
+++ b/camel/camel-win32.h
@@ -24,9 +24,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-data-server-config.h"
#include <glib.h>
diff --git a/camel/camel.c b/camel/camel.c
index 0789426..9a4564c 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -18,9 +18,7 @@
* Bertrand Guiheneuf <bertrand helixcode com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <signal.h>
diff --git a/camel/providers/imapx/camel-imapx-command.c b/camel/providers/imapx/camel-imapx-command.c
index e56dd6a..cf54416 100644
--- a/camel/providers/imapx/camel-imapx-command.c
+++ b/camel/providers/imapx/camel-imapx-command.c
@@ -15,9 +15,8 @@
*
*/
-#include "camel-imapx-command.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gstdio.h>
#include <glib/gi18n-lib.h>
@@ -26,6 +25,8 @@
#include "camel-imapx-server.h"
#include "camel-imapx-store.h"
+#include "camel-imapx-command.h"
+
#define c(...) camel_imapx_debug(command, __VA_ARGS__)
typedef struct _CamelIMAPXRealCommand CamelIMAPXRealCommand;
diff --git a/camel/providers/imapx/camel-imapx-conn-manager.c
b/camel/providers/imapx/camel-imapx-conn-manager.c
index c8bda8b..983c69b 100644
--- a/camel/providers/imapx/camel-imapx-conn-manager.c
+++ b/camel/providers/imapx/camel-imapx-conn-manager.c
@@ -18,9 +18,7 @@
* Authors: Chenthill Palanisamy <pchenthill novell com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index 1002a30..0d73287 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -18,9 +18,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <glib/gi18n-lib.h>
diff --git a/camel/providers/imapx/camel-imapx-input-stream.c
b/camel/providers/imapx/camel-imapx-input-stream.c
index 8afb0a6..b71bd74 100644
--- a/camel/providers/imapx/camel-imapx-input-stream.c
+++ b/camel/providers/imapx/camel-imapx-input-stream.c
@@ -15,9 +15,8 @@
*
*/
-#include "camel-imapx-input-stream.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <string.h>
#include <stdio.h>
#include <ctype.h>
@@ -30,6 +29,8 @@
#include "camel-imapx-server.h"
#include "camel-imapx-utils.h"
+#include "camel-imapx-input-stream.h"
+
#define CAMEL_IMAPX_INPUT_STREAM_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), CAMEL_TYPE_IMAPX_INPUT_STREAM, CamelIMAPXInputStreamPrivate))
diff --git a/camel/providers/imapx/camel-imapx-job.c b/camel/providers/imapx/camel-imapx-job.c
index 635ceaf..ed9c45a 100644
--- a/camel/providers/imapx/camel-imapx-job.c
+++ b/camel/providers/imapx/camel-imapx-job.c
@@ -14,9 +14,8 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/providers/imapx/camel-imapx-provider.c b/camel/providers/imapx/camel-imapx-provider.c
index bc9b94a..9036364 100644
--- a/camel/providers/imapx/camel-imapx-provider.c
+++ b/camel/providers/imapx/camel-imapx-provider.c
@@ -20,9 +20,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include <camel/camel.h>
diff --git a/camel/providers/imapx/camel-imapx-search.c b/camel/providers/imapx/camel-imapx-search.c
index a14ba6e..b4e0a80 100644
--- a/camel/providers/imapx/camel-imapx-search.c
+++ b/camel/providers/imapx/camel-imapx-search.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "camel-imapx-search.h"
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index f2bd005..518dbe3 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/providers/imapx/camel-imapx-store-summary.c
b/camel/providers/imapx/camel-imapx-store-summary.c
index ef58f6d..6b0158e 100644
--- a/camel/providers/imapx/camel-imapx-store-summary.c
+++ b/camel/providers/imapx/camel-imapx-store-summary.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index cca9c25..96bbb84 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -18,9 +18,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <sys/types.h>
#ifdef _WIN32
diff --git a/camel/providers/imapx/camel-imapx-summary.c b/camel/providers/imapx/camel-imapx-summary.c
index dbaff72..6e3a2d2 100644
--- a/camel/providers/imapx/camel-imapx-summary.c
+++ b/camel/providers/imapx/camel-imapx-summary.c
@@ -18,9 +18,7 @@
* Dan Winship <danw ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index e94e123..c60666d 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 00987b1..47ba761 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/providers/local/camel-local-private.c b/camel/providers/local/camel-local-private.c
index 75eae8d..f19c784 100644
--- a/camel/providers/local/camel-local-private.c
+++ b/camel/providers/local/camel-local-private.c
@@ -16,9 +16,7 @@
* Authors: Srinivsa Ragavan <sragavan novell com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
index 1da21ce..71eebc8 100644
--- a/camel/providers/local/camel-local-private.h
+++ b/camel/providers/local/camel-local-private.h
@@ -23,9 +23,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-data-server-config.h"
#include <glib.h>
diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
index de41646..0613dd0 100644
--- a/camel/providers/local/camel-local-provider.c
+++ b/camel/providers/local/camel-local-provider.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 2362381..324a44e 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 11caeed..9fee506 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index 5ff9a13..7ec56fd 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <dirent.h>
#include <errno.h>
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index 2c53329..be483b1 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <dirent.h>
#include <errno.h>
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index ca5fb94..2c5a56b 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -16,9 +16,7 @@
* Authors: Not Zed <notzed lostzed mmc com au>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <dirent.h>
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 478ec31..56ca428 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -18,9 +18,7 @@
* Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index 87829cf..cff6ff1 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index b169a74..4e82fdc 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 2a745e6..7eaafe9 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <dirent.h>
#include <errno.h>
diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index 3cae858..7f771ec 100644
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <dirent.h>
#include <errno.h>
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index 09372e5..b653192 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -16,9 +16,7 @@
* Authors: Not Zed <notzed lostzed mmc com au>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <dirent.h>
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index 3ea2732..af8c064 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -16,9 +16,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <dirent.h>
#include <errno.h>
diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index 2a5849d..b97810d 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <dirent.h>
#include <errno.h>
diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c
index 1b6c835..44e3719 100644
--- a/camel/providers/local/camel-spool-summary.c
+++ b/camel/providers/local/camel-spool-summary.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index ad65baf..8e45b11 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -19,9 +19,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/camel/providers/nntp/camel-nntp-private.h b/camel/providers/nntp/camel-nntp-private.h
index 6b7f0c3..e1df345 100644
--- a/camel/providers/nntp/camel-nntp-private.h
+++ b/camel/providers/nntp/camel-nntp-private.h
@@ -24,9 +24,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-data-server-config.h"
G_BEGIN_DECLS
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index db28e25..a2382a1 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -19,9 +19,7 @@
* Chris Toshok <toshok ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/camel/providers/nntp/camel-nntp-store-summary.c b/camel/providers/nntp/camel-nntp-store-summary.c
index e3664a9..cacccce 100644
--- a/camel/providers/nntp/camel-nntp-store-summary.c
+++ b/camel/providers/nntp/camel-nntp-store-summary.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdlib.h>
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index fda075f..100dd09 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -18,9 +18,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/providers/nntp/camel-nntp-stream.c b/camel/providers/nntp/camel-nntp-stream.c
index eb39870..ad5d7da 100644
--- a/camel/providers/nntp/camel-nntp-stream.c
+++ b/camel/providers/nntp/camel-nntp-stream.c
@@ -16,9 +16,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index 32b15a8..d4c47aa 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c
index e9b99c6..7ac7b84 100644
--- a/camel/providers/pop3/camel-pop3-engine.c
+++ b/camel/providers/pop3/camel-pop3-engine.c
@@ -17,9 +17,7 @@
* Authors: Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 8f91e1c..bb7042e 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -19,9 +19,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 6da8d00..c3e7d15 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -20,9 +20,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 297f4db..7d92847 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -19,9 +19,7 @@
* Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/providers/pop3/camel-pop3-stream.c b/camel/providers/pop3/camel-pop3-stream.c
index 6de7b88..69398e5 100644
--- a/camel/providers/pop3/camel-pop3-stream.c
+++ b/camel/providers/pop3/camel-pop3-stream.c
@@ -19,9 +19,7 @@
/* This is *identical* to the camel-nntp-stream, so should probably
* work out a way to merge them */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c
b/camel/providers/sendmail/camel-sendmail-provider.c
index 4e92bd9..7a8124a 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -19,9 +19,7 @@
* Dan Winship <danw ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <camel/camel.h>
#include <glib/gi18n-lib.h>
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c
b/camel/providers/sendmail/camel-sendmail-transport.c
index 15c6288..7767945 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -18,9 +18,7 @@
* Authors: Dan Winship <danw ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <fcntl.h>
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 1ab3018..c7b667c 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -18,9 +18,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <camel/camel.h>
#include <glib/gi18n-lib.h>
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index de6bc6f..44e96bf 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -18,9 +18,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <errno.h>
diff --git a/camel/tests/lib/camel-test.h b/camel/tests/lib/camel-test.h
index 03cc827..d08c996 100644
--- a/camel/tests/lib/camel-test.h
+++ b/camel/tests/lib/camel-test.h
@@ -14,7 +14,7 @@
/* some utilities for testing */
-#include "config.h"
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <glib/gstdio.h>
diff --git a/camel/tests/lib/session.c b/camel/tests/lib/session.c
index fa6ee85..827fc59 100644
--- a/camel/tests/lib/session.c
+++ b/camel/tests/lib/session.c
@@ -12,9 +12,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "session.h"
diff --git a/camel/tests/misc/rfc2047.c b/camel/tests/misc/rfc2047.c
index 269aefd..0d57ac0 100644
--- a/camel/tests/misc/rfc2047.c
+++ b/camel/tests/misc/rfc2047.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj novell com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/tests/misc/split.c b/camel/tests/misc/split.c
index 0536c0e..eac9548 100644
--- a/camel/tests/misc/split.c
+++ b/camel/tests/misc/split.c
@@ -12,7 +12,8 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
-#include <config.h>
+
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/tests/misc/test1.c b/camel/tests/misc/test1.c
index 4b10f69..eb944c4 100644
--- a/camel/tests/misc/test1.c
+++ b/camel/tests/misc/test1.c
@@ -13,7 +13,7 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/tests/misc/test2.c b/camel/tests/misc/test2.c
index 30d102e..2ca8ac3 100644
--- a/camel/tests/misc/test2.c
+++ b/camel/tests/misc/test2.c
@@ -13,7 +13,7 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/tests/misc/url-scan.c b/camel/tests/misc/url-scan.c
index def9ed2..5539db9 100644
--- a/camel/tests/misc/url-scan.c
+++ b/camel/tests/misc/url-scan.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/tests/misc/url.c b/camel/tests/misc/url.c
index 082bfe2..0f519fd 100644
--- a/camel/tests/misc/url.c
+++ b/camel/tests/misc/url.c
@@ -13,7 +13,7 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/tests/misc/utf7.c b/camel/tests/misc/utf7.c
index 3f43a58..b79cf10 100644
--- a/camel/tests/misc/utf7.c
+++ b/camel/tests/misc/utf7.c
@@ -12,7 +12,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/camel/tests/smime/pgp-mime.c b/camel/tests/smime/pgp-mime.c
index 19c4bab..eb44050 100644
--- a/camel/tests/smime/pgp-mime.c
+++ b/camel/tests/smime/pgp-mime.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c
index b5b6072..05f7771 100644
--- a/camel/tests/smime/pgp.c
+++ b/camel/tests/smime/pgp.c
@@ -17,9 +17,7 @@
* Authors: Jeffrey Stedfast <fejj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/camel/tests/smime/pkcs7.c b/camel/tests/smime/pkcs7.c
index 0bcdfe3..3f1d845 100644
--- a/camel/tests/smime/pkcs7.c
+++ b/camel/tests/smime/pkcs7.c
@@ -13,7 +13,7 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/config.h.in b/config.h.in
index 08f0290..549804f 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/libebackend/e-backend-factory.c b/libebackend/e-backend-factory.c
index b8ef063..e9b8493 100644
--- a/libebackend/e-backend-factory.c
+++ b/libebackend/e-backend-factory.c
@@ -33,14 +33,14 @@
* to pair with the requested #ESource.
**/
-#include "e-backend-factory.h"
-
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <libedataserver/libedataserver.h>
#include <libebackend/e-data-factory.h>
+#include "e-backend-factory.h"
+
G_DEFINE_ABSTRACT_TYPE (EBackendFactory, e_backend_factory, E_TYPE_EXTENSION)
static void
diff --git a/libebackend/e-backend.c b/libebackend/e-backend.c
index ab76092..bbe3144 100644
--- a/libebackend/e-backend.c
+++ b/libebackend/e-backend.c
@@ -30,7 +30,8 @@
* All #EBackend instances are created by an #EBackendFactory.
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <glib/gi18n-lib.h>
#include <gio/gio.h>
diff --git a/libebackend/e-cache-reaper.c b/libebackend/e-cache-reaper.c
index 862f2bf..a7e4c91 100644
--- a/libebackend/e-cache-reaper.c
+++ b/libebackend/e-cache-reaper.c
@@ -15,6 +15,8 @@
*
*/
+#include "evolution-data-server-config.h"
+
#include <errno.h>
#include <time.h>
#include <glib/gstdio.h>
diff --git a/libebackend/e-collection-backend.c b/libebackend/e-collection-backend.c
index e45bc4a..67c19de 100644
--- a/libebackend/e-collection-backend.c
+++ b/libebackend/e-collection-backend.c
@@ -37,9 +37,8 @@
* its own #EAuthenticationSession instances to the #ESourceRegistryServer.
**/
-#include "e-collection-backend.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libedataserver/libedataserver.h>
@@ -47,6 +46,8 @@
#include <libebackend/e-server-side-source.h>
#include <libebackend/e-source-registry-server.h>
+#include "e-collection-backend.h"
+
#define E_COLLECTION_BACKEND_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_COLLECTION_BACKEND, ECollectionBackendPrivate))
diff --git a/libebackend/e-data-factory.c b/libebackend/e-data-factory.c
index 85a2bd4..e1e78f1 100644
--- a/libebackend/e-data-factory.c
+++ b/libebackend/e-data-factory.c
@@ -21,9 +21,8 @@
* @short_description: An abstract base class for a backend-based server
**/
-#include "e-data-factory.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libedataserver/libedataserver.h>
@@ -33,6 +32,8 @@
#include <e-dbus-subprocess-backend.h>
+#include "e-data-factory.h"
+
#define E_DATA_FACTORY_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_DATA_FACTORY, EDataFactoryPrivate))
diff --git a/libebackend/e-db3-utils.c b/libebackend/e-db3-utils.c
index 12803af..b1493da 100644
--- a/libebackend/e-db3-utils.c
+++ b/libebackend/e-db3-utils.c
@@ -21,7 +21,7 @@
* Utilities for coping with Berkeley DB file format changes.
**/
-#include "config.h"
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <sys/stat.h>
diff --git a/libebackend/e-dbhash.c b/libebackend/e-dbhash.c
index cfe729d..07d3010 100644
--- a/libebackend/e-dbhash.c
+++ b/libebackend/e-dbhash.c
@@ -25,7 +25,7 @@
* file for permanent storage.
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-dbhash.h"
diff --git a/libebackend/e-dbus-server.c b/libebackend/e-dbus-server.c
index 313ee78..cc67b14 100644
--- a/libebackend/e-dbus-server.c
+++ b/libebackend/e-dbus-server.c
@@ -21,9 +21,9 @@
* @short_description: An abstract base class for a D-Bus server
**/
-#include "e-dbus-server.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
+#include <glib.h>
#ifdef G_OS_UNIX
#include <glib-unix.h>
@@ -33,6 +33,8 @@
#include <libebackend/e-backend-enumtypes.h>
+#include "e-dbus-server.h"
+
#define E_DBUS_SERVER_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_DBUS_SERVER, EDBusServerPrivate))
diff --git a/libebackend/e-file-cache.c b/libebackend/e-file-cache.c
index 62b678d..529764f 100644
--- a/libebackend/e-file-cache.c
+++ b/libebackend/e-file-cache.c
@@ -27,7 +27,8 @@
* the cache is temporarily frozen with e_file_cache_freeze_changes().
**/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <string.h>
#include <unistd.h>
diff --git a/libebackend/e-offline-listener.c b/libebackend/e-offline-listener.c
index 645ccd2..b4b5b51 100644
--- a/libebackend/e-offline-listener.c
+++ b/libebackend/e-offline-listener.c
@@ -30,9 +30,7 @@
* deprecated. Use #GNetworkMonitor instead.
**/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "evolution-data-server-config.h"
#include "e-offline-listener.h"
diff --git a/libebackend/e-offline-listener.h b/libebackend/e-offline-listener.h
index fda0f1d..43617ac 100644
--- a/libebackend/e-offline-listener.h
+++ b/libebackend/e-offline-listener.h
@@ -27,10 +27,6 @@
#ifndef E_OFFLINE_LISTENER_H
#define E_OFFLINE_LISTENER_H
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
#include <glib-object.h>
/* Standard GObject macros */
diff --git a/libebackend/e-server-side-source-credentials-provider.c
b/libebackend/e-server-side-source-credentials-provider.c
index a23f907..503a737 100644
--- a/libebackend/e-server-side-source-credentials-provider.c
+++ b/libebackend/e-server-side-source-credentials-provider.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
diff --git a/libebackend/e-server-side-source.c b/libebackend/e-server-side-source.c
index 243003c..8393067 100644
--- a/libebackend/e-server-side-source.c
+++ b/libebackend/e-server-side-source.c
@@ -24,14 +24,15 @@
* exclusive to the registry D-Bus service.
**/
-#include "e-server-side-source.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <stdio.h>
#include <glib/gi18n-lib.h>
/* Private D-Bus classes. */
-#include <e-dbus-source.h>
+#include "e-dbus-source.h"
+
+#include "e-server-side-source.h"
#define E_SERVER_SIDE_SOURCE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/libebackend/e-source-registry-server.c b/libebackend/e-source-registry-server.c
index 4552c95..01900d0 100644
--- a/libebackend/e-source-registry-server.c
+++ b/libebackend/e-source-registry-server.c
@@ -31,19 +31,20 @@
* advertise available data sources on a remote server.
**/
-#include "e-source-registry-server.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n-lib.h>
/* Private D-Bus classes. */
-#include <e-dbus-source.h>
-#include <e-dbus-source-manager.h>
+#include "e-dbus-source.h"
+#include "e-dbus-source-manager.h"
#include "e-server-side-source.h"
#include "e-server-side-source-credentials-provider.h"
+#include "e-source-registry-server.h"
+
#define E_SOURCE_REGISTRY_SERVER_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_SOURCE_REGISTRY_SERVER, ESourceRegistryServerPrivate))
diff --git a/libebackend/e-sqlite3-vfs.c b/libebackend/e-sqlite3-vfs.c
index 1980a33..579e36f 100644
--- a/libebackend/e-sqlite3-vfs.c
+++ b/libebackend/e-sqlite3-vfs.c
@@ -16,9 +16,10 @@
*
*/
+#include "evolution-data-server-config.h"
+
#include <sqlite3.h>
#include <glib.h>
-#include <config.h>
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/libebackend/e-subprocess-factory.c b/libebackend/e-subprocess-factory.c
index d59d9bc..83fbf2b 100644
--- a/libebackend/e-subprocess-factory.c
+++ b/libebackend/e-subprocess-factory.c
@@ -22,9 +22,7 @@
* @short_description: An abstract base class for a backend-subprocess server
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/libebackend/e-user-prompter-server-extension.c b/libebackend/e-user-prompter-server-extension.c
index 10b9864..e0f85c8 100644
--- a/libebackend/e-user-prompter-server-extension.c
+++ b/libebackend/e-user-prompter-server-extension.c
@@ -35,9 +35,7 @@
* e_user_prompter_server_extension_response() call.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/libebackend/e-user-prompter-server.c b/libebackend/e-user-prompter-server.c
index 7d497df..8358def 100644
--- a/libebackend/e-user-prompter-server.c
+++ b/libebackend/e-user-prompter-server.c
@@ -23,9 +23,7 @@
* Acting as a global singleton for user prompts from backends.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include "evolution-data-server-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/libebackend/e-user-prompter.c b/libebackend/e-user-prompter.c
index 5a1e7a8..71dd81e 100644
--- a/libebackend/e-user-prompter.c
+++ b/libebackend/e-user-prompter.c
@@ -23,9 +23,7 @@
* Use this to initiate a user prompt from an #EBackend descendant.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include "evolution-data-server-config.h"
#include <libedataserver/libedataserver.h>
diff --git a/libedataserver/e-alphabet-index-private.cpp b/libedataserver/e-alphabet-index-private.cpp
index 9b73d96..d3e44f4 100644
--- a/libedataserver/e-alphabet-index-private.cpp
+++ b/libedataserver/e-alphabet-index-private.cpp
@@ -17,9 +17,7 @@
* Authors: Tristan Van Berkom <tristanvb openismus com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-alphabet-index-private.h"
diff --git a/libedataserver/e-cancellable-locks.c b/libedataserver/e-cancellable-locks.c
index ca4ddd5..4eb1ada 100644
--- a/libedataserver/e-cancellable-locks.c
+++ b/libedataserver/e-cancellable-locks.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-cancellable-locks.h"
diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
index 626dcc1..803bef8 100644
--- a/libedataserver/e-categories.c
+++ b/libedataserver/e-categories.c
@@ -16,9 +16,7 @@
*
*/
-#if HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <errno.h>
#include <string.h>
diff --git a/libedataserver/e-client.c b/libedataserver/e-client.c
index aa5cad4..dc27150 100644
--- a/libedataserver/e-client.c
+++ b/libedataserver/e-client.c
@@ -34,9 +34,7 @@
* such as #EBookClient and #ECalClient.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
#include <gio/gio.h>
diff --git a/libedataserver/e-collator.c b/libedataserver/e-collator.c
index f8a9a17..d7c8f69 100644
--- a/libedataserver/e-collator.c
+++ b/libedataserver/e-collator.c
@@ -29,9 +29,7 @@
* letter in the user's alphabet.
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/libedataserver/e-credentials.c b/libedataserver/e-credentials.c
index 20e1f61..3237257 100644
--- a/libedataserver/e-credentials.c
+++ b/libedataserver/e-credentials.c
@@ -17,9 +17,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index fdfd58a..3caad3b 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -19,7 +19,7 @@
* Tristan Van Berkom <tristanvb openismus com>
*/
-#include "config.h"
+#include "evolution-data-server-config.h"
#include <string.h>
#include <sys/stat.h>
diff --git a/libedataserver/e-debug-log.c b/libedataserver/e-debug-log.c
index 9180eed..4a31397 100644
--- a/libedataserver/e-debug-log.c
+++ b/libedataserver/e-debug-log.c
@@ -18,7 +18,8 @@
* Authors: Federico Mena-Quintero <federico novell com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <errno.h>
#include <stdio.h>
#include <string.h>
diff --git a/libedataserver/e-extensible.c b/libedataserver/e-extensible.c
index bcf1e57..8f3d7fa 100644
--- a/libedataserver/e-extensible.c
+++ b/libedataserver/e-extensible.c
@@ -55,9 +55,7 @@
* </informalexample>
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-extension.h"
#include "e-data-server-util.h"
diff --git a/libedataserver/e-extension.c b/libedataserver/e-extension.c
index f9edd7d..3133c9c 100644
--- a/libedataserver/e-extension.c
+++ b/libedataserver/e-extension.c
@@ -38,9 +38,7 @@
* registered in the library module's e_module_load() function.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-extension.h"
diff --git a/libedataserver/e-free-form-exp.c b/libedataserver/e-free-form-exp.c
index b2192b7..b6e22e7 100644
--- a/libedataserver/e-free-form-exp.c
+++ b/libedataserver/e-free-form-exp.c
@@ -17,9 +17,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/libedataserver/e-iterator.c b/libedataserver/e-iterator.c
index 1b4b783..7f3633e 100644
--- a/libedataserver/e-iterator.c
+++ b/libedataserver/e-iterator.c
@@ -17,7 +17,7 @@
* Authors: Christopher James Lahey <clahey umich edu>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-iterator.h"
diff --git a/libedataserver/e-list-iterator.c b/libedataserver/e-list-iterator.c
index 80c9adb..3ee066e 100644
--- a/libedataserver/e-list-iterator.c
+++ b/libedataserver/e-list-iterator.c
@@ -17,7 +17,7 @@
* Authors: Christopher James Lahey <clahey umich edu>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-list-iterator.h"
#include "e-list.h"
diff --git a/libedataserver/e-list.c b/libedataserver/e-list.c
index 0595b21..9632a04 100644
--- a/libedataserver/e-list.c
+++ b/libedataserver/e-list.c
@@ -17,7 +17,7 @@
* Authors: Christopher James Lahey <clahey umich edu>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include "e-list.h"
#include "e-list-iterator.h"
diff --git a/libedataserver/e-module.c b/libedataserver/e-module.c
index b25c04f..da8c3c0 100644
--- a/libedataserver/e-module.c
+++ b/libedataserver/e-module.c
@@ -21,9 +21,7 @@
* @short_description: A module loader
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
diff --git a/libedataserver/e-network-monitor.c b/libedataserver/e-network-monitor.c
index f2b15d4..42df560 100644
--- a/libedataserver/e-network-monitor.c
+++ b/libedataserver/e-network-monitor.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <gio/gio.h>
diff --git a/libedataserver/e-proxy.c b/libedataserver/e-proxy.c
index 02a7d05..7a1e136 100644
--- a/libedataserver/e-proxy.c
+++ b/libedataserver/e-proxy.c
@@ -17,9 +17,7 @@
* Veerapuram Varadhan <vvaradhan novell com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/libedataserver/e-secret-store.c b/libedataserver/e-secret-store.c
index aeca476..0a133dc 100644
--- a/libedataserver/e-secret-store.c
+++ b/libedataserver/e-secret-store.c
@@ -24,9 +24,7 @@
* lookup and delete secrets from the keyring.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index f5b922b..2aeaff5 100644
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -78,9 +78,7 @@
* Execute a sequence. The last function return is the return type.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/libedataserver/e-soup-auth-bearer.c b/libedataserver/e-soup-auth-bearer.c
index 41ce32e..eeed0b9 100644
--- a/libedataserver/e-soup-auth-bearer.c
+++ b/libedataserver/e-soup-auth-bearer.c
@@ -30,9 +30,7 @@
* and pass the results to e_soup_auth_bearer_set_access_token().
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-soup-auth-bearer.h"
diff --git a/libedataserver/e-soup-ssl-trust.c b/libedataserver/e-soup-ssl-trust.c
index c12d46a..a97a7f2 100644
--- a/libedataserver/e-soup-ssl-trust.c
+++ b/libedataserver/e-soup-ssl-trust.c
@@ -23,9 +23,7 @@
*
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-source-authentication.h"
#include "e-source-webdav.h"
diff --git a/libedataserver/e-source-collection.c b/libedataserver/e-source-collection.c
index 0347a5b..540c793 100644
--- a/libedataserver/e-source-collection.c
+++ b/libedataserver/e-source-collection.c
@@ -34,16 +34,17 @@
* ]|
**/
-#include "e-source-collection.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
/* Private D-Bus classes. */
-#include <e-dbus-source.h>
+#include "e-dbus-source.h"
#include <libedataserver/e-data-server-util.h>
+#include "e-source-collection.h"
+
#define E_SOURCE_COLLECTION_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_SOURCE_COLLECTION, ESourceCollectionPrivate))
diff --git a/libedataserver/e-source-contacts.c b/libedataserver/e-source-contacts.c
index 85bbb77..7107ff6 100644
--- a/libedataserver/e-source-contacts.c
+++ b/libedataserver/e-source-contacts.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-source-address-book.h"
diff --git a/libedataserver/e-source-credentials-provider-impl-google.c
b/libedataserver/e-source-credentials-provider-impl-google.c
index 5761a17..4b6f2cb 100644
--- a/libedataserver/e-source-credentials-provider-impl-google.c
+++ b/libedataserver/e-source-credentials-provider-impl-google.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/libedataserver/e-source-credentials-provider-impl-password.c
b/libedataserver/e-source-credentials-provider-impl-password.c
index 25315bf..d9e71d5 100644
--- a/libedataserver/e-source-credentials-provider-impl-password.c
+++ b/libedataserver/e-source-credentials-provider-impl-password.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/libedataserver/e-source-credentials-provider-impl.c
b/libedataserver/e-source-credentials-provider-impl.c
index 109e7f6..69d063f 100644
--- a/libedataserver/e-source-credentials-provider-impl.c
+++ b/libedataserver/e-source-credentials-provider-impl.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/libedataserver/e-source-credentials-provider.c b/libedataserver/e-source-credentials-provider.c
index 2a9a8da..f30b186 100644
--- a/libedataserver/e-source-credentials-provider.c
+++ b/libedataserver/e-source-credentials-provider.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
diff --git a/libedataserver/e-source-ldap.c b/libedataserver/e-source-ldap.c
index 7b0e881..8e2daf2 100644
--- a/libedataserver/e-source-ldap.c
+++ b/libedataserver/e-source-ldap.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-source-authentication.h"
#include "e-source-security.h"
diff --git a/libedataserver/e-source-local.c b/libedataserver/e-source-local.c
index ec171fb..c8a3261 100644
--- a/libedataserver/e-source-local.c
+++ b/libedataserver/e-source-local.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-source-local.h"
diff --git a/libedataserver/e-source-mail-composition.c b/libedataserver/e-source-mail-composition.c
index f47953b..46d0065 100644
--- a/libedataserver/e-source-mail-composition.c
+++ b/libedataserver/e-source-mail-composition.c
@@ -34,9 +34,7 @@
* ]|
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <libedataserver/e-data-server-util.h>
diff --git a/libedataserver/e-source-mail-signature.c b/libedataserver/e-source-mail-signature.c
index 27b404c..7f52c4c 100644
--- a/libedataserver/e-source-mail-signature.c
+++ b/libedataserver/e-source-mail-signature.c
@@ -34,14 +34,15 @@
* ]|
**/
-#include "e-source-mail-signature.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n-lib.h>
#include <libedataserver/e-data-server-util.h>
+#include "e-source-mail-signature.h"
+
#define E_SOURCE_MAIL_SIGNATURE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_SOURCE_MAIL_SIGNATURE, ESourceMailSignaturePrivate))
diff --git a/libedataserver/e-source-proxy.c b/libedataserver/e-source-proxy.c
index 43c8a20..733a8a6 100644
--- a/libedataserver/e-source-proxy.c
+++ b/libedataserver/e-source-proxy.c
@@ -35,14 +35,15 @@
* ]|
**/
-#include "e-source-proxy.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libedataserver/e-source-enumtypes.h>
#include <libedataserver/e-data-server-util.h>
+#include "e-source-proxy.h"
+
#define E_SOURCE_PROXY_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_SOURCE_PROXY, ESourceProxyPrivate))
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index 1cd6331..235be5e 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -41,9 +41,8 @@
* thus it requires a running main loop for its proper functionality.
**/
-#include "e-source-registry.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gstdio.h>
#include <glib/gi18n-lib.h>
@@ -53,18 +52,20 @@
#include <gcr/gcr-base.h>
/* Private D-Bus classes. */
-#include <e-dbus-source.h>
-#include <e-dbus-source-manager.h>
+#include "e-dbus-source.h"
+#include "e-dbus-source-manager.h"
-#include <libedataserver/e-data-server-util.h>
-#include <libedataserver/e-source-collection.h>
-#include <libedataserver/e-source-enumtypes.h>
+#include "e-data-server-util.h"
+#include "e-source-collection.h"
+#include "e-source-enumtypes.h"
/* Needed for the defaults API. */
-#include <libedataserver/e-source-address-book.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-identity.h>
+#include "e-source-address-book.h"
+#include "e-source-calendar.h"
+#include "e-source-mail-account.h"
+#include "e-source-mail-identity.h"
+
+#include "e-source-registry.h"
#define E_SOURCE_REGISTRY_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/libedataserver/e-source-weather.c b/libedataserver/e-source-weather.c
index 47c5da1..a0e4fa4 100644
--- a/libedataserver/e-source-weather.c
+++ b/libedataserver/e-source-weather.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-source-enumtypes.h"
#include "e-source-weather.h"
diff --git a/libedataserver/e-source-webdav.c b/libedataserver/e-source-webdav.c
index 5ad2135..59e2ad5 100644
--- a/libedataserver/e-source-webdav.c
+++ b/libedataserver/e-source-webdav.c
@@ -43,9 +43,7 @@
* ]|
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index ee81465..1a9c80b 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -65,14 +65,13 @@
* fail with %G_IO_ERROR_NOT_SUPPORTED.
**/
-#include "e-source.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n-lib.h>
/* Private D-Bus classes. */
-#include <e-dbus-source.h>
+#include "e-dbus-source.h"
#include "e-data-server-util.h"
#include "e-secret-store.h"
@@ -112,6 +111,8 @@
#include "e-source-weather.h"
#include "e-source-webdav.h"
+#include "e-source.h"
+
#define E_SOURCE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_SOURCE, ESourcePrivate))
diff --git a/libedataserver/e-time-utils.c b/libedataserver/e-time-utils.c
index 7bb7d75..b4cd61b 100644
--- a/libedataserver/e-time-utils.c
+++ b/libedataserver/e-time-utils.c
@@ -18,7 +18,8 @@
* Authors: Damon Chaplin (damon ximian com)
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#define _XOPEN_SOURCE
#define _XOPEN_SOURCE_EXTENDED 1 /* for strptime */
@@ -197,9 +198,7 @@ enum ptime_locale_status { not, loc, raw };
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110 - 1301 USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <assert.h>
#include <ctype.h>
diff --git a/libedataserver/e-transliterator-private.cpp b/libedataserver/e-transliterator-private.cpp
index f06ba2c..bb15593 100644
--- a/libedataserver/e-transliterator-private.cpp
+++ b/libedataserver/e-transliterator-private.cpp
@@ -17,9 +17,7 @@
* Authors: Tristan Van Berkom <tristanvb openismus com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-transliterator-private.h"
diff --git a/libedataserver/e-url.c b/libedataserver/e-url.c
index 7acaab7..288f926 100644
--- a/libedataserver/e-url.c
+++ b/libedataserver/e-url.c
@@ -19,7 +19,8 @@
* Rodrigo Moya <rodrigo ximian com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
diff --git a/libedataserver/e-webdav-discover.c b/libedataserver/e-webdav-discover.c
index 8fe1e3a..b5db819 100644
--- a/libedataserver/e-webdav-discover.c
+++ b/libedataserver/e-webdav-discover.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/libedataserver/e-xml-hash-utils.c b/libedataserver/e-xml-hash-utils.c
index fa0a9c0..816f6e3 100644
--- a/libedataserver/e-xml-hash-utils.c
+++ b/libedataserver/e-xml-hash-utils.c
@@ -16,7 +16,7 @@
*
*/
-#include "config.h"
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/libedataserver/e-xml-utils.c b/libedataserver/e-xml-utils.c
index 77bf015..5545afd 100644
--- a/libedataserver/e-xml-utils.c
+++ b/libedataserver/e-xml-utils.c
@@ -16,7 +16,7 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <unistd.h>
#include <fcntl.h>
diff --git a/libedataserverui/e-cell-renderer-color.c b/libedataserverui/e-cell-renderer-color.c
index 761afa5..2f35064 100644
--- a/libedataserverui/e-cell-renderer-color.c
+++ b/libedataserverui/e-cell-renderer-color.c
@@ -16,9 +16,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-cell-renderer-color.h"
diff --git a/libedataserverui/e-credentials-prompter-impl-google.c
b/libedataserverui/e-credentials-prompter-impl-google.c
index 2acfeb2..3b5a185 100644
--- a/libedataserverui/e-credentials-prompter-impl-google.c
+++ b/libedataserverui/e-credentials-prompter-impl-google.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/libedataserverui/e-credentials-prompter-impl-password.c
b/libedataserverui/e-credentials-prompter-impl-password.c
index 512f32f..fd90b81 100644
--- a/libedataserverui/e-credentials-prompter-impl-password.c
+++ b/libedataserverui/e-credentials-prompter-impl-password.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/libedataserverui/e-credentials-prompter-impl.c b/libedataserverui/e-credentials-prompter-impl.c
index 4a432f6..3ca2404 100644
--- a/libedataserverui/e-credentials-prompter-impl.c
+++ b/libedataserverui/e-credentials-prompter-impl.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-credentials-prompter.h"
#include "e-credentials-prompter-impl.h"
diff --git a/libedataserverui/e-credentials-prompter.c b/libedataserverui/e-credentials-prompter.c
index 40c39a7..641be02 100644
--- a/libedataserverui/e-credentials-prompter.c
+++ b/libedataserverui/e-credentials-prompter.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/libedataserverui/e-trust-prompt.c b/libedataserverui/e-trust-prompt.c
index 6f232ee..6086486 100644
--- a/libedataserverui/e-trust-prompt.c
+++ b/libedataserverui/e-trust-prompt.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <string.h>
diff --git a/libedataserverui/e-webdav-discover-widget.c b/libedataserverui/e-webdav-discover-widget.c
index d1abf68..5cfed0f 100644
--- a/libedataserverui/e-webdav-discover-widget.c
+++ b/libedataserverui/e-webdav-discover-widget.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/cache-reaper/module-cache-reaper.c b/modules/cache-reaper/module-cache-reaper.c
index 2d15b50..a513908 100644
--- a/modules/cache-reaper/module-cache-reaper.c
+++ b/modules/cache-reaper/module-cache-reaper.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <libebackend/libebackend.h>
diff --git a/modules/gnome-online-accounts/e-goa-client.c b/modules/gnome-online-accounts/e-goa-client.c
index 11f361b..48e3953 100644
--- a/modules/gnome-online-accounts/e-goa-client.c
+++ b/modules/gnome-online-accounts/e-goa-client.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <libedataserver/libedataserver.h>
diff --git a/modules/gnome-online-accounts/e-goa-password-based.c
b/modules/gnome-online-accounts/e-goa-password-based.c
index dea674a..85f0450 100644
--- a/modules/gnome-online-accounts/e-goa-password-based.c
+++ b/modules/gnome-online-accounts/e-goa-password-based.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
/* XXX Yeah, yeah... */
#define GOA_API_IS_SUBJECT_TO_CHANGE
diff --git a/modules/gnome-online-accounts/goaewsclient.c b/modules/gnome-online-accounts/goaewsclient.c
index 884dda5..b4384c0 100644
--- a/modules/gnome-online-accounts/goaewsclient.c
+++ b/modules/gnome-online-accounts/goaewsclient.c
@@ -23,7 +23,8 @@
* evolution-ews/src/server/e-ews-connection.c
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <glib/gi18n-lib.h>
#include <libsoup/soup.h>
diff --git a/modules/gnome-online-accounts/module-credentials-goa.c
b/modules/gnome-online-accounts/module-credentials-goa.c
index 4d5ea1a..00a36a7 100644
--- a/modules/gnome-online-accounts/module-credentials-goa.c
+++ b/modules/gnome-online-accounts/module-credentials-goa.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-goa-password-based.h"
diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c
b/modules/gnome-online-accounts/module-gnome-online-accounts.c
index 929c0e4..e662180 100644
--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <glib/gi18n-lib.h>
#include <libsoup/soup.h>
diff --git a/modules/google-backend/module-google-backend.c b/modules/google-backend/module-google-backend.c
index 795516b..8bbbb48 100644
--- a/modules/google-backend/module-google-backend.c
+++ b/modules/google-backend/module-google-backend.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/outlook-backend/module-outlook-backend.c
b/modules/outlook-backend/module-outlook-backend.c
index e1c3b60..a787982 100644
--- a/modules/outlook-backend/module-outlook-backend.c
+++ b/modules/outlook-backend/module-outlook-backend.c
@@ -21,7 +21,8 @@
* as a placeholder with hopes that Microsoft will eventually provide
* access to calendar+contacts via CalDAV/CardDAV or even EWS. */
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/owncloud-backend/module-owncloud-backend.c
b/modules/owncloud-backend/module-owncloud-backend.c
index 238cd7e..900e241 100644
--- a/modules/owncloud-backend/module-owncloud-backend.c
+++ b/modules/owncloud-backend/module-owncloud-backend.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <libebackend/libebackend.h>
#include <libedataserver/libedataserver.h>
diff --git a/modules/secret-monitor/module-secret-monitor.c b/modules/secret-monitor/module-secret-monitor.c
index 07d12b0..817c401 100644
--- a/modules/secret-monitor/module-secret-monitor.c
+++ b/modules/secret-monitor/module-secret-monitor.c
@@ -15,6 +15,8 @@
*
*/
+#include "evolution-data-server-config.h"
+
/* XXX Yeah, yeah... */
#define SECRET_API_SUBJECT_TO_CHANGE
diff --git a/modules/trust-prompt/module-trust-prompt.c b/modules/trust-prompt/module-trust-prompt.c
index 4005516..4bfbf68 100644
--- a/modules/trust-prompt/module-trust-prompt.c
+++ b/modules/trust-prompt/module-trust-prompt.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include "evolution-data-server-config.h"
#include <glib/gi18n-lib.h>
diff --git a/modules/trust-prompt/trust-prompt-gtk.c b/modules/trust-prompt/trust-prompt-gtk.c
index 8907c88..c6e99a7 100644
--- a/modules/trust-prompt/trust-prompt-gtk.c
+++ b/modules/trust-prompt/trust-prompt-gtk.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include "evolution-data-server-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/ubuntu-online-accounts/e-signon-session-password.c
b/modules/ubuntu-online-accounts/e-signon-session-password.c
index 12b22c8..6f4144b 100644
--- a/modules/ubuntu-online-accounts/e-signon-session-password.c
+++ b/modules/ubuntu-online-accounts/e-signon-session-password.c
@@ -15,14 +15,15 @@
*
*/
-#include "e-signon-session-password.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libsignon-glib/signon-glib.h>
#include "uoa-utils.h"
+#include "e-signon-session-password.h"
+
#define SIGNON_METHOD_PASSWORD "password"
#define SIGNON_MECHANISM_PASSWORD "password"
diff --git a/modules/ubuntu-online-accounts/module-credentials-uoa.c
b/modules/ubuntu-online-accounts/module-credentials-uoa.c
index 30c2a46..0233ee9 100644
--- a/modules/ubuntu-online-accounts/module-credentials-uoa.c
+++ b/modules/ubuntu-online-accounts/module-credentials-uoa.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-signon-session-password.h"
diff --git a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
index 51feee6..f51ea39 100644
--- a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
+++ b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <glib/gi18n-lib.h>
#include <libsignon-glib/signon-glib.h>
#include <libaccounts-glib/accounts-glib.h>
diff --git a/modules/ubuntu-online-accounts/uoa-utils.c b/modules/ubuntu-online-accounts/uoa-utils.c
index 59676b1..3884789 100644
--- a/modules/ubuntu-online-accounts/uoa-utils.c
+++ b/modules/ubuntu-online-accounts/uoa-utils.c
@@ -15,14 +15,15 @@
*
*/
-#include "uoa-utils.h"
+#include "evolution-data-server-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <rest/rest-proxy.h>
#include <json-glib/json-glib.h>
#include <libsignon-glib/signon-glib.h>
+#include "uoa-utils.h"
+
#define GOOGLE_USERINFO_URI \
"https://www.googleapis.com/oauth2/v2/userinfo";
diff --git a/modules/yahoo-backend/module-yahoo-backend.c b/modules/yahoo-backend/module-yahoo-backend.c
index 3e784a4..0a34236 100644
--- a/modules/yahoo-backend/module-yahoo-backend.c
+++ b/modules/yahoo-backend/module-yahoo-backend.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/services/evolution-addressbook-factory/evolution-addressbook-factory.c
b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
index 08ed333..b9e3fe5 100644
--- a/services/evolution-addressbook-factory/evolution-addressbook-factory.c
+++ b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <locale.h>
#include <stdlib.h>
#include <glib/gi18n.h>
diff --git a/services/evolution-calendar-factory/evolution-calendar-factory.c
b/services/evolution-calendar-factory/evolution-calendar-factory.c
index 76beda4..6b76ff0 100644
--- a/services/evolution-calendar-factory/evolution-calendar-factory.c
+++ b/services/evolution-calendar-factory/evolution-calendar-factory.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <locale.h>
#include <stdlib.h>
#include <glib/gi18n.h>
diff --git a/services/evolution-source-registry/evolution-scan-gconf-tree-xml.c
b/services/evolution-source-registry/evolution-scan-gconf-tree-xml.c
index d4f2316..f0456aa 100644
--- a/services/evolution-source-registry/evolution-scan-gconf-tree-xml.c
+++ b/services/evolution-source-registry/evolution-scan-gconf-tree-xml.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <locale.h>
#include <stdlib.h>
#include <glib/gi18n.h>
diff --git a/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c
b/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c
index 88a4bd6..1a1caa1 100644
--- a/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c
+++ b/services/evolution-source-registry/evolution-source-registry-migrate-proxies.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/services/evolution-source-registry/evolution-source-registry.c
b/services/evolution-source-registry/evolution-source-registry.c
index ef05287..9805fbd 100644
--- a/services/evolution-source-registry/evolution-source-registry.c
+++ b/services/evolution-source-registry/evolution-source-registry.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <locale.h>
#include <stdlib.h>
#include <glib/gi18n.h>
diff --git a/services/evolution-user-prompter/evolution-user-prompter.c
b/services/evolution-user-prompter/evolution-user-prompter.c
index 21d1ad2..3f37163 100644
--- a/services/evolution-user-prompter/evolution-user-prompter.c
+++ b/services/evolution-user-prompter/evolution-user-prompter.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <locale.h>
#include <libintl.h>
#include <glib/gi18n.h>
diff --git a/services/evolution-user-prompter/prompt-user-gtk.c
b/services/evolution-user-prompter/prompt-user-gtk.c
index 851a35d..9a7fcaa 100644
--- a/services/evolution-user-prompter/prompt-user-gtk.c
+++ b/services/evolution-user-prompter/prompt-user-gtk.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /* HAVE_CONFIG_H */
+#include "evolution-data-server-config.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
diff --git a/tests/book-migration/test-migration.c b/tests/book-migration/test-migration.c
index 81bcd37..81eb7ee 100644
--- a/tests/book-migration/test-migration.c
+++ b/tests/book-migration/test-migration.c
@@ -17,7 +17,7 @@
* Authors: Tristan Van Berkom <tristanvb openismus com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <libebook/libebook.h>
diff --git a/tests/libebook-contacts/test-phone-number.c b/tests/libebook-contacts/test-phone-number.c
index fb4dcbc..2f0fbc7 100644
--- a/tests/libebook-contacts/test-phone-number.c
+++ b/tests/libebook-contacts/test-phone-number.c
@@ -17,9 +17,7 @@
* Authors: Mathias Hasselmann <mathias openismus com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <libebook-contacts/libebook-contacts.h>
#include <locale.h>
diff --git a/tests/libebook/client/test-book-client-cursor-operations.c
b/tests/libebook/client/test-book-client-cursor-operations.c
index 72daa80..b57add1 100644
--- a/tests/libebook/client/test-book-client-cursor-operations.c
+++ b/tests/libebook/client/test-book-client-cursor-operations.c
@@ -17,7 +17,7 @@
* Authors: Tristan Van Berkom <tristanvb openismus com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <libebook/libebook.h>
diff --git a/tests/libebook/client/test-book-client-custom-summary.c
b/tests/libebook/client/test-book-client-custom-summary.c
index 4168a81..80f0cfc 100644
--- a/tests/libebook/client/test-book-client-custom-summary.c
+++ b/tests/libebook/client/test-book-client-custom-summary.c
@@ -18,7 +18,7 @@
* Mathias Hasselmann <mathias openismus com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <libebook/libebook.h>
diff --git a/tests/libebook/client/test-book-client-e164-param.c
b/tests/libebook/client/test-book-client-e164-param.c
index 660bdcf..3d2ea54 100644
--- a/tests/libebook/client/test-book-client-e164-param.c
+++ b/tests/libebook/client/test-book-client-e164-param.c
@@ -17,7 +17,8 @@
* Authors: Tristan Van Berkom <tristanvb openismus com>
*/
-#include <config.h>
+#include "evolution-data-server-config.h"
+
#include <stdlib.h>
#include <libebook/libebook.h>
diff --git a/tests/libedata-book/data-test-utils.c b/tests/libedata-book/data-test-utils.c
index 29bba5e..31af1a5 100644
--- a/tests/libedata-book/data-test-utils.c
+++ b/tests/libedata-book/data-test-utils.c
@@ -17,9 +17,7 @@
* Authors: Tristan Van Berkom <tristanvb openismus com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
diff --git a/tests/test-server-utils/e-test-server-utils.c b/tests/test-server-utils/e-test-server-utils.c
index 180ef03..4c177ea 100644
--- a/tests/test-server-utils/e-test-server-utils.c
+++ b/tests/test-server-utils/e-test-server-utils.c
@@ -34,9 +34,7 @@
* and e_test_server_utils_teardown() in thier fixture's setup and teardown routines.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include "e-test-server-utils.h"
diff --git a/tools/addressbook-export/addressbook-export.c b/tools/addressbook-export/addressbook-export.c
index 7c19614..0dcff94 100644
--- a/tools/addressbook-export/addressbook-export.c
+++ b/tools/addressbook-export/addressbook-export.c
@@ -17,9 +17,7 @@
* Authors: Gilbert Fang <gilbert fang sun com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-data-server-config.h"
#include <stdlib.h>
#include <string.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
