Patch:Android:Applied patch 'android_fix.patch' from ticket #538 and #522, librairies...

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk/navit@2933 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/configure.in b/configure.in
index 7e67a3d..1aa9638 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -106,7 +106,7 @@ linux*_android)
        speech_android=yes; speech_android_reason="host_os is android"
        MODULE_LDFLAGS="-module -Xcompiler -nostdlib"
        MODULE_LIBADD="-llog"
        speech_android=yes; speech_android_reason="host_os is android"
        MODULE_LDFLAGS="-module -Xcompiler -nostdlib"
        MODULE_LIBADD="-llog"

-       NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS -L\$(top_builddir)/navit -lnavit"
+       NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS"

        ;;
 esac
 if test "x$win32" = "xyes"
        ;;
 esac
 if test "x$win32" = "xyes"

@@ -650,7 +650,7 @@ AC_SUBST(MOFILES)
 AC_SUBST(POFILES)
 AC_SUBST(POIFILES)
 AM_GNU_GETTEXT_VERSION
 AC_SUBST(POFILES)
 AC_SUBST(POIFILES)
 AM_GNU_GETTEXT_VERSION

-AM_GNU_GETTEXT(use-libtool, need-ngettext, \$(top_builddir)/intl/)
+AM_GNU_GETTEXT(no-libtool, need-ngettext, \$(top_builddir)/intl/)

 AC_SUBST(LIBINTL)
 AC_SUBST(LTLIBINTL)
 if test x"$LIBINTL" != "x" ;then
 AC_SUBST(LIBINTL)
 AC_SUBST(LTLIBINTL)
 if test x"$LIBINTL" != "x" ;then

diff --git a/navit/support/wordexp/wordexp.c b/navit/support/wordexp/wordexp.c
index bacaea5..868b482 100644 (file)
--- a/navit/support/wordexp/wordexp.c
+++ b/navit/support/wordexp/wordexp.c
@@ -83,7 +83,7 @@ int
 wordexp(const char *words, wordexp_t *we, int flags)
 {      
        int     i;
 wordexp(const char *words, wordexp_t *we, int flags)
 {      
        int     i;

-       int     error;  
+       int     error = 0;

        char   *words_expanded;
 #ifdef HAVE_API_WIN32_BASE
        glob_t  pglob;
        char   *words_expanded;
 #ifdef HAVE_API_WIN32_BASE
        glob_t  pglob;

@@ -94,7 +94,6 @@ wordexp(const char *words, wordexp_t *we, int flags)
  
        /* expansion of ´$NAME´ or ´${NAME}´ */
        words_expanded=expand_variables(words);
  
        /* expansion of ´$NAME´ or ´${NAME}´ */
        words_expanded=expand_variables(words);

-

 #ifdef HAVE_API_WIN32_BASE
        /* expansion of ´*´, ´?´ */
        error=glob(words_expanded, 0, NULL, &pglob);
 #ifdef HAVE_API_WIN32_BASE
        /* expansion of ´*´, ´?´ */
        error=glob(words_expanded, 0, NULL, &pglob);