44 lines
1.7 KiB
Plaintext
44 lines
1.7 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.6 2010/09/23 22:12:10 jeremy Exp $
|
|
--- configure.ac.orig Tue Oct 13 09:09:30 2009
|
|
+++ configure.ac Thu Sep 16 14:06:25 2010
|
|
@@ -6,7 +6,7 @@ AC_PREREQ(2.58)
|
|
dnl Get the version of Subversion, using m4's esyscmd() command to do this
|
|
dnl at m4-time, since AC_INIT() requires it then.
|
|
AC_INIT([subversion],
|
|
- [esyscmd(python build/getversion.py SVN subversion/include/svn_version.h)],
|
|
+ [esyscmd(${MODPY_BIN} build/getversion.py SVN subversion/include/svn_version.h)],
|
|
[http://subversion.tigris.org/])
|
|
|
|
AC_CONFIG_SRCDIR(subversion/include/svn_types.h)
|
|
@@ -60,7 +60,7 @@ if test "$INSTALL" = "build/install-sh -c"; then
|
|
INSTALL="$abs_srcdir/$INSTALL"
|
|
fi
|
|
|
|
-AC_SUBST([MKDIR], ["$INSTALL -d"])
|
|
+AC_SUBST([MKDIR], ["/bin/mkdir -p"])
|
|
|
|
# ==== Libraries, for which we may have source to build ======================
|
|
|
|
@@ -769,7 +769,7 @@ AS_HELP_STRING([--enable-gprof],
|
|
# Python: Used for testsuite, and bindings
|
|
|
|
|
|
-PYTHON="`$abs_srcdir/build/find_python.sh`"
|
|
+PYTHON=${MODPY_BIN}
|
|
if test -z "$PYTHON"; then
|
|
AC_MSG_WARN([Python 2.4 or later is required to run the testsuite])
|
|
AC_MSG_WARN([or to use the Subversion Python bindings])
|
|
@@ -787,10 +787,10 @@ SVN_CHECK_JDK($JAVA_OLDEST_WORKING_VER)
|
|
|
|
AC_PATH_PROG(PERL, perl, none)
|
|
|
|
-AC_PATH_PROG(RUBY, ruby, none)
|
|
+AC_PATH_PROG(RUBY, ruby18, none)
|
|
if test "$RUBY" != "none"; then
|
|
if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)'; then
|
|
- AC_PATH_PROG(RDOC, rdoc, none)
|
|
+ AC_PATH_PROG(RDOC, rdoc18, none)
|
|
AC_CACHE_CHECK([for Ruby major version], [svn_cv_ruby_major],[
|
|
svn_cv_ruby_major="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(MAJOR))'`"
|
|
])
|