[libvirt] [PATCH] build: fix bootstrap on MacOS X

[Eric Blake]

On 10/05/2010 10:39 AM, Justin Clift wrote:
> On 10/06/2010 02:15 AM, Eric Blake wrote:
>> * .gnulib: Update to latest, for bootstrap fixes.
>> * bootstrap: Synchronize with upstream.
>> * bootstrap.conf: Add pkg-config pre-requisite.
>> ---
>>
>>> As a thought, after installing pkg-config back onto the system, the
>>> above error about "CONFIG-pkg-config" not being found still happens,
>>> so something isn't right. :/
>
> ACK. It now runs through correctly when pkg-config is on the system,
> and also errors out with a useful error if it's not found:

Thanks for testing.  Pushed with one tweak suggested by Bruno Haible. 
Gnulib itself doesn't depend on pkg-config; when libvirt's bootstrap 
process fails, we don't want to confuse users with a message that might 
cause them to look to the wrong package for a fix.

diff --git i/autogen.sh w/autogen.sh
index 3fff381..6c2e3bc 100755
--- i/autogen.sh
+++ w/autogen.sh
@@ -49,7 +49,7 @@ if test "$t" = "$(cat $curr_status 2>/dev/null)" \
  else
      echo running bootstrap...
      ./bootstrap && bootstrap_hash > $curr_status \
-      || { echo "Failed to bootstrap gnulib, please investigate."; exit 
1; }
+      || { echo "Failed to bootstrap, please investigate."; exit 1; }
  fi

  cd "$THEDIR"


-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org