Author: danielsh
Date: Fri Dec 31 11:01:56 2010
New Revision: 1054087
URL: http://svn.apache.org/viewvc?rev=1054087&view=rev
Log:
Don't error on 'none: bad command or file name' when SWIG was disabled
at configure-time.
(Yes, I'm on Debian, thanks for asking.)
* Makefile.in
(check-SWIG): New target.
(swig-py, swig-pl, swig-rb): Use new target to fail early.
* build/generator/gen_make.py
(Generator.write): Use the new target in build-outputs.mk, too.
* build/ac-macros/swig.m4
(SVN_FIND_SWIG): Don't check for 'none', just set the thing to 'none'.
As a side effect, the message to stdout is obliterated.
Modified:
subversion/trunk/Makefile.in
subversion/trunk/build/ac-macros/swig.m4
subversion/trunk/build/generator/gen_make.py
Modified: subversion/trunk/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1054087&r1=1054086&r2=1054087&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Fri Dec 31 11:01:56 2010
@@ -702,6 +702,12 @@ install-man:
install-swig-py: install-swig-py-lib
install-swig-rb: install-swig-rb-lib
+check-SWIG:
+ if [ "$(SWIG)" = "none" ]; then \
+ echo "SWIG disabled at configure time" >&2; \
+ exit 1; \
+ fi
+
clean-swig: clean-swig-headers clean-swig-py clean-swig-rb clean-swig-pl
extraclean-swig: extraclean-swig-headers extraclean-swig-py \
extraclean-swig-rb extraclean-swig-pl
@@ -730,7 +736,7 @@ READLINK_PL=$(PERL) -e 'use Cwd; print C
swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
$(SWIG_PL_DIR)/native/Makefile
-swig-pl: $(swig-pl_DEPS)
+swig-pl: check-SWIG $(swig-pl_DEPS)
if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL)
$(SWIG_PL_SRC_DIR)`"; then \
ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \
fi
@@ -773,7 +779,7 @@ copy-swig-py: autogen-swig-py $(SWIG_PY_
done
@touch $(SWIG_PY_DIR)/libsvn/__init__.py
-swig-py: autogen-swig-py copy-swig-py
+swig-py: check-SWIG autogen-swig-py copy-swig-py
check-swig-py: swig-py
cd $(SWIG_PY_DIR); \
@@ -795,7 +801,7 @@ clean-swig-py:
extraclean-swig-py: clean-swig-py
$(EXTRACLEAN_SWIG_PY)
-swig-rb: autogen-swig-rb
+swig-rb: check-SWIG autogen-swig-rb
check-swig-rb: swig-rb svnserve
cd $(SWIG_RB_DIR); \
Modified: subversion/trunk/build/ac-macros/swig.m4
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/ac-macros/swig.m4?rev=1054087&r1=1054086&r2=1054087&view=diff
==============================================================================
--- subversion/trunk/build/ac-macros/swig.m4 (original)
+++ subversion/trunk/build/ac-macros/swig.m4 Fri Dec 31 11:01:56 2010
@@ -55,7 +55,7 @@ AC_DEFUN(SVN_FIND_SWIG,
where=$1
if test $where = no; then
- AC_PATH_PROG(SWIG, none, none)
+ SWIG=none
elif test $where = check; then
AC_PATH_PROG(SWIG, swig, none)
else
Modified: subversion/trunk/build/generator/gen_make.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1054087&r1=1054086&r2=1054087&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Fri Dec 31 11:01:56 2010
@@ -349,9 +349,16 @@ class Generator(gen_base.GeneratorBase):
continue
outputs = [ ]
+
+ # Fake CHECK-SWIG dependency, because these targets are in
+ # both Makefile.in AND build-outputs.mk
+ if itype == "swig-rb" or itype == "swig-py" or itype == "swig-pl":
+ outputs.append('check-SWIG')
+
for t in i_targets:
if hasattr(t, 'filename'):
outputs.append(t.filename)
+
data.itargets.append(_eztdata(type=itype, outputs=outputs))
########################################
