Skip to contentSkip to conversation

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

PATCH In review [email protected]... 3 participants 3 messages Jan 15, 2014 – Mar 23, 2014

lore
Share & tools
lore
#0 lore raw

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

From: David Sommerseth <[email protected]...>

---
 configure.ac            | 8 ++++----
 src/openvpn/Makefile.am | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
configure.ac +4 -4
index 636d4e2..ec8b96b 100644
@@ -680,7 +680,7 @@ fi
 
 case "${with_mem_check}" in
 	valgrind)
-		AC_CHECK_HEADER(
+		AC_CHECK_HEADERS(
 			[valgrind/memcheck.h],
 			[
 				CFLAGS="${CFLAGS} -g -fno-inline"
@@ -694,7 +694,7 @@ case "${with_mem_check}" in
 		)
 		;;
 	dmalloc)
-		AC_CHECK_HEADER(
+		AC_CHECK_HEADERS(
 			[dmalloc.h],
 			[AC_CHECK_LIB(
 				[dmalloc],
@@ -923,7 +923,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.])
@@ -962,7 +962,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.])
src/openvpn/Makefile.am +1 -1
index 0b79e10..fd593c5 100644
@@ -18,7 +18,7 @@ EXTRA_DIST = \
 	openvpn.vcxproj \
 	openvpn.vcxproj.filters
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/compat
 
Signature · 1 line
1.8.5.2
#1 lore raw

ACK

-Steffan

Quoted 84 lines

-----Original Message-----
From: [email protected]... [mailto:[email protected]...]
Sent: woensdag 15 januari 2014 17:36
To: [email protected]
Subject: [Openvpn-devel] [PATCH] Adjusted autotools files to build more cleanly on newer autoconf/automake versions

From: David Sommerseth <[email protected]...>

---
 configure.ac            | 8 ++++----
 src/openvpn/Makefile.am | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
configure.ac +2 -2
@@ -680,7 +680,7 @@ fi
 
 case "${with_mem_check}" in
 	valgrind)
-		AC_CHECK_HEADER(
+		AC_CHECK_HEADERS(
 			[valgrind/memcheck.h],
 			[
 				CFLAGS="${CFLAGS} -g -fno-inline"
@@ -694,7 +694,7 @@ case "${with_mem_check}" in
 		)
 		;;
 	dmalloc)
-		AC_CHECK_HEADER(
+		AC_CHECK_HEADERS(
 			[dmalloc.h],
 			[AC_CHECK_LIB(
 				[dmalloc],
@@ -923,7 +923,7 @@ if test "$enable_snappy" = "yes" && test

"$enable_comp_stub" = "no"; then

     saved_CFLAGS="${CFLAGS}"
     CFLAGS="${CFLAGS} ${SNAPPY_CFLAGS}"
configure.ac +1 -1
-    AC_CHECK_HEADER(snappy-c.h,
+    AC_CHECK_HEADERS(snappy-c.h,
        ,
        [
 	   AC_MSG_RESULT([Snappy headers not found.]) @@ -962,7 +962,7 @@

if test "$enable_lz4" = "yes" && test "$enable_comp_stub" = "no"; then

     saved_CFLAGS="${CFLAGS}"
     CFLAGS="${CFLAGS} ${LZ4_CFLAGS}"
configure.ac +1 -1
-    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

src/openvpn/Makefile.am +1 -2
@@ -18,7 +18,7 @@ EXTRA_DIST = \
 	openvpn.vcxproj \
 	openvpn.vcxproj.filters
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/compat
 
--

1.8.5.2

-----------------------------------------------------------------------
-------
CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments & Everything In Between. Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.c
lktrk
_______________________________________________
Openvpn-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

#2 lore raw
In reply to [email protected]...

Your patch has been applied to the master branch.

commit fb69bfd05eef20547848f901bb66d394f64308a2

Author: David Sommerseth
Date:   Wed Jan 15 17:36:04 2014 +0100
     Adjusted autotools files to build more cleanly on newer autoconf/automake versions

     Signed-off-by: David Sommerseth <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/8239
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering