From: David Sommerseth Date: Wed, 15 Jan 2014 16:36:04 +0000 (+0100) Subject: Adjusted autotools files to build more cleanly on newer autoconf/automake versions X-Git-Tag: v2.4_alpha1~466 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb69bfd05eef20547848f901bb66d394f64308a2;p=thirdparty%2Fopenvpn.git Adjusted autotools files to build more cleanly on newer autoconf/automake versions Signed-off-by: David Sommerseth Acked-by: Steffan Karger 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 --- diff --git a/configure.ac b/configure.ac index 380dcdbb7..c622f333b 100644 --- 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 0b79e1044..fd593c57a 100644 --- 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