WiresharkWiFiInjection: lorcon-autotooling.patch

gtk/Makefile.am

@@ -152 +152 @@
         win32-file-dlg.h
 
 # Common headers
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) $(LIBGNUTLS_CFLAGS) $(PORTAUDIO_INCLUDES) $(GTKHEX_CFLAGS)
 
+libui_a_LIBADD = /usr/lib/libgtkhex.a
 
 doxygen:
 if HAVE_DOXYGEN

configure.in

@@ -494 +494 @@
 if test "x$enable_gtk2" = "xyes" -a "x$enable_wireshark" = "xyes"; then
         GTK_OK=two
         AM_PATH_GTK_2_0(2.0.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no, gthread)
+
+        PKG_CHECK_MODULES(GTKHEX, [ gtkhex >= 1.0.0 ])
+        AC_SUBST(GTKHEX_CFLAGS)
+        AC_SUBST(GTKHEX_LIBS)
 elif test "x$enable_gtk2" != "xyes" -a "x$enable_wireshark" = "xyes"; then
         GTK_OK=one
         AM_PATH_GTK(1.2.0, CFLAGS="$CFLAGS $GTK_CFLAGS", GTK_OK=no )

Makefile.am

@@ -280 +280 @@
         $(wireshark_optional_objects)   \
         gtk/libui.a                     \
         codecs/libcodec.a               \
-        wiretap/libwiretap.la           \
+        ${top_builddir}/wiretap/libwiretap.la           \
         epan/libwireshark.la            \
         @INET_PTON_LO@                  \
         @SNMP_LIBS@ @SSL_LIBS@          \
@@ -290 +290 @@
         @LIBGCRYPT_LIBS@                        \
         @LIBGNUTLS_LIBS@                \
         @LIBSMI_LDFLAGS@                \
-        @PORTAUDIO_LIBS@
+        @PORTAUDIO_LIBS@                \
+        $(GTKHEX_LIBS)                  \
+        -lorcon
 
 if ENABLE_STATIC
 tshark_LDFLAGS = -Wl,-static -all-static