git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Freshen POD (manual pages) stylesheet.
[libguestfs.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index
bd15a27
..
6e89c84
100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-24,7
+24,7
@@
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
# 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)
+t=$(git submodule status
|sed 's/^[ +-]//;s/ .*//'
)
if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
: # good, it's up to date
else
if test "$t" = "$(cat $curr_status 2>/dev/null)"; then
: # good, it's up to date
else
@@
-46,21
+46,27
@@
fi
# 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.
# 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
require_ocaml_pkg()
{
pkg=$1
- test -d .git || return 1
- url=$(git config remote.origin.url) || return 1
- case $url in
- *git.et.redhat.com/libguestfs.git) ;;
- *) return 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
esac
- ocamlfind query "$pkg" || return 1
return 0
}
return 0
}
-require_ocaml_pkg xml-light \
- || { echo "you must have ocaml, ocamlfind and ocaml-xml-light"; exit 1; }
+{ 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 no arguments were specified and configure has run before, use the previous
# arguments