3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
6 --- cyrus-sasl-2.1.17/configure.in~configure
7 +++ cyrus-sasl-2.1.17/configure.in
9 AC_DEFINE(TRY_DLOPEN_WHEN_STATIC,[],[Should we try to dlopen() plugins while staticly compiled?])
12 -if test "$ac_cv_prog_gcc" = yes; then
13 +if test "$ac_cv_c_compiler_gnu" = yes; then
14 CFLAGS="-Wall -W ${CFLAGS}"
18 AC_PATH_PROGS(JAVAH, javah kaffeh, no)
19 AC_CHECK_PROGS(JAVADOC, javadoc, :)
20 if test "$JAVAC" = "no" -o "$JAVAH" = "no"; then
21 - AC_WARN([Disabling Java support])
22 + AC_MSG_WARN([Disabling Java support])
27 LDFLAGS="$LDFLAGS -L$digest/lib"
29 if test "$with_des" = no; then
30 - AC_WARN(No DES support for DIGEST-MD5)
31 + AC_MSG_WARN([No DES support for DIGEST-MD5])
38 if test "$with_openssl" = no; then
39 - AC_WARN([OpenSSL not found -- OTP will be disabled])
40 + AC_MSG_WARN([OpenSSL not found -- OTP will be disabled])
47 if test "$with_openssl" = no; then
48 - AC_WARN([OpenSSL not found -- SRP will be disabled])
49 + AC_MSG_WARN([OpenSSL not found -- SRP will be disabled])
56 if test "$with_openssl" = no; then
57 - AC_WARN([OpenSSL not found -- NTLM will be disabled])
58 + AC_MSG_WARN([OpenSSL not found -- NTLM will be disabled])
63 AC_CHECK_FUNC(snprintf, [AC_DEFINE(HAVE_SNPRINTF,[],[Does the system have snprintf()?])], [sasl_cv_snprintf=yes])
64 AC_CHECK_FUNC(vsnprintf, [AC_DEFINE(HAVE_VSNPRINTF,[],[Does the system have vsnprintf()?])], [sasl_cv_snprintf=yes])
65 if test $sasl_cv_snprintf = yes; then
66 - LIBOBJS="$LIBOBJS snprintf.o"
67 + AC_LIBOBJ([snprintf])
68 SNPRINTFOBJS="snprintf.o"
69 LTSNPRINTFOBJS="snprintf.lo"
72 [AC_DEFINE(HAVE_GETADDRINFO,[],[Do we have a getaddrinfo() function?])
73 sasl_cv_getaddrinfo=no])])
74 if test $sasl_cv_getaddrinfo = yes; then
75 - LIBOBJS="$LIBOBJS getaddrinfo.o"
76 + AC_LIBOBJ([getaddrinfo])
77 GETADDRINFOOBJS="getaddrinfo.o"
78 LTGETADDRINFOOBJS="getaddrinfo.lo"
81 IPv6_CHECK_FUNC(getnameinfo,
82 [AC_DEFINE(HAVE_GETNAMEINFO,[],[Do we have a getnameinfo() function?])], [sasl_cv_getnameinfo=yes])
83 if test $sasl_cv_getnameinfo = yes; then
84 - LIBOBJS="$LIBOBJS getnameinfo.o"
85 + AC_LIBOBJ([getnameinfo])
86 GETNAMEINFOOBJS="getnameinfo.o"
87 LTGETNAMEINFOOBJS="getnameinfo.lo"
89 AC_SUBST(GETNAMEINFOOBJS)
90 AC_SUBST(LTGETNAMEINFOOBJS)
92 -LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
95 +#LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
101 @@ -1092,7 +1092,7 @@
103 AC_CONFIG_HEADERS(config.h)
106 +AC_CONFIG_FILES([Makefile
110 @@ -1108,6 +1108,7 @@
111 java/javax/security/auth/Makefile
112 java/javax/security/auth/callback/Makefile
118 echo Configuration Complete. Type \'make\' to build.
119 --- cyrus-sasl-2.1.17/saslauthd/auth_rimap.c~configure
120 +++ cyrus-sasl-2.1.17/saslauthd/auth_rimap.c
122 /* PUBLIC DEPENDENCIES */
123 #include "mechanisms.h"
129 --- cyrus-sasl-2.1.17/saslauthd/auth_sia.c~configure
130 +++ cyrus-sasl-2.1.17/saslauthd/auth_sia.c
135 +#include <libio.h> /* NULL */
139 --- cyrus-sasl-2.1.17/saslauthd/configure.in~configure
140 +++ cyrus-sasl-2.1.17/saslauthd/configure.in
142 AC_DEFINE(HAVE_SIA,[],[Include SIA Support])
143 LIB_SIA="-lsecurity -ldb -lm -laud"
145 - AC_ERROR([No support for SIA found])
146 + AC_MSG_ERROR([No support for SIA found])
154 +AH_TEMPLATE([AUTH_SASLDB], [])
155 +AH_TEMPLATE([HAVE_FUNC], [])
156 +AH_TEMPLATE([HAVE_FUNCTION], [])
157 +AH_TEMPLATE([HAVE_GSSAPI], [])
158 +AH_TEMPLATE([HAVE_LDAP], [])
159 +AH_TEMPLATE([HAVE_PAM], [])
160 +AH_TEMPLATE([HAVE_PRETTY_FUNCTION], [])
161 +AH_TEMPLATE([HAVE_SASLAUTHD], [])
162 +AH_TEMPLATE([HAVE_SIA], [])
163 +AH_TEMPLATE([HAVE_STRUCT_SOCKADDR_STORAGE], [])
164 +AH_TEMPLATE([KRB5_HEIMDAL], [])
165 +AH_TEMPLATE([PATH_SASLAUTHD_RUNDIR], [])
166 +AH_TEMPLATE([SASLAUTHD_THREADED], [])
167 +AH_TEMPLATE([USE_DOORS], [])
168 +AH_TEMPLATE([HAVE_GETADDRINFO], [])
169 +AH_TEMPLATE([HAVE_GETNAMEINFO], [])
170 +AH_TEMPLATE([HAVE_OPENSSL], [])
171 +AH_TEMPLATE([HAVE_SOCKADDR_SA_LEN], [])
172 +AH_TEMPLATE([HAVE_SOCKLEN_T], [])
173 +AH_TEMPLATE([HAVE_SS_FAMILY], [])
174 +AH_TEMPLATE([HAVE_GETADDRINFO], [])
175 +AH_TEMPLATE([HAVE_GETNAMEINFO], [])
176 +AH_TEMPLATE([HAVE_OPENSSL], [])
177 +AH_TEMPLATE([HAVE_SOCKADDR_SA_LEN], [])
178 +AH_TEMPLATE([HAVE_SOCKLEN_T], [])
179 +AH_TEMPLATE([HAVE_SS_FAMILY], [])
180 +AH_TEMPLATE([HAVE_KRB], [])
181 +AH_TEMPLATE([SASL_BERKELEYDB], [])
182 +AH_TEMPLATE([SASL_DB_PATH], [])
183 +AH_TEMPLATE([SASL_GDBM], [])
184 +AH_TEMPLATE([SASL_NDBM], [])
185 +AH_TEMPLATE([STATIC_KERBEROS4], [])
186 +AH_TEMPLATE([STATIC_SASLDB], [])
187 +AH_TEMPLATE([WITH_DES], [])
188 +AH_TEMPLATE([WITH_SSL_DES], [])
189 AC_CONFIG_HEADERS(saslauthd.h)
192 +AC_CONFIG_FILES([Makefile])