From 8ac4e59be278114221ad789c522edc2ce7e11ea9 Mon Sep 17 00:00:00 2001 From: martin-s Date: Fri, 14 Aug 2009 19:41:00 +0000 Subject: [PATCH] Fix:Build:Fixed some build system bugs git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@2464 ffa7fe5e-494d-0410-b361-a75ebd5db220 --- navit/configure.in | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/navit/configure.in b/navit/configure.in index 6f57ade..9b6c73c 100644 --- a/navit/configure.in +++ b/navit/configure.in @@ -83,7 +83,7 @@ linux*_android) AC_DEFINE(HAVE_API_ANDROID, 1, [Have Android API]) echo "void dl_unwind_find_exidx(void) {}" >crt0.c $CC -c crt0.c - $AR r libg.a crt0.a + $AR r libg.a crt0.o vehicle_android=yes; vehicle_android_reason="host_os is android" graphics_android=yes; graphics_android_reason="host_os is android" MODULE_LDFLAGS="-Xcompiler -nostdlib" @@ -555,10 +555,7 @@ LINGUAS="" if test "x$enable_nls" = "xyes"; then - AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"] - AC_CHECK_LIB(intl, gettext, [INTLIBS="-lintl" HAVEGETTEXT="yes"], - INTLIBS="" )) - + AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"],[INTLIBS="-lintl" HAVEGETTEXT="yes"]) AC_CHECK_PROG(XGETTEXT, xgettext, xgettext) AC_CHECK_PROG(MSGMERGE, msgmerge, msgmerge) AC_CHECK_PROG(MSGFMT, msgfmt, msgfmt) @@ -570,7 +567,7 @@ if test "x$enable_nls" = "xyes"; then fi fi - if test "$XGETTEXT" != "" -a "$HAVEGETTEXT" != ""; then + if test "$XGETTEXT" != "" ; then PO="" if test "$LINGUAS" = ""; then ling=` (cd $srcdir/po; /bin/ls *.po.in) ` @@ -584,8 +581,8 @@ if test "x$enable_nls" = "xyes"; then else LINGUAS="" PO="" - echo "xgettext and libintl.a don't both exist; will not build i18n support" - enable_nls = no + echo "xgettext doesn't exist; will not build i18n support" + enable_nls=no fi for lang in $LINGUAS; do MOFILES="$MOFILES $lang.mo" -- 2.7.4