m4: Rename guestfs_*.m4 to guestfs-*.m4.

For consistency with other code.
This commit is contained in:
Richard W.M. Jones
2017-10-06 12:58:14 +01:00
parent aad2c9413f
commit fbf044a11c
23 changed files with 24 additions and 24 deletions

View File

@@ -88,11 +88,11 @@ gl_INIT
dnl Check for external programs required to either build or run
dnl libguestfs.
HEADING([Checking for external programs])
m4_include([m4/guestfs_progs.m4])
m4_include([m4/guestfs-progs.m4])
dnl Find the release date for this version. This is used in
dnl the website 'index.html' file. We have to do this after
dnl testing for awk in guestfs_progs.m4 above.
dnl testing for awk in guestfs-progs.m4 above.
AC_MSG_CHECKING([for the release date of $PACKAGE_VERSION])
RELEASE_DATE="$(grep ^$PACKAGE_VERSION@<:@@<:@:space:@:>@@:>@ ${srcdir}/RELEASES | $AWK '{print $2}')"
AS_IF([test "x$RELEASE_DATE" != "x"],[
@@ -107,63 +107,63 @@ AC_SUBST([RELEASE_DATE])
dnl The C compiler environment.
HEADING([Checking for the C compiler environment])
m4_include([m4/guestfs_c.m4])
m4_include([m4/guestfs-c.m4])
dnl Any C libraries required by the libguestfs C library (not the daemon).
HEADING([Checking for libraries used by libguestfs])
m4_include([m4/guestfs_libraries.m4])
m4_include([m4/guestfs-libraries.m4])
dnl Check for FUSE.
HEADING([Checking for FUSE])
m4_include([m4/guestfs_fuse.m4])
m4_include([m4/guestfs-fuse.m4])
dnl The daemon and any dependencies.
HEADING([Checking the daemon and its dependencies])
m4_include([m4/guestfs_daemon.m4])
m4_include([m4/guestfs-daemon.m4])
dnl The appliance and any dependencies.
HEADING([Checking the appliance and its dependencies])
m4_include([m4/guestfs_appliance.m4])
m4_include([m4/guestfs-appliance.m4])
dnl Check for QEMU.
HEADING([Checking for QEMU])
m4_include([m4/guestfs_qemu.m4])
m4_include([m4/guestfs-qemu.m4])
dnl Miscellaneous libraries used by other programs.
HEADING([Checking for other libraries])
m4_include([m4/guestfs_misc_libraries.m4])
m4_include([m4/guestfs-misc-libraries.m4])
dnl Check for language bindings.
HEADING([Checking for OCaml])
m4_include([m4/guestfs_ocaml.m4])
m4_include([m4/guestfs-ocaml.m4])
HEADING([Checking for Perl])
m4_include([m4/guestfs_perl.m4])
m4_include([m4/guestfs-perl.m4])
HEADING([Checking for Python])
m4_include([m4/guestfs_python.m4])
m4_include([m4/guestfs-python.m4])
HEADING([Checking for Ruby])
m4_include([m4/guestfs_ruby.m4])
m4_include([m4/guestfs-ruby.m4])
HEADING([Checking for Java])
m4_include([m4/guestfs_java.m4])
m4_include([m4/guestfs-java.m4])
HEADING([Checking for Haskell])
m4_include([m4/guestfs_haskell.m4])
m4_include([m4/guestfs-haskell.m4])
HEADING([Checking for PHP])
m4_include([m4/guestfs_php.m4])
m4_include([m4/guestfs-php.m4])
HEADING([Checking for Erlang])
m4_include([m4/guestfs_erlang.m4])
m4_include([m4/guestfs-erlang.m4])
HEADING([Checking for Lua])
m4_include([m4/guestfs_lua.m4])
m4_include([m4/guestfs-lua.m4])
HEADING([Checking for Go])
m4_include([m4/guestfs_golang.m4])
m4_include([m4/guestfs-golang.m4])
HEADING([Checking for GObject Introspection])
m4_include([m4/guestfs_gobject.m4])
m4_include([m4/guestfs-gobject.m4])
dnl Bash completion.
HEADING([Checking for bash completion])
m4_include([m4/guestfs_bash_completion.m4])
m4_include([m4/guestfs-bash-completion.m4])
dnl Miscellaneous configuration that doesn't fit anywhere else.
HEADING([Performing additional configuration])
m4_include([m4/guestfs_misc.m4])
m4_include([m4/guestfs-misc.m4])
dnl Work around autoconf's lack of expanded variables.
eval my_sysconfdir="\"[$]sysconfdir\""

View File

@@ -368,8 +368,8 @@ Libguestfs uses the GNU autotools build system (autoconf, automake,
libtool).
The F<./configure> script is generated from F<configure.ac> and
F<m4/guestfs_*.m4>. Most of the configure script is split over many
m4 macro files by topic, for example F<m4/guestfs_daemon.m4> deals
F<m4/guestfs-*.m4>. Most of the configure script is split over many
m4 macro files by topic, for example F<m4/guestfs-daemon.m4> deals
with the dependencies of the daemon.
The job of the top level F<Makefile.am> is mainly to list the