summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/build/m4/check_perl.m42
-rw-r--r--source4/build/smb_build/makefile.pm1
-rw-r--r--source4/main.mk4
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"