Switched to fib-1.1

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

diff --git a/navit/configure.in b/navit/configure.in
index 8377459..d564b98 100644 (file)
--- a/navit/configure.in
+++ b/navit/configure.in
@@ -148,8 +148,6 @@ fi
 AC_SUBST(PYTHON_LIB)
 AC_SUBST(PYTHON_INC)
 
-AC_CONFIG_SUBDIRS(src/fib-1.0)
-
 LIBS="$LIBS -rdynamic"
 
 AC_OUTPUT([
@@ -159,6 +157,7 @@ src/data/Makefile
 src/data/mg/Makefile
 src/data/textfile/Makefile
 src/data/garmin_img/Makefile
+src/fib-1.1/Makefile
 src/gui/Makefile
 src/gui/gtk/Makefile
 src/gui/sdl/Makefile

diff --git a/navit/src/Makefile.am b/navit/src/Makefile.am
index f5098c9..3bb6133 100644 (file)
--- a/navit/src/Makefile.am
+++ b/navit/src/Makefile.am
@@ -1,10 +1,6 @@
-SUBDIRS=fib-1.0 data gui graphics xpm
+SUBDIRS=fib-1.1 data gui graphics xpm
 
-fib-1.0 fib-1.0/Makefile.in: fib-1.0/Makefile.am
-       cd fib-1.0
-       ./configure
-
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @SPEECHD_CFLAGS@ -DMODULE=\"navit\"
+AM_CPPFLAGS = -Ifib-1.1 @NAVIT_CFLAGS@ @SPEECHD_CFLAGS@ -DMODULE=\"navit\"
 
 
 bin_PROGRAMS = navit
@@ -23,5 +19,5 @@ navit_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_wind
        param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h search.h speech.h statusbar.h \
        toolbar.h transform.h track.h util.h vehicle.h xmlconfig.h
 
-navit_LDADD = @NAVIT_LIBS@ @SPEECHD_LIBS@ -Lfib-1.0 -lfib
+navit_LDADD = @NAVIT_LIBS@ @SPEECHD_LIBS@ -Lfib-1.1 -lfib
 

diff --git a/navit/src/fib-1.1/Makefile.in b/navit/src/fib-1.1/Makefile.in
deleted file mode 100644 (file)
index d482937..0000000
--- a/navit/src/fib-1.1/Makefile.in
+++ /dev/null
@@ -1,116 +0,0 @@
-#      $Id: Makefile.in,v 1.1 2005-12-02 10:41:56 martin-s Exp $
-#
-
-SHELL = /bin/sh
-
-LIB = fib
-
-SRCS = fib.c
-OBJS = fib.o
-SOBJS = fib.so
-POBJS = fib.po
-
-INCS = fib.h
-
-TESTPROG = use
-TESTSRCS = use.c
-TESTOBJS = use.o
-
-REGRESS_PROG = fibtest fibtest2 tt
-
-DEBUG = -g -Wall -Werror
-#OPT = -O2
-PROFILE = -pg
-LIBOPTS = -DFH_STATS # -DNO_FREE
-
-srcdir = @srcdir@
-
-AFLAGS = -Wall -I$(srcdir) $(DEBUG) $(OPT) $(LIBOPTS) $(CFLAGS)
-
-MAJOR = 1
-ARNAME = lib$(LIB).a
-SONAME = lib$(LIB).so.$(MAJOR)
-PANAME = lib$(LIB)_p.a
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-LIBDIR = @libdir@
-LIBOWN = 0
-LIBGRP = 0
-LIBMOD = 0444
-INCDIR = @includedir@
-INCOWN = 0
-INCGRP = 0
-INCMOD = 0444
-
-all: $(ARNAME) $(SONAME) $(PANAME)
-
-$(ARNAME): $(OBJS)
-       $(AR) rc $@ $(OBJS)
-
-$(SONAME): $(SOBJS)
-       $(CC) -shared -o $@ $(SOBJS)
-
-$(PANAME): $(POBJS)
-       $(AR) rc $@ $(POBJS)
-
-$(TESTPROG): $(TESTOBJS) $(ARNAME)
-       $(CC) -static $(CFLAGS) -o $@ $(TESTOBJS) $(ARNAME) $(PROFILE)
-
-deepclean: clean
-       rm -f Makefile config.cache config.log config.status configure
-
-clean: regressclean
-       rm -f $(ARNAME) $(OBJS) $(SONAME) $(SOBJS) $(PANAME) $(POBJS)   \
-           $(TESTPROG) $(TESTOBJS) .depend
-
-install: $(ARNAME) $(SONAME) $(PANAME)
-       mkdir -p -m 755 $(LIBDIR)
-       for i in $(ARNAME) $(SONAME) $(PANAME); do              \
-               cp $$i $(LIBDIR);                               \
-               chown $(LIBOWN):$(LIBGRP) $(LIBDIR)/$$i;        \
-               chmod $(LIBMOD) $(LIBDIR)/$$i;                  \
-       done
-       mkdir -p -m 755 $(INCDIR)
-       for i in $(INCS); do                                    \
-               cp $$i $(INCDIR);                               \
-               chown $(INCOWN):$(INCGRP) $(INCDIR)/$$i;        \
-               chmod $(INCMOD) $(INCDIR)/$$i;                  \
-       done
-
-depend:
-       mkdep $(AFLAGS) $(SRCS)
-
-$(srcdir)/configure: configure.in
-       cd $(srcdir) && autoconf
-
-Makefile: Makefile.in config.status
-       ./config.status
-
-config.status: configure
-       ./config.status --recheck
-
-regress: $(REGRESS_PROG)
-       @for i in $(REGRESS_PROG); do                           \
-               echo Regression for $$i;                        \
-               ./$$i > regress.new;                            \
-               diff $${i}.out regress.new;                     \
-       done
-       rm regress.new
-
-regressclean:
-       rm -f $(REGRESS_PROG)
-
-.SUFFIXES:
-.SUFFIXES: .so .po .c .o
-.c.so:
-       $(CC) -fpic $(AFLAGS) -c $< -o $@
-
-.c.po:
-       $(CC) $(PROFILE) $(AFLAGS) -c $< -o $@
-
-.c.o:
-       $(CC) $(CPPFLAGS) $(AFLAGS) -c $< -o $@
-
-.c: $(ARNAME)
-       $(CC) $(CPPFLAGS) $(AFLAGS) -o $@ $< $(ARNAME)

diff --git a/navit/src/route.c b/navit/src/route.c
index aa239e7..22141e7 100644 (file)
--- a/navit/src/route.c
+++ b/navit/src/route.c
@@ -18,7 +18,7 @@
 #include "track.h"
 #include "graphics.h"
 #include "transform.h"
-#include "fib-1.0/fib.h"
+#include "fib.h"
 
 static int speed_list[]={
        10, /* street_0 */