update to automake stuff, make nedmalloc default to 'yes' on freebsd,…

… update version

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@590 d19b8d6e-7fed-0310-83ef-9ca221ded41b

bootstrap.freebsd

@@ -6,7 +6,7 @@ echo
 
 aclocal19
 autoheader259
-libtoolize15
+libtoolize15 --force
 automake19 --add-missing --copy --foreign 
 autoconf259
 

configure.in

@@ -1,6 +1,6 @@
 dnl intro
 AC_INIT(pdns/receiver.cc)
-AM_INIT_AUTOMAKE(pdns, 2.9.20)
+AM_INIT_AUTOMAKE(pdns, 2.9.21-svn)
 AC_CANONICAL_HOST
 AM_CONFIG_HEADER(config.h)
 AC_C_BIGENDIAN 
@@ -14,7 +14,7 @@ AC_PROG_YACC
 AM_PROG_LEX
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
-AM_PROG_LIBTOOL 
+AC_PROG_LIBTOOL 
 AC_LANG_CPLUSPLUS
 
 dnl Checks for header files.
@@ -59,6 +59,7 @@ LIBS=$ac_save_LIBS
 
 DYNLINKFLAGS=""
 THREADFLAGS=""
+enable_nedmalloc="no"
 
 case "$host_os" in
 solaris2.8 | solaris2.9 ) 
@@ -87,6 +88,10 @@ openbsd*)
 	LDFLAGS="-lc_r $LDFLAGS"
 	CXXFLAGS="-pthread $CXXFLAGS"
 	;;
+freebsd*)
+	AM_CONDITIONAL(NEDMALLOC, true)
+	enable_nedmalloc="yes"
+	;;
 *)
 	AC_DEFINE(HAVE_IPV6,1,[If the host operating system understands IPv6])
 	DYNLINKFLAGS="-rdynamic"
@@ -182,6 +187,19 @@ AC_MSG_RESULT($enable_recursor)
 
 AM_CONDITIONAL(RECURSOR,test x"$enable_recursor" = "xyes")
 
+
+AC_MSG_CHECKING(whether we should use nedmalloc allocator)
+AC_ARG_ENABLE(nedmalloc, 
+ [  --enable-nedmalloc	If we should use nedmalloc],
+	enable_nedmalloc=$enableval,
+
+	 )
+
+AC_MSG_RESULT($enable_nedmalloc)
+
+AM_CONDITIONAL(NEDMALLOC,test x"$enable_nedmalloc" = "xyes")
+
+
 for a in $modules $dynmodules
 do
 	case "$a" in

pdns/Makefile.am

@@ -93,6 +93,11 @@ mtasker.hh sillyrecords.cc syncres.hh recursor_cache.cc recursor_cache.hh dnspar
 dnswriter.cc dnswriter.hh dnsrecords.cc dnsrecords.hh rcpgenerator.cc rcpgenerator.hh \
 base64.cc base64.hh zoneparser-tng.cc zoneparser-tng.hh 
 
+if NEDMALLOC
+pdns_recursor_SOURCES += ext/nedmalloc/malloc.c
+endif
+
+
 #../modules/gmysqlbackend/smysql.cc 
 
 pdns_recursor_LDFLAGS=