wireshark/wireshark-0006-Add-pkgconfig-entry.patch

61 lines
1.7 KiB
Diff
Raw Normal View History

2016-01-14 10:56:55 +00:00
commit 7a47641e4b8b152264bb5d85807821a3d982eeae
Author: Radek Vokal <rvokal@fedoraproject.org>
Date: Wed Jan 6 09:37:49 2016 +0100
2016-01-14 10:56:55 +00:00
Add pkgconfig entry
diff --git a/Makefile.am b/Makefile.am
2016-01-14 10:56:55 +00:00
index 913e064..30f8107 100644
--- a/Makefile.am
+++ b/Makefile.am
2016-01-14 10:56:55 +00:00
@@ -55,6 +55,9 @@ EXTRA_PROGRAMS = wireshark-gtk wireshark tshark tfshark capinfos captype editcap
dist_pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
smi_modules ipmap.html pdml2html.xsl
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = wireshark.pc
+
#
2016-01-14 10:56:55 +00:00
# Install global profiles in the "profiles" subdirectory
#
diff --git a/configure.ac b/configure.ac
2016-01-14 10:56:55 +00:00
index dc8c307..dedd1a4 100644
--- a/configure.ac
+++ b/configure.ac
2016-01-14 10:56:55 +00:00
@@ -3101,6 +3101,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
2016-01-14 10:56:55 +00:00
index 826b230..fec2d25 100644
--- a/wireshark.pc.in
+++ b/wireshark.pc.in
@@ -1,14 +1,11 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
2016-01-14 10:56:55 +00:00
-libdir=@ABSOLUTE_CMAKE_INSTALL_LIBDIR@
-sharedlibdir=${libdir}
-includedir=${prefix}/include/wireshark
-plugindir=@PLUGIN_INSTALL_DIR@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
Name: wireshark
-Description: wireshark network packet dissection library
-Version: @PROJECT_VERSION@
-
-Requires:
-Libs: -L${libdir} -L${sharedlibdir} -lwireshark
-Cflags: -I${includedir}
+Description: Network Traffic Analyzer
+Version: @PACKAGE_VERSION@
2016-01-14 10:56:55 +00:00
+Requires: Qt
+Libs: -L@libdir@ -lwireshark -lwiretap
+Cflags: -DWS_VAR_IMPORT=extern -DHAVE_STDARG_H -DWS_MSVC_NORETURN= -I@includedir@/wireshark -I@includedir@/wireshark/epan