aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.in6
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 45544e7c6e..d984a1058d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -690,7 +690,7 @@ EXTRA_DIST = \
if SETUID_INSTALL
install-exec-hook:
- -chmod +s $(DESTDIR)$(bindir)/ethereal
+ -chmod +s $(DESTDIR)$(bindir)/dumpcap
-chmod +s $(DESTDIR)$(bindir)/tethereal
else
install-exec-hook:
diff --git a/configure.in b/configure.in
index 180155ffae..4ad5e2ad8c 100644
--- a/configure.in
+++ b/configure.in
@@ -823,7 +823,11 @@ AC_MSG_CHECKING(whether to install ethereal setuid)
if test "x$enable_setuid_install" = "xno" ; then
AC_MSG_RESULT(no)
else
- AC_MSG_RESULT(yes)
+ if test "x$enable_dumpcap" = "xno" ; then
+ AC_MSG_ERROR(Setuid install works only with --enable-dumpcap, but dumpcap disabled)
+ else
+ AC_MSG_RESULT(yes)
+ fi
fi
AM_CONDITIONAL(SETUID_INSTALL, test x$enable_setuid_install = xyes)