mirror of
https://git.freebsd.org/ports.git
synced 2025-07-10 13:59:22 -04:00
fdcd202235
exit function declared in autoconf 2.59 configure scripts conflicts
with Clang 6 because stdlib.h declares it with an attribute for C++11
or later. This is fixed in later versions of autoconf 2.60.
- Add USES=autoreconf to regenerate configure, new version of
autoconf no longer declares the exit function. [1]
- Merge the changes from files/patch-configure and post-patch taget
into acinclude/ac_with_{cclient,openssl}.m4
[1] http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=a71c24a704ec0570ba99be909fffbc044d50908b
Reviewed by: koobs, mat
Approved by: koobs (mentor)
Differential Revision: https://reviews.freebsd.org/D15532
MFH: 2018Q2
52 lines
1.7 KiB
Text
52 lines
1.7 KiB
Text
FreeBSD sh(1) does not support the Brace Expansion.
|
|
|
|
--- acinclude/ac_with_openssl.m4.orig 2018-05-22 07:38:01 UTC
|
|
+++ acinclude/ac_with_openssl.m4
|
|
@@ -3,7 +3,7 @@ dnl Output:
|
|
dnl AC_SUBST: @OPENSSL_INCLUDES@ @OPENSSL_LDFLAGS@ @OPENSSL_LIBS@
|
|
dnl AM_CONDITIONAL: HAVE_OPENSSL
|
|
AC_DEFUN(AC_WITH_OPENSSL,[
|
|
- OPENSSLLOCATIONS="/usr,/usr/local,/usr/local/openssl,/opt/openssl,/usr/local/ssl,/usr/lib/ssl,/usr/ssl"
|
|
+ OPENSSLLOCATIONS=""
|
|
HAVE_OPENSSL="no"
|
|
OPENSSL_LDFLAGS=""
|
|
OPENSSL_LIBS=""
|
|
@@ -14,7 +14,7 @@ AC_DEFUN(AC_WITH_OPENSSL,[
|
|
if test "$withval" = "no" ; then
|
|
OPENSSLLOCATIONS=""
|
|
else
|
|
- test "$withval" = "yes" || OPENSSLLOCATIONS="$withval,${OPENSSLLOCATIONS}"
|
|
+ test "$withval" = "yes" || OPENSSLLOCATIONS="$withval"
|
|
fi
|
|
]
|
|
)
|
|
@@ -22,13 +22,12 @@ AC_DEFUN(AC_WITH_OPENSSL,[
|
|
ifelse([$2], , :, [$2])
|
|
else
|
|
AC_MSG_CHECKING([for libssl])
|
|
- for p in `eval "echo {${OPENSSLLOCATIONS}}{/lib,/lib64}"` ; do
|
|
+ p=${OPENSSLLOCATIONS}/lib
|
|
if test -r "${p}/libssl.a" -o -r "${p}/libssl.so" ; then
|
|
OPENSSL_LDFLAGS="-L${p}"
|
|
AC_MSG_RESULT([found in ${p}])
|
|
break
|
|
fi
|
|
- done
|
|
if test -z "${OPENSSL_LDFLAGS}" ; then
|
|
AC_MSG_RESULT([not found])
|
|
ifelse([$2], , :, [$2])
|
|
@@ -50,13 +49,12 @@ AC_DEFUN(AC_WITH_OPENSSL,[
|
|
ifelse([$2], , :, [$2])
|
|
else
|
|
AC_MSG_CHECKING([for openssl/ssl.h])
|
|
- for p in `eval "echo {${OPENSSLLOCATIONS}}{/include,}"` ; do
|
|
+ p=${OPENSSLLOCATIONS}/include
|
|
if test -r "${p}/openssl/ssl.h" ; then
|
|
OPENSSL_INCLUDES="-I${p}"
|
|
AC_MSG_RESULT([found in ${p}])
|
|
break
|
|
fi
|
|
- done
|
|
if test -z "${OPENSSL_INCLUDES}" ; then
|
|
AC_MSG_RESULT([not found])
|
|
ifelse([$2], , :, [$2])
|