[shotwell/wip/autotools: 6/27] build: Re-add support for unity

[Jens Georg <jensgeorg src gnome org>]

commit d1298035015adc85e8dfde8f2834d093d35188df
Author: Jens Georg <mail jensge org>
Date:   Wed May 25 00:25:00 2016 +0200

    build: Re-add support for unity
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile.am  |    9 ++++++---
 configure.ac |   17 +++++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7b6032c..690b2e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,9 @@ GITIGNOREFILES = \
 -include $(top_srcdir)/git.mk
 
 bin_PROGRAMS = shotwell
-shotwell_CFLAGS = $(SHOTWELL_CFLAGS) \
+shotwell_CFLAGS = \
+       $(SHOTWELL_CFLAGS) \
+       $(UNITY_CFLAGS) \
        -I$(top_srcdir)/vapi \
        -D_PREFIX='"$(prefix)"' \
        -D_VERSION='"$(VERSION)"' \
@@ -44,7 +46,7 @@ shotwell_CFLAGS = $(SHOTWELL_CFLAGS) \
        -D_LIBEXECDIR='"$(libexecdir)"' \
        -D_LIB='"$(libdir)"'
 
-shotwell_LIBS = $(SHOTWELL_LIBS)
+shotwell_LDADD = $(SHOTWELL_LIBS) $(UNITY_LIBS)
 shotwell_VALAFLAGS = --pkg gio-2.0 --pkg gtk+-3.0 --pkg gee-0.8 \
        --pkg gio-unix-2.0 --pkg sqlite3 --pkg gmodule-2.0 \
        --vapidir $(top_srcdir)/vapi \
@@ -52,7 +54,8 @@ shotwell_VALAFLAGS = --pkg gio-2.0 --pkg gtk+-3.0 --pkg gee-0.8 \
        --pkg libexif --pkg gudev-1.0 --pkg gstreamer-1.0 \
        --pkg gstreamer-pbutils-1.0 \
        -g --enable-checking --target-glib=2.32 --thread --fatal-warnings \
-       --enable-experimental --enable-deprecated
+       --enable-experimental --enable-deprecated \
+       $(UNITY_VALAFLAGS)
 
 if IS_GITVERSION
 shotwell_CFLAGS += -D_GIT_VERSION='"@GITVER@"'
diff --git a/configure.ac b/configure.ac
index b681365..8afd27c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,23 @@ PKG_CHECK_MODULES(SHOTWELL, [
                              webkit2gtk-4.0
                             ])
 
+AC_ARG_ENABLE([unity-support],
+              AS_HELP_STRING([--enable-unity-support],
+                             [Enable Ubuntu Unity integration]),,
+              [enable_unity_support=no])
+
+AS_IF([test "x$enable_unity_support" = "xyes"],
+      [
+       PKG_CHECK_MODULES(UNITY, [unity],
+                         [
+                          HAVE_UNITY=yes
+                          UNITY_VALAFLAGS="--pkg unity --define UNITY_SUPPORT"
+                          AC_SUBST([UNITY_VALAFLAGS])
+                         ], [HAVE_UNITY=no])
+      ], [HAVE_UNITY=no])
+AC_SUBST([HAVE_UNITY])
+AM_CONDITIONAL([HAVE_UNITY],[test "x$HAVE_UNITY" = "xyes"])
+
 dnl ***********************************************************************
 dnl Initialize Libtool
 dnl ***********************************************************************