Adjusted autotools files to build more cleanly on newer autoconf/automake versions

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1389803764-5879-1-git-send-email-davids@redhat.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8239
Signed-off-by: Gert Doering <gert@greenie.muc.de>

diff --git a/configure.ac b/configure.ac
index 380dcdbb7ebef898081c59c9b779433d3e92756f..c622f333b973d76fb147c5bebf55559161a6260d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -686,7 +686,7 @@ fi
 
 case "${with_mem_check}" in
        valgrind)
-               AC_CHECK_HEADER(
+               AC_CHECK_HEADERS(
                        [valgrind/memcheck.h],
                        [
                                CFLAGS="${CFLAGS} -g -fno-inline"
@@ -700,7 +700,7 @@ case "${with_mem_check}" in
                )
                ;;
        dmalloc)
-               AC_CHECK_HEADER(
+               AC_CHECK_HEADERS(
                        [dmalloc.h],
                        [AC_CHECK_LIB(
                                [dmalloc],
@@ -929,7 +929,7 @@ if test "$enable_snappy" = "yes" && test "$enable_comp_stub" = "no"; then
 
     saved_CFLAGS="${CFLAGS}"
     CFLAGS="${CFLAGS} ${SNAPPY_CFLAGS}"
-    AC_CHECK_HEADER(snappy-c.h,
+    AC_CHECK_HEADERS(snappy-c.h,
        ,
        [
           AC_MSG_RESULT([Snappy headers not found.])
@@ -968,7 +968,7 @@ if test "$enable_lz4" = "yes" && test "$enable_comp_stub" = "no"; then
 
     saved_CFLAGS="${CFLAGS}"
     CFLAGS="${CFLAGS} ${LZ4_CFLAGS}"
-    AC_CHECK_HEADER(lz4.h,
+    AC_CHECK_HEADERS(lz4.h,
        ,
        [
           AC_MSG_RESULT([LZ4 headers not found.])

diff --git a/src/openvpn/Makefile.am b/src/openvpn/Makefile.am
index 0b79e104498cc6b7c466b1e8eb762615dd736001..fd593c57ae2e16e198af0da840d8b41c66f0cf9c 100644 (file)
--- a/src/openvpn/Makefile.am
+++ b/src/openvpn/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = \
        openvpn.vcxproj \
        openvpn.vcxproj.filters
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/compat