On 19.07.2013 13:20, Eric Blake wrote:
On 07/19/2013 01:30 AM, Michal Privoznik wrote:
> Currently, in the autogen.sh script we check whether .git is an existing
> directory in which case bootstrap is run. However, if libvirt is a
> submodule, then the .git is just a file (with reference to the topmost
> .git directory). However, our submodule routines work well. So there's
> no real reason why we should prohibit users to build libvirt from
> submodule.
> ---
>
> diff to v1:
> - prefer || over -o
>
> autogen.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/autogen.sh b/autogen.sh
> index 42e5608..f7c2022 100755
> --- a/autogen.sh
> +++ b/autogen.sh
> @@ -64,7 +64,7 @@ bootstrap_hash()
> # like to run 'git clean -x -f po' to fix it; but only ./bootstrap
regenerates
> # the required file po/Makevars.
> # Only run bootstrap from a git checkout, never from a tarball.
> -if test -d .git; then
> +if test -d .git || -f .git; then
Simpler as:
if test -r .git; then
ACK. Out of curiousity, what project is using libvirt as a submodule?
One of my GSoC students is working on a wireshark dissector and he
basically has both libvirt and wireshark as submodules.
Michal