nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

r13131@catbus: nickm | 2007-06-01 06:20:29 -0400

Browse Source 
Test for ~/.svk/local, not ~/.svk.  Eschew use of test -a and test -o.  Bulletproof more against odd shells.


svn:r10439
This commit is contained in:
Nick Mathewson 2007-06-01 10:20:37 +00:00
parent 3600d2f708
commit 0af91800f9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acinclude.m4
View File

@ -45,19 +45,19 @@ h=""
if test x$2 = xdevpkg; then if test x$2 = xdevpkg; then
h=" headers for" h=" headers for"
fi 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"]) 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 if test x"$tor_$1_$2_debian" != x"$tor_$1_devpkg_debian"; then
AC_WARN([ You will probably need $tor_$1_devpkg_debian too.]) AC_WARN([ You will probably need $tor_$1_devpkg_debian too.])
fi fi
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"]) 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 if test x"$tor_$1_$2_redhat != x"$tor_$1_devpkg_redhat"; then
AC_WARN([ You will probably need $tor_$1_devpkg_redhat too.]) AC_WARN([ You will probably need $tor_$1_devpkg_redhat too.])
fi fi
else 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]) 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 if test x"$tor_$1_$2_redhat" != x"$tor_$1_devpkg_redhat"; then
AC_WARN([ You will probably need $tor_$1_devpkg_redhat too.]) 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 fi
# Skip the directory if it isn't there. # 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; continue;
fi fi

2
configure.in
View File

@ -274,7 +274,7 @@ AC_CHECK_HEADERS(linux/netfilter_ipv4.h,
if test x$transparent = xtrue ; then if test x$transparent = xtrue ; then
transparent_ok=0 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 transparent_ok=1
fi fi
if test x$linux_netfilter_ipv4 = x1 ; then if test x$linux_netfilter_ipv4 = x1 ; then

6
src/or/Makefile.am
View File

@ -39,11 +39,11 @@ noinst_HEADERS = or.h eventdns.h eventdns_tor.h micro-revision.i
tor_main.o: micro-revision.i tor_main.o: micro-revision.i
micro-revision.i: FORCE 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 ../.. | \ svn info ../.. | \
sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \ sed -n 's/^Revision: \([0-9][0-9]*\).*/"\1"/p' > micro-revision.tmp \
|| true; \ || true; \
elif test x`which svk` != x && test -d ~/.svk; then \ elif test x`which svk` != x && test -d ~/.svk/local; then \
location=../..; \ location=../..; \
rev=x; \ rev=x; \
while test x$$rev = xx; do \ while test x$$rev = xx; do \
@ -71,7 +71,7 @@ micro-revision.i: FORCE
echo '""' > micro-revision.i; \ echo '""' > micro-revision.i; \
fi; \ fi; \
elif test ! -f micro-revision.i || \ 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; \ mv micro-revision.tmp micro-revision.i; \
fi fi