mirror of
https://git.freebsd.org/ports.git
synced 2025-05-30 01:46:55 -04:00
22a683a337
Adjust ./configure to set the correct CLANG_FORMAT value when clang-format is not found (when none of the llvm ports are installed). PR: 267814 Submitted by: Tatsuki Makino <tatsuki_makino@hotmail.com> MFH: 2022Q4
85 lines
2.3 KiB
Text
85 lines
2.3 KiB
Text
--- configure.orig 2022-11-15 10:58:55.000000000 -0800
|
|
+++ configure 2022-11-24 07:15:39.173234000 -0800
|
|
@@ -819,6 +819,8 @@
|
|
PKG_CONFIG
|
|
PKINIT_FALSE
|
|
PKINIT_TRUE
|
|
+KX509_FALSE
|
|
+KX509_TRUE
|
|
OPENLDAP_MODULE_FALSE
|
|
OPENLDAP_MODULE_TRUE
|
|
LIB_openldap
|
|
@@ -14915,7 +14917,7 @@
|
|
done
|
|
IFS=$as_save_IFS
|
|
|
|
- test -z "$ac_cv_prog_CLANG_FORMAT" && ac_cv_prog_CLANG_FORMAT="no"
|
|
+ test -z "$ac_cv_prog_CLANG_FORMAT" && ac_cv_prog_CLANG_FORMAT=""
|
|
fi
|
|
fi
|
|
CLANG_FORMAT=$ac_cv_prog_CLANG_FORMAT
|
|
@@ -16561,9 +16563,15 @@
|
|
printf "%s\n" "#define KX509 1" >>confdefs.h
|
|
|
|
fi
|
|
+ if test "$enable_kx509" != no; then
|
|
+ KX509_TRUE=
|
|
+ KX509_FALSE='#'
|
|
+else
|
|
+ KX509_TRUE='#'
|
|
+ KX509_FALSE=
|
|
+fi
|
|
|
|
|
|
-
|
|
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
|
if test -n "$ac_tool_prefix"; then
|
|
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
|
@@ -17649,7 +17657,7 @@
|
|
;;
|
|
*-*-freebsd*)
|
|
native_pthread_support=yes
|
|
- PTHREAD_LIBADD="-pthread"
|
|
+ PTHREAD_LIBADD="-lpthread"
|
|
;;
|
|
*-*-openbsd*)
|
|
native_pthread_support=yes
|
|
@@ -17907,7 +17915,7 @@
|
|
printf %s "(cached) " >&6
|
|
else $as_nop
|
|
|
|
-if eval "test \"\$ac_cv_func_db_create\" != yes" ; then
|
|
+if eval "test \"\$ac_cv_func_db_create\" = yes" ; then
|
|
ac_save_LIBS="$LIBS"
|
|
for ac_lib in "" $dbheader db-6 db-5 db4 db3 db; do
|
|
case "$ac_lib" in
|
|
@@ -18448,6 +18456,9 @@
|
|
|
|
printf "%s\n" "#define HAVE_NDBM 1" >>confdefs.h
|
|
have_ndbm=yes
|
|
+ if test "$db_type" = "unknown"; then
|
|
+ db_type=ndbm
|
|
+ fi
|
|
else
|
|
|
|
$as_unset ac_cv_func_dbm_firstkey
|
|
@@ -30678,7 +30689,7 @@
|
|
|
|
krb_cv_compile_et="no"
|
|
krb_cv_com_err_need_r=""
|
|
-krb_cv_compile_et_cross=no
|
|
+krb_cv_compile_et_cross=yes
|
|
if test "${COMPILE_ET}" != "no"; then
|
|
|
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compile_et has the features we need" >&5
|
|
@@ -31185,6 +31196,10 @@
|
|
fi
|
|
if test -z "${PKINIT_TRUE}" && test -z "${PKINIT_FALSE}"; then
|
|
as_fn_error $? "conditional \"PKINIT\" was never defined.
|
|
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
+fi
|
|
+if test -z "${KX509_TRUE}" && test -z "${KX509_FALSE}"; then
|
|
+ as_fn_error $? "conditional \"KX509\" was never defined.
|
|
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
|
fi
|
|
if test -z "${HAVE_CAPNG_TRUE}" && test -z "${HAVE_CAPNG_FALSE}"; then
|