summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-01-27 04:41:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:14 -0500
commit00169404eddd859262ef6f0684143efbedcd7bf7 (patch)
tree9c58a01bf8c6180bc47602d351f591d826f5463e
parent2a750c8c63a76543910ca02d3414a55620649dad (diff)
downloadsamba-00169404eddd859262ef6f0684143efbedcd7bf7.tar.gz
samba-00169404eddd859262ef6f0684143efbedcd7bf7.tar.bz2
samba-00169404eddd859262ef6f0684143efbedcd7bf7.zip
r5033: Remove --with-eparserdir configure option and eparser_idl make target.
This is all done in the lorikeet/ethereal Makefile now. (This used to be commit 5ec9fad5cfc9c6010550aa1890e9d213030db55d)
-rw-r--r--source4/build/smb_build/check_path.m419
-rw-r--r--source4/build/smb_build/makefile.pm4
-rwxr-xr-xsource4/script/build_idl.sh7
3 files changed, 0 insertions, 30 deletions
diff --git a/source4/build/smb_build/check_path.m4 b/source4/build/smb_build/check_path.m4
index 5ceda46d87..bfd15d3d8c 100644
--- a/source4/build/smb_build/check_path.m4
+++ b/source4/build/smb_build/check_path.m4
@@ -107,24 +107,6 @@ 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)
@@ -132,7 +114,6 @@ 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.pm b/source4/build/smb_build/makefile.pm
index 343ce44207..89d4566e64 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -32,7 +32,6 @@ exec_prefix=\@exec_prefix\@
VPATH=\@srcdir\@
srcdir=\@srcdir\@
builddir=\@builddir\@
-eparserdir=\@eparserdir\@
BASEDIR= \@prefix\@
BINDIR = \@bindir\@
@@ -132,9 +131,6 @@ idl_full: build/pidl/idl.pm
idl: build/pidl/idl.pm
\@CPP=\"\@CPP\@\" PERL=\"\$(PERL)\" 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
diff --git a/source4/script/build_idl.sh b/source4/script/build_idl.sh
index a4d0dfea8b..dbd48e1485 100755
--- a/source4/script/build_idl.sh
+++ b/source4/script/build_idl.sh
@@ -5,7 +5,6 @@ FULLBUILD=$1
[ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --client"
-EPARSERPIDL="$PERL ./build/pidl/pidl.pl --output $EPARSERPREFIX/ndr_ --parse --header --parser --eparser"
if [ x$FULLBUILD = xFULL ]; then
echo Rebuilding all idl files in librpc/idl
@@ -13,12 +12,6 @@ if [ x$FULLBUILD = xFULL ]; then
exit 0
fi
-if [ x$FULLBUILD = xEPARSER ]; then
- echo Rebuilding all idl files in librpc/idl
- $EPARSERPIDL librpc/idl/*.idl || exit 1
- exit 0
-fi
-
list=""
for f in librpc/idl/*.idl; do