Allow debhelper to call autoreconf

Add dependency on autoconf-archive
Remove useless AC_PIKE_COMPILER_FLAG tests

diff --git a/debian/control b/debian/control
index 85e086e8c5189a134904ec534c5214e67f0ffef1..ee92979f7b5786dde1fd18ffddc9f73dae98ee4b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: spamass-milter
 Section: mail
 Priority: optional
 Standards-Version: 4.2.0
-Build-Depends: libmilter-dev, debhelper (>= 12), groff-base, autotools-dev
+Build-Depends: libmilter-dev, debhelper (>= 12), groff-base, autoconf-archive
 Maintainer: Don Armstrong <don@debian.org>
 Vcs-Git: https://git.donarmstrong.com/deb_pkgs/spamass-milter.git
 Vcs-Browser: https://git.donarmstrong.com/deb_pkgs/spamass-milter.git

diff --git a/debian/patches/series b/debian/patches/series
index 0c34f8ef1d8bf026f1b849364b26ce9881301748..39873738b0bc23b38c8f1319bb69140c4c8fc7c0 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ ignore_by_smtp_auth
 fix_spacing_in_received_header
 auth_in_received
 queueid_in_envrcpt
+update_for_new_autoconf

diff --git a/debian/patches/update_for_new_autoconf b/debian/patches/update_for_new_autoconf
new file mode 100644 (file)
index 0000000..7bab81c
--- /dev/null
+++ b/debian/patches/update_for_new_autoconf
@@ -0,0 +1,18 @@
+--- a/configure.in
++++ b/configure.in
+@@ -18,12 +18,12 @@
+ AC_LANG(C++)
+ 
+ # Enable useable exception handler if it exists.
+-AC_CXX_VERBOSE_TERMINATE_HANDLER
++# AC_CXX_VERBOSE_TERMINATE_HANDLER
+ 
+ # Try and disable all inlining; gdb shows the inlined function in a
+ # stack trace and you lose the caller's frame.  Bad for debugging.
+-AC_PIKE_COMPILER_FLAG(-fno-default-inline,fno_default_inline,CXXFLAGS)
+-AC_PIKE_COMPILER_FLAG(-fno-inline,fno_inline,CXXFLAGS)
++# AC_PIKE_COMPILER_FLAG(-fno-default-inline,fno_default_inline,CXXFLAGS)
++# AC_PIKE_COMPILER_FLAG(-fno-inline,fno_inline,CXXFLAGS)
+ 
+ #PIKE_INCLUDE_PATHS
+ #PIKE_LIBRARY_PATHS