diff options
| author | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-01-28 14:32:54 +0000 |
|---|---|---|
| committer | kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2010-01-28 14:32:54 +0000 |
| commit | 62f07480f4783be241cb255f951d9ad790991da7 (patch) | |
| tree | d03a9ede85d4484291b546807351edceead2a26b | |
| parent | 12a67c31fb78560b6681441267673544acba0cff (diff) | |
| download | navit-62f07480f4783be241cb255f951d9ad790991da7.tar.gz | |
Patch:Android:Applied patch 'android_fix.patch' from ticket #538 and #522, librairies loading
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2933 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | navit/support/wordexp/wordexp.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 7e67a3de0..1aa96385a 100644 --- 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" - NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS -L\$(top_builddir)/navit -lnavit" + NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS" ;; esac if test "x$win32" = "xyes" @@ -650,7 +650,7 @@ AC_SUBST(MOFILES) 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 diff --git a/navit/support/wordexp/wordexp.c b/navit/support/wordexp/wordexp.c index bacaea57c..868b482d1 100644 --- 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; - int error; + int error = 0; 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); - #ifdef HAVE_API_WIN32_BASE /* expansion of ´*´, ´?´ */ error=glob(words_expanded, 0, NULL, &pglob); |