0438143249
For example (${OSVERSION} >= 900000 && ${OSVERSION} < 900021) is always true,
as is (${OSVERSION} > 900002 || ${OSVERSION} < 900000 && ${OSVERSION} > 800107).
Regarding patches, when an EXTRA_PATCHES is no longer needed, I remove it, when
it is always needed, I renamed it, in one case, I merged two patches.
Differential Revision: https://reviews.freebsd.org/D2209
48 lines
2 KiB
Text
48 lines
2 KiB
Text
Index: configure
|
|
diff -u configure.orig configure
|
|
--- configure.orig 2011-09-14 13:19:05.073252913 +0900
|
|
+++ configure 2011-09-14 13:21:19.010068209 +0900
|
|
@@ -606,6 +606,7 @@
|
|
IMAP_COM_ERR_LIBS
|
|
LIB_RT
|
|
LIB_UCDSNMP
|
|
+LDFLAGS_UCDSNMP
|
|
SNMP_CONFIG
|
|
LIB_WRAP
|
|
SNMP_SUBDIRS
|
|
@@ -7171,7 +7172,7 @@
|
|
|
|
done
|
|
|
|
- if test "$ac_cv_header_pcreposix_h" == "yes"; then
|
|
+ if test "$ac_cv_header_pcreposix_h" = "yes"; then
|
|
LIBS="$LIBS -lpcre -lpcreposix";
|
|
|
|
$as_echo "#define ENABLE_REGEX /**/" >>confdefs.h
|
|
@@ -9540,7 +9540,7 @@
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
|
|
+LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS"
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
/* end confdefs.h. */
|
|
|
|
@@ -9842,7 +9842,7 @@
|
|
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}"
|
|
elif test "$gss_impl" = "heimdal"; then
|
|
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
|
|
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
|
|
+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err -lhx509"
|
|
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}"
|
|
elif test "$gss_impl" = "cybersafe03"; then
|
|
# Version of CyberSafe with two libraries
|
|
@@ -10781,7 +10784,7 @@
|
|
|
|
$as_echo "#define HAVE_UCDSNMP 1" >>confdefs.h
|
|
|
|
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
|
|
+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpmdbOpen in -lrpm" >&5
|
|
$as_echo_n "checking for rpmdbOpen in -lrpm... " >&6; }
|
|
if ${ac_cv_lib_rpm_rpmdbOpen+:} false; then :
|