Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

configure.ac: unify search dirs for pcap and add lib32 #819

Merged
merged 1 commit into from
Dec 29, 2023

Conversation

shr-project
Copy link
Contributor

  • add lib32 because when building lib32-tcpreplay it's impossible to set --with-libpcap so that it would find both include files as well as the library in lib32 directory

  • maybe it would be beneficial to split --with-libpcap into --with-libpcap-includedir --with-libpcap-libdir as this already searches in the --with-libpcap value with and without any "lib" prefix, but include files always expect "include" dir there

  • most of this code was added in: 202b8e8#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570

  • then search for ${host_cpu} lib/${host_cpu} (without -${host_os} suffix) and ${build_arch}-${host_os} lib/${build_arch}-${host_os} was added, but only for search of dynamic library in: c3d5236

  • ${build_arch}-${host_os} lib/${build_arch}-${host_os} was later replaced with: lib/${MULTIARCH} ${MULTIARCH} and it was added to static library search as well

    but for dynamic library it was searching in reversed order: ${MULTIARCH} lib/${MULTIARCH} ed9e3a8

    I don't think this reversed order was intentional, just unify all 4 cases to use the same directories in the same order

* add lib32 because when building lib32-tcpreplay it's
  impossible to set --with-libpcap so that it would find
  both include files as well as the library in lib32 directory

* maybe it would be beneficial to split --with-libpcap
  into --with-libpcap-includedir --with-libpcap-libdir as this
  already searches in the --with-libpcap value with and
  without any "lib" prefix, but include files always expect
  "include" dir there

* most of this code was added in:
  appneta@202b8e8#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570

* then search for
  ${host_cpu} lib/${host_cpu} (without -${host_os} suffix)
  and ${build_arch}-${host_os} lib/${build_arch}-${host_os}
  was added, but only for search of dynamic library in:
  appneta@c3d5236

* ${build_arch}-${host_os} lib/${build_arch}-${host_os}
  was later replaced with:
  lib/${MULTIARCH} ${MULTIARCH}
  and it was added to static library search as well

  but for dynamic library it was searching in reversed order:
  ${MULTIARCH} lib/${MULTIARCH}
  appneta@ed9e3a8

  I don't think this reversed order was intentional, just unify all 4 cases
  to use the same directories in the same order

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
@shr-project shr-project marked this pull request as ready for review September 5, 2023 12:53
@fklassen fklassen changed the base branch from master to 4.5.0 December 29, 2023 18:46
@fklassen fklassen self-assigned this Dec 29, 2023
@fklassen fklassen merged commit 8235264 into appneta:4.5.0 Dec 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants