diff options
| author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-02-13 10:06:56 +0000 |
|---|---|---|
| committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-02-13 10:06:56 +0000 |
| commit | a77f19406e47d48017ed15871e4504d77de56367 (patch) | |
| tree | b2a0b0e621bf347bd2d8aa1ae36b07784a4c8193 | |
| parent | 3018f52ca52a3c0cf5527af4d537c316e2109cdb (diff) | |
| download | navit-a77f19406e47d48017ed15871e4504d77de56367.tar.gz | |
Fix:Core:Fixed wince build
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2048 ffa7fe5e-494d-0410-b361-a75ebd5db220
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | navit/Makefile.am | 2 | ||||
| -rw-r--r-- | navit/start.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 99bc2c4f6..6195dba36 100644 --- a/configure.in +++ b/configure.in @@ -85,8 +85,8 @@ AC_SUBST(cross_compiling) AC_SUBST(CC_FOR_BUILD) AC_SUBST(CCLD_FOR_BUILD) -AC_ARG_ENABLE(variant, [ --enable-variant=something set variant], VARIANT=$enableval) -AC_SUBST(variant) +AC_ARG_ENABLE(variant, [ --enable-variant=something set variant], NAVIT_VARIANT=$enableval) +AC_SUBST(NAVIT_VARIANT) AC_ARG_ENABLE(avoid-unaligned, [ --enable-avoid-unaligned avoid unaligned accesses], AVOID_UNALIGNED=$enableval, AVOID_UNALIGNED=no) test x"${AVOID_UNALIGNED}" = xyes && AC_DEFINE(AVOID_UNALIGNED,[],Define to avoid unaligned access) diff --git a/navit/Makefile.am b/navit/Makefile.am index 2c8608797..3f41b11e3 100644 --- a/navit/Makefile.am +++ b/navit/Makefile.am @@ -73,7 +73,7 @@ if SOURCE_MODE_SVN else echo "#define SVN_VERSION \"@SOURCE_MODE@\"" >>version.h.tmp endif - echo "#define VARIANT \"@VARIANT@\"" >>version.h.tmp + echo "#define NAVIT_VARIANT \"@NAVIT_VARIANT@\"" >>version.h.tmp if ! diff version.h.tmp version.h >/dev/null 2>/dev/null; \ then \ mv version.h.tmp version.h; \ diff --git a/navit/start.c b/navit/start.c index cc9d7d0d1..91ba1705f 100644 --- a/navit/start.c +++ b/navit/start.c @@ -42,7 +42,7 @@ #include <winbase.h> #endif -char *version=PACKAGE_VERSION" "SVN_VERSION""VARIANT; +char *version=PACKAGE_VERSION" "SVN_VERSION""NAVIT_VARIANT; static void print_usage(void) |