From: Eric Blake <eblake@redhat.com>
Date: Fri, 11 Jan 2013 18:30:55 +0000 (-0700)
Subject: build: avoid m4_expand for RHEL 5
X-Git-Tag: v1.0.2-rc1~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10370efb29f3dce7ff1fe8bafdf815728bc78249;p=thirdparty%2Flibvirt.git

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.
---

diff --git a/m4/virt-lib.m4 b/m4/virt-lib.m4
index 771c37615e..778cd40a6e 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