diff options
| author | David Sommerseth <davids@redhat.com> | 2014-01-15 17:36:04 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2014-03-23 13:06:15 +0100 |
| commit | fb69bfd05eef20547848f901bb66d394f64308a2 (patch) | |
| tree | 76ed51103973dbd037044ccd31569179c36e7c2c | |
| parent | 8f7d5e671a49a316a5fd6392f480d51533fc2747 (diff) | |
| download | openvpn-fb69bfd05eef20547848f901bb66d394f64308a2.tar.gz openvpn-fb69bfd05eef20547848f901bb66d394f64308a2.tar.xz openvpn-fb69bfd05eef20547848f901bb66d394f64308a2.zip | |
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>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/openvpn/Makefile.am | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 380dcdb..c622f33 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 0b79e10..fd593c5 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 |