summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2002-11-05 02:00:36 +0000
committerTim Potter <tpot@samba.org>2002-11-05 02:00:36 +0000
commitb0c440824d1780c62dde2caa2bd58756aaf78b16 (patch)
treed15f90e4034bd7449b1fc92faedf1464ba323be0 /source3
parentfd59cd42833c0bce9460d40ba6437eb04d48405c (diff)
downloadsamba-b0c440824d1780c62dde2caa2bd58756aaf78b16.tar.gz
samba-b0c440824d1780c62dde2caa2bd58756aaf78b16.tar.bz2
samba-b0c440824d1780c62dde2caa2bd58756aaf78b16.zip
Fix mysterious error message when running 'make python_{ext,install}'
without configuring with python. (This used to be commit 01a89690a2e9d234188704c04e58b5dfa2e7d1f3)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in8
-rw-r--r--source3/configure.in4
2 files changed, 7 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6a7f21b311..89d15a2bb9 100644
--- 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 7a8f259bd4..906bf5f348 100644
--- 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