rename autotools to autoconf

It seems bette to use the more specific name in case we later want a
separate module for automake.

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
new file mode 100644 (file)
index 0000000..fcdc256
--- /dev/null
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -0,0 +1,56 @@
+# A buildsystem plugin for handling autoconf based projects
+#
+# Copyright: © 2008 Joey Hess
+#            © 2008-2009 Modestas Vainius
+# License: GPL-2+
+
+package Debian::Debhelper::Buildsystem::autoconf;
+
+use strict;
+use File::Spec;
+use Debian::Debhelper::Dh_Lib;
+use base 'Debian::Debhelper::Buildsystem::makefile';
+
+sub DESCRIPTION {
+       "GNU Autoconf (configure)"
+}
+
+sub check_auto_buildable {
+       my $this=shift;
+       my ($action)=@_;
+
+       # Handle configure; the rest - next class
+       if ($action eq "configure") {
+               return -x "configure";
+       }
+       return 0;
+}
+
+sub configure {
+       my $this=shift;
+
+       # Standard set of options for configure.
+       my @opts;
+       push @opts, "--build=" . dpkg_architecture_value("DEB_BUILD_GNU_TYPE");
+       push @opts, "--prefix=/usr";
+       push @opts, "--includedir=\${prefix}/include";
+       push @opts, "--mandir=\${prefix}/share/man";
+       push @opts, "--infodir=\${prefix}/share/info";
+       push @opts, "--sysconfdir=/etc";
+       push @opts, "--localstatedir=/var";
+       push @opts, "--libexecdir=\${prefix}/lib/" . sourcepackage();
+       push @opts, "--disable-maintainer-mode";
+       push @opts, "--disable-dependency-tracking";
+       # Provide --host only if different from --build, as recommended in
+       # autotools-dev README.Debian: When provided (even if equal)
+       # autoconf 2.52+ switches to cross-compiling mode.
+       if (dpkg_architecture_value("DEB_BUILD_GNU_TYPE")
+           ne dpkg_architecture_value("DEB_HOST_GNU_TYPE")) {
+               push @opts, "--host=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE");
+       }
+
+       $this->mkdir_builddir();
+       $this->doit_in_builddir($this->get_rel2builddir_path("configure"), @opts, @_);
+}
+
+1;

diff --git a/Debian/Debhelper/Buildsystem/autotools.pm b/Debian/Debhelper/Buildsystem/autotools.pm
deleted file mode 100644 (file)
index 3bbd274..0000000
--- a/Debian/Debhelper/Buildsystem/autotools.pm
+++ /dev/null
@@ -1,56 +0,0 @@
-# A buildsystem plugin for handling autotools based projects
-#
-# Copyright: © 2008 Joey Hess
-#            © 2008-2009 Modestas Vainius
-# License: GPL-2+
-
-package Debian::Debhelper::Buildsystem::autotools;
-
-use strict;
-use File::Spec;
-use Debian::Debhelper::Dh_Lib;
-use base 'Debian::Debhelper::Buildsystem::makefile';
-
-sub DESCRIPTION {
-       "GNU Autotools (configure)"
-}
-
-sub check_auto_buildable {
-       my $this=shift;
-       my ($action)=@_;
-
-       # Handle configure; the rest - next class
-       if ($action eq "configure") {
-               return -x "configure";
-       }
-       return 0;
-}
-
-sub configure {
-       my $this=shift;
-
-       # Standard set of options for configure.
-       my @opts;
-       push @opts, "--build=" . dpkg_architecture_value("DEB_BUILD_GNU_TYPE");
-       push @opts, "--prefix=/usr";
-       push @opts, "--includedir=\${prefix}/include";
-       push @opts, "--mandir=\${prefix}/share/man";
-       push @opts, "--infodir=\${prefix}/share/info";
-       push @opts, "--sysconfdir=/etc";
-       push @opts, "--localstatedir=/var";
-       push @opts, "--libexecdir=\${prefix}/lib/" . sourcepackage();
-       push @opts, "--disable-maintainer-mode";
-       push @opts, "--disable-dependency-tracking";
-       # Provide --host only if different from --build, as recommended in
-       # autotools-dev README.Debian: When provided (even if equal) autotools
-       # 2.52+ switches to cross-compiling mode.
-       if (dpkg_architecture_value("DEB_BUILD_GNU_TYPE")
-           ne dpkg_architecture_value("DEB_HOST_GNU_TYPE")) {
-               push @opts, "--host=" . dpkg_architecture_value("DEB_HOST_GNU_TYPE");
-       }
-
-       $this->mkdir_builddir();
-       $this->doit_in_builddir($this->get_rel2builddir_path("configure"), @opts, @_);
-}
-
-1;

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index a9885bb89cce8bbd985bed135e4605bbd318980f..afb03dd7bf0139b9ec1d3f9d3cb23cac416a7bb5 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -16,7 +16,7 @@ our @EXPORT=qw(&buildsystems_init &buildsystems_do &load_buildsystem);
 # Historical order must be kept for backwards compatibility. New
 # buildsystems MUST be added to the END of the list.
 our @BUILDSYSTEMS = (
-    "autotools",
+    "autoconf",
     "perl_makemaker",
     "makefile",
     "python_distutils",