Commit d98e3dc3 authored by Thomas Roessler's avatar Thomas Roessler

Cross compilation patches from Rüdiger Kuhlmann

<ruediger.kuhlmann@stud.uni-karlsruhe.de>.
parent eb26a789
......@@ -47,6 +47,13 @@ checktypes_LDADD =
checktypes_DEPENDENCIES =
$(makedoc_OBJECTS): $(makedoc_SOURCES)
$(HOST_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $<
makedoc: $(makedoc_OBJECTS) $(makedoc_DEPENDENCIES)
@rm -rf makedoc
$(HOST_CC) $(AM_CFLAGS) $(LDFLAGS) $(makedoc_LDFLAGS) $(makedoc_OBJECTS) $(makedoc_LDADD) -o makedoc
CPP=@CPP@
DEFS=-DSHAREDIR=\"$(sharedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
......
......@@ -33,6 +33,7 @@ AC_PROG_CPP
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AC_PROG_RANLIB
AC_CHECK_TOOL(AR, ar, ar)
AC_C_INLINE
AC_C_CONST
......@@ -272,12 +273,13 @@ AC_ARG_WITH(regex, [ --with-regex Use the GNU regex library ],
[AC_CHECK_FUNCS(regcomp, mutt_cv_regex=no, mutt_cv_regex=yes)])
if test $mutt_cv_regex = no ; then
AC_MSG_CHECKING(whether your system's regexp library is completely broken)
AC_CACHE_CHECK([whether your system's regexp library is completely broken],
[mutt_cv_regex_broken],
AC_TRY_RUN([
#include <unistd.h>
#include <regex.h>
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)
mutt_cv_regex_broken=no, mutt_cv_regex_broken=yes, mutt_cv_regex_broken=yes))
AC_MSG_RESULT([$mutt_cv_regex_broken])
if test $mutt_cv_regex_broken = yes ; then
echo "Using the included GNU regex instead." >&AC_FD_MSG
......
## Process this file with automake to produce Makefile.in
AR=@AR@
AUTOMAKE_OPTIONS = foreign
if USE_GSS
......
......@@ -16,6 +16,9 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
#ifndef MAPPING_H
#define MAPPING_H
struct mapping_t
{
char *name;
......@@ -26,3 +29,5 @@ char *mutt_getnamebyvalue (int, const struct mapping_t *);
char *mutt_compile_help (char *, size_t, int, struct mapping_t *);
int mutt_getvaluebyname (const char *, const struct mapping_t *);
#endif
......@@ -84,13 +84,13 @@ all: all-@USE_NLS@
all-yes: cat-id-tbl.c $(CATALOGS)
all-no:
.PHONY: ../keymap_alldefs.h
../keymap_alldefs.h:
.PHONY: $(top_srcdir)/keymap_alldefs.h
$(top_srcdir)/keymap_alldefs.h:
cd .. && $(MAKE) keymap_alldefs.h
$(srcdir)/$(PACKAGE).pot: $(POTFILES)
$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
--add-comments --keyword=_ --keyword=N_ \
--directory=.. --add-comments --keyword=_ --keyword=N_ \
--files-from=$(srcdir)/POTFILES.in \
&& test ! -f $(PACKAGE).po \
|| ( rm -f $(srcdir)/$(PACKAGE).pot \
......
......@@ -50,4 +50,5 @@ WHERE short SortAlias INITVAL (SORT_ALIAS);
WHERE short PgpSortKeys INITVAL (SORT_ADDRESS);
#endif
#include "mapping.h"
extern const struct mapping_t SortMethods[];
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment