gnucash-on-osx master: Enable libchipcard, include in bundle.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-osx/commit/a7039487 (commit)
	from  https://github.com/Gnucash/gnucash-on-osx/commit/e486481f (commit)



commit a7039487d669f08de8b96fc690a74eca2e6fd621
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Feb 11 10:39:35 2016 -0800

    Enable libchipcard, include in bundle.

diff --git a/gnucash-bundler/gnucash.bundle b/gnucash-bundler/gnucash.bundle
index b86136c..8d1ed4f 100644
--- a/gnucash-bundler/gnucash.bundle
+++ b/gnucash-bundler/gnucash.bundle
@@ -103,6 +103,10 @@
     ${prefix}/bin/aqbanking-cli
   </binary>
 
+  <binary dest="${bundle}/Contents/MacOS">
+    ${prefix}/bin/chipcard-tool
+  </binary>
+
   <binary>
     ${prefix}/lib/goffice
   </binary>
@@ -161,6 +165,14 @@
   </data>
 
   <data>
+    ${prefix}/share/chipcard
+  </data>
+
+  <data>
+    ${prefix}/etc/chipcard
+  </data>
+
+  <data>
     ${prefix}/share/libofx
   </data>
 
diff --git a/modulesets/gnucash.modules b/modulesets/gnucash.modules
index ca2084a..41731db 100644
--- a/modulesets/gnucash.modules
+++ b/modulesets/gnucash.modules
@@ -34,8 +34,8 @@
   <include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
  <!--include href="file:///Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
 
-  <autotools id="libchipcard" autogen-sh="configure" >
-    <branch module="gnucash/Dependencies/libchipcard-5.0.3beta.tar.gz" version="5.0.3"
+  <autotools id="libchipcard" autogen-sh="configure" autogenargs="--enable-local-install">
+    <branch module="gnucash/Dependencies/libchipcard-5.0.4.tar.gz" version="5.0.4"
 	    repo="sourceforge" />
     <dependencies>
       <dep package="libgcrypt"/>
@@ -86,6 +86,7 @@
       <dep package="gmp"/>
       <dep package="ktoblzcheck"/>
       <dep package="xmlsec"/>
+      <dep package="libchipcard"/>
     </dependencies>
   </autotools>
 
@@ -99,6 +100,8 @@
       <dep package="gwenhywfar-svn"/>
       <dep package="gmp"/>
       <dep package="ktoblzcheck"/>
+      <dep package="xmlsec"/>
+      <dep package="libchipcard"/>
     </dependencies>
   </autotools>
 



Summary of changes:
 gnucash-bundler/gnucash.bundle | 12 ++++++++++++
 modulesets/gnucash.modules     |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)