3 # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
6 --- mutt-1.5.4/./configure.in~configure
7 +++ mutt-1.5.4/./configure.in
9 dnl !!! WHEN ADDING NEW CONFIGURE TESTS, PLEASE ADD CODE TO MAIN.C !!!
10 dnl !!! TO DUMP THEIR RESULTS WHEN MUTT -V IS CALLED !!!
16 +AC_CONFIG_SRCDIR([mutt.h])
17 AM_CONFIG_HEADER(config.h)
19 mutt_cv_version=`cat $srcdir/VERSION`
22 AC_ARG_WITH(slang, [ --with-slang[=DIR] Use S-Lang instead of ncurses],
23 [AC_CACHE_CHECK([if this is a BSD system], mutt_cv_bsdish,
24 - [AC_TRY_RUN([#include <sys/param.h>
25 + [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/param.h>
36 - mutt_cv_bsdish=no)])
37 +}]])],[mutt_cv_bsdish=yes],[mutt_cv_bsdish=no],[mutt_cv_bsdish=no])])
39 AC_MSG_CHECKING(for S-Lang)
40 if test $withval = yes; then
42 AC_DEFINE(SIG_ATOMIC_VOLATILE_T, [volatile sig_atomic_t])
46 +AC_CHECK_DECLS([sys_siglist])
49 dnl For MD5 and SHA1 on 64-bit systems
52 dnl This is the method autoconf-2.50's new AC_CHECK_TYPE macro uses.
53 dnl We need to be backwards compatible to autoconf 2.13, though. -lh
54 AC_MSG_CHECKING(for uint32_t)
56 +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
57 #include <sys/types.h>
66 +#endif]], [[if ((uint32_t *) 0)
68 if (sizeof (uint32_t))
72 AC_DEFINE(HAVE_UINT32_T,1,[ Define if you have the uint32_t type. ])
74 - ], AC_MSG_RESULT(no)
76 + ],[AC_MSG_RESULT(no)
82 AC_CHECK_FUNCS(snprintf, , [mutt_cv_snprintf=yes])
83 AC_CHECK_FUNCS(vsnprintf, , [mutt_cv_snprintf=yes])
84 if test $mutt_cv_snprintf = yes; then
85 -# AC_LIBOBJ(snprintf)
86 - LIBOBJS="$LIBOBJS snprintf.o"
90 dnl SCO uses chsize() instead of ftruncate()
92 if test $mutt_cv_regex = no ; then
93 AC_CACHE_CHECK([whether your system's regexp library is completely broken],
94 [mutt_cv_regex_broken],
96 + AC_RUN_IFELSE([AC_LANG_SOURCE([[
99 -main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }],
100 - mutt_cv_regex_broken=no, mutt_cv_regex_broken=yes, mutt_cv_regex_broken=yes))
101 +main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); }]])],[mutt_cv_regex_broken=no],[mutt_cv_regex_broken=yes],[mutt_cv_regex_broken=yes]))
102 if test $mutt_cv_regex_broken = yes ; then
103 - echo "Using the included GNU regex instead." >&AC_FD_MSG
104 + echo "Using the included GNU regex instead." >&AS_MESSAGE_FD([])
109 if test $mutt_cv_regex = yes; then
110 AC_DEFINE(USE_GNU_REGEX,1,[ Define if you want to use the included regex.c. ])
111 -### AC_LIBOBJ(regex)
112 - LIBOBJS="$LIBOBJS regex.o"
119 AC_DEFINE_UNQUOTED(MAILPATH,"$mutt_cv_mailpath",[ Where new mail is spooled. ])
121 - AC_CACHE_CHECK(if $mutt_cv_mailpath is world writable, mutt_cv_worldwrite, [AC_TRY_RUN([#include <sys/types.h>
122 + AC_CACHE_CHECK(if $mutt_cv_mailpath is world writable, mutt_cv_worldwrite, [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
123 #include <sys/stat.h>
125 int main (int argc, char **argv)
126 @@ -420,14 +415,14 @@
127 stat ("$mutt_cv_mailpath", &s);
128 if (s.st_mode & S_IWOTH) exit (0);
130 -}], mutt_cv_worldwrite=yes, mutt_cv_worldwrite=no, mutt_cv_worldwrite=no)])
131 +}]])],[mutt_cv_worldwrite=yes],[mutt_cv_worldwrite=no],[mutt_cv_worldwrite=no])])
134 if test $mutt_cv_worldwrite = yes; then
135 AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
138 - AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_TRY_RUN([#include <sys/types.h>
139 + AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
140 #include <sys/stat.h>
142 int main (int argc, char **argv)
144 stat ("$mutt_cv_mailpath", &s);
145 if (s.st_mode & S_IWGRP) exit (0);
147 -}], mutt_cv_groupwrite=yes, mutt_cv_groupwrite=no, mutt_cv_groupwrite=no)])
148 +}]])],[mutt_cv_groupwrite=yes],[mutt_cv_groupwrite=no],[mutt_cv_groupwrite=no])])
150 if test $mutt_cv_groupwrite = yes; then
151 AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
153 AC_CACHE_CHECK([whether this iconv is good enough], mutt_cv_iconv_good,
154 mutt_save_LIBS="$LIBS"
155 LIBS="$LIBS $LIBICONV"
157 + AC_RUN_IFELSE([AC_LANG_SOURCE([[
162 !(ob == buf && obl == sizeof(buf)) ||
166 - mutt_cv_iconv_good=yes,
167 - mutt_cv_iconv_good=no,
168 - mutt_cv_iconv_good=yes)
169 + ]])],[mutt_cv_iconv_good=yes],[mutt_cv_iconv_good=no],[mutt_cv_iconv_good=yes])
170 LIBS="$mutt_save_LIBS")
171 if test "$mutt_cv_iconv_good" = no; then
172 AC_MSG_ERROR(Try using libiconv instead)
174 AC_CACHE_CHECK([whether iconv is non-transcribing], mutt_cv_iconv_nontrans,
175 mutt_save_LIBS="$LIBS"
176 LIBS="$LIBS $LIBICONV"
178 + AC_RUN_IFELSE([AC_LANG_SOURCE([[
183 return ((cd = iconv_open("UTF-8", "UTF-8")) == (iconv_t)(-1) ||
184 iconv(cd, &ib, &ibl, &ob, &obl));
187 - mutt_cv_iconv_nontrans=no,
188 - mutt_cv_iconv_nontrans=yes,
189 - mutt_cv_iconv_nontrans=no)
190 + ]])],[mutt_cv_iconv_nontrans=no],[mutt_cv_iconv_nontrans=yes],[mutt_cv_iconv_nontrans=no])
191 LIBS="$mutt_save_LIBS")
192 if test "$mutt_cv_iconv_nontrans" = yes; then
193 AC_DEFINE(ICONV_NONTRANS, 1)
194 @@ -888,32 +877,26 @@
195 AC_CHECK_HEADERS(wchar.h)
197 AC_CACHE_CHECK([for wchar_t], mutt_cv_wchar_t,
199 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
206 - [ wchar_t wc; return 0; ],
207 - mutt_cv_wchar_t=yes,
208 - mutt_cv_wchar_t=no))
209 + ]], [[ wchar_t wc; return 0; ]])],[mutt_cv_wchar_t=yes],[mutt_cv_wchar_t=no]))
211 if test "$mutt_cv_wchar_t" = no; then
212 AC_DEFINE(wchar_t,int,[ Define to 'int' if system headers don't define. ])
215 AC_CACHE_CHECK([for wint_t], mutt_cv_wint_t,
217 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
224 - [ wint_t wc; return 0; ],
225 - mutt_cv_wint_t=yes,
226 - mutt_cv_wint_t=no))
227 + ]], [[ wint_t wc; return 0; ]])],[mutt_cv_wint_t=yes],[mutt_cv_wint_t=no]))
229 if test "$mutt_cv_wint_t" = no; then
230 AC_DEFINE(wint_t,int,[ Define to 'int' if system headers don't define. ])
231 @@ -925,16 +908,13 @@
232 AC_CHECK_FUNCS(iswxdigit towupper towlower)
234 AC_CACHE_CHECK([for mbstate_t], mutt_cv_mbstate_t,
236 + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
243 - [ mbstate_t s; return 0; ],
244 - mutt_cv_mbstate_t=yes,
245 - mutt_cv_mbstate_t=no))
246 + ]], [[ mbstate_t s; return 0; ]])],[mutt_cv_mbstate_t=yes],[mutt_cv_mbstate_t=no]))
248 if test "$mutt_cv_mbstate_t" = no; then
249 AC_DEFINE(mbstate_t,int,[ Define to 'int' if system headers don't define. ])
251 if test "$wc_funcs" != yes -a "$wc_funcs" != no; then
252 AC_CACHE_CHECK([for wchar_t functions], mutt_cv_wc_funcs,
255 + AC_LINK_IFELSE([AC_LANG_PROGRAM([[
256 #define _XOPEN_SOURCE 1
264 - [mbrtowc(0, 0, 0, 0); wctomb(0, 0); wcwidth(0);
265 - iswprint(0); iswspace(0); towlower(0); towupper(0); iswalnum(0)],
266 - mutt_cv_wc_funcs=yes))
267 +#endif]], [[mbrtowc(0, 0, 0, 0); wctomb(0, 0); wcwidth(0);
268 + iswprint(0); iswspace(0); towlower(0); towupper(0); iswalnum(0)]])],[mutt_cv_wc_funcs=yes],[]))
269 wc_funcs=$mutt_cv_wc_funcs
272 @@ -968,26 +946,21 @@
275 AC_CACHE_CHECK([for nl_langinfo and CODESET], mutt_cv_langinfo_codeset,
276 - [AC_TRY_LINK([#include <langinfo.h>],
277 - [char* cs = nl_langinfo(CODESET);],
278 - mutt_cv_langinfo_codeset=yes,
279 - mutt_cv_langinfo_codeset=no)])
280 + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[char* cs = nl_langinfo(CODESET);]])],[mutt_cv_langinfo_codeset=yes],[mutt_cv_langinfo_codeset=no])])
281 if test $mutt_cv_langinfo_codeset = yes; then
282 AC_DEFINE(HAVE_LANGINFO_CODESET,1,[ Define if you have <langinfo.h> and nl_langinfo(CODESET). ])
285 AC_CACHE_CHECK([for nl_langinfo and YESEXPR], mutt_cv_langinfo_yesexpr,
286 - [AC_TRY_LINK([#include <langinfo.h>],
287 - [char* cs = nl_langinfo(YESEXPR);],
288 - mutt_cv_langinfo_yesexpr=yes,
289 - mutt_cv_langinfo_yesexpr=no)])
290 + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]], [[char* cs = nl_langinfo(YESEXPR);]])],[mutt_cv_langinfo_yesexpr=yes],[mutt_cv_langinfo_yesexpr=no])])
291 if test $mutt_cv_langinfo_yesexpr = yes; then
292 AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have <langinfo.h> and nl_langinfo(YESEXPR). ])
295 -AC_OUTPUT(Makefile intl/Makefile m4/Makefile
296 +AC_CONFIG_FILES([Makefile intl/Makefile m4/Makefile
297 po/Makefile.in doc/Makefile contrib/Makefile