File cares-autotools.diff of Package libcares2.32783

From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-05-02 15:15:23.388234597 +0200

build: do away with old autotools constructs

---
 Makefile.am  |    9 +++------
 configure.ac |    6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

Index: c-ares-1.9.1/Makefile.am
===================================================================
--- c-ares-1.9.1.orig/Makefile.am
+++ c-ares-1.9.1/Makefile.am
@@ -1,4 +1,3 @@
-AUTOMAKE_OPTIONS = foreign nostdinc
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -22,7 +21,7 @@ ACLOCAL_AMFLAGS = -I m4
 # $(top_srcdir) is for c-ares's ares_setup.h and other "c-ares-private" files
 
 if CURLDEBUG
-INCLUDES = -I$(top_builddir)/../include/curl \
+AM_CPPFLAGS = -I$(top_builddir)/../include/curl \
            -I$(top_builddir)/../include      \
            -I$(top_srcdir)/../include        \
            -I$(top_builddir)/../lib          \
@@ -30,7 +29,7 @@ INCLUDES = -I$(top_builddir)/../include/
            -I$(top_builddir)                 \
            -I$(top_srcdir)
 else
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
            -I$(top_srcdir)
 endif
 
@@ -108,9 +107,7 @@ CFLAG_CARES_SYMBOL_HIDING = @CFLAG_CARES
 
 # For Windows build targets, when building or using static c-ares
 if USE_CPPFLAG_CARES_STATICLIB
-AM_CPPFLAGS = -DCARES_STATICLIB
-else
-AM_CPPFLAGS =
+AM_CPPFLAGS += -DCARES_STATICLIB
 endif
 
 if DOING_CARES_SYMBOL_HIDING
Index: c-ares-1.9.1/configure.ac
===================================================================
--- c-ares-1.9.1.orig/configure.ac
+++ c-ares-1.9.1/configure.ac
@@ -8,8 +8,8 @@ XC_OVR_ZZ50
 CARES_OVERRIDE_AUTOCONF
 
 AC_CONFIG_SRCDIR([ares_ipv6.h])
-AM_CONFIG_HEADER([ares_config.h ares_build.h])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([ares_config.h ares_build.h])
+m4_ifdef([AC_CONFIG_MACRO_DIRS], [AC_CONFIG_MACRO_DIRS([m4])], [AC_CONFIG_MACRO_DIR([m4])])
 AM_MAINTAINER_MODE
 
 CARES_CHECK_OPTION_DEBUG
@@ -68,7 +68,7 @@ if test -f ${srcdir}/ares_build.h; then
   rm -f ${srcdir}/ares_build.h
 fi
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign nostdinc])
 
 dnl
 dnl Detect the canonical host and target build environment