summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-11-10 03:08:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:41 -0500
commitd1f4ba08df3844a0d6af5e39ac66e724e68c32b3 (patch)
tree2cbf7c4f447efd08a65acc81a760ae5a63ab7998 /source4/build/smb_build
parent7fb2523b4c9bca00c85307d458605f76deb09599 (diff)
downloadsamba-d1f4ba08df3844a0d6af5e39ac66e724e68c32b3.tar.gz
samba-d1f4ba08df3844a0d6af5e39ac66e724e68c32b3.tar.bz2
samba-d1f4ba08df3844a0d6af5e39ac66e724e68c32b3.zip
r3651: Add a new configure option --with-eparserdir
This allows us to call 'make eparser_idl', generate the files required by the ethereal pidl plugin, and put them in the right place. (See lorikeet/ethereal) Andrew Bartlett (This used to be commit bd9497b092335b2646a1955ea7c55ad33eb7d538)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/check_path.m419
-rw-r--r--source4/build/smb_build/makefile.pl7
2 files changed, 25 insertions, 1 deletions
diff --git a/source4/build/smb_build/check_path.m4 b/source4/build/smb_build/check_path.m4
index bfd15d3d8c..5ceda46d87 100644
--- a/source4/build/smb_build/check_path.m4
+++ b/source4/build/smb_build/check_path.m4
@@ -107,6 +107,24 @@ AC_ARG_WITH(logfilebase,
;;
esac])
+#################################################
+# set configuration directory location
+eparserdir=""
+
+AC_ARG_WITH(eparserdir,
+[ --with-eparserdir=DIR Where to put output for the Ethereal/PIDL plugin],
+[ case "$withval" in
+ yes|no)
+ #
+ # Just in case anybody does it
+ #
+ AC_MSG_ERROR([--with-eparserdir called without argument])
+ ;;
+ * )
+ eparserdir="$withval"
+ ;;
+ esac])
+
AC_SUBST(configdir)
AC_SUBST(lockdir)
AC_SUBST(piddir)
@@ -114,6 +132,7 @@ AC_SUBST(logfilebase)
AC_SUBST(privatedir)
AC_SUBST(bindir)
AC_SUBST(sbindir)
+AC_SUBST(eparserdir)
debug=no
AC_ARG_ENABLE(debug,
diff --git a/source4/build/smb_build/makefile.pl b/source4/build/smb_build/makefile.pl
index 9664728e93..a5e86e76f0 100644
--- a/source4/build/smb_build/makefile.pl
+++ b/source4/build/smb_build/makefile.pl
@@ -29,6 +29,7 @@ exec_prefix=\@exec_prefix\@
VPATH=\@srcdir\@
srcdir=\@srcdir\@
builddir=\@builddir\@
+eparserdir=\@eparserdir\@
BASEDIR= \@prefix\@
BINDIR = \@bindir\@
@@ -37,6 +38,7 @@ LIBDIR = \@libdir\@
CONFIGDIR = \@configdir\@
VARDIR = \@localstatedir\@
+
# The permissions to give the executables
INSTALLPERMS = 0755
@@ -125,7 +127,10 @@ idl_full: build/pidl/idl.pm
CPP=\"\@CPP\@\" PERL=\"\$(PERL)\" script/build_idl.sh FULL
idl: build/pidl/idl.pm
- \@CPP=\"\@CPP\@\" script/build_idl.sh
+ \@CPP=\"\@CPP\@\" script/build_idl.sh PARTIAL
+
+eparser_idl: build/pidl/idl.pm
+ CPP=\"\@CPP\@\" PERL=\"\$(PERL)\" EPARSERPREFIX=\"\$(eparserdir)\" script/build_idl.sh EPARSER
build/pidl/idl.pm: build/pidl/idl.yp
-yapp -s build/pidl/idl.yp