--- subversion-1.3.0/build/ac-macros/swig.m4.orig	2005-10-25 14:23:16 +0300

+++ subversion-1.3.0/build/ac-macros/swig.m4	2006-01-19 01:19:04 +0200

@@ -184,28 +184,30 @@ AC_DEFUN(SVN_FIND_SWIG,

     ])

     SWIG_RB_LINK="$svn_cv_ruby_link"

-    AC_CACHE_VAL([svn_cv_ruby_sitedir],[

-      svn_cv_ruby_sitedir="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(sitedir))'`"

-    ])

-    AC_ARG_WITH([ruby-sitedir],

-    AC_HELP_STRING([--with-ruby-sitedir=SITEDIR],

-                               [install Ruby bindings in SITEDIR

-                                (default is same as ruby's one)]),

-    [svn_ruby_installdir="$withval"],

-    [svn_ruby_installdir="$svn_cv_ruby_sitedir"])

-

     AC_MSG_CHECKING([where to install Ruby scripts])

-    AC_CACHE_VAL([svn_cv_ruby_sitedir_libsuffix],[

-      svn_cv_ruby_sitedir_libsuffix="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(sitelibdir)).sub(/^#{Config::CONFIG.fetch(%q(sitedir))}/, %q())'`"

+    AC_CACHE_VAL([svn_cv_ruby_sitelibdir],[

+      svn_cv_ruby_sitelibdir="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(sitelibdir))'`"

     ])

-    SWIG_RB_SITE_LIB_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_libsuffix}"

+    AC_ARG_WITH([ruby-sitelibdir],

+    AC_HELP_STRING([--with-ruby-sitelibdir=SITELIBDIR],

+                               [install Ruby scripts in SITELIBDIR

+                                (default is same as ruby's one)]),

+    [svn_ruby_sitelibdir="$withval"],

+    [svn_ruby_sitelibdir="$svn_cv_ruby_sitelibdir"])

+    SWIG_RB_SITE_LIB_DIR="${svn_ruby_sitelibdir}"

     AC_MSG_RESULT([$SWIG_RB_SITE_LIB_DIR])

     AC_MSG_CHECKING([where to install Ruby extensions])

-    AC_CACHE_VAL([svn_cv_ruby_sitedir_archsuffix],[

-      svn_cv_ruby_sitedir_archsuffix="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(sitearchdir)).sub(/^#{Config::CONFIG.fetch(%q(sitedir))}/, %q())'`"

+    AC_CACHE_VAL([svn_cv_ruby_sitearchdir],[

+      svn_cv_ruby_sitearchdir="`$RUBY -rrbconfig -e 'print Config::CONFIG.fetch(%q(sitearchdir))'`"

     ])

-    SWIG_RB_SITE_ARCH_DIR="${svn_ruby_installdir}${svn_cv_ruby_sitedir_archsuffix}"

+    AC_ARG_WITH([ruby-sitearchdir],

+    AC_HELP_STRING([--with-ruby-sitearchdir=SITEARCHDIR],

+                               [install Ruby extensions in SITEARCHDIR

+                                (default is same as ruby's one)]),

+    [svn_ruby_sitearchdir="$withval"],

+    [svn_ruby_sitearchdir="$svn_cv_ruby_sitearchdir"])

+    SWIG_RB_SITE_ARCH_DIR="${svn_ruby_sitearchdir}"

     AC_MSG_RESULT([$SWIG_RB_SITE_ARCH_DIR])

     AC_MSG_CHECKING([how to use output level for Ruby bindings tests])