diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-07-11 03:01:42 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-07-11 03:01:42 +0800 |
| commit | fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231 (patch) | |
| tree | f315f05c15fd4973a30f8dff1a29477ac8c2f803 /configure.ac | |
| parent | 1690e6760f23f95f245d4acde8c768ccdedfc3b8 (diff) | |
| download | gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.gz gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.bz2 gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.lz gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.xz gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.tar.zst gsoc2013-evolution-fa3d3c2403a3fcdd7bd4b66cb2acb7baf40ab231.zip | |
Bug 722068 - Make Evolution build under Win32
This also makes gnome-desktop an optional dependency, which can
be avoided with --disable-gnome-desktop configure option.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e0fb89d33e..57d1a640a9 100644 --- a/configure.ac +++ b/configure.ac @@ -271,9 +271,23 @@ PKG_CHECK_MODULES([GNOME_PLATFORM], gcr-3 >= gcr_minimum_version libxml-2.0 >= libxml_minimum_version shared-mime-info >= shared_mime_info_minimum_version - gnome-desktop-3.0 >= gnome_desktop_minimum_version gsettings-desktop-schemas >= gsettings_desktop_schemas_minimum_version webkitgtk-3.0 >= webkitgtk_minimum_version]) + +GNOME_DESKTOP_DEPENDENCY="" +AC_ARG_ENABLE([gnome-desktop], + [AS_HELP_STRING([--enable-gnome-desktop], + [Enable GNOME desktop dependency for thumbnails @<:@default=yes@:>@])], + [enable_gnome_desktop="$enableval"], [enable_gnome_desktop=yes]) + +if test "$enable_gnome_desktop" = "yes"; then + GNOME_DESKTOP_DEPENDENCY=gnome-desktop-3.0 + PKG_CHECK_MODULES([GNOME_DESKTOP], [$GNOME_DESKTOP_DEPENDENCY >= gnome_desktop_minimum_version]) + GNOME_PLATFORM_CFLAGS="$GNOME_PLATFORM_CFLAGS $GNOME_DESKTOP_CFLAGS" + GNOME_PLATFORM_LIBS="$GNOME_PLATFORM_LIBS $GNOME_DESKTOP_LIBS" + AC_DEFINE(HAVE_GNOME_DESKTOP, 1, [gnome-desktop]) +fi +AC_SUBST(GNOME_DESKTOP_DEPENDENCY) AC_SUBST(GNOME_PLATFORM_CFLAGS) AC_SUBST(GNOME_PLATFORM_LIBS) @@ -286,6 +300,11 @@ PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], AC_SUBST(EVOLUTION_DATA_SERVER_CFLAGS) AC_SUBST(EVOLUTION_DATA_SERVER_LIBS) +dnl ************************************************** +dnl wait.h is not available on win32 +dnl ************************************************** + +AC_CHECK_HEADERS(sys/wait.h, AC_DEFINE(HAVE_SYS_WAIT_H, 1, [Have <sys/wait.h>])) dnl **************** dnl Enchant Library |