diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 20:17:56 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 20:17:56 +0200 |
commit | 2fbe25b39d096b55a5dbb80720cd01e08e42a2b0 (patch) | |
tree | 64a0a19d5278bb341396189789fd41e530e31d0d /source4/heimdal_build/internal.m4 | |
parent | 3573420d7d108d796e0b424c131061dc74c23033 (diff) | |
parent | f2ac351d6ef8d240f9e45f4df58b022052457d76 (diff) | |
download | samba-2fbe25b39d096b55a5dbb80720cd01e08e42a2b0.tar.gz samba-2fbe25b39d096b55a5dbb80720cd01e08e42a2b0.tar.bz2 samba-2fbe25b39d096b55a5dbb80720cd01e08e42a2b0.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
(This used to be commit c87a8ba1fef1ba508ad6527d0bae4bcdd5b3cb69)
Diffstat (limited to 'source4/heimdal_build/internal.m4')
-rw-r--r-- | source4/heimdal_build/internal.m4 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4 index 18ecbb75cd..f83fdf7460 100644 --- a/source4/heimdal_build/internal.m4 +++ b/source4/heimdal_build/internal.m4 @@ -186,6 +186,7 @@ SMB_ENABLE(compile_et, NO) # LEX_YACC_COMBINATIONS="" LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.33:bison-2.3" +LEX_YACC_COMBINATIONS="$LEX_YACC_COMBINATIONS flex-2.5.34:bison-2.3" AC_PROG_LEX LEX_BASENAME=`basename "$LEX"` @@ -254,3 +255,7 @@ if test t$ac_cv_func_getprogname != tyes; then SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME, YES) SMB_ENABLE(HEIMDAL_ROKEN_GETPROGNAME_H, YES) fi + +VPATH="$VPATH:\$(HEIMDAL_VPATH)" + +SMB_INCLUDE_MK(heimdal_build/internal.mk) |