From ce0543ac70ea86056a6f35aad2e8f2ad2d0fcfbb Mon Sep 17 00:00:00 2001
From: Tushar Gohad <tushar.gohad@intel.com>
Date: Sun, 29 Jun 2014 20:48:57 -0700
Subject: [PATCH] autoconf: Add Xorcode pkgconfig, other minor fixes

Signed-off-by: Tushar Gohad <tushar.gohad@intel.com>
---
 Makefile.am       |  3 ++-
 Xorcode.pc.in     | 15 +++++++++++++++
 configure.ac      | 12 ++++++++++++
 erasurecode.pc.in |  2 +-
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 Xorcode.pc.in

diff --git a/Makefile.am b/Makefile.am
index 39d211a..e5d6393 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
-AM_CPPFLAGS=-I./ -I../include -I/usr/local/include/jerasure
+AM_CPPFLAGS = $(CPPFLAGS) -I$(abs_top_builddir)/include/xor_codes -I$(abs_top_builddir)/include/erasurecode
+
 if DEBUG
 AM_CFLAGS = -g3 -O0
 else
diff --git a/Xorcode.pc.in b/Xorcode.pc.in
new file mode 100644
index 0000000..b429507
--- /dev/null
+++ b/Xorcode.pc.in
@@ -0,0 +1,15 @@
+# Xorcode pkg-config source file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: Xorcode
+Description: Flat XOR-based erasure codes
+Version: @XORCODE_VERSION@
+Requires:
+Conflicts:
+Libs: -L${libdir} @XORCODE_RLD_FLAGS@ -lXorcode
+Libs.private: @XORCODE_STATIC_LIBS@
+Cflags: -I${includedir}/ -I${includedir}/xor_codes @XORCODE_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 3da654b..65f22f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,17 @@ AC_SUBST(LT_CURRENT)
 AC_SUBST(LT_REVISION)
 AC_SUBST(LT_AGE)
 
+# Xorcode version
+XORCODE_MAJOR_VERSION=0
+XORCODE_MINOR_VERSION=9
+XORCODE_MICRO_VERSION=4
+XORCODE_VERSION=$XORCODE_MAJOR_VERSION.$XORCODE_MINOR_VERSION.$XORCODE_MICRO_VERSION
+
+AC_SUBST(XORCODE_MAJOR_VERSION)
+AC_SUBST(XORCODE_MINOR_VERSION)
+AC_SUBST(XORCODE_MICRO_VERSION)
+AC_SUBST(XORCODE_VERSION)
+
 
 dnl Needed when reconfiguring with 'autoreconf -i -s'
 AC_CONFIG_MACRO_DIR([m4])
@@ -107,4 +118,5 @@ AC_SUBST(EXTRA_LDFLAGS)
 
 AC_OUTPUT(Makefile)
 AC_OUTPUT(erasurecode.pc)
+AC_OUTPUT(Xorcode.pc)
 
diff --git a/erasurecode.pc.in b/erasurecode.pc.in
index 42337f5..9cbc40d 100644
--- a/erasurecode.pc.in
+++ b/erasurecode.pc.in
@@ -12,4 +12,4 @@ Requires:
 Conflicts:
 Libs: -L${libdir} @ERASURECODE_RLD_FLAGS@ -lerasurecode
 Libs.private: @ERASURECODE_STATIC_LIBS@
-Cflags: -I${includedir}/ @ERASURECODE_CFLAGS@
+Cflags: -I${includedir}/ -I${includedir}/erasurecode @ERASURECODE_CFLAGS@