summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-03-31 01:44:42 +0000
committerTim Potter <tpot@samba.org>2003-03-31 01:44:42 +0000
commit4b664cfccbb5defa1088e897b012b939c3d99ca9 (patch)
tree7ac0ec1d74cd8896e02bf2e35d8553d496185f3b
parent663e5a380cfcab97b24efd3ebbb2869516953023 (diff)
downloadsamba-4b664cfccbb5defa1088e897b012b939c3d99ca9.tar.gz
samba-4b664cfccbb5defa1088e897b012b939c3d99ca9.tar.bz2
samba-4b664cfccbb5defa1088e897b012b939c3d99ca9.zip
Break the current build dependency on perl. Perl is required for
include/tdbsam2_parse_info.h which is included by sam/gumm_tdb.c which doesn't seem to be used anywhere. It would be nice to have the tdbsam2 stuff hidden behind a --with configuration parameter so it doesn't interfere with normal builds. (One of the build farm machines doesn't have perl installed). (This used to be commit 58924582e8bb922680860a13a89381b44906e9bc)
-rw-r--r--source3/Makefile.in11
1 files changed, 8 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d9e29ed7b1..f712d99693 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -21,6 +21,7 @@ LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@ @CFLAGS@
AWK=@AWK@
DYNEXP=@DYNEXP@
PYTHON=@PYTHON@
+PERL=@PERL@
TERMLDFLAGS=@TERMLDFLAGS@
TERMLIBS=@TERMLIBS@
@@ -1253,9 +1254,13 @@ utils/net_proto.h:
$(NET_OBJ1)
include/tdbsam2_parse_info.h:
- @cd $(srcdir) && @PERL@ -w script/genstruct.pl \
- -o include/tdbsam2_parse_info.h $(CC) -E -O2 -g \
- include/tdbsam2.h
+ @if test -n "$(PERL)"; then \
+ cd $(srcdir) && @PERL@ -w script/genstruct.pl \
+ -o include/tdbsam2_parse_info.h $(CC) -E -O2 -g \
+ include/tdbsam2.h; \
+ else \
+ echo Unable to build $@, continuing; \
+ fi
# "make headers" or "make proto" calls a subshell because we need to
# make sure these commands are executed in sequence even for a