f367c79829
and already adding it conditionally
40 lines
1.5 KiB
Plaintext
40 lines
1.5 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.6 2011/09/11 14:16:06 naddy Exp $
|
|
--- configure.ac.orig Sat Apr 9 10:45:59 2011
|
|
+++ configure.ac Wed Sep 7 21:37:45 2011
|
|
@@ -153,7 +153,7 @@ if test x"$_gcc_psign" = xyes ; then
|
|
CFLAGS="$CFLAGS -Wno-pointer-sign"
|
|
fi
|
|
|
|
-CFLAGS="$CFLAGS -Wall -Wno-pointer-sign"
|
|
+CFLAGS="$CFLAGS -Wall"
|
|
|
|
if test $USE_MAINTAINER_MODE = yes; then
|
|
CFLAGS="-g -Wall -Wno-pointer-sign"
|
|
@@ -679,6 +679,7 @@ else
|
|
AC_CHECK_LIB(resolv, res_query, LDAP_LIBS="$LDAP_LIBS -lresolv")
|
|
AC_CHECK_LIB(socket, bind, LDAP_LIBS="$LDAP_LIBS -lsocket")
|
|
AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
|
|
+ AC_CHECK_LIB(sasl2, sasl_version, LDAP_LIBS="$LDAP_LIBS -lsasl2")
|
|
AC_CHECK_LIB(lber, ber_get_tag, LDAP_LIBS="$LDAP_LIBS -llber",,
|
|
$LDAP_LIBS)
|
|
|
|
@@ -694,7 +695,8 @@ else
|
|
|
|
AC_CHECK_LIB(ldap, ldap_start_tls_s,
|
|
[ ac_cv_have_tls=yes ],
|
|
- [ ac_cv_have_tls=no ])
|
|
+ [ ac_cv_have_tls=no ],
|
|
+ $LDAP_LIBS)
|
|
|
|
fi
|
|
|
|
@@ -754,7 +756,7 @@ if test "$ac_cv_enable_jpilot" = yes; then
|
|
AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.) ])
|
|
fi
|
|
|
|
- AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock"], [JPILOT_LIBS="" ac_cv_enable_jpilot="no"])
|
|
+ AC_CHECK_LIB(pisock, unpack_Address, [JPILOT_LIBS="-lpisock -pthread"], [JPILOT_LIBS="" ac_cv_enable_jpilot="no"], -pthread)
|
|
if test x"$ac_cv_enable_jpilot" = xyes; then
|
|
AC_DEFINE(USE_JPILOT, 1, Define if you want JPilot support in addressbook.)
|
|
else
|