r9939: Add configure check for yapp.

(This used to be commit 0300f2329c71429e43ed18e6f411985a76e5aad5)

diff --git a/source4/build/m4/check_perl.m4 b/source4/build/m4/check_perl.m4
index 34a7e5e7699de2bcf23cd0976e35fffbe3775222..2e090ef7cef9b87e10eaf748a97b4959119dabcd 100644 (file)
--- 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 e2ab304adcf1fc0a4d5dce80d8862a545916dfd1..eeb6dac461d865a23ccff8eb3ca28e7513f3793f 100644 (file)
--- 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 78898d5b547a37da5fe60d0c683b2edb03a17a5b..fae77d49538336b000c5be706846f0c12ad9b17d 100644 (file)
--- 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"