1. 22 12月, 2016 1 次提交
    • A
      m4/virt-arg: Rename LIBVIRT_ARG_WITH* macros · e64f2fab
      Andrea Bolognani 提交于
      LIBVIRT_ARG_WITH_ALT is more generic than LIBVIRT_ARG_WITH, which
      is tailored at switching features on and off.
      
      Rename the macros according to their intended purpose, and add
      some documentation to help developers pick between the two.
      e64f2fab
  2. 21 12月, 2016 3 次提交
  3. 07 11月, 2016 2 次提交
    • A
      wireshark: Use ${exec_prefix} instead of ${prefix} · 7b3b2540
      Andrea Bolognani 提交于
      ${exec_prefix} and ${prefix} point to the same directory in
      most setups, but when that's not the case the former should
      be used for architecture-dependent data such as shared objects,
      which makes it the best fit for our Wireshark dissector.
      
      While at it, change all uses of $(var) to ${var}: they are
      absolutely identicaly as far as make's concerned, but autoconf
      itself seems to prefer the latter form so we might as well
      follow suit.
      7b3b2540
    • A
      wireshark: Make fallback path construction more reliable · 054fd1a7
      Andrea Bolognani 提交于
      We only need to strip $ws_prefix from $ws_plugindir if we've
      retrieved it from pkg-config: if we're building it ourselves
      from $libdir, we can just use it without further processing.
      054fd1a7
  4. 26 10月, 2016 5 次提交
    • A
      wireshark: Rename plugindir to ws_plugindir · 3cbf0549
      Andrea Bolognani 提交于
      Since we're using autoconf to substitute the right value in
      Makefile.am now, we can use a less generic name without running
      into circular dependencies.
      3cbf0549
    • A
      wireshark: Inject $(prefix) at the right time · c587c735
      Andrea Bolognani 提交于
      Adding $(prefix) in Makefile.am, as we were doing, means that
      it would be prepended even when using --with-ws-plugindir,
      which is something we don't want to happen.
      
      Instead, we add it beforehand but take care that it doesn't
      get expanded until make is called.
      c587c735
    • A
      wireshark: Strip prefix correctly · debf2f0b
      Andrea Bolognani 提交于
      Even when we're building $plugindir ourselves because we can't
      retrieve it using pkg-config, we still want to strip the prefix,
      except in that case it would be the same prefix we're using for
      building libvirt.
      
      The fact that $plugindir is missing also doesn't tell us
      anything about $ws_prefix, so we have to handle the two variables
      separately.
      debf2f0b
    • A
      wireshark: Hoist $ws_prefix declaration · c64a0a8e
      Andrea Bolognani 提交于
      Keep all variable declarations close together.
      c64a0a8e
    • A
      wireshark: Introduce $ws_modversion · 18251701
      Andrea Bolognani 提交于
      Use a separate variable instead of setting it inline for
      slightly cleaner code.
      18251701
  5. 21 10月, 2016 1 次提交
  6. 27 7月, 2016 1 次提交
    • M
      virt-wireshark: Properly substract wireshark prefix · 5c2bc001
      Michal Privoznik 提交于
      So, when building wireshark plugin, we get the plugindir variable
      from the wireshark.pc as well as prefix. Then we replace the
      prefix in the plugindir with our own prefix where libvirt is
      building to:
      
        plugindir="${prefix}${plugindir#ws_prefix}"
      
      However, as you can see, there's '$' missing in front of the
      ws_prefix variable. This results in the mangled plugindir, for
      instance like this:
      
        plugindir='/usr/usr/lib64/wireshark/plugins'
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      5c2bc001
  7. 26 4月, 2016 1 次提交
    • M
      wireshark: Fix distcheck · dc3002b4
      Michal Privoznik 提交于
      Our distcheck is broken. Well, it works but only by pure chance.
      When wireshark plugin is enabled, we try to query which path
      should the plugin be installed into. Firstly, we try to ask
      pkg-config as some releases of wireshark already sets
      corresponding variable in their pkg-config files. However, if we
      obtained no value from there we try to construct the path on our
      own. Based on our observations it usually is:
      $libdir/wireshark/plugins/$version/.
      Now, the problem is in the way we are deciding whether we have
      obtained the plugin directory from pkg-config or not. Simply
      said, we are checking wrong variable. The variable we are
      checking has never been set, thus in our test is empty and
      therefore we will always construct the plugin dir path on our
      own, regardless of its presence in the pkg-config file.
      To make things worse, after fixing this problem, VPATH build was
      broken as it now tried to install plugin into correct directory.
      Yes, this is problem, because --prefix was not honoured and
      everything but the plugin was installed into given prefix. I've
      managed to resolve this issue by replacing plugin dir prefix with
      our own. So when doing regular installation (our prefix ==
      wireshark prefix), nothing changes. When doing VPATH build &
      installation plugin is installed into correctly prefixed dir.
      Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
      dc3002b4
  8. 13 1月, 2016 1 次提交
  9. 29 10月, 2015 1 次提交
    • M
      wireshark: Install to generic plugin directory · 7c8250d7
      Michal Privoznik 提交于
      There has been a report on the list [1] that we are not
      installing the wireshark dissector into the correct plugin
      directory. And in fact we are not. The problem is, the plugin
      directory path is constructed at compile time. However, it's
      dependent on the wireshark version, e.g.
      
        /usr/lib/wireshark/plugins/1.12.6
      
      This is rather unfortunate, because if libvirt RPMs were built
      with one version, but installed on a system with newer one, the
      plugins are not really loaded. This problem lead fedora packagers
      to unify plugin path to:
      
        /usr/lib/wireshark/plugins/
      
      Cool! But this was enabled just in wireshark-1.12.6-4. Therefore,
      we must require at least that version.
      
      And while at it, on some distributions, the wireshark.pc file
      already has a variable that defines where plugin dir is. Use that
      if possible.
      
      1: https://www.redhat.com/archives/libvirt-users/2015-October/msg00063.htmlSigned-off-by: NMichal Privoznik <mprivozn@redhat.com>
      7c8250d7
  10. 17 3月, 2015 1 次提交
    • P
      rpm-build: use pkg-config to detect wireshark presence · 37397320
      Pavel Hrdina 提交于
      Wireshark supports pkg-config since 1.11.3.  Right now we build
      wireshark-dissectior tool as default trough rpm build only on
      fedora >= 21 and there is new wireshark that supports pkg-config.
      If someone wants to build libvirt with wireshark-dissector against old
      wireshark, they should specify the location by hand.
      
      This patch is mainly to fix wrong dependency on wireshark binary as it
      doesn't make sense to require that binary file to just get version info
      of that package in makefile.
      Signed-off-by: NPavel Hrdina <phrdina@redhat.com>
      37397320