Fix mysterious error message when running 'make python_{ext,install}'

without configuring with python.
(This used to be commit 01a89690a2e9d234188704c04e58b5dfa2e7d1f3)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6a7f21b31101530a84e72892b4c3838369d4ce3b..89d15a2bb9b99b0160d695820de87cd39cf2155b 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -894,11 +894,17 @@ python_common_proto:
                $(PY_COMMON_PROTO_OBJ)
 
 python_ext: $(PYTHON_OBJS)
+       @if test -z "$(PYTHON)"; then \
+               echo Use the option --with-python to configure python; \
+               exit 1; fi
        PYTHON_OBJS="$(PYTHON_OBJS)" PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS) $(FLAGS)" \
-       LIBS="$(LIBS)" \
+x1     LIBS="$(LIBS)" \
                $(PYTHON) python/setup.py build
 
 python_install: $(PYTHON_OBJS)
+       @if test -z "$(PYTHON)"; then \
+               echo Use the option --with-python to configure python; \
+               exit 1; fi
        PYTHON_OBJS="$(PYTHON_OBJS)" PYTHON_CFLAGS="$(CFLAGS) $(CPPFLAGS)" \
        LIBS="$(LIBS)" \
                $(PYTHON) python/setup.py install

diff --git a/source3/configure.in b/source3/configure.in
index 7a8f259bd4f3717a0c0113e7aad169451806e259..906bf5f348e6c267503a2468ca1c6322123ea080 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3115,10 +3115,6 @@ AC_SUBST(FLAGS1)
 # though they can coexist in different directories.)  In the future
 # this might make the Python stuff be built by default.
 
-# FIXME: At the moment, if you don't configure with python, but try to
-# build "python_ext", then you get a very mysterious error message,
-# because $(PYTHON) is "".
-
 AC_ARG_WITH(python,
 [  --with-python=PYTHONNAME  build Python libraries],
 [ case "${withval-python}" in