#
#
# patch ".mtn-ignore"
#  from [d7787423a1ba8910fc48af560ee285b3a51248a6]
#    to [277f992ed04060f8b149c746a8575066c3a9240f]
# 
# patch "configure.ac"
#  from [cac08fd0d93722586d01648f2ebf7a553edc3fa9]
#    to [9d42b22ad34940b5452e866a6b255e574b6e3dce]
# 
# patch "idna/Makefile.am"
#  from [9bd29ff33d3a296695d1a01e8148df137e6f4c23]
#    to [3d488dadb7833d0496d2172214bfaf77bcedcabd]
# 
# patch "idna/configure.ac"
#  from [105102f88cea84a6a5f8eac6ef1896ce35273d35]
#    to [2a97033aff497ff3e8178b396974517b49d33bfe]
# 
# patch "m4/netxx.m4"
#  from [ced01d921bec3fcc597022d7bc33428899cb9ad6]
#    to [69ba0ab01e5c6c2cb01ff9693892ff6d0a270247]
# 
# patch "netxx/Makefile.am"
#  from [77ae531e6662f3fba9f4fee9e4566a4e2b38f751]
#    to [d10129ca3a4af73548337d6d82fcc3acd55764c9]
# 
# patch "netxx/configure.ac"
#  from [f09e94a3c2f1b5dfad5106f0d06f9c2c124549f4]
#    to [cd0be0962f79b2628b10d9739460595c1c3dacb6]
# 
# patch "netxx/osutil.h"
#  from [74df9538ae587f638afa95772b582ad5d173c70a]
#    to [79e905d037b0ddfe0ed61857bddadbf595dc4dc7]
#
============================================================
--- .mtn-ignore	d7787423a1ba8910fc48af560ee285b3a51248a6
+++ .mtn-ignore	277f992ed04060f8b149c746a8575066c3a9240f
@@ -1,11 +1,13 @@
 \.dirstamp$
 ^ABOUT-NLS$
 /Makefile(\.in)?$
+/aclocal\.m4$
 ^aclocal\.m4$
 ^build-arch-stamp$
 ^build-indep-stamp$
 ^compile$
 ^config\.(guess|h(\.in)?|log|rpath|status|sub)$
+/configure$
 ^configure$
 ^debian/files$
 ^debian/monotone
