Skip to content

Commit 0f088f5

Browse files
committed
Distinguish configure scripts on release mode and non release mode.
Although makefiles in Subversion's release tarball do not support generating SWIG language bindings C source files using swig, the configure scripts shipped with the release tarball had an option to specify how to find SWIG executable, and checked it. To avoid this, we introduce "release mode" to the configure script and hide the option and code to check a SWIG executable on it. * . (svn:ignore): Ignore aclocal.m4. * Makefile.in (local-extraclean): Clean up aclocal.m4. * aclocal.m4.in (): Renamed from aclocal.m4 * autogen.sh (): Write an macro "SVN_RELEASE_MODE" definition to aclocal.m4 if --release is specfied on the command line. * build/ac-macros/swig.m4 (): Also mension about Perl and Ruby. (SVN_CHECK_SWIG): - Hide --with-swig option in release mode. - Check SWIG executable only if non release mode and at least one of SWIG bindings is specfied to be built. (SVN_FIND_SWIG): Move checks for each bindings into new macro SVN_DETERMINE_SWIG_OPTS. (SVN_DETERMINE_SWIG_OPTS): New macro split from SVN_FIND_SWIG. - When not in release mode, warn if Perl/Python/Ruby interpreter is set but SWIG is not found. Also do not build them with make swig-pl/make swig-py/ make swig-rb in this case. - Check swig version only when it is needed and when not in release mode. * configure.ac (): - Tweak help string for --with-swig-perl, --with-swig-python, --with-swig-ruby. - Warn if --with-swig-perl is not specified but variable 'PERL' is set. - Warn if --with-swig-ruby is not specified but variable 'RUBY' is set, even the value is not 'no' nor 'none'. * subversion/bindings/swig/INSTALL (Step 2): Mention that configure and makefiles in the release tarball don't support generating SWIG bindings C source files. Review by: brane (commit message, help string, and the structure of SVN_CHECK_SWIG macro) git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1884610 13f79535-47bb-0310-9956-ffa450edef68
1 parent 68a47a5 commit 0f088f5

File tree

6 files changed

+527
-233
lines changed

6 files changed

+527
-233
lines changed

Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,7 @@ local-distclean: local-clean
478478
local-extraclean: extraclean-bindings local-distclean
479479
rm -f $(top_srcdir)/build-outputs.mk \
480480
$(top_srcdir)/subversion/svn_private_config.h.in \
481+
$(top_srcdir)/aclocal.m4 \
481482
$(top_srcdir)/configure \
482483
$(top_srcdir)/gen-make.opts \
483484
$(top_srcdir)/build/config.guess \
File renamed without changes.

autogen.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,17 @@ while test $# != 0; do
5151
;;
5252
esac
5353
done
54+
55+
# Generate aclocal.m4
56+
cp -f aclocal.m4.in aclocal.m4
57+
if test -n "$RELEASE_MODE"; then
58+
cat <<EOF >>aclocal.m4
59+
60+
# Generated by 'autogen.sh --release'
61+
AC_DEFUN([SVN_RELEASE_MODE],[1])
62+
EOF
63+
fi
64+
5465
# ### The order of parameters is important; buildcheck.sh depends on it and
5566
# ### we don't want to copy the fancy option parsing loop there. For the
5667
# ### same reason, all parameters should be quoted, so that buildcheck.sh

0 commit comments

Comments
 (0)