summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Greenan <kmgreen2@gmail.com>2014-07-31 08:32:32 -0700
committerKevin Greenan <kmgreen2@gmail.com>2014-07-31 08:32:32 -0700
commit4469d69a1e14ef0d22f50c08020ab2135d3ad261 (patch)
tree15035cd3298cfe439ab2c1082ad928d11911efdb
parent1bb14c6a3a56591d411ac7ec0ebf8a55f3be0554 (diff)
downloadliberasurecode-4469d69a1e14ef0d22f50c08020ab2135d3ad261.tar.gz
Distributing the generated config.h (renamed to config_erasurecode.h), since it is used by the publid headers...
-rw-r--r--.gitignore3
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac2
-rw-r--r--include/erasurecode/erasurecode_stdinc.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index f559828..24fafc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ config.status
config.sub
Makefile
config.h.in
+config_liberasurecode.h.in
.deps
-config.h
+config_liberasurecode.h
stamp-h1
diff --git a/Makefile.am b/Makefile.am
index d071c47..714d06f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,8 @@ include_HEADERS = \
include/erasurecode/erasurecode_version.h \
include/erasurecode/list.h \
include/xor_codes/xor_hd_code_defs.h \
- include/xor_codes/xor_code.h
+ include/xor_codes/xor_code.h \
+ include/config_liberasurecode.h
test: check
@./test/alg_sig_test
diff --git a/configure.ac b/configure.ac
index 0412ad7..3f20373 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_PREREQ([2.61])
AM_INIT_AUTOMAKE([subdir-objects])
LT_INIT # libtool
-AC_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADER(include/config_liberasurecode.h)
dnl Needed when reconfiguring with 'autoreconf -i -s'
AC_CONFIG_MACRO_DIR([m4])
diff --git a/include/erasurecode/erasurecode_stdinc.h b/include/erasurecode/erasurecode_stdinc.h
index ef9f916..ee60ccb 100644
--- a/include/erasurecode/erasurecode_stdinc.h
+++ b/include/erasurecode/erasurecode_stdinc.h
@@ -25,7 +25,7 @@
#ifndef _ERASURECODE_STDINC_H_
#define _ERASURECODE_STDINC_H_
-#include "config.h"
+#include "config_liberasurecode.h"
#include "erasurecode_log.h"
#ifdef HAVE_SYSLOG_H