============================================================
--- configure.ac	cac08fd0d93722586d01648f2ebf7a553edc3fa9
+++ configure.ac	9d42b22ad34940b5452e866a6b255e574b6e3dce
@@ -18,6 +18,9 @@ AC_INIT(monotone, 0.39, address@hidden
 # FIXME: The AC_INIT line has to be kept in sync with monotone/configure.ac.
 AC_PREREQ(2.58)
 AC_INIT(monotone, 0.39, address@hidden)
+AC_CONFIG_AUX_DIR([.])
+AC_CONFIG_MACRO_DIR([m4])
+
 AC_CONFIG_SRCDIR([monotone/monotone.cc])
 
 CONFIGARGS="$ac_configure_args"
============================================================
--- idna/Makefile.am	9bd29ff33d3a296695d1a01e8148df137e6f4c23
+++ idna/Makefile.am	3d488dadb7833d0496d2172214bfaf77bcedcabd
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS=subdir-objects no-dist foreign 1.7.1
-
 lib_LIBRARIES = libidna.a
 include_HEADERS = idna.h punycode.h stringprep.h
 
@@ -7,8 +5,3 @@ libidna_a_SOURCES =							\
 	gunibreak.h gunicomp.h gunidecomp.h idna.c idn-int.h nfkc.c	\
 	profiles.c punycode.c rfc3454.c stringprep.c toutf8.c		\
 	version.c
-
-libidna_a_CPPFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS)
-libidna_a_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/.. $(LIB3RDPARTY_CFLAGS)
-libidna_a_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir)/.. $(LIB3RDPARTY_CXXFLAGS)
-
============================================================
--- idna/configure.ac	105102f88cea84a6a5f8eac6ef1896ce35273d35
+++ idna/configure.ac	2a97033aff497ff3e8178b396974517b49d33bfe
@@ -18,9 +18,14 @@ AC_INIT(idna, XX, address@hidden
 
 AC_PREREQ(2.58)
 AC_INIT(idna, XX, address@hidden)
-AM_INIT_AUTOMAKE
 AC_CONFIG_AUX_DIR([..])
 AC_CONFIG_MACRO_DIR([../m4])
+
+AM_INIT_AUTOMAKE([1.7.1 foreign no-dist no-define])
 AC_CONFIG_SRCDIR([idna.h])
 AC_CONFIG_FILES([Makefile])
+
+AC_PROG_CC
+AC_PROG_RANLIB
+
 AC_OUTPUT
============================================================
--- m4/netxx.m4	ced01d921bec3fcc597022d7bc33428899cb9ad6
+++ m4/netxx.m4	69ba0ab01e5c6c2cb01ff9693892ff6d0a270247
@@ -1,9 +1,10 @@ AC_DEFUN([AC_NET_IPV6],
 # checks done primarily for the benefit of netxx
 
 # Check for IPv6.  Let the user enable or disable it manually using a
 # three-state (yes|no|auto) --enable argument.
 AC_DEFUN([AC_NET_IPV6],
-[AC_ARG_ENABLE(ipv6,
+[AC_LANG_ASSERT([C++])
+ AC_ARG_ENABLE(ipv6,
    AS_HELP_STRING([--enable-ipv6],[enable IPv6 support (default=auto)]), ,
    enable_ipv6=auto)
  if test x"${enable_ipv6}" = xauto || test x"${enable_ipv6}" = xyes; then
@@ -22,31 +23,14 @@ AC_DEFUN([AC_NET_IPV6],
                      #include <arpa/inet.h>
                      #endif])
  fi
- # Control cannot reach this point without $enable_ipv6 being either
- # "yes" or "no".
- if test $enable_ipv6 = yes; then
-   AC_DEFINE(USE_IPV6, 1, [Define if IPv6 support should be included.])
- fi
 ])
 
 AC_DEFUN([MTN_NETXX_DEPENDENCIES],
 [AC_NET_IPV6
- AM_CONDITIONAL(MISSING_INET6, [test $enable_ipv6 = no])
+ if test $enable_ipv6 = yes; then
+   AC_DEFINE(USE_IPV6, 1, [Define if IPv6 support should be included.])
+ fi
  AC_SEARCH_LIBS([gethostbyname], [nsl])
  AC_SEARCH_LIBS([accept], [socket])
  AC_SEARCH_LIBS([inet_aton], [resolv])
- AC_CHECK_FUNCS([gethostbyaddr inet_ntoa socket])
- AC_CHECK_FUNC(inet_pton, [AM_CONDITIONAL(MISSING_INET_PTON, false)], 
-			  [AM_CONDITIONAL(MISSING_INET_PTON, true)])
-
- AC_CHECK_FUNC(inet_ntop, [AM_CONDITIONAL(MISSING_INET_NTOP, false)], 
-			  [AM_CONDITIONAL(MISSING_INET_NTOP, true)])
-
- AC_CHECK_FUNC(getaddrinfo, [AM_CONDITIONAL(MISSING_GETADDRINFO, false)], 
-			    [AM_CONDITIONAL(MISSING_GETADDRINFO, true)])
- AC_HAVE_INADDR_NONE
- AC_CHECK_TYPES([socklen_t],,,[
-  #include <sys/types.h>
-  #include <sys/socket.h>
- ])
 ])
============================================================
--- netxx/Makefile.am	77ae531e6662f3fba9f4fee9e4566a4e2b38f751
+++ netxx/Makefile.am	d10129ca3a4af73548337d6d82fcc3acd55764c9
@@ -1,6 +1,3 @@
-AUTOMAKE_OPTIONS=subdir-objects no-dist 1.7.1
-ACLOCAL_AMFLAGS = -I m4
-
 lib_LIBRARIES = libnetxx.a
 include_HEADERS = 
 libnetxx_a_SOURCES =							\
@@ -15,18 +12,12 @@ libnetxx_a_SOURCES =							\
 	sockopt.h streambase.cxx streambase.h stream.cxx stream.h	\
 	streamserver.cxx streamserver.h timeout.h types.h
 
-libnetxx_a_CPPFLAGS =
-libnetxx_a_CFLAGS = $(AM_CFLAGS) $(LIB3RDPARTY_CFLAGS)
-libnetxx_a_CXXFLAGS = $(AM_CXXFLAGS) -I$(top_srcdir) $(LIB3RDPARTY_CXXFLAGS)
-
 if MISSING_INET_PTON
-  libnetxx_a_SOURCES += netxx/inet_pton.cxx netxx/inet_pton.h
-  libnetxx_a_CPPFLAGS += -DNETXX_NO_PTON
+  libnetxx_a_SOURCES += inet_pton.cxx inet_pton.h
 endif
 
 if MISSING_INET_NTOP
-  libnetxx_a_SOURCES += netxx/inet_ntop.cxx netxx/inet_ntop.h
-  libnetxx_a_CPPFLAGS += -DNETXX_NO_NTOP
+  libnetxx_a_SOURCES += inet_ntop.cxx inet_ntop.h
 endif
 
 if MISSING_GETADDRINFO
@@ -35,7 +26,6 @@ endif
   libnetxx_a_SOURCES += resolve_getaddrinfo.cxx
 endif
 
+# This is necessary because autoreconf doesn't pay attention to
+# AC_CONFIG_MACRO_DIR.
+ACLOCAL_AMFLAGS = -I ../m4
-if MISSING_INET6
-  libnetxx_a_CPPFLAGS += -DNETXX_NO_INET6
-endif
-
============================================================
--- netxx/configure.ac	f09e94a3c2f1b5dfad5106f0d06f9c2c124549f4
+++ netxx/configure.ac	cd0be0962f79b2628b10d9739460595c1c3dacb6
@@ -18,9 +18,41 @@ AC_INIT(netxx, XX, address@hidden
 
 AC_PREREQ(2.58)
 AC_INIT(netxx, XX, address@hidden)
-AM_INIT_AUTOMAKE
 AC_CONFIG_AUX_DIR([..])
 AC_CONFIG_MACRO_DIR([../m4])
+
+AM_INIT_AUTOMAKE([1.7.1 foreign no-dist no-define])
 AC_CONFIG_SRCDIR([netxx.h])
 AC_CONFIG_FILES([Makefile])
+
+AC_PROG_CXX
+AC_PROG_RANLIB
+
+AC_LANG_PUSH([C++])
+AC_NET_IPV6
+if test $enable_ipv6 = no; then
+   AC_DEFINE(NETXX_NO_INET6, 1, [Define to suppress IPv6 support.])
+fi
+
+AC_CHECK_FUNC(inet_pton,
+  [AM_CONDITIONAL(MISSING_INET_PTON, false)],
+  [AM_CONDITIONAL(MISSING_INET_PTON, true)
+   AC_DEFINE(NETXX_NO_PTON, 1, [Define if inet_pton is not available.])
+  ])
+
+AC_CHECK_FUNC(inet_ntop,
+  [AM_CONDITIONAL(MISSING_INET_NTOP, false)],
+  [AM_CONDITIONAL(MISSING_INET_NTOP, true)
+   AC_DEFINE(NETXX_NO_PTON, 1, [Define if inet_pton is not available.])
+  ])
+
+AC_CHECK_FUNC(getaddrinfo,
+  [AM_CONDITIONAL(MISSING_GETADDRINFO, false)], 
+  [AM_CONDITIONAL(MISSING_GETADDRINFO, true)])
+
+AC_CHECK_TYPES([socklen_t],,,[
+ #include <sys/types.h>
+ #include <sys/socket.h>
+])
+
 AC_OUTPUT
============================================================
--- netxx/osutil.h	74df9538ae587f638afa95772b582ad5d173c70a
+++ netxx/osutil.h	79e905d037b0ddfe0ed61857bddadbf595dc4dc7
@@ -80,7 +80,6 @@
 #endif
 
 #include <string>
-#include "config.h"
 
 namespace Netxx 
 {