relay on the top-level Makefile to build radsniff

we don't need to regenerate radsniff.mk

diff --git a/configure b/configure
index 50d6a28f82132481a7ea9acd81fc32b744200c8b..093d3af27183ef7e808b5d26038411070c029c30 100755 (executable)
--- a/configure
+++ b/configure
@@ -15468,7 +15468,7 @@ ac_config_commands="$ac_config_commands scripts-chmod"
 unset ac_cv_env_LIBS_set
 unset ac_cv_env_LIBS_value
 
-ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/bin/radsniff.mk ./src/bin/checkrad ./src/bin/radlast ./src/bin/radtest ./scripts/rc.radiusd ./scripts/cron/radiusd.cron.daily ./scripts/cron/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/radrelay.conf ./raddb/radiusd.conf"
+ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/bin/checkrad ./src/bin/radlast ./src/bin/radtest ./scripts/rc.radiusd ./scripts/cron/radiusd.cron.daily ./scripts/cron/radiusd.cron.monthly ./scripts/cryptpasswd ./raddb/radrelay.conf ./raddb/radiusd.conf"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16172,7 +16172,6 @@ do
     "scripts-chmod") CONFIG_COMMANDS="$CONFIG_COMMANDS scripts-chmod" ;;
     "./Make.inc") CONFIG_FILES="$CONFIG_FILES ./Make.inc" ;;
     "./src/include/build-radpaths-h") CONFIG_FILES="$CONFIG_FILES ./src/include/build-radpaths-h" ;;
-    "./src/bin/radsniff.mk") CONFIG_FILES="$CONFIG_FILES ./src/bin/radsniff.mk" ;;
     "./src/bin/checkrad") CONFIG_FILES="$CONFIG_FILES ./src/bin/checkrad" ;;
     "./src/bin/radlast") CONFIG_FILES="$CONFIG_FILES ./src/bin/radlast" ;;
     "./src/bin/radtest") CONFIG_FILES="$CONFIG_FILES ./src/bin/radtest" ;;

diff --git a/configure.ac b/configure.ac
index 6e8911e44b35f3ce128ec2aa1c55a27c7d52304f..3998694f645faf287aa153e6a11361cd57395c46 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2313,7 +2313,6 @@ AC_SUBST(INSTALLSTRIP)
 AC_OUTPUT(\
   ./Make.inc \
   ./src/include/build-radpaths-h \
-  ./src/bin/radsniff.mk \
   ./src/bin/checkrad \
   ./src/bin/radlast \
   ./src/bin/radtest \

diff --git a/src/bin/radsniff.mk b/src/bin/radsniff.mk
index e3d8e10aeeb921b98316877d02c2ca8d00d50b61..993bad83b61b489dbbb818e04343f6a1a77055f2 100644 (file)
--- a/src/bin/radsniff.mk
+++ b/src/bin/radsniff.mk
@@ -1,5 +1,3 @@
-PCAP_LIBS      := -lpcap
-
 ifneq ($(PCAP_LIBS),)
 TARGET         := radsniff
 else

diff --git a/src/bin/radsniff.mk.in b/src/bin/radsniff.mk.in
deleted file mode 100644 (file)
index 04c43a4..0000000
--- a/src/bin/radsniff.mk.in
+++ /dev/null
@@ -1,13 +0,0 @@
-PCAP_LIBS      := @PCAP_LIBS@
-
-ifneq ($(PCAP_LIBS),)
-TARGET         := radsniff
-else
-TARGET         :=
-endif
-
-SOURCES                := radsniff.c collectd.c
-
-TGT_PREREQS    := libfreeradius-util.a libfreeradius-radius.a
-TGT_LDLIBS     := $(LIBS) $(PCAP_LIBS) $(COLLECTDC_LIBS)
-TGT_LDFLAGS     := $(LDFLAGS) $(PCAP_LDFLAGS) $(COLLECTDC_LDFLAGS)