mirror of
https://git.freebsd.org/ports.git
synced 2025-07-11 22:39:16 -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
54 lines
1.9 KiB
Text
54 lines
1.9 KiB
Text
FreeBSD sh(1) does not support the Brace Expansion.
|
|
|
|
--- acinclude/ac_with_cclient.m4.orig 2018-05-22 07:37:52 UTC
|
|
+++ acinclude/ac_with_cclient.m4
|
|
@@ -3,7 +3,7 @@ dnl Output:
|
|
dnl AC_SUBST: @CCLIENT_INCLUDES@ @CCLIENT_LIBS@ @CCLIENT_CXXFLAGS@
|
|
dnl AM_CONDITIONAL: HAVE_CCLIENT
|
|
AC_DEFUN(AC_WITH_CCLIENT,[
|
|
- CCLIENTLOCATIONS="/usr,/usr/local"
|
|
+ CCLIENTLOCATIONS=""
|
|
HAVE_CCLIENT="no"
|
|
CCLIENT_LIBS=""
|
|
CCLIENT_INCLUDES=""
|
|
@@ -16,7 +16,7 @@ AC_DEFUN(AC_WITH_CCLIENT,[
|
|
if test "$withval" = "no" ; then
|
|
CCLIENTLOCATIONS=""
|
|
else
|
|
- test "$withval" = "yes" || CCLIENTLOCATIONS="$withval,${CCLIENTLOCATIONS}"
|
|
+ test "$withval" = "yes" || CCLIENTLOCATIONS="$withval"
|
|
fi
|
|
]
|
|
)
|
|
@@ -28,7 +28,7 @@ AC_DEFUN(AC_WITH_CCLIENT,[
|
|
dnl Looking for headers c-client headers
|
|
dnl
|
|
AC_MSG_CHECKING([for c-client.h])
|
|
- for p in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/include/c-client,/include,/include/imap}"` ; do
|
|
+ p=${CCLIENTLOCATIONS}/include/c-client
|
|
if test -r "${p}/c-client.h" -a -r "${p}/linkage.h" -a -r "${p}/linkage.c" ; then
|
|
CCLIENT_INCLUDES="-I${p}"
|
|
CCLIENT_LINKAGE_H="${p}/linkage.h"
|
|
@@ -36,7 +36,6 @@ AC_DEFUN(AC_WITH_CCLIENT,[
|
|
AC_MSG_RESULT([found in ${p}])
|
|
break
|
|
fi
|
|
- done
|
|
if test -z "${CCLIENT_INCLUDES}" ; then
|
|
AC_MSG_RESULT([not found])
|
|
ifelse([$2], , :, [$2])
|
|
@@ -48,13 +47,12 @@ AC_DEFUN(AC_WITH_CCLIENT,[
|
|
dnl Looking for c-client libraries
|
|
dnl
|
|
AC_MSG_CHECKING([for c-client library])
|
|
- for l in `eval "echo {${CCLIENTLOCATIONS}}{,/c-client,/lib/c-client,/lib,/lib64}/{libc-client,libc-client4,c-client}{${SOP}}"` ; do
|
|
+ l=${CCLIENTLOCATIONS}/lib/libc-client4.so
|
|
if test -r "$l" ; then
|
|
AC_MSG_RESULT([found ${l}])
|
|
CCLIENT_LIBS="$l"
|
|
break
|
|
fi
|
|
- done
|
|
if test -z "${CCLIENT_LIBS}" ; then
|
|
AC_MSG_RESULT([not found])
|
|
ifelse([$2], , :, [$2])
|