From fd64ef32214ceb05f89c51073e3a4673fb0c32aa Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Wed, 4 Feb 2015 10:08:53 +0000
Subject: Update to libexpat 2.0.1

Also change the build system to cmake, as the autotools based one
doesn't seem to work with the current automake version.
---
 strata/core.morph          | 8 +++-----
 strata/core/libexpat.morph | 7 +++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/strata/core.morph b/strata/core.morph
index ce6d5eb1..5b84f011 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -168,12 +168,10 @@ chunks:
 - name: libexpat
   morph: strata/core/libexpat.morph
   repo: upstream:libexpat
-  ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c
-  unpetrify-ref: baserock/morph
+  ref: 7cfc09db3e258129ab05811f2f9e351746ddab9f
+  unpetrify-ref: R_2_1_0
   build-depends:
-  - autoconf-tarball
-  - automake
-  - libtool-tarball
+  - cmake
 - name: XML-Parser
   repo: upstream:XML-Parser
   ref: e1a3ec157140a699e3020836475a0df622f70f1b
diff --git a/strata/core/libexpat.morph b/strata/core/libexpat.morph
index 1e0fe696..b36a67aa 100644
--- a/strata/core/libexpat.morph
+++ b/strata/core/libexpat.morph
@@ -1,9 +1,8 @@
 name: libexpat
 kind: chunk
 configure-commands:
-- autoreconf -i
-- ./configure --prefix="${PREFIX-/usr}"
+- mkdir o && cd o && cmake -DCMAKE_INSTALL_PREFIX=/usr ..
 build-commands:
-- make
+- cd o && make
 install-commands:
-- make DESTDIR="$DESTDIR" install
+- cd o && make DESTDIR="$DESTDIR" install
-- 
cgit v1.2.1