-
Notifications
You must be signed in to change notification settings - Fork 852
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
autotools: use pkg-config and Homebrew when looking for libcrypto.
Grab the stuff from libpcap's configure script that looks for libssl (and libcrypto) and adapt it to look for libcrypto. his includes some macros to check using pkg-config (and other macros, such as macros to save and restore CFLAGS, LIBS, and LDFLAGS; any resemblance between their names and the cmake_push_check_state() and cmake_pop_check_state() commands is *entirely* coincidental :-)). Instead of checking for DES_cbc_encrypt(), which we don't use, to determine whether the libcrypto we found is usable, check for EVP_CIPHER_CTX_block_size(), which we *do* use. (We also check whether the openssl/evp.h header exists; if it doesn't, we might have found the libcrypto that Apple bundles with macOS, for which they do *NOT* provide the header in newer versions of Xcode.) See also #1174. This means that we don't need to check whether we have openssl/evp.h at compile time - now, if we don't, we don't even set HAVE_LIBCRYPTO, so there's no need to check HAVE_OPENSSL_EVP_H. (cherry picked from commit 749988b)
- Loading branch information
Showing
4 changed files
with
499 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -207,6 +207,29 @@ AC_DEFUN(AC_LBL_C_INIT, | |
| fi | ||
| ]) | ||
|
|
||
| dnl | ||
| dnl Save the values of various variables that affect compilation and | ||
| dnl linking, and that we don't ourselves modify persistently; done | ||
| dnl before a test involving compiling or linking is done, so that we | ||
| dnl can restore those variables after the test is done. | ||
| dnl | ||
| AC_DEFUN(AC_LBL_SAVE_CHECK_STATE, | ||
| [ | ||
| save_CFLAGS="$CFLAGS" | ||
| save_LIBS="$LIBS" | ||
| save_LDFLAGS="$LDFLAGS" | ||
| ]) | ||
|
|
||
| dnl | ||
| dnl Restore the values of variables saved by AC_LBL_SAVE_CHECK_STATE. | ||
| dnl | ||
| AC_DEFUN(AC_LBL_RESTORE_CHECK_STATE, | ||
| [ | ||
| CFLAGS="$save_CFLAGS" | ||
| LIBS="$save_LIBS" | ||
| LDFLAGS="$save_LDFLAGS" | ||
| ]) | ||
|
|
||
| dnl | ||
| dnl Check whether the compiler option specified as the second argument | ||
| dnl is supported by the compiler and, if so, add it to the macro | ||
|
|
@@ -517,7 +540,6 @@ AC_DEFUN(AC_LBL_LIBPCAP, | |
| # We didn't find a local libpcap. | ||
| # Look for an installed pkg-config. | ||
| # | ||
| AC_PATH_TOOL(PKG_CONFIG, pkg-config) | ||
| if test -n "$PKG_CONFIG" ; then | ||
| # | ||
| # We have it. Are there .pc files for libpcap? | ||
|
|
@@ -1210,3 +1232,266 @@ AC_DEFUN(AC_LBL_SSLEAY, | |
| incdir="-I$1/include" | ||
| fi | ||
| ]) | ||
|
|
||
| m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) | ||
| dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- | ||
| dnl serial 11 (pkg-config-0.29) | ||
| dnl | ||
| dnl Copyright © 2004 Scott James Remnant <[email protected]>. | ||
| dnl Copyright © 2012-2015 Dan Nicholson <[email protected]> | ||
| dnl | ||
| dnl This program is free software; you can redistribute it and/or modify | ||
| dnl it under the terms of the GNU General Public License as published by | ||
| dnl the Free Software Foundation; either version 2 of the License, or | ||
| dnl (at your option) any later version. | ||
| dnl | ||
| dnl This program is distributed in the hope that it will be useful, but | ||
| dnl WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| dnl General Public License for more details. | ||
| dnl | ||
| dnl You should have received a copy of the GNU General Public License | ||
| dnl along with this program; if not, write to the Free Software | ||
| dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA | ||
| dnl 02111-1307, USA. | ||
| dnl | ||
| dnl As a special exception to the GNU General Public License, if you | ||
| dnl distribute this file as part of a program that contains a | ||
| dnl configuration script generated by Autoconf, you may include it under | ||
| dnl the same distribution terms that you use for the rest of that | ||
| dnl program. | ||
|
|
||
| dnl PKG_PREREQ(MIN-VERSION) | ||
| dnl ----------------------- | ||
| dnl Since: 0.29 | ||
| dnl | ||
| dnl Verify that the version of the pkg-config macros are at least | ||
| dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's | ||
| dnl installed version of pkg-config, this checks the developer's version | ||
| dnl of pkg.m4 when generating configure. | ||
| dnl | ||
| dnl To ensure that this macro is defined, also add: | ||
| dnl m4_ifndef([PKG_PREREQ], | ||
| dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) | ||
| dnl | ||
| dnl See the "Since" comment for each macro you use to see what version | ||
| dnl of the macros you require. | ||
| m4_defun([PKG_PREREQ], | ||
| [m4_define([PKG_MACROS_VERSION], [0.29]) | ||
| m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, | ||
| [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) | ||
| ])dnl PKG_PREREQ | ||
|
|
||
| dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) | ||
| dnl ---------------------------------- | ||
| dnl Since: 0.16 | ||
| dnl | ||
| dnl Search for the pkg-config tool and set the PKG_CONFIG variable to | ||
| dnl first found in the path. Checks that the version of pkg-config found | ||
| dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.17.0 is | ||
| dnl used since that's the first version where --static was supported. | ||
| AC_DEFUN([PKG_PROG_PKG_CONFIG], | ||
| [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) | ||
| m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) | ||
| m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) | ||
| AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) | ||
| AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) | ||
| AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) | ||
| if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
| AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) | ||
| fi | ||
| if test -n "$PKG_CONFIG"; then | ||
| _pkg_min_version=m4_default([$1], [0.17.0]) | ||
| AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) | ||
| if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
| AC_MSG_RESULT([yes]) | ||
| else | ||
| AC_MSG_RESULT([no]) | ||
| PKG_CONFIG="" | ||
| fi | ||
| fi[]dnl | ||
| ])dnl PKG_PROG_PKG_CONFIG | ||
|
|
||
| dnl PKG_CHECK_EXISTS(MODULE, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | ||
| dnl ------------------------------------------------------------------- | ||
| dnl Since: 0.18 | ||
| dnl | ||
| dnl Check to see whether a particular module exists. Similar to | ||
| dnl PKG_CHECK_MODULE(), but does not set variables or print errors. | ||
| AC_DEFUN([PKG_CHECK_EXISTS], | ||
| [ | ||
| if test -n "$PKG_CONFIG" && \ | ||
| AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then | ||
| m4_default([$2], [:]) | ||
| m4_ifvaln([$3], [else | ||
| $3])dnl | ||
| fi]) | ||
|
|
||
| dnl _PKG_CONFIG_WITH_FLAGS([VARIABLE], [FLAGS], [MODULE]) | ||
| dnl --------------------------------------------- | ||
| dnl Internal wrapper calling pkg-config via PKG_CONFIG and, if | ||
| dnl pkg-config fails, reporting the error and quitting. | ||
| m4_define([_PKG_CONFIG_WITH_FLAGS], | ||
| [if test ! -n "$$1"; then | ||
| $1=`$PKG_CONFIG $2 "$3" 2>/dev/null` | ||
| if test "x$?" != "x0"; then | ||
| # | ||
| # That failed - report an error. | ||
| # Re-run the command, telling pkg-config to print an error | ||
| # message, capture the error message, and report it. | ||
| # This causes the configuration script to fail, as it means | ||
| # the script is almost certainly doing something wrong. | ||
| # | ||
| _PKG_SHORT_ERRORS_SUPPORTED | ||
| if test $_pkg_short_errors_supported = yes; then | ||
| _pkg_error_string=`$PKG_CONFIG --short-errors --print-errors $2 "$3" 2>&1` | ||
| else | ||
| _pkg_error_string=`$PKG_CONFIG --print-errors $2 "$3" 2>&1` | ||
| fi | ||
| AC_MSG_ERROR([$PKG_CONFIG $2 "$3" failed: $_pkg_error_string]) | ||
| fi | ||
| fi[]dnl | ||
| ])dnl _PKG_CONFIG_WITH_FLAGS | ||
|
|
||
|
|
||
| dnl _PKG_CONFIG([VARIABLE], [FLAGS], [MODULE]) | ||
| dnl --------------------------------------------- | ||
| dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting | ||
| dnl pkg_failed based on the result. | ||
| m4_define([_PKG_CONFIG], | ||
| [if test -n "$$1"; then | ||
| pkg_cv_[]$1="$$1" | ||
| elif test -n "$PKG_CONFIG"; then | ||
| PKG_CHECK_EXISTS([$3], | ||
| [pkg_cv_[]$1=`$PKG_CONFIG $2 "$3" 2>/dev/null` | ||
| test "x$?" != "x0" && pkg_failed=yes ], | ||
| [pkg_failed=yes]) | ||
| else | ||
| pkg_failed=untried | ||
| fi[]dnl | ||
| ])dnl _PKG_CONFIG | ||
|
|
||
| dnl _PKG_SHORT_ERRORS_SUPPORTED | ||
| dnl --------------------------- | ||
| dnl Internal check to see if pkg-config supports short errors. | ||
| AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], | ||
| [ | ||
| if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | ||
| _pkg_short_errors_supported=yes | ||
| else | ||
| _pkg_short_errors_supported=no | ||
| fi[]dnl | ||
| ])dnl _PKG_SHORT_ERRORS_SUPPORTED | ||
|
|
||
|
|
||
| dnl PKG_CHECK_MODULE(VARIABLE-PREFIX, MODULE, [ACTION-IF-FOUND], | ||
| dnl [ACTION-IF-NOT-FOUND]) | ||
| dnl -------------------------------------------------------------- | ||
| dnl Since: 0.4.0 | ||
| AC_DEFUN([PKG_CHECK_MODULE], | ||
| [ | ||
| AC_MSG_CHECKING([for $2 with pkg-config]) | ||
| if test -n "$PKG_CONFIG"; then | ||
| AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $2, overriding pkg-config])dnl | ||
| AC_ARG_VAR([$1][_LIBS], [linker flags for $2, overriding pkg-config])dnl | ||
| AC_ARG_VAR([$1][_LIBS_STATIC], [static-link linker flags for $2, overriding pkg-config])dnl | ||
| if AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$2"]); then | ||
| # | ||
| # The package was found, so try to get its C flags and | ||
| # libraries. | ||
| # | ||
| AC_MSG_RESULT([found]) | ||
| _PKG_CONFIG_WITH_FLAGS([$1][_CFLAGS], [--cflags], [$2]) | ||
| _PKG_CONFIG_WITH_FLAGS([$1][_LIBS], [--libs], [$2]) | ||
| _PKG_CONFIG_WITH_FLAGS([$1][_LIBS_STATIC], [--libs --static], [$2]) | ||
| m4_default([$3], [:]) | ||
| else | ||
| AC_MSG_RESULT([not found]) | ||
| m4_default([$4], [:]) | ||
| fi | ||
| else | ||
| # No pkg-config, so obviously not found with pkg-config. | ||
| AC_MSG_RESULT([pkg-config not found]) | ||
| m4_default([$4], [:]) | ||
| fi | ||
| ])dnl PKG_CHECK_MODULE | ||
|
|
||
|
|
||
| dnl PKG_CHECK_MODULE_STATIC(VARIABLE-PREFIX, MODULE, [ACTION-IF-FOUND], | ||
| dnl [ACTION-IF-NOT-FOUND]) | ||
| dnl --------------------------------------------------------------------- | ||
| dnl Since: 0.29 | ||
| dnl | ||
| dnl Checks for existence of MODULE and gathers its build flags with | ||
| dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags | ||
| dnl and VARIABLE-PREFIX_LIBS from --libs. | ||
| AC_DEFUN([PKG_CHECK_MODULE_STATIC], | ||
| [ | ||
| _save_PKG_CONFIG=$PKG_CONFIG | ||
| PKG_CONFIG="$PKG_CONFIG --static" | ||
| PKG_CHECK_MODULE($@) | ||
| PKG_CONFIG=$_save_PKG_CONFIG[]dnl | ||
| ])dnl PKG_CHECK_MODULE_STATIC | ||
|
|
||
|
|
||
| dnl PKG_INSTALLDIR([DIRECTORY]) | ||
| dnl ------------------------- | ||
| dnl Since: 0.27 | ||
| dnl | ||
| dnl Substitutes the variable pkgconfigdir as the location where a module | ||
| dnl should install pkg-config .pc files. By default the directory is | ||
| dnl $libdir/pkgconfig, but the default can be changed by passing | ||
| dnl DIRECTORY. The user can override through the --with-pkgconfigdir | ||
| dnl parameter. | ||
| AC_DEFUN([PKG_INSTALLDIR], | ||
| [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) | ||
| m4_pushdef([pkg_description], | ||
| [pkg-config installation directory @<:@]pkg_default[@:>@]) | ||
| AC_ARG_WITH([pkgconfigdir], | ||
| [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, | ||
| [with_pkgconfigdir=]pkg_default) | ||
| AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) | ||
| m4_popdef([pkg_default]) | ||
| m4_popdef([pkg_description]) | ||
| ])dnl PKG_INSTALLDIR | ||
|
|
||
|
|
||
| dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) | ||
| dnl -------------------------------- | ||
| dnl Since: 0.27 | ||
| dnl | ||
| dnl Substitutes the variable noarch_pkgconfigdir as the location where a | ||
| dnl module should install arch-independent pkg-config .pc files. By | ||
| dnl default the directory is $datadir/pkgconfig, but the default can be | ||
| dnl changed by passing DIRECTORY. The user can override through the | ||
| dnl --with-noarch-pkgconfigdir parameter. | ||
| AC_DEFUN([PKG_NOARCH_INSTALLDIR], | ||
| [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) | ||
| m4_pushdef([pkg_description], | ||
| [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) | ||
| AC_ARG_WITH([noarch-pkgconfigdir], | ||
| [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, | ||
| [with_noarch_pkgconfigdir=]pkg_default) | ||
| AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) | ||
| m4_popdef([pkg_default]) | ||
| m4_popdef([pkg_description]) | ||
| ])dnl PKG_NOARCH_INSTALLDIR | ||
|
|
||
|
|
||
| dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, | ||
| dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | ||
| dnl ------------------------------------------- | ||
| dnl Since: 0.28 | ||
| dnl | ||
| dnl Retrieves the value of the pkg-config variable for the given module. | ||
| AC_DEFUN([PKG_CHECK_VAR], | ||
| [ | ||
| AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl | ||
| _PKG_CONFIG([$1], [--variable="][$3]["], [$2]) | ||
| AS_VAR_COPY([$1], [pkg_cv_][$1]) | ||
| AS_VAR_IF([$1], [""], [$5], [$4])dnl | ||
| ])dnl PKG_CHECK_VAR | ||
Oops, something went wrong.