GNOME.org
 

[evolution-data-server/wip/cmake] Some more progress

commit 66740541c2dae8c0617ce9dd10f433040278b13c
Author: Milan Crha <mcrha redhat com>
Date:   Tue Sep 20 19:38:15 2016 +0200

    Some more progress

 CMakeLists.txt                                 |  246 ++++++++++++++++++++++-
 cmake/modules/PkgConfigEx.cmake                |   32 +++
 config.h.in                                    |  211 ++++-----------------
 modules/google-backend/module-google-backend.c |    2 +-
 4 files changed, 301 insertions(+), 190 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e28dd48..35b66cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ cmake_policy(VERSION 3.0)
 project(evolution-data-server
        VERSION 3.23.1
        LANGUAGES C CXX)
+set(PROJECT_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server";)
 
 # Base Version: This is for API/version tracking for things like
 # D-Bus server files. This should always be the major/minor of
@@ -114,17 +115,90 @@ include(CheckCSourceCompiles)
 include(CheckCSourceRuns)
 include(CheckFunctionExists)
 include(CheckIncludeFile)
+include(CheckLibraryExists)
 
 # Project custom modules
 include(PrintableOptions)
 
 add_printable_variable(LIB_SUFFIX "Library directory suffix, usually defined to '64' for x86_64 systems" "")
 add_printable_variable_bare(CMAKE_INSTALL_PREFIX)
-add_printable_variable_path(INCLUDE_INSTALL_DIR "Install directory for header files, defaults to 
CMAKE_INSTALL_PREFIX/include" ${CMAKE_INSTALL_PREFIX}/include)
-add_printable_variable_path(LIB_INSTALL_DIR "Install directory for library files, defaults to 
CMAKE_INSTALL_PREFIX/lib{LIB_SUFFIX}" ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
-add_printable_variable_path(LIBEXEC_INSTALL_DIR "Install directory for library executable files, defaults to 
CMAKE_INSTALL_PREFIX/libexec" ${CMAKE_INSTALL_PREFIX}/libexec)
-add_printable_variable_path(SHARE_INSTALL_PREFIX "Install directory for shared files, defaults to 
CMAKE_INSTALL_PREFIX/share" ${CMAKE_INSTALL_PREFIX}/share)
-add_printable_variable_path(SYSCONF_INSTALL_DIR "Install directory for system configuration files, defaults 
to CMAKE_INSTALL_PREFIX/etc" ${CMAKE_INSTALL_PREFIX}/etc)
+add_printable_variable_path(BIN_INSTALL_DIR "Install directory for binary files, defaults to 
CMAKE_INSTALL_PREFIX/bin" "${CMAKE_INSTALL_PREFIX}/bin")
+add_printable_variable_path(INCLUDE_INSTALL_DIR "Install directory for header files, defaults to 
CMAKE_INSTALL_PREFIX/include" "${CMAKE_INSTALL_PREFIX}/include")
+add_printable_variable_path(LIB_INSTALL_DIR "Install directory for library files, defaults to 
CMAKE_INSTALL_PREFIX/lib{LIB_SUFFIX}" "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
+add_printable_variable_path(LIBEXEC_INSTALL_DIR "Install directory for library executable files, defaults to 
CMAKE_INSTALL_PREFIX/libexec" "${CMAKE_INSTALL_PREFIX}/libexec")
+add_printable_variable_path(SHARE_INSTALL_PREFIX "Install directory for shared files, defaults to 
CMAKE_INSTALL_PREFIX/share" "${CMAKE_INSTALL_PREFIX}/share")
+add_printable_variable_path(SYSCONF_INSTALL_DIR "Install directory for system configuration files, defaults 
to CMAKE_INSTALL_PREFIX/etc" "${CMAKE_INSTALL_PREFIX}/etc")
+
+# ******************************
+# Special directories
+# ******************************
+
+# If you add something here, consider whether or not you also
+# need to add it to one or more .pc.in files (for Connector, etc)
+
+set(privdatadir "${SHARE_INSTALL_PREFIX}/${PROJECT_NAME}")
+set(privincludedir "${INCLUDE_INSTALL_DIR}/${PROJECT_NAME}")
+set(privlibdir "${LIB_INSTALL_DIR}/${PROJECT_NAME}")
+set(privlibexecdir "${LIBEXEC_INSTALL_DIR}'/${PROJECT_NAME}")
+
+if(WIN32)
+       # On Win32 there is no "rpath" mechanism. We install the private
+       # shared libraries in $libdir, meaning the DLLs will actually be in
+       # $bindir. This means just having $bindir in PATH will be enough.
+       set(privsolibdir "${LIB_INSTALL_DIR}")
+else(WIN32)
+       set(privsolibdir "${privlibdir}")
+endif(WIN32)
+
+set(imagesdir "${SHARE_INSTALL_PREFIX}/pixmaps/${PROJECT_NAME}")
+set(moduledir "${privlibdir}/registry-modules")
+set(credentialmoduledir "${privlibdir}/credential-modules")
+set(ebook_backenddir "${privlibdir}/addressbook-backends")
+set(ecal_backenddir "${privlibdir}/calendar-backends")
+set(ro_sourcesdir "${privdatadir}/ro-sources")
+set(rw_sourcesdir "${privdatadir}/rw-sources")
+set(weatherdatadir "${privdatadir}/weather")
+set(camel_providerdir "${privlibdir}/camel-providers")
+
+# *******************
+# D-BUS service stuff
+# *******************
+set(servicelibexecdir "${LIBEXEC_INSTALL_DIR}")
+if(WIN32 AND (NOT ("$ENV{WIN32_SERVICELIBEXECDIR}" STREQUAL "")))
+       #
+       # D-Bus requires Windows full path, not Unix-like, like the one provided by MSYS
+       #
+       AC_SUBST(WIN32_SERVICELIBEXECDIR)
+       set(servicelibexecdir "$ENV{WIN32_SERVICELIBEXECDIR}")
+endif(WIN32 AND (NOT ("$ENV{WIN32_SERVICELIBEXECDIR}" STREQUAL "")))
+
+add_printable_variable_path(WITH_DBUS_SERVICE_DIR "Set directory for D-Bus service files" 
"${SHARE_INSTALL_PREFIX}/dbus-1/services")
+
+# It is correct for this to be in ${CMAKE_INSTALL_PREFIX}/lib, even on systems where that
+# does not match ${LIB_INSTALL_DIR}. This is what systemd uses on such platforms.
+
+add_printable_variable_path(WITH_SYSTEMDUSERUNITDIR "Set directory for systemd user units, or 'no' to 
disable" "${CMAKE_INSTALL_PREFIX}/lib/systemd/user")
+
+string(LENGTH "${CMAKE_BINARY_DIR}" bindirlen)
+string(SUBSTRING "${WITH_SYSTEMDUSERUNITDIR}" 0 ${bindirlen} substr)
+string(TOUPPER "${WITH_SYSTEMDUSERUNITDIR}" optupper)
+
+if(("${optupper}" STREQUAL "ON") OR ("${substr}" STREQUAL "${CMAKE_BINARY_DIR}"))
+       set(WITH_SYSTEMD_USER_UNITS ON)
+       set(WITH_SYSTEMDUSERUNITDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/user")
+elseif(NOT WITH_SYSTEMDUSERUNITDIR)
+       set(WITH_SYSTEMD_USER_UNITS OFF)
+else()
+       set(WITH_SYSTEMD_USER_UNITS ON)
+endif()
+
+unset(bindirlen)
+unset(substr)
+unset(optupper)
+
+# ******************************
+# Dependencies
+# ******************************
 
 include(CodeCoverageGCOV)
 include(DistTarget)
@@ -142,11 +216,36 @@ add_printable_option(ENABLE_MAINTAINER_MODE "Enable maintainer mode" OFF)
 # Setup compiler/linker flags
 setup_build_flags(${ENABLE_MAINTAINER_MODE})
 
+CHECK_INCLUDE_FILE(com_err.h HAVE_COM_ERR_H)
+CHECK_INCLUDE_FILE(et/com_err.h HAVE_ET_COM_ERR_H)
 CHECK_INCLUDE_FILE(sys/wait.h HAVE_SYS_WAIT_H)
 CHECK_INCLUDE_FILE(wspiapi.h HAVE_WSPIAPI_H)
+CHECK_INCLUDE_FILE(zlib.h HAVE_ZLIB_H)
 CHECK_FUNCTION_EXISTS(fsync HAVE_FSYNC)
 CHECK_FUNCTION_EXISTS(strptime HAVE_STRPTIME)
 CHECK_FUNCTION_EXISTS(nl_langinfo HAVE_NL_LANGINFO)
+CHECK_FUNCTION_EXISTS(fsync HAVE_FSYNC)
+
+# ******************************
+# gperf executable
+# ******************************
+
+find_program(GPERF gperf)
+if(NOT GPERF)
+       message(FATAL_ERROR "You need gperf to build ${PROJECT_NAME}")
+endif(NOT GPERF)
+
+# ******************************
+# deflateInit is a #define, use deflateEnd instead
+# ******************************
+CHECK_LIBRARY_EXISTS(z deflateEnd "" deflateEnd_exists)
+
+if(NOT HAVE_ZLIB_H)
+       message(FATAL_ERROR "zlib.h not found")
+endif(NOT HAVE_ZLIB_H)
+if(NOT deflateEnd_exists)
+       message(FATAL_ERROR "zlib doesn't provide deflateEnd")
+endif(NOT deflateEnd_exists)
 
 pkg_check_modules(GNOME_PLATFORM
        gio-2.0>=${glib_minimum_version}
@@ -161,10 +260,6 @@ else(WIN32)
        pkg_check_modules(GIO_UNIX gio-unix-2.0)
 endif(WIN32)
 
-# ******************************
-# Check for libphonenumber
-# ******************************
-
 # *******************
 # Check for ICU
 # *******************
@@ -571,14 +666,143 @@ endif(NOT WIN32)
 # ******************************
 
 set(defval OFF)
-if(CMAKE_SYSTEM_NAME STREQUAL "SunOs")
+if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
        set(defval ON)
-endif(CMAKE_SYSTEM_NAME STREQUAL "SunOs")
+endif(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
 
 add_printable_option(ENABLE_BROKEN_SPOOL "Use SunOS/Solaris sendmail which has a broken spool format" 
${defval})
 
 unset(defval)
 
+# ******************************
+# sqlite3 flags
+# ******************************
+pkg_check_modules(SQLITE3 sqlite3>=${sqlite_minimum_version})
+
+# ******************************
+# Google flags
+# ******************************
+
+add_printable_option(ENABLE_GOOGLE "Enable Google support" ON)
+if(ENABLE_GOOGLE)
+       pkg_check_modules_for_option(ENABLE_GOOGLE "Google" LIBGDATA libgdata>=${libgdata_minimum_version})
+       set(HAVE_LIBGDATA ON)
+endif(ENABLE_GOOGLE)
+
+# ******************************
+# Checks for large file support
+# ******************************
+
+add_printable_option(ENABLE_LARGEFILE "Enable support for large files" ON)
+
+if(ENABLE_LARGEFILE)
+       CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
+
+       if(HAVE_UNISTD_H)
+               set(CMAKE_REQUIRED_FLAGS "-DHAVE_UNISTD_H")
+       endif(HAVE_UNISTD_H)
+
+       CHECK_C_SOURCE_COMPILES("#ifdef HAVE_UNISTD_H
+                       #include <unistd.h>
+                       #endif
+                       int main(void) {
+                               off64_t x1;
+                               return 0;
+                       }" have_off64_t_bare)
+       if(NOT have_off64_t_bare)
+               CHECK_C_SOURCE_COMPILES("#define _LARGEFILE64_SOURCE
+                               #ifdef HAVE_UNISTD_H
+                               #include <unistd.h>
+                               #endif
+                               int main(void) {
+                                       off64_t x1;
+                                       return 0;
+                               }" have_off64_t_with_largefile64_source)
+       endif(NOT have_off64_t_bare)
+
+       CHECK_C_SOURCE_COMPILES("#include <sys/types.h>
+                       #include <sys/stat.h>
+                       #include <fcntl.h>
+                       int main(void) {
+                               int fd = open (\"__o_largefile\", O_CREAT | O_RDWR | O_LARGEFILE, 0644);
+                               return 0;
+                       }" have_o_largefile_bare)
+       if(NOT have_o_largefile_bare)
+               CHECK_C_SOURCE_COMPILES("#define _LARGEFILE64_SOURCE
+                               #include <sys/types.h>
+                               #include <sys/stat.h>
+                               #include <fcntl.h>
+                               int main(void) {
+                                       int fd = open (\"__o_largefile\", O_CREAT | O_RDWR | O_LARGEFILE, 
0644);
+                                       return 0;
+                               }" have_o_largefile_with_largefile64_source)
+       endif(NOT have_o_largefile_bare)
+
+       set(HAVE_O_LARGEFILE ON)
+       if(have_o_largefile_with_largefile64_source)
+               add_definitions(-D_LARGEFILE64_SOURCE=1)
+       elseif(NOT have_o_largefile_bare)
+               set(HAVE_O_LARGEFILE OFF)
+       endif()
+       unset(CMAKE_REQUIRED_FLAGS)
+else(ENABLE_LARGEFILE)
+       set(HAVE_O_LARGEFILE OFF)
+endif(ENABLE_LARGEFILE)
+
+# ******************************
+# subparts flags
+# ******************************
+
+pkg_check_modules(SOUP libsoup-2.4)
+pkg_check_modules(DATA_SERVER gio-2.0 gmodule-2.0 libsecret-1 libxml-2.0 libsoup-2.4 ${mozilla_nspr} 
${mozilla_nss})
+set(E_DATA_SERVER_INCLUDES ${E_DATA_SERVER_INCLUDES} ${MANUAL_NSPR_INCLUDES} ${MANUAL_NSS_INCLUDES})
+set(E_DATA_SERVER_LDFLAGS ${E_DATA_SERVER_LDFLAGS} ${MANUAL_NSPR_LIBS} ${MANUAL_NSS_LIBS})
+
+pkg_check_modules(BACKEND gio-2.0 gmodule-2.0 libsecret-1 libsoup-2.4 libxml-2.0)
+pkg_check_modules(ADDRESSBOOK gio-2.0 libxml-2.0 libsoup-2.4 libsecret-1)
+pkg_check_modules(CALENDAR gio-2.0 libical>=${libical_minimum_version} libsoup-2.4 libxml-2.0 libsecret-1)
+set(CALENDAR_CFLAGS "${CALENDAR_CFLAGS} ${LIBICAL_EXTRA_CFLAGS}")
+
+pkg_check_modules(CAMEL gio-2.0 gmodule-2.0 ${mozilla_nss} ${mozilla_nspr} 
sqlite3>=${sqlite_minimum_version})
+set(CAMEL_CFLAGS "${CAMEL_CFLAGS} ${KRB5_CFLAGS} ${MANUAL_NSS_CFLAGS} ${MANUAL_NSPR_CFLAGS} ${ICU_CFLAGS}")
+set(CAMEL_LDFLAGS "${CAMEL_LDFLAGS} -lz ${KRB5_LDFLAGS} ${MANUAL_NSS_LIBS} ${MANUAL_NSPR_LIBS} ${ICU_LIBS}")
+
+# ******************************
+# libical tweaks
+# ******************************
+
+pkg_check_at_least_version(HAVE_LIBICAL_2_0 libical 2.0)
+
+# *****
+# libical.pc from libical-0.43 has a bug in its CFlags.
+# It wants apps to include <libical/ical*.h> but it's CFlags make it difficult
+# to differentiate between <libical/ical.h> and <ical.h>
+# We have fixed all our instances to use <libical/ical.h>.
+# Work-around the buggy CFlags for the 0.43 version.
+# *****
+pkg_check_exact_version(libical_is_0_43 libical 0.43)
+if(libical_is_0_43)
+       pkg_check_variable(LIBICAL_EXTRA_CFLAGS libical includedir)
+endif(libical_is_0_43)
+
+set(CMAKE_REQUIRED_FLAGS "${CALENDAR_CFLAGS}")
+set(CMAKE_REQUIRED_LIBRARIES "${CALENDAR_LDFLAGS}")
+
+CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
+                       int main(void) {
+                               ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN);
+                               return 0;
+                       }" HAVE_ICAL_UNKNOWN_TOKEN_HANDLING)
+
+CHECK_C_SOURCE_COMPILES("#include <libical/ical.h>
+                       int main(void) {
+                               icaltzutil_set_exact_vtimezones_support (0);
+                               return 0;
+                       }" HAVE_ICALTZUTIL_SET_EXACT_VTIMEZONES_SUPPORT)
+
+unset(CMAKE_REQUIRED_FLAGS)
+unset(CMAKE_REQUIRED_LIBRARIES)
+
 # Generate the config.h file
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
 
diff --git a/cmake/modules/PkgConfigEx.cmake b/cmake/modules/PkgConfigEx.cmake
index cb35229..f562b57 100644
--- a/cmake/modules/PkgConfigEx.cmake
+++ b/cmake/modules/PkgConfigEx.cmake
@@ -11,6 +11,14 @@
 #
 #    calls pkg-config --exists for _pkg and stores the result to _output_name.
 #
+# pkg_check_at_least_version(_output_name _pkg _version)
+#
+#    calls pkg-config --at-least-version=_version for _pkg and stores the result to _output_name.
+#
+# pkg_check_exact_version(_output_name _pkg _version)
+#
+#    calls pkg-config --exact-version=_version for _pkg and stores the result to _output_name.
+#
 # pkg_check_variable(_output_name _pkg _name)
 #
 #    gets a variable named _name from package _pkg and stores the result into _output_name
@@ -37,6 +45,30 @@ macro(pkg_check_exists _output_name _pkg)
        endif(${_output_name})
 endmacro()
 
+macro(pkg_check_at_least_version _output_name _pkg _version)
+       execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --atleast-version=${_version} ${_pkg}
+                       RESULT_VARIABLE ${_output_name})
+
+       # Negate the result, because 0 means 'found'
+       if(${_output_name})
+               set(${_output_name} OFF)
+       else(${_output_name})
+               set(${_output_name} ON)
+       endif(${_output_name})
+endmacro()
+
+macro(pkg_check_exact_version _output_name _pkg _version)
+       execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --exact-version=${_version} ${_pkg}
+                       RESULT_VARIABLE ${_output_name})
+
+       # Negate the result, because 0 means 'found'
+       if(${_output_name})
+               set(${_output_name} OFF)
+       else(${_output_name})
+               set(${_output_name} ON)
+       endif(${_output_name})
+endmacro()
+
 function(pkg_check_variable _output_name _pkg _name)
     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=${_name} ${_pkg}
                     OUTPUT_VARIABLE _pkg_result
diff --git a/config.h.in b/config.h.in
index 24b8c4e..e7e4cee 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,6 +3,9 @@
 /* Name of the package */
 #define PACKAGE "@PROJECT_NAME@"
 
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "@PROJECT_BUGREPORT@"
+
 /* Version number of the project */
 #define VERSION "@PROJECT_VERSION@"
 
@@ -27,6 +30,18 @@
 /* D-Bus service name for the user prompter */
 #define USER_PROMPTER_DBUS_SERVICE_NAME "@USER_PROMPTER_DBUS_SERVICE_NAME@"
 
+/* Define Google OAuth 2.0 Client ID to use */
+#define GOOGLE_CLIENT_ID "@WITH_GOOGLE_CLIENT_ID@"
+
+/* Define Google OAuth 2.0 Client Secret to use */
+#define GOOGLE_CLIENT_SECRET "@WITH_GOOGLE_CLIENT_SECRET@"
+
+/* Path to a sendmail binary, or equivalent */
+#define SENDMAIL_PATH "@SENDMAIL_PATH@"
+
+/* Directory local mail is delivered to */
+#define SYSTEM_MAIL_DIR "@SYSTEM_MAIL_DIR@"
+
 /* Configured with enabled maintainer mode */
 #cmakedefine ENABLE_MAINTAINER_MODE 1
 
@@ -48,12 +63,6 @@
 /* Define to 1 if Google autentication support is enabled. */
 #cmakedefine ENABLE_GOOGLE_AUTH 1
 
-/* Define Google OAuth 2.0 Client ID to use */
-#define GOOGLE_CLIENT_ID "@WITH_GOOGLE_CLIENT_ID@"
-
-/* Define Google OAuth 2.0 Client Secret to use */
-#define GOOGLE_CLIENT_SECRET "@WITH_GOOGLE_CLIENT_SECRET@"
-
 /* Define to 1 if the examples should be built. */
 #cmakedefine BUILD_EXAMPLES 1
 
@@ -84,12 +93,6 @@
 /* Define if SMIME should be enabled */
 #cmakedefine ENABLE_SMIME 1
 
-/* Path to a sendmail binary, or equivalent */
-#define SENDMAIL_PATH "@SENDMAIL_PATH@"
-
-/* Directory local mail is delivered to */
-#define SYSTEM_MAIL_DIR "@SYSTEM_MAIL_DIR@"
-
 /* Define if struct tm has a tm_gmtoff member */
 #cmakedefine HAVE_TM_GMTOFF 1
 
@@ -153,185 +156,37 @@
 /* Define if you use SunLDAP */
 #cmakedefine SUNLDAP */
 
-
-/* *************************************************** */
-
-
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Solaris-style ctime_r */
-/* #undef CTIME_R_THREE_ARGS */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
 /* Solaris-style gethostbyaddr_r */
-/* #undef GETHOSTBYADDR_R_SEVEN_ARGS */
+#cmakedefine GETHOSTBYADDR_R_SEVEN_ARGS 1
 
 /* Solaris-style gethostbyname_r */
-/* #undef GETHOSTBYNAME_R_FIVE_ARGS */
-
-/* Define it once memory returned by libical is free'ed properly */
-#define HANDLE_LIBICAL_MEMORY 1
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#define HAVE_ALLOCA_H 1
+#cmakedefine GETHOSTBYNAME_R_FIVE_ARGS 1
 
 /* Have <com_err.h> */
-#define HAVE_COM_ERR_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
+#cmakedefine HAVE_COM_ERR_H 1
 
 /* Have <et/com_err.h> */
-#define HAVE_ET_COM_ERR_H 1
-
-/* Define to 1 if you have the `gnu_get_libc_version' function. */
-#define HAVE_GNU_GET_LIBC_VERSION 1
-
-/* Define to 1 if you have the google-1.0 package. */
-#define HAVE_GOOGLE 1
-
-/* libical provides icaltzutil_set_exact_vtimezones_support function */
-#define HAVE_ICALTZUTIL_SET_EXACT_VTIMEZONES_SUPPORT 1
-
-/* libical provides ical_set_unknown_token_handling_setting function */
-#define HAVE_ICAL_UNKNOWN_TOKEN_HANDLING 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
+#cmakedefine HAVE_ET_COM_ERR_H 1
 
 /* Define if compiled with libical 2.0 */
-#define HAVE_LIBICAL_2_0 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <nspr.h> header file. */
-/* #undef HAVE_NSPR_H */
-
-/* Define to 1 if you have the <nss.h> header file. */
-/* #undef HAVE_NSS_H */
-
-/* Define to 1 if you have the <prio.h> header file. */
-/* #undef HAVE_PRIO_H */
-
-/* Define to 1 if you have the regexec function. */
-#define HAVE_REGEXEC 1
-
-/* Define to 1 if you have the <smime.h> header file. */
-/* #undef HAVE_SMIME_H */
-
-/* Define to 1 if you have the <ssl.h> header file. */
-/* #undef HAVE_SSL_H */
-
-/* Define to 1 if you have the `statfs' function. */
-#define HAVE_STATFS 1
-
-/* Define to 1 if you have the `statvfs' function. */
-#define HAVE_STATVFS 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtok_r' function. */
-#define HAVE_STRTOK_R 1
-
-/* Have <sys/mount.h> */
-#define HAVE_SYS_MOUNT_H 1
-
-/* Have <sys/param.h> */
-#define HAVE_SYS_PARAM_H 1
-
-/* Have <sys/statvfs.h> */
-#define HAVE_SYS_STATVFS_H 1
+#cmakedefine HAVE_LIBICAL_2_0 1
 
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unicode/ucol.h> header file. */
-/* #undef HAVE_UNICODE_UCOL_H */
+/* libical provides ical_set_unknown_token_handling_setting function */
+#cmakedefine HAVE_ICAL_UNKNOWN_TOKEN_HANDLING 1
 
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
+/* libical provides icaltzutil_set_exact_vtimezones_support function */
+#cmakedefine HAVE_ICALTZUTIL_SET_EXACT_VTIMEZONES_SUPPORT 1
 
-/* Have libaccounts-glib */
-/* #undef HAVE_UOA */
+/* Define to 1 if you have the libgdata package. */
+#cmakedefine HAVE_LIBGDATA 1
 
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
+/* Define to 1 when have O_LARGEFILE open flag */
+#cmakedefine HAVE_O_LARGEFILE 1
 
+#ifndef HAVE_O_LARGEFILE
 /* Define to 0 if your system does not have the O_LARGEFILE flag */
-/* #undef O_LARGEFILE */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server";
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "evolution-data-server"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "evolution-data-server 3.22.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "evolution-data-server"
+#define O_LARGEFILE 0
+#endif /* HAVE_O_LARGEFILE */
 
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.22.0"
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-       STACK_DIRECTION > 0 => grows toward higher addresses
-       STACK_DIRECTION < 0 => grows toward lower addresses
-       STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "3.22.0"
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
+/* Have libaccounts-glib */
+#cmakedefine HAVE_UOA 1
diff --git a/modules/google-backend/module-google-backend.c b/modules/google-backend/module-google-backend.c
index 2e52742..795516b 100644
--- a/modules/google-backend/module-google-backend.c
+++ b/modules/google-backend/module-google-backend.c
@@ -20,7 +20,7 @@
 
 #include <libebackend/libebackend.h>
 
-#ifdef HAVE_GOOGLE
+#ifdef HAVE_LIBGDATA
 #include <gdata/gdata.h>
 #endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]