X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=autogen.sh;h=794d25c437c23a4ee8edc56a071ad61524ca32f3;hp=6e89c842b86afb1935aae7e22af8f24963de6612;hb=8bc6e9d6a89672bbe1e7469774abe889354deb67;hpb=9e5fabbe01c0964f7124595beec01dde836d93a6

diff --git a/autogen.sh b/autogen.sh
index 6e89c84..794d25c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -14,7 +14,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # Rebuild the autotools environment.
 
@@ -42,35 +42,9 @@ if [ ! -z "$BUILDDIR" ]; then
     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
+if test $# == 0 && test -x ./config.status; then
     ./config.status --recheck
 else
     $CONFIGUREDIR/configure "$@"