[dates] Don't ship a copy of libowl, but use the installed one

[Ross Burton <rburton src gnome org>]

commit 8a79a9fc52c73bf256decfedd0fe7d399553e7aa
Author: Ross Burton <ross linux intel com>
Date:   Mon Dec 7 15:51:25 2009 +0000

    Don't ship a copy of libowl, but use the installed one

 Makefile.am                      |    2 +-
 configure.ac                     |   14 +-
 libowl/Makefile.am               |   16 --
 libowl/owlcolourbutton.c         |  158 ---------------------
 libowl/owlcolourbutton.h         |   71 ----------
 libowl/owlcolourpalette.c        |  165 ----------------------
 libowl/owlcolourpalette.h        |   71 ----------
 libowl/owlcolourselectordialog.c |  288 --------------------------------------
 libowl/owlcolourselectordialog.h |   78 ----------
 libowl/owlcolourswatch.c         |  185 ------------------------
 libowl/owlcolourswatch.h         |   69 ---------
 src/Makefile.am                  |    9 +-
 12 files changed, 11 insertions(+), 1115 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9403f83..e8a3c7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libowl src po data
+SUBDIRS = src po data
 
 EXTRA_DIST = intltool-extract.in intltool-merge.in intltool-update.in LICENSE LICENSE.lgpl
 
diff --git a/configure.ac b/configure.ac
index 1a4c5be..aedd5e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,12 +48,14 @@ AC_ARG_ENABLE(hildon,AS_HELP_STRING([--enable-hildon],[Turn on hildon support]),
 
 AM_CONDITIONAL(WITH_HILDON, test "x$hildon" = "xtrue")
 
-AC_ARG_ENABLE(owl, [AC_HELP_STRING([--enable-owl], 
-	      [Use the OWL colour widgets])],
-	      owl="$enableval",
-	      owl=false)
-
-AM_CONDITIONAL(USE_OWL, test "x$owl" = "xtrue")
+AC_ARG_ENABLE(owl,
+        AS_HELP_STRING([--enable-owl],[Use the OWL menu]),
+        ,enable_owl=no)
+AS_IF([test "x$enable_owl" = "xyes"], [
+        PKG_CHECK_MODULES(OWL, libowl)
+        AC_DEFINE(WITH_OWL, 1, [libowl present])
+        ])
+AM_CONDITIONAL(USE_OWL, test "x$enable_owl" = "xyes")
 
 # -- End of Hildon Stuff --
 
diff --git a/src/Makefile.am b/src/Makefile.am
index f6fa9f4..90c7049 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,11 +2,10 @@ AM_CPPFLAGS=-DPKGDATADIR=\"$(pkgdatadir)\"				\
 	-DDATES_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DDATADIR=\""$(datadir)"\"
 
-AM_CFLAGS = -Wall $(DATES_CFLAGS)
+AM_CFLAGS = -Wall $(DATES_CFLAGS) $(OWL_CFLAGS)
 
 if USE_OWL
 AM_CFLAGS += -DUSE_OWL=1
-INCLUDES = -I$(top_builddir)/libowl
 endif
 
 noinst_LTLIBRARIES = libgtkdatesview.la
@@ -35,10 +34,6 @@ dates_SOURCES = $(platform) 	\
 	gconf-bridge.h		\
 	gconf-bridge.c
 
-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la
-
-if USE_OWL
-dates_LDADD += $(top_builddir)/libowl/libowl.la
-endif 
+dates_LDADD = $(DATES_LIBS) $(OWL_LIBS) libgtkdatesview.la
 
 MAINTAINERCLEANFILES = config.h.in Makefile.in