openstack
/
liberasurecode
Code Issues Proposed changes

autoconf: Add Xorcode pkgconfig, other minor fixes 

Signed-off-by: Tushar Gohad <tushar.gohad@intel.com>
This commit is contained in:
Tushar Gohad 2014-06-29 20:48:57 -07:00
parent f101b311be
commit ce0543ac70
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -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

15
Xorcode.pc.in Normal file
View File

@ -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@

12
configure.ac
View File

@ -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)

2
erasurecode.pc.in
View File

@ -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@