[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] build: avoid m4_expand for RHEL 5



Problem introduced in commit cd699ed.

* m4/virt-lib.m4 (LIBVIRT_CHECK_LIB, LIBVIRT_CHECK_PKG): Set up
direct expansions, since autoconf 2.59 lacked m4_expand.
---

Pushing under the build-breaker rule, once I finish testing.

 m4/virt-lib.m4 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/m4/virt-lib.m4 b/m4/virt-lib.m4
index 771c376..778cd40 100644
--- a/m4/virt-lib.m4
+++ b/m4/virt-lib.m4
@@ -84,16 +84,16 @@ AC_DEFUN([LIBVIRT_CHECK_LIB],[
       if test "x$with_var" != "xcheck"; then
         fail=1
       fi
-      m4_expand(with_var[=no])
+      with_var=no
     ])
     if test "$fail" = "0" && test "x$with_var" != "xno" ; then
       AC_CHECK_HEADER([header_name], [
-        m4_expand(with_var[=yes])
+        with_var=yes
       ],[
         if test "x$with_var" != "xcheck"; then
           fail=1
         fi
-        m4_expand(with_var[=no])
+        with_var=no
       ])
     fi
   fi
@@ -218,20 +218,20 @@ AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[
         if test "x$with_var" != "xcheck"; then
           fail=1
         fi
-        m4_expand(with_var[=no])
+        with_var=no
       ])
     ])
     if test "$fail" = "0" && test "x$with_var" != "xno" ; then
       AC_CHECK_HEADER([header_name], [
-        m4_expand(with_var[=yes])
+        with_var=yes
       ],[
         AC_CHECK_HEADER([header_name_alt], [
-          m4_expand(with_var[=yes])
+          with_var=yes
         ],[
           if test "x$with_var" != "xcheck"; then
             fail=1
           fi
-          m4_expand(with_var[=no])
+          with_var=no
         ])
       ])
     fi
@@ -326,12 +326,12 @@ AC_DEFUN([LIBVIRT_CHECK_PKG],[
   fail=0
   if test "x$with_var" != "xno" ; then
     PKG_CHECK_MODULES(check_name, pc_name[ >= ]pc_version, [
-      m4_expand(with_var[=yes])
+      with_var=yes
     ],[
       if test "x$with_var" != "xcheck"; then
         fail=1
       fi
-      m4_expand(with_var[=no])
+      with_var=no
     ])
   fi

-- 
1.8.0.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]