[Libguestfs] [PATCH 02/16] configure: Move (old, Perl) tools detection into m4/guestfs_perl.m4.

Richard W.M. Jones rjones at redhat.com
Thu Oct 29 15:02:07 UTC 2015


---
 configure.ac       | 20 --------------------
 m4/guestfs_perl.m4 | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5a3ba96..2862afc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1094,26 +1094,6 @@ m4_include([m4/guestfs_lua.m4])
 m4_include([m4/guestfs_golang.m4])
 m4_include([m4/guestfs_gobject.m4])
 
-dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.)
-AS_IF([test "x$PERL" != "xno"],[
-    missing_perl_modules=no
-    for pm in Pod::Usage Getopt::Long Sys::Virt Locale::TextDomain Win::Hivex Win::Hivex::Regedit ; do
-        AC_MSG_CHECKING([for $pm])
-        if ! $PERL -M$pm -e1 >&AS_MESSAGE_LOG_FD 2>&1; then
-            AC_MSG_RESULT([no])
-            missing_perl_modules=yes
-        else
-            AC_MSG_RESULT([yes])
-        fi
-    done
-    if test "x$missing_perl_modules" = "xyes"; then
-        AC_MSG_WARN([some Perl modules required to compile the Perl virt-* tools are missing])
-    fi
-])
-
-AM_CONDITIONAL([HAVE_TOOLS],
-    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-
 dnl Bash completion.
 PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
     bash_completion=yes
diff --git a/m4/guestfs_perl.m4 b/m4/guestfs_perl.m4
index 1306dd2..9951aa0 100644
--- a/m4/guestfs_perl.m4
+++ b/m4/guestfs_perl.m4
@@ -39,3 +39,23 @@ AS_IF([test "x$enable_perl" != "xno"],[
 ])
 AM_CONDITIONAL([HAVE_PERL],
     [test "x$enable_perl" != "xno" && test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
+
+dnl Check for Perl modules needed by Perl virt tools (virt-df, etc.)
+AS_IF([test "x$PERL" != "xno"],[
+    missing_perl_modules=no
+    for pm in Pod::Usage Getopt::Long Sys::Virt Locale::TextDomain Win::Hivex Win::Hivex::Regedit ; do
+        AC_MSG_CHECKING([for $pm])
+        if ! $PERL -M$pm -e1 >&AS_MESSAGE_LOG_FD 2>&1; then
+            AC_MSG_RESULT([no])
+            missing_perl_modules=yes
+        else
+            AC_MSG_RESULT([yes])
+        fi
+    done
+    if test "x$missing_perl_modules" = "xyes"; then
+        AC_MSG_WARN([some Perl modules required to compile the Perl virt-* tools are missing])
+    fi
+])
+
+AM_CONDITIONAL([HAVE_TOOLS],
+    [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"])
-- 
2.5.0




More information about the Libguestfs mailing list