Fix *NIX builds where we need our own inet_pton.c or inet_ntop.c . This should fix...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25579 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index 19aeba1a0444612e5681da067a105a3e4acc1824..58e46862fbb346ae8dd9ab0d1afe25aa64fe38e0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -312,6 +312,7 @@ wireshark_LDADD = \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
        @INET_PTON_LO@                  \
+       @INET_NTOP_LO@                  \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
@@ -322,6 +323,10 @@ wireshark_LDADD = \
        @LIBSMI_LDFLAGS@                \
        @PORTAUDIO_LIBS@
 
+wireshark_DEPENDENCIES =               \
+       @INET_PTON_LO@                  \
+       @INET_NTOP_LO@
+
 if ENABLE_STATIC
 tshark_LDFLAGS = -Wl,-static -all-static
 else
@@ -335,6 +340,7 @@ tshark_LDADD = \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
        @INET_PTON_LO@                  \
+       @INET_NTOP_LO@                  \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
@@ -346,6 +352,10 @@ tshark_LDADD = \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
 
+tshark_DEPENDENCIES =                  \
+       @INET_PTON_LO@                  \
+       @INET_NTOP_LO@
+
 if ENABLE_STATIC
 rawshark_LDFLAGS = -Wl,-static -all-static
 else
@@ -359,6 +369,7 @@ rawshark_LDADD = \
        epan/libwireshark.la            \
        wsutil/libwsutil.la             \
        @INET_PTON_LO@                  \
+       @INET_NTOP_LO@                  \
        @SSL_LIBS@                      \
        $(plugin_ldadd)                 \
        @PCRE_LIBS@                     \
@@ -370,6 +381,10 @@ rawshark_LDADD = \
        @LIBGNUTLS_LIBS@                \
        @LIBSMI_LDFLAGS@
 
+rawshark_DEPENDENCIES =                        \
+       @INET_PTON_LO@                  \
+       @INET_NTOP_LO@
+
 # Optional objects that I know how to build, and that are needed by
 # text2pcap.
 text2pcap_optional_objects = @STRERROR_O@ @STRPTIME_O@
@@ -432,6 +447,9 @@ dumpcap_LDADD = \
        @LIBGCRYPT_LIBS@                \
        @LIBCAP_LIBS@
 
+dumpcap_DEPENDENCIES =                 \
+       @INET_NTOP_LO@
+
 # Common headers
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
        $(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS) $(LIBSMI_CFLAGS)

diff --git a/epan/Makefile.am b/epan/Makefile.am
index f02dbbd38390f6e9d14844c7f404e700008ce444..bbb3846129336c351bcd3d38601d21dedc3fc07f 100644 (file)
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -102,8 +102,10 @@ CLEANFILES = \
        libwireshark.la                 \
        libwireshark_generated.a        \
        libwireshark_generated.la       \
-       libwireshark_asmopt.a   \
-       libwireshark_asmopt.la  \
+       libwireshark_asmopt.a           \
+       libwireshark_asmopt.la          \
+       inet_ntop.c                     \
+       inet_pton.c                     \
        *~
 
 DISTCLEANFILES = \
@@ -172,6 +174,12 @@ tvbtest.o exntest.o: exceptions.h
 sminmpec.c: enterprise-numbers make-sminmpec.pl
        $(PERL) $(srcdir)/make-sminmpec.pl $(srcdir)/enterprise-numbers sminmpec.c
 
+inet_ntop.c:
+       ln -s ../inet_ntop.c .
+
+inet_pton.c:
+       ln -s ../inet_pton.c .
+
 if HAVE_PLUGINS
 
 if ENABLE_STATIC