mirror of
https://github.com/libguestfs/libguestfs.git
synced 2026-03-22 07:03:38 +00:00
e1b48287eb
My patch was wrong. I kept the sed transformation the same in the two places, but it wasn't strict enough to also work on the file contents. Sorry about that. This fixes it. >From 93927cc7b9f63c414e5bfeb7eba393fde3295601 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering@redhat.com> Date: Fri, 20 Nov 2009 16:23:17 +0100 Subject: [PATCH libguestfs] build: correct sed transformation to work also on .git-module-status * autogen.sh: Use a more strict sed transformation so it works also on the contents of .git-module-status, which has no prefix. * cfg.mk (_submodule_hash): Use a stricter sed regexp.
78 lines
2.4 KiB
Bash
Executable File
78 lines
2.4 KiB
Bash
Executable File
#!/bin/bash -
|
|
# libguestfs
|
|
# Copyright (C) 2009 Red Hat Inc.
|
|
#
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
#
|
|
# Rebuild the autotools environment.
|
|
|
|
set -e
|
|
set -v
|
|
|
|
# Ensure that whenever we pull in a gnulib update or otherwise change to a
|
|
# different version (i.e., when switching branches), we also rerun ./bootstrap.
|
|
curr_status=.git-module-status
|
|
t=$(git submodule status|sed 's/^[ -]//;s/ .*//')
|
|
if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
|
|
: # good, it's up to date
|
|
else
|
|
echo running bootstrap...
|
|
./bootstrap && echo "$t" > $curr_status
|
|
fi
|
|
|
|
CONFIGUREDIR=.
|
|
|
|
# Run configure in BUILDDIR if it's set
|
|
if [ ! -z "$BUILDDIR" ]; then
|
|
mkdir -p $BUILDDIR
|
|
cd $BUILDDIR
|
|
|
|
CONFIGUREDIR=..
|
|
fi
|
|
|
|
# Ensure that an ocaml package is present for build-from sources.
|
|
# This is *not* for anything that is required at configure-time
|
|
# when configure is run from a distribution tarball. From those,
|
|
# nothing ocaml-related is required.
|
|
# ocamlfind cannot detect the presence of -devel packages directly,
|
|
# so if $pkg ends in -devel, first check for the base package, and
|
|
# if that's found, check for the existence of $base.cmxa in the
|
|
# resulting directory.
|
|
require_ocaml_pkg()
|
|
{
|
|
pkg=$1
|
|
case $pkg in
|
|
*-devel)
|
|
local base=${pkg%%-devel}
|
|
local dir=$(ocamlfind query "$base") || return 1
|
|
test -f "$dir/$base.cmxa" || return 1
|
|
;;
|
|
*) ocamlfind query "$pkg" > /dev/null 2>&1 || return 1;;
|
|
esac
|
|
return 0
|
|
}
|
|
|
|
{ require_ocaml_pkg xml-light && require_ocaml_pkg xml-light-devel; } \
|
|
|| { echo "you must have ocaml, ocamlfind, ocaml-xml-light" \
|
|
"and ocaml-xml-light-devel" >&2; exit 1; }
|
|
|
|
# If no arguments were specified and configure has run before, use the previous
|
|
# arguments
|
|
if [ $# == 0 -a -x ./config.status ]; then
|
|
./config.status --recheck
|
|
else
|
|
$CONFIGUREDIR/configure "$@"
|
|
fi
|