jer 15/04/13 05:00:01 Modified: wireshark-99999999-pkgconfig.patch Log: Fix variables in wireshark.pc (bug #546126). (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch?r1=1.1&r2=1.2 Index: wireshark-99999999-pkgconfig.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/files/wireshark-99999999-pkgconfig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wireshark-99999999-pkgconfig.patch 11 Apr 2015 00:46:46 -0000 1.1 +++ wireshark-99999999-pkgconfig.patch 13 Apr 2015 05:00:01 -0000 1.2 @@ -1,15 +1,45 @@ --- a/configure.ac +++ b/configure.ac -@@ -245,6 +245,8 @@ - # the comments in acolocal.m4 +@@ -242,9 +242,10 @@ + # 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 # PKG_PROG_PKG_CONFIG -+PKG_INSTALLDIR + if test -z "$PKG_CONFIG"; then - AC_MSG_ERROR(I couldn't find pkg-config; make sure it's installed and in your path) + AC_MSG_ERROR(I couldn't find pkg-config; make sure it's installed and in your path) fi -@@ -2808,6 +2808,7 @@ +@@ -1918,6 +1919,18 @@ + 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" +@@ -3086,10 +3099,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
