diff options
author | Jim Meyering <meyering@redhat.com> | 2011-06-28 20:09:54 +0200 |
---|---|---|
committer | Richard W.M. Jones <rjones@redhat.com> | 2011-06-28 23:33:13 +0100 |
commit | f5098279b6d0de51b5dd855ee499ced157a33995 (patch) | |
tree | 8340054e7108c247d569d3ba0ce472625853cf75 | |
parent | 72daf40de09cdf78f951a941bf6fbf271bf9d44d (diff) | |
download | hivex-f5098279b6d0de51b5dd855ee499ced157a33995.tar.gz hivex-f5098279b6d0de51b5dd855ee499ced157a33995.tar.xz hivex-f5098279b6d0de51b5dd855ee499ced157a33995.zip |
maint: avoid using test's -a and -o operators; they are not portable
* configure.ac: use "test C1 && test C2", not "test C1 -a C2";
* autogen.sh: Likewise.
* sh/hivexget: Use "test C1 || test C2", not "test C1 -o C2"
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | configure.ac | 16 | ||||
-rwxr-xr-x | sh/hivexget | 2 |
3 files changed, 11 insertions, 9 deletions
@@ -51,7 +51,7 @@ mkdir -p perl/lib/Win # 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 "$@" diff --git a/configure.ac b/configure.ac index 1d929b4..22b806f 100644 --- a/configure.ac +++ b/configure.ac @@ -173,8 +173,10 @@ AC_SUBST([LIBXML2_LIBS]) dnl Check for OCaml (optional, for OCaml bindings). AC_PROG_OCAML AC_PROG_FINDLIB -AM_CONDITIONAL([HAVE_OCAML],[test "x$OCAMLC" != "xno" -a "x$OCAMLFIND" != "xno"]) -AM_CONDITIONAL([HAVE_OCAMLOPT], [test "x$OCAMLOPT" != "xno" -a "x$OCAMLFIND" != "xno"]) +AM_CONDITIONAL([HAVE_OCAML], + [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"]) +AM_CONDITIONAL([HAVE_OCAMLOPT], + [test "x$OCAMLOPT" != "xno" && test "x$OCAMLFIND" != "xno"]) if test "x$OCAMLC" != "xno"; then dnl Check if we have caml/unixsupport.h header (OCaml bindings only). @@ -226,7 +228,7 @@ if test "x$missing_perl_modules" = "xyes"; then fi AM_CONDITIONAL([HAVE_PERL], - [test "x$PERL" != "xno" -a "x$missing_perl_modules" != "xyes"]) + [test "x$PERL" != "xno" && test "x$missing_perl_modules" != "xyes"]) dnl Check for Python (optional, for Python bindings). AC_CHECK_PROG([PYTHON],[python],[python],[no]) @@ -265,14 +267,14 @@ AC_SUBST(PYTHON_INCLUDEDIR) AC_SUBST(PYTHON_SITE_PACKAGES) AM_CONDITIONAL([HAVE_PYTHON], - [test "x$PYTHON_INCLUDEDIR" != "x" -a "x$PYTHON_SITE_PACKAGES" != "x"]) + [test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_SITE_PACKAGES" != "x"]) dnl dnl Check for Ruby and rake (optional, for Ruby bindings). dnl AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0]) dnl AC_CHECK_PROG([RAKE],[rake],[rake],[no]) dnl AM_CONDITIONAL([HAVE_RUBY], -dnl [test "x$RAKE" != "xno" -a -n "$HAVE_LIBRUBY"]) +dnl [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"]) dnl dnl Check for Java. dnl AC_ARG_WITH(java_home, @@ -282,7 +284,7 @@ dnl [], dnl [with_java_home=check]) dnl if test "x$with_java_home" != "xno"; then -dnl if test "x$with_java_home" != "xyes" -a "x$with_java_home" != "xcheck" +dnl if test "x$with_java_home" != "xyes" && test "x$with_java_home" != "xcheck" dnl then dnl # Reject unsafe characters in $JAVA_HOME dnl jh_lf=' @@ -304,7 +306,7 @@ dnl for d in \ dnl /usr/lib/jvm/java \ dnl /usr/lib/jvm/java-6-openjdk dnl do -dnl if test -d $d -a -f $d/bin/java; then +dnl if test -d $d && test -f $d/bin/java; then dnl JAVA_HOME=$d dnl break dnl fi diff --git a/sh/hivexget b/sh/hivexget index f804d0d..be73d62 100755 --- a/sh/hivexget +++ b/sh/hivexget @@ -17,7 +17,7 @@ set -e -if [ $# -lt 2 -o $# -gt 3 ]; then +if test $# -lt 2 || test $# -gt 3; then echo "hivexget hivefile path [key]" exit 1 fi |