Use AX_COMPILER_FLAGS from autoconf-archive

5 files changed, 6 insertions, 100 deletions

diff --git a/NEWS b/NEWS
index b29f42b..0d31580 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,11 @@
 D-Bus Python Bindings 1.2.1 (UNRELEASED)
 ========================================
 
-...
+Dependencies:
+
+• Building from git (but not from tarballs) now requires
+  macros from the GNU Autoconf Archive, for example the autoconf-archive
+  package in Debian or Fedora derivatives.
 
 D-Bus Python Bindings 1.2.0 (2013-05-07)
 ========================================
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 4edd514..a924560 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -2,6 +2,4 @@ EXTRA_DIST = \
     am-check-pymod.m4 \
     am-check-python-headers.m4 \
     dbus-py-add-rst2htmlflag.m4 \
-    jh-add-cflag.m4 \
-    tp-compiler-flag.m4 \
-    tp-compiler-warnings.m4
+    $(NULL)
diff --git a/m4/jh-add-cflag.m4 b/m4/jh-add-cflag.m4
deleted file mode 100644
index 75fa78c..0000000
--- a/m4/jh-add-cflag.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-dnl JH_ADD_CFLAG(FLAG)
-dnl checks whether the C compiler supports the given flag, and if so, adds
-dnl it to $CFLAGS.  If the flag is already present in the list, then the
-dnl check is not performed.
-AC_DEFUN([JH_ADD_CFLAG],
-[
-case " $CFLAGS " in
-*@<:@\	\ @:>@$1@<:@\	\ @:>@*)
-  ;;
-*)
-  save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $1"
-  AC_MSG_CHECKING([whether [$]CC understands $1])
-  AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
-  AC_MSG_RESULT($jh_has_option)
-  if test $jh_has_option = no; then
-    CFLAGS="$save_CFLAGS"
-  fi
-  ;;
-esac])
diff --git a/m4/tp-compiler-flag.m4 b/m4/tp-compiler-flag.m4
deleted file mode 100644
index fc05e9e..0000000
--- a/m4/tp-compiler-flag.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-dnl A version of AS_COMPILER_FLAG that supports both C and C++.
-dnl Based on:
-
-dnl as-compiler-flag.m4 0.1.0
-dnl autostars m4 macro for detection of compiler flags
-dnl David Schleef <ds@schleef.org>
-dnl $Id: as-compiler-flag.m4,v 1.1 2005/06/18 18:02:46 burgerman Exp $
-
-dnl TP_COMPILER_FLAG(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
-dnl Tries to compile with the given CFLAGS and CXXFLAGS.
-dnl
-dnl Runs ACTION-IF-ACCEPTED if the compiler for the currently selected
-dnl AC_LANG can compile with the flags, and ACTION-IF-NOT-ACCEPTED otherwise.
-
-AC_DEFUN([TP_COMPILER_FLAG],
-[
-  AC_MSG_CHECKING([to see if compiler understands $1])
-
-  save_CFLAGS="$CFLAGS"
-  save_CXXFLAGS="$CXXFLAGS"
-  CFLAGS="$CFLAGS $1"
-  CXXFLAGS="$CXXFLAGS $1"
-
-  AC_TRY_COMPILE([ ], [], [flag_ok=yes], [flag_ok=no])
-  CFLAGS="$save_CFLAGS"
-  CXXFLAGS="$save_CXXFLAGS"
-
-  if test "X$flag_ok" = Xyes ; then
-    $2
-    true
-  else
-    $3
-    true
-  fi
-  AC_MSG_RESULT([$flag_ok])
-])
diff --git a/m4/tp-compiler-warnings.m4 b/m4/tp-compiler-warnings.m4
deleted file mode 100644
index fab5dc8..0000000
--- a/m4/tp-compiler-warnings.m4
+++ /dev/null
@@ -1,40 +0,0 @@
-dnl TP_COMPILER_WARNINGS(VARIABLE, WERROR_BY_DEFAULT, DESIRABLE, UNDESIRABLE)
-dnl $1 (VARIABLE): the variable to put flags into
-dnl $2 (WERROR_BY_DEFAULT): a command returning true if -Werror should be the
-dnl     default
-dnl $3 (DESIRABLE): warning flags we want (e.g. all extra shadow)
-dnl $4 (UNDESIRABLE): warning flags we don't want (e.g.
-dnl   missing-field-initializers unused-parameter)
-AC_DEFUN([TP_COMPILER_WARNINGS],
-[
-  AC_REQUIRE([AC_ARG_ENABLE])dnl
-  AC_REQUIRE([AC_HELP_STRING])dnl
-  AC_REQUIRE([TP_COMPILER_FLAG])dnl
-
-  tp_warnings=""
-  for tp_flag in $3; do
-    TP_COMPILER_FLAG([-W$tp_flag], [tp_warnings="$tp_warnings -W$tp_flag"])
-  done
-
-  tp_error_flags="-Werror"
-  TP_COMPILER_FLAG([-Werror], [tp_werror=yes], [tp_werror=no])
-
-  for tp_flag in $4; do
-    TP_COMPILER_FLAG([-Wno-$tp_flag],
-      [tp_warnings="$tp_warnings -Wno-$tp_flag"])
-    TP_COMPILER_FLAG([-Wno-error=$tp_flag],
-      [tp_error_flags="$tp_error_flags -Wno-error=$tp_flag"], [tp_werror=no])
-  done
-
-  AC_ARG_ENABLE([Werror],
-    AC_HELP_STRING([--disable-Werror],
-      [compile without -Werror (normally enabled in development builds)]),
-    tp_werror=$enableval, :)
-
-  if test "x$tp_werror" = xyes && $2; then
-    $1="$tp_warnings $tp_error_flags"
-  else
-    $1="$tp_warnings"
-  fi
-
-])