FIX:build: Don't forget navit subdir. Check for win32 after its detected.

Only initialize NLS if enabled

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

diff --git a/Makefile.am b/Makefile.am
index 92f705f..a7afcec 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,8 @@ include $(top_srcdir)/Makefile.inc
 SUBDIRS=
 if ENABLE_NLS
 SUBDIRS+=intl po
-else
-SUBDIRS+=navit
 endif
+SUBDIRS+=navit
 pkgdoc_DATA = README
 EXTRA_DIST = README COPYRIGHT
 DIST_SUBDIRS=intl po navit

diff --git a/configure.in b/configure.in
index 881eb0d..42121c8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -601,11 +601,6 @@ AC_CHECK_HEADER(
                ,
 )
 
-LIBS="$LIBS -lm"
-if test "$win32" == "no"; then
-       LIBS="$LIBS -rdynamic"
-fi
-
 PACKAGE=navit
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
@@ -632,6 +627,12 @@ then
        NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/win32 -lsupport_win32"
 fi
 AM_CONDITIONAL(SUPPORT_WIN32, [test "x$win32" = "xyes"])
+
+LIBS="$LIBS -lm"
+if test "$win32" == "no"; then
+       LIBS="$LIBS -rdynamic"
+fi
+
 support_libc=no
 AC_ARG_ENABLE(support_libc, [  --enable-support-libc enable builtin mini libc ], support_libc=$enableval)
 AM_CONDITIONAL(SUPPORT_LIBC, [test "x$support_libc" = "xyes"])

diff --git a/navit/main.c b/navit/main.c
index 6e91fb1..db8805c 100644 (file)
--- a/navit/main.c
+++ b/navit/main.c
@@ -197,7 +197,9 @@ main_init(char *program)
 void
 main_init_nls(void)
 {
+#ifdef ENABLE_NLS
        bindtextdomain(PACKAGE, getenv("NAVIT_LOCALEDIR"));
        bind_textdomain_codeset (PACKAGE, "UTF-8");
        textdomain(PACKAGE);
+#endif
 }