3a1a1b5cf9
- Don't apply upsteamed patches no. 13, 14, 15, 16, 17 - Fix variable overflow (patch no. 18) - Updated RTPproxy dissector (backported three more patches from trunk) Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
From: =?UTF-8?q?Radek=20Vok=C3=A1l?= <rvokal@fedoraproject.org>
|
|
Date: Thu, 17 Dec 2009 09:17:07 +0000
|
|
Subject: [PATCH] Add pkgconfig entry
|
|
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index eb735a5..2844c90 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -50,6 +50,9 @@ bin_PROGRAMS = \
|
|
EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
|
|
randpkt text2pcap dumpcap reordercap rawshark wireshark_cxx
|
|
|
|
+pkgconfigdir = $(libdir)/pkgconfig
|
|
+pkgconfig_DATA = wireshark.pc
|
|
+
|
|
#
|
|
# Wireshark configuration files are put in $(pkgdatadir).
|
|
#
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 1356d9a..8691bbf 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2543,6 +2543,7 @@ AC_CONFIG_HEADERS(config.h)
|
|
AC_OUTPUT(
|
|
Makefile
|
|
doxygen.cfg
|
|
+ wireshark.pc
|
|
asn1/Makefile
|
|
_CUSTOM_ASN1_AC_OUTPUT_
|
|
asn1/acp133/Makefile
|
|
diff --git a/wireshark.pc.in b/wireshark.pc.in
|
|
new file mode 100644
|
|
index 0000000..2e2fcdc
|
|
--- /dev/null
|
|
+++ b/wireshark.pc.in
|
|
@@ -0,0 +1,11 @@
|
|
+prefix=@prefix@
|
|
+exec_prefix=@exec_prefix@
|
|
+libdir=@libdir@
|
|
+includedir=@includedir@
|
|
+
|
|
+Name: wireshark
|
|
+Description: Network Traffic Analyzer
|
|
+Version: @PACKAGE_VERSION@
|
|
+Requires: glib-2.0 gmodule-2.0
|
|
+Libs: -L@libdir@ -lwireshark -lwiretap
|
|
+Cflags: -DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -DWS_MSVC_NORETURN= -I@includedir@/wireshark -I@includedir@/wireshark/epan
|