summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-analyzer/wireshark/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-analyzer/wireshark/files')
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch20
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch29
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch51
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch52
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch14
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch88
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch20
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch18
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch40
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch11
-rw-r--r--net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch10
-rw-r--r--net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch62
12 files changed, 415 insertions, 0 deletions
diff --git a/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch b/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch
new file mode 100644
index 00000000000..24b5c7ddc9b
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.11.0-oldlibs.patch
@@ -0,0 +1,20 @@
+--- a/epan/Makefile.am
++++ b/epan/Makefile.am
+@@ -137,6 +137,7 @@
+ # Add the object files for missing routines, if any.
+ #
+ libwireshark_la_LIBADD = \
++ ${top_builddir}/wiretap/libwiretap.la ${top_builddir}/wsutil/libwsutil.la \
+ libwireshark_generated.la \
+ libwireshark_asmopt.la crypt/libairpdcap.la \
+ ftypes/libftypes.la dfilter/libdfilter.la dissectors/libdissectors.la \
+@@ -144,8 +145,7 @@
+ wmem/libwmem.la $(wslua_lib) $(wspython_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
+ @C_ARES_LIBS@ @ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ \
+ @KRB5_LIBS@ @SSL_LIBS@ @LIBSMI_LDFLAGS@ @GEOIP_LIBS@ \
+- ${top_builddir}/wiretap/libwiretap.la @GLIB_LIBS@ \
+- ${top_builddir}/wsutil/libwsutil.la -lm
++ @GLIB_LIBS@ -lm
+
+ libwireshark_la_DEPENDENCIES = \
+ libwireshark_generated.la \
diff --git a/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch b/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
new file mode 100644
index 00000000000..1e87ce6e2bb
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.11.3-gtk-deprecated-warnings.patch
@@ -0,0 +1,29 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1491,26 +1491,6 @@
+ wireshark_man=""
+ fi
+
+-if test "$have_gtk" = "yes" ; then
+- # If we have GTK then add flags for it.
+-
+- CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
+- CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+- if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
+- ## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
+- ## The deprecations in Gtk 3.10 will not be fixed ...
+- CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
+- else
+- CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+- fi
+- CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+- if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
+- # Enable GSEAL when building with GTK > 2.20
+- # (Versions prior to 2.22 lacked some necessary accessors.)
+- CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
+- fi
+-fi
+-
+ # XXX - Is this really necessary? When we build with both Gtk+ and Qt it works...
+ if test "$use_glib_cflags" = "true"; then
+ # Use GLIB_CFLAGS
diff --git a/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch b/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch
new file mode 100644
index 00000000000..3118178d696
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.12.5-cross-compile.patch
@@ -0,0 +1,51 @@
+https://code.wireshark.org/review/8481
+
+From edefd74591d8f7010024a31576c2cb51eb1526ad Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Sat, 16 May 2015 05:08:53 -0400
+Subject: [PATCH] switch to AC_PATH_TOOL
+
+The TOOL variant will automatically search for host prefixed scripts
+(e.g. armv7a-unknown-linux-gnueabi-pcap-config) before falling back
+to the default (i.e. pcap-config). This makes cross-compiling a bit
+simpler.
+
+Change-Id: Ia450839693b5550f798634a7e8b82c2a661b088c
+---
+ acinclude.m4 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index ffb1cac..c79c427 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -380,7 +380,7 @@ AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
+ # The user didn't specify a directory in which libpcap resides.
+ # First, look for a pcap-config script.
+ #
+- AC_PATH_PROG(PCAP_CONFIG, pcap-config)
++ AC_PATH_TOOL(PCAP_CONFIG, pcap-config)
+
+ if test -n "$PCAP_CONFIG" ; then
+ #
+@@ -1217,7 +1217,7 @@ AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
+ AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
+ fi
+ else
+- AC_PATH_PROG(KRB5_CONFIG, krb5-config)
++ AC_PATH_TOOL(KRB5_CONFIG, krb5-config)
+ if test -x "$KRB5_CONFIG"
+ then
+ KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
+@@ -2033,7 +2033,7 @@ AC_DEFUN([AC_WIRESHARK_QT_CHECK],
+ [
+ no_qt=""
+
+- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
++ AC_PATH_TOOL(PKG_CONFIG, pkg-config, no)
+
+ if test x$PKG_CONFIG != xno ; then
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then
+--
+2.4.0
+
diff --git a/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch b/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
new file mode 100644
index 00000000000..b8290d00c96
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.12.6-rcc.patch
@@ -0,0 +1,52 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1609,11 +1609,37 @@
+ # we don't know whether they'll be doing that,
+ # so this is the best we can do.
+ #
+- MIC=moc
++ MOC=moc
+ fi
+ fi
+ fi
+ AC_SUBST(MOC)
++AC_PATH_PROG(RCC, rcc)
++if test "x$RCC" = x
++then
++ AC_PATH_PROG(RCC, rcc-qt4)
++ if test "x$RCC" = x
++ then
++ if test "x$have_qt" = "xyes"; then
++ #
++ # If you want to build with Qt, you'd better
++ # have rcc.
++ #
++ AC_MSG_ERROR(I couldn't find moc or rcc-qt4; make sure it's installed and in your path)
++ else
++ #
++ # We shouldn't fail here, as the user's not
++ # building with Qt, and we shouldn't force them
++ # to have Qt installed if they're not doing so.
++ # "make dist" will fail if they do that, but
++ # we don't know whether they'll be doing that,
++ # so this is the best we can do.
++ #
++ RCC=rcc
++ fi
++ fi
++fi
++AC_SUBST(RCC)
+
+ # Error out if a glib header other than a "top level" header
+ # (glib.h, glib-object.h, gio.h) or certain other headers( e.g.,gmodule.h)
+--- a/ui/qt/Makefile.am
++++ b/ui/qt/Makefile.am
+@@ -116,7 +116,7 @@
+
+ .qrc.rcc.cpp:
+ $(MKDIR_P) $(@D)
+- $(AM_V_RCC)rcc -name `basename $< .qrc` -o $@ $<
++ $(AM_V_RCC)$(RCC) -name `basename $< .qrc` -o $@ $<
+
+ ui_%.h: %.ui
+ $(AM_V_UIC)$(UIC) $< -o $@
diff --git a/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch b/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch
new file mode 100644
index 00000000000..94554fdf485
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.6.13-ldflags.patch
@@ -0,0 +1,14 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -61,9 +61,9 @@
+ # "-R" here.
+ #
+ AC_DEFUN([AC_WIRESHARK_ADD_DASH_L],
+-[$1="$$1 -L$2"
+-case "$host_os" in
++[case "$host_os" in
+ solaris*)
++ $1="$$1 -L$2"
+ $1="$$1 -R$2"
+ ;;
+ esac
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch b/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch
new file mode 100644
index 00000000000..be1343d4504
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.99.0-qt5.patch
@@ -0,0 +1,88 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2043,21 +2043,23 @@
+ # Try the Qt 5 version first.
+ # (And be prepared to add Qt6 at some point....)
+ #
+- for modprefix in Qt5 Qt
+- do
+- pkg_config_module="${modprefix}$1"
+- AC_MSG_CHECKING(for $pkg_config_module - version >= $min_qt_version)
+- if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_module; then
+- mod_version=`$PKG_CONFIG --modversion $pkg_config_module`
+- AC_MSG_RESULT(yes (version $mod_version))
+- Qt_CFLAGS="$Qt_CFLAGS `$PKG_CONFIG --cflags $pkg_config_module`"
+- Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs $pkg_config_module`"
+- found_$1=yes
+- break
+- else
+- AC_MSG_RESULT(no)
+- fi
+- done
++ if test "$with_qt5" = yes; then
++ modprefix=Qt5
++ else
++ modprefix=Qt
++ fi
++ pkg_config_module="${modprefix}$1"
++ AC_MSG_CHECKING(for $pkg_config_module - version >= $min_qt_version)
++ if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_module; then
++ mod_version=`$PKG_CONFIG --modversion $pkg_config_module`
++ AC_MSG_RESULT(yes (version $mod_version))
++ Qt_CFLAGS="$Qt_CFLAGS `$PKG_CONFIG --cflags $pkg_config_module`"
++ Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs $pkg_config_module`"
++ found_$1=yes
++ break
++ else
++ AC_MSG_RESULT(no)
++ fi
+
+ if test "x$found_$1" = "xyes"; then
+ # Run Action-If-Found
+--- a/configure.ac
++++ b/configure.ac
+@@ -456,10 +456,15 @@
+ #
+ # GUI toolkit options
+ #
+-AC_ARG_WITH([qt],
+- AC_HELP_STRING( [--with-qt=@<:@yes/no@:>@],
++AC_ARG_WITH([qt4],
++ AC_HELP_STRING( [--with-qt4=@<:@yes/no@:>@],
++ [use Qt @<:@default=yes@:>@]),
++ with_qt4="$withval", with_qt4="unspecified")
++
++AC_ARG_WITH([qt5],
++ AC_HELP_STRING( [--with-qt5=@<:@yes/no@:>@],
+ [use Qt @<:@default=yes@:>@]),
+- with_qt="$withval", with_qt="unspecified")
++ with_qt5="$withval", with_qt5="unspecified")
+
+ AC_ARG_WITH([gtk2],
+ AC_HELP_STRING( [--with-gtk2=@<:@yes/no@:>@],
+@@ -1373,7 +1378,6 @@
+ AC_SUBST(GTK2_MIN_VERSION)
+ GTK3_MIN_VERSION=3.0.0
+ AC_SUBST(GTK3_MIN_VERSION)
+-QT_MIN_VERSION=4.6.0
+ AC_SUBST(QT_MIN_VERSION)
+ # GTK+ and Qt checks; we require GTK+ $GTK2_MIN_VERSION or later or
+ # GTK3_MIN_VERSION or later or Qt $QT_MIN_VERSION or later.
+@@ -1417,14 +1421,15 @@
+ if test "x$enable_wireshark" = "xyes"; then
+ if test "x$with_gtk2" = "xunspecified" -a \
+ "x$with_gtk3" = "xunspecified" -a \
+- "x$with_qt" = "xunspecified"; then
++ "x$with_qt4" = "xunspecified" -a \
++ "x$with_qt5" = "xunspecified"; then
+ #
+ # No GUI toolkit was explicitly specified; pick Qt and GTK+ 3.
+ #
+ with_qt=yes
+ with_gtk3=yes
+ fi
+- if test "x$with_qt" = "xyes"; then
++ if test "x$with_qt" = "xyes" || test "x$with_qt4" = "xyes" || test "x$with_qt5" = "xyes"; then
+ #
+ # Qt was specified; Make sure we have a C++ compiler.
+ #
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch b/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch
new file mode 100644
index 00000000000..ba61de64535
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.99.0.1975-sse4_2.patch
@@ -0,0 +1,20 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -985,6 +985,7 @@
+ AC_SUBST(PIE_CFLAGS)
+ AC_SUBST(PIE_LDFLAGS)
+
++AC_ARG_ENABLE(sse4_2,[ --enable-sse4_2 Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions],[
+ CFLAGS_before_simd="$CFLAGS"
+ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-msse4.2, C)
+ if test "x$CFLAGS" != "x$CFLAGS_before_simd"
+@@ -1011,6 +1012,9 @@
+ else
+ have_sse42=no
+ fi
++],[
++AC_MSG_RESULT(no)
++])
+ dnl build libwsutil_sse42 only if there is SSE4.2
+ AM_CONDITIONAL(SSE42_SUPPORTED, test "x$have_sse42" = "xyes")
+ AC_SUBST(CFLAGS_SSE42)
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch b/net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch
new file mode 100644
index 00000000000..adda8fe8561
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.99.1-sbc.patch
@@ -0,0 +1,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2731,7 +2731,14 @@
+
+ # Check Bluetooth SBC codec for RTP Player
+ # git://git.kernel.org/pub/scm/bluetooth/sbc.git
+-PKG_CHECK_MODULES(SBC, sbc >= 1.0, [have_sbc=yes], [have_sbc=no])
++AC_ARG_WITH(sbc,
++ AC_HELP_STRING( [--with-sbc],
++ [add support for playing SBC]),
++ [if test "x$withval" = "xyes"; then
++ PKG_CHECK_MODULES(SBC, sbc >= 1.0, [have_sbc=yes], [have_sbc=no])
++ else
++ have_sbc=no
++ fi])
+ if (test "${have_sbc}" = "yes"); then
+ AC_DEFINE(HAVE_SBC, 1, [Define to support playing SBC by standalone BlueZ SBC library])
+ CFLAGS="$CFLAGS $(pkg-config sbc --cflags)"
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch b/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch
new file mode 100644
index 00000000000..e7124ad3eca
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.99.6-gcc_option.patch
@@ -0,0 +1,40 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -1735,15 +1735,15 @@
+ CXXFLAGS_saved="$CXXFLAGS"
+ if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
+ then
+- CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION"
++ CXXFLAGS="$GCC_OPTION $CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error"
+ elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
+ then
+- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
++ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
+ elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
+ then
+- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
++ CXXFLAGS="$GCC_OPTION $CXXFLAGS -Werror"
+ else
+- CXXFLAGS="$CXXFLAGS $GCC_OPTION"
++ CXXFLAGS="$GCC_OPTION $CXXFLAGS"
+ fi
+ AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(
+@@ -1773,7 +1773,7 @@
+ # added them, by setting CXXFLAGS to the saved value plus
+ # just the new option.
+ #
+- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
++ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
+ ],
+ [
+ AC_MSG_RESULT(yes)
+@@ -1785,7 +1785,7 @@
+ # added them, by setting CXXFLAGS to the saved value plus
+ # just the new option.
+ #
+- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
++ CXXFLAGS="$GCC_OPTION $CXXFLAGS_saved"
+ fi
+ ],
+ [
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch b/net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch
new file mode 100644
index 00000000000..445fe102722
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.99.7-qt-pie.patch
@@ -0,0 +1,11 @@
+--- a/ui/qt/Makefile.am
++++ b/ui/qt/Makefile.am
+@@ -84,7 +84,7 @@
+
+ # Common headers
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap $(LIBGCRYPT_CFLAGS) \
+- $(LIBGNUTLS_CFLAGS) $(PIE_CFLAGS)
++ $(LIBGNUTLS_CFLAGS)
+
+ AM_CXXFLAGS = $(AM_CLEAN_CFLAGS)
+
diff --git a/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
new file mode 100644
index 00000000000..47459515ee7
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-1.99.8-qtchooser.patch
@@ -0,0 +1,10 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -2149,7 +2149,6 @@
+ # -qt={version} argument, otherwise we look for particular
+ # tool versions using tool name suffixes.
+ #
+- AC_PATH_PROG(QTCHOOSER, qtchooser)
+ if test ! -z "$QTCHOOSER"; then
+ #
+ # We found qtchooser; we assume that means that
diff --git a/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
new file mode 100644
index 00000000000..51f3c8f9eb9
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch
@@ -0,0 +1,62 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -242,7 +242,7 @@
+ # This is referenced via AC_REQUIRE([PKG_PROG_PKG_CONFIG] in some macros
+ # like PKG_CHECK_MODULES. If the first call to such a macro is under an
+ # "if" statement, it's safer to call PKG_PROG_PKG_CONFIG directly, see
+-# the comments in acolocal.m4
++# the comments in aclocal.m4
+ #
+ # We want version 0.7 or better. (XXX - explain why. Is that just
+ # because our Qt tests were originally based on AM_PATH_GTK, and *it*
+@@ -1910,6 +1910,19 @@
+ AC_SUBST(plugins_dir)
+
+ #
++# Find out where to store wireshark.pc and what should be in it
++#
++
++PKG_INSTALLDIR
++
++AC_SUBST(CMAKE_INSTALL_PREFIX,[$prefix])
++AC_SUBST(CMAKE_INSTALL_LIBDIR,[`basename $libdir`])
++PLUGIN_INSTALL_DIR="\${libdir}/$PACKAGE_NAME/$PACKAGE_VERSION/$plugins_dir"
++AC_SUBST(PLUGIN_INSTALL_DIR)
++PROJECT_VERSION="$PACKAGE_VERSION"
++AC_SUBST(PROJECT_VERSION)
++
++#
+ # If we have <dlfcn.h>, check whether we have dladdr.
+ #
+ if test "$ac_cv_header_dlfcn_h" = "yes"
+@@ -3080,10 +3093,15 @@
+ sinclude(asn1/Custom.m4) dnl
+ ifdef(_CUSTOM_ASN1_AC_OUTPUT_,, define(_CUSTOM_ASN1_AC_OUTPUT_, )) dnl
+
++#
++# Configuration output
++#
++
+ AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT(
+ Makefile
+ doxygen.cfg
++ wireshark.pc
+ asn1/Makefile
+ _CUSTOM_ASN1_AC_OUTPUT_
+ asn1/acp133/Makefile
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -56,6 +56,12 @@
+ smi_modules ipmap.html pdml2html.xsl
+
+ #
++# Install a pkgconfig file
++#
++
++pkgconfig_DATA = wireshark.pc
++
++#
+ # Install global profiles in the "profiles" subdirectory
+ #
+ profilesdir = $(pkgdatadir)