Merge pull request #132 from haydenroche5/dist

Make changes to get make distcheck working.

Author: SparkiDev

Makefile.am

@@ -1,11 +1,11 @@
-
 SUFFIXES = 
 TESTS =
 noinst_PROGRAMS =
 noinst_HEADERS =
 check_PROGRAMS =
 dist_noinst_SCRIPTS =
 DISTCLEANFILES =
+pkginclude_HEADERS =
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -22,3 +22,17 @@ bench_LDADD      = libwolfengine.la
 DISTCLEANFILES  += .libs/bench
 
 test: check
+
+# By default, make distcheck will only add wolfEngine/ as an include directory.
+# So, for example, a file like unit.h that has #include
+# <wolfengine/we_logging.h> won't be able to find we_logging.h, because
+# wolfEngine/include isn't an include directory. We add it here.
+#
+# The OpenSSL lib and include directories won't be visible to make distcheck
+# either because make distcheck runs ./configure with no other options. If
+# OpenSSL isn't installed in a standard location, this naked configure command
+# will fail to find it. We tell it where to find the include and lib directory
+# for OpenSSL here.
+AM_DISTCHECK_CONFIGURE_FLAGS=CPPFLAGS="-I@abs_top_srcdir@/include \
+                                         @OPENSSL_INCLUDES@" \
+                             LDFLAGS="@OPENSSL_LDFLAGS@"

configure.ac

@@ -24,6 +24,21 @@ USER_CFLAGS="$CFLAGS"
 AC_PROG_CC
 AC_LANG(C)
 
+# shared library versioning
+WOLFENGINE_LIBRARY_VERSION=1:0:0
+#                          | | |
+#                   +------+ | +---+
+#                   |        |     |
+#                  current:revision:age
+#                   |        |     |
+#                   |        |     +- increment if interfaces have been added
+#                   |        |        set to zero if interfaces have been removed
+#                   |        |        or changed
+#                   |        +- increment if source code has changed
+#                   |           set to zero if current is incremented
+#                   +- increment if interfaces have been added, removed or changed
+AC_SUBST([WOLFENGINE_LIBRARY_VERSION])
+
 LIBS="$LIBS -ldl"
 
 AC_CHECK_HEADERS([openssl/engine.h])

include/include.am

@@ -5,6 +5,6 @@
 noinst_HEADERS += include/wolfengine/we_internal.h \
                   include/wolfengine/we_openssl_bc.h 
 
-pkginclude_HEADERS = include/wolfengine/we_wolfengine.h \
-                     include/wolfengine/we_logging.h \
-                     include/wolfengine/we_fips.h
+pkginclude_HEADERS += include/wolfengine/we_wolfengine.h \
+                      include/wolfengine/we_logging.h \
+                      include/wolfengine/we_fips.h

src/include.am

@@ -2,6 +2,8 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
+libwolfengine_la_LDFLAGS = ${AM_LDFLAGS} -no-undefined -version-info ${WOLFENGINE_LIBRARY_VERSION}
+
 libwolfengine_la_SOURCES =
 libwolfengine_la_SOURCES += src/we_aes_block.c
 libwolfengine_la_SOURCES += src/we_aes_cbc_hmac.c