Cross compilation patches from Rüdiger Kuhlmann

<ruediger.kuhlmann@stud.uni-karlsruhe.de>.

diff --git a/Makefile.am b/Makefile.am
index e906d61a814f1cc763b845312e90ebbbb33a3d05..f8392925a4aef6ce421af8e9eaa4e235948e1857 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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)\" \

diff --git a/configure.in b/configure.in
index a82976f6eed12226c08d348b7fac4135d38b5eae..83f160eedfb01e6285fb7b90bb31ac9ed0e24ee5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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

diff --git a/imap/Makefile.am b/imap/Makefile.am
index c049fae0bfc5a49ba08f23fa7bd77930d3e6b093..efb97def1bb4aee025ce22e395285fc2fc3a5ca3 100644 (file)
--- a/imap/Makefile.am
+++ b/imap/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+AR=@AR@
+
 AUTOMAKE_OPTIONS = foreign
 
 if USE_GSS

diff --git a/mapping.h b/mapping.h
index 4d3d1565f09823a3e5c5433d8233ee8378a3fd97..87ae7adff72e546ca1639dc9fdf1c31a705d4452 100644 (file)
--- a/mapping.h
+++ b/mapping.h
@@ -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

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 24b058ac383bd4e3dc4ec00f7332295e64db6165..1e79ec643c5a8d3e8e22ec24921433f8cc80498f 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -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 \

diff --git a/sort.h b/sort.h
index ff62939b2d7d039d0bf86543cc7d5ac44e5b2e9b..da32278ea86d4ae779a22cb65eeb8b75be7388b8 100644 (file)
--- a/sort.h
+++ b/sort.h
@@ -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[];