diff options
| author | James Peach <jpeach@samba.org> | 2005-09-02 03:10:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:36:23 -0500 |
| commit | fd4db6e26ec06f74e8815085d96ef541960a34c7 (patch) | |
| tree | 799a2407f75bf7ca2546c9703554e75d6c25b153 | |
| parent | ad14812b8f036fb47b4817d5ee391416dd9bf567 (diff) | |
| download | samba-fd4db6e26ec06f74e8815085d96ef541960a34c7.tar.gz samba-fd4db6e26ec06f74e8815085d96ef541960a34c7.tar.bz2 samba-fd4db6e26ec06f74e8815085d96ef541960a34c7.zip | |
r9939: Add configure check for yapp.
(This used to be commit 0300f2329c71429e43ed18e6f411985a76e5aad5)
| -rw-r--r-- | source4/build/m4/check_perl.m4 | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 1 | ||||
| -rw-r--r-- | source4/main.mk | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/source4/build/m4/check_perl.m4 b/source4/build/m4/check_perl.m4 index 34a7e5e769..2e090ef7ce 100644 --- a/source4/build/m4/check_perl.m4 +++ b/source4/build/m4/check_perl.m4 @@ -14,5 +14,7 @@ if test x"$debug" = x"yes";then PERL="$PERL -W" fi +AC_PATH_PROG(YAPP, yapp, false) + PIDL_ARGS="" AC_SUBST(PIDL_ARGS) diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index e2ab304adc..eeb6dac461 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -89,6 +89,7 @@ XSLTPROC=$config{XSLTPROC} LEX=$config{LEX} YACC=$config{YACC} +YAPP=$config{YAPP} CPP=$config{CPP} diff --git a/source4/main.mk b/source4/main.mk index 78898d5b54..fae77d4953 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -134,14 +134,14 @@ idl: pidl/lib/Parse/Pidl/IDL.pm @CPP="$(CPP)" PERL="$(PERL)" script/build_idl.sh PARTIAL @PIDL_ARGS@ pidl/lib/Parse/Pidl/IDL.pm: pidl/idl.yp - -yapp -s -m 'Parse::Pidl::IDL' -o pidl/lib/Parse/Pidl/IDL.pm pidl/idl.yp + -$(YAPP) -s -m 'Parse::Pidl::IDL' -o pidl/lib/Parse/Pidl/IDL.pm pidl/idl.yp smb_interfaces: pidl/smb_interfaces.pm $(PERL) -Ipidl script/build_smb_interfaces.pl \ include/smb_interfaces.h pidl/smb_interfaces.pm: pidl/smb_interfaces.yp - -yapp -s -m 'smb_interfaces' -o pidl/smb_interfaces.pm pidl/smb_interfaces.yp + -$(YAPP) -s -m 'smb_interfaces' -o pidl/smb_interfaces.pm pidl/smb_interfaces.yp include/config.h: @echo "include/config.h not present" |