Fix rpcapd building.

Don't name the target for rpcapd in the top-level Makefile "rpcapd", as
that exists in the top-level source directory - as a source subdirectory
containing the rpcapd source.  Name it "build-rpcapd" instead.

diff --git a/Makefile.in b/Makefile.in
index 02bfe5625e5d8121017d805f81e357e279d4fa8a..2901c5d9b3649698c467e05a8b7e552101316fff 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,7 @@ DYEXT = @DYEXT@
 V_RPATH_OPT = @V_RPATH_OPT@
 DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
 PROG=libpcap
-RPCAPD=@RPCAPD@
+BUILD_RPCAPD=@BUILD_RPCAPD@
 INSTALL_RPCAPD=@INSTALL_RPCAPD@
 RPCAPD_LIBS=@RPCAPD_LIBS@
 
@@ -382,7 +382,7 @@ EXTRA_DIST = \
        Win32/Prj/wpcap.vcxproj \
        Win32/Prj/wpcap.vcxproj.filters
 
-all: libpcap.a shared $(RPCAPD) pcap-config
+all: libpcap.a shared $(BUILD_RPCAPD) pcap-config
 
 libpcap.a: $(OBJ)
        @rm -f $@
@@ -530,7 +530,7 @@ pcap-config: $(srcdir)/pcap-config.in ./config.status
 #
 # Remote pcap daemon.
 #
-rpcapd: libpcap.a
+build-rpcapd: libpcap.a
        cd rpcapd; $(MAKE)
 
 #

diff --git a/configure b/configure
index a6f242463b1ae1a286a82e0e6e6561eff6fe7f7a..3dd029d5c5840bfcd4e887b49f9b4abdba491de3 100755 (executable)
--- a/configure
+++ b/configure
@@ -639,7 +639,7 @@ USB_SRC
 PCAP_SUPPORT_USB
 RPCAPD_LIBS
 INSTALL_RPCAPD
-RPCAPD
+BUILD_RPCAPD
 MAN_USERMOD_SECTION
 MAN_MISC_INFO
 MAN_FILE_FORMATS
@@ -7382,7 +7382,7 @@ done
 $as_echo "#define ENABLE_REMOTE /**/" >>confdefs.h
 
        SSRC="$SSRC pcap-new.c pcap-rpcap.c rpcap-protocol.c sockutils.c"
-       RPCAPD=rpcapd
+       BUILD_RPCAPD=build-rpcapd
        INSTALL_RPCAPD=install-rpcapd
        ;;
 *)     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

diff --git a/configure.ac b/configure.ac
index a8f3f37bef16c88f12d7cb69fedb7b3ef1cfa1a1..5cb9f6fe90bcc91d7335a4f42e1d040e7b443e1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1218,7 +1218,7 @@ yes)      AC_MSG_RESULT(yes)
        AC_DEFINE(ENABLE_REMOTE,,
            [Define to 1 if remote packet capture is to be supported])
        SSRC="$SSRC pcap-new.c pcap-rpcap.c rpcap-protocol.c sockutils.c"
-       RPCAPD=rpcapd
+       BUILD_RPCAPD=build-rpcapd
        INSTALL_RPCAPD=install-rpcapd
        ;;
 *)     AC_MSG_RESULT(no)
@@ -1586,7 +1586,7 @@ AC_SUBST(DYEXT)
 AC_SUBST(MAN_FILE_FORMATS)
 AC_SUBST(MAN_MISC_INFO)
 AC_SUBST(MAN_USERMOD_SECTION)
-AC_SUBST(RPCAPD)
+AC_SUBST(BUILD_RPCAPD)
 AC_SUBST(INSTALL_RPCAPD)
 AC_SUBST(RPCAPD_LIBS)