diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-06-01 10:20:37 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-06-01 10:20:37 +0000 |
| commit | 0af91800f9807594c108bceed17531d031954363 (patch) | |
| tree | ad70df327be97fb6e5da137cddfa1e4cc9d511fc | |
| parent | 3600d2f708fb9657ff505deff2999cde31632c80 (diff) | |
| download | tor-0af91800f9807594c108bceed17531d031954363.tar.gz tor-0af91800f9807594c108bceed17531d031954363.zip | |
r13131@catbus: nickm | 2007-06-01 06:20:29 -0400
Test for ~/.svk/local, not ~/.svk. Eschew use of test -a and test -o. Bulletproof more against odd shells.
svn:r10439
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/or/Makefile.am | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 7b0c5d9593..b64c67ba01 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -45,19 +45,19 @@ h="" if test x$2 = xdevpkg; then h=" headers for" fi -if test -f /etc/debian_version -a x"$tor_$1_$2_debian" != x; then +if test -f /etc/debian_version && test x"$tor_$1_$2_debian" != x; then AC_WARN([On Debian, you can install$h $1 using "apt-get install $tor_$1_$2_debian"]) if test x"$tor_$1_$2_debian" != x"$tor_$1_devpkg_debian"; then AC_WARN([ You will probably need $tor_$1_devpkg_debian too.]) fi fi -if test -f /etc/fedora-release -a x"$tor_$1_$2_redhat" != x; then +if test -f /etc/fedora-release && test x"$tor_$1_$2_redhat" != x; then AC_WARN([On Fedora Core, you can install$h $1 using "yum install $tor_$1_$2_redhat"]) if test x"$tor_$1_$2_redhat != x"$tor_$1_devpkg_redhat"; then AC_WARN([ You will probably need $tor_$1_devpkg_redhat too.]) fi else - if test -f /etc/redhat-release -a x"$tor_$1_$2_redhat" != x; then + if test -f /etc/redhat-release && test x"$tor_$1_$2_redhat" != x; then AC_WARN([On most Redhat-based systems, you can get$h $1 by installing the $tor_$1_$2_redhat" RPM package]) if test x"$tor_$1_$2_redhat" != x"$tor_$1_devpkg_redhat"; then AC_WARN([ You will probably need $tor_$1_devpkg_redhat too.]) @@ -98,7 +98,7 @@ AC_CACHE_CHECK([for $1 directory], tor_cv_library_$1_dir, [ fi # Skip the directory if it isn't there. - if test ! -d "$tor_trydir" -a "$tor_trydir" != "(system)"; then + if test ! -d "$tor_trydir" && test "$tor_trydir" != "(system)"; then continue; fi diff --git a/configure.in b/configure.in index 7d062573cc..ce3e578946 100644 --- a/configure.in +++ b/configure.in @@ -274,7 +274,7 @@ AC_CHECK_HEADERS(linux/netfilter_ipv4.h, if test x$transparent = xtrue ; then transparent_ok=0 - if test x$net_if_found = x1 -a x$net_pfvar_found = x1 ; then + if test x$net_if_found = x1 && test x$net_pfvar_found = x1 ; then transparent_ok=1 fi if test x$linux_netfilter_ipv4 = x1 ; then diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 2b35ef75c7..5fda7e5cbc 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -39,11 +39,11 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i tor_main.o: micro-revision.i micro-revision.i: FORCE - @if test -d ../../.svn -a x`which svn` != x ; then \ + @if test -d ../../.svn && test x`which svn` != x ; then \ svn info ../.. | \ sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \ || true; \ - elif test x`which svk` != x && test -d ~/.svk; then \ + elif test x`which svk` != x && test -d ~/.svk/local; then \ location=../..; \ rev=x; \ while test x$$rev = xx; do \ @@ -71,7 +71,7 @@ micro-revision.i: FORCE echo '""' > micro-revision.i; \ fi; \ elif test ! -f micro-revision.i || \ - test "`cat micro-revision.tmp`" != "`cat micro-revision.i`"; then \ + test x"`cat micro-revision.tmp`" != x"`cat micro-revision.i`"; then \ mv micro-revision.tmp micro-revision.i; \ fi |