Fix:directfb:fixed Makefile.am and configure.in

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

diff --git a/configure.in b/configure.in
index 80d4514..35badb5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -112,6 +112,25 @@ AM_CONDITIONAL(GUI_GTK, [test "x$gtk2_pkgconfig" = "xyes"])
 AM_CONDITIONAL(GRAPHICS_GTK_DRAWING_AREA, [test "x$gtk2_pkgconfig" = "xyes"])
 AM_CONDITIONAL(PLUGINS, [test "x$plugins" = "xyes"])
 
+AC_ARG_ENABLE(gui-directfb, [  --disable-gui-directfb             don't create gui directfb ], MODULE_GUI_DIRECTFB=$enableval, MODULE_GUI_DIRECTFB=yes)
+
+if test "x$MODULE_GUI_DIRECTFB" = "xyes"; then
+       PKG_CHECK_MODULES(DIRECTFB, [directfb], [directfb_pkgconfig=yes], [directfb_pkgconfig=no])
+       if test "x$directfb_pkgconfig" = "xyes"; then
+               AC_DEFINE(HAVE_DIRECTFB, 1, [Define to 1 if you have directfb])
+       fi
+fi
+
+DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
+
+#DIRECTFB_CFLAGS="-D_REENTRANT -I/data/oe/tmp/staging/arm-angstrom-linux-gnueabi/usr/include/directfb/"
+#DIRECTFB_LIBS="-L/data/oe/tmp/staging/arm-angstrom-linux-gnueabi/usr/lib/ -ldirectfb -lfusion -ldirect -lpthread"
+
+AC_SUBST(DIRECTFB_CFLAGS)
+AC_SUBST(DIRECTFB_LIBS)
+AM_CONDITIONAL(GUI_DIRECTFB, [test "x$directfb_pkgconfig" = "xyes"])
+AM_CONDITIONAL(GRAPHICS_DIRECTFB, [test "x$directfb_pkgconfig" = "xyes"])
+
 AC_ARG_ENABLE(graphics-qt-qpainter, [  --disable-graphics-qt-qpainter             don't create graphics qt-qpainter], enable_graphics_qt_qpainter=$enableval, enable_graphics_qt_qpainter=yes)
 if test "x${enable_graphics_qt_qpainter}" = "xyes" ; then
        PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore], ,enable_graphics_qt_qpainter=no)
@@ -578,6 +597,7 @@ navit/data/poi_geodownload/libmdb/include/Makefile
 navit/fib-1.1/Makefile
 navit/graphics/Makefile
 navit/graphics/gtk_drawing_area/Makefile
+navit/graphics/directfb/Makefile
 navit/graphics/cogl/Makefile
 navit/graphics/opengl/Makefile
 navit/graphics/null/Makefile
@@ -589,6 +609,7 @@ navit/gui/internal/Makefile
 navit/gui/clutter/Makefile
 navit/gui/cegui/Makefile
 navit/gui/cegui/datafiles/Makefile
+navit/gui/directfb/Makefile
 navit/osd/Makefile
 navit/osd/core/Makefile
 navit/speech/Makefile
@@ -645,6 +666,12 @@ if test -z "$sdl_failures"
         else
                 echo "OpenGL gui  : DISABLED : you are missing $sdl_failures"
 fi
+if test x"$directfb_pkgconfig" = xyes
+       then
+       echo "DIRECTFB    : ENABLED"
+       else
+       echo "DIRECTFB    : DISABLED"
+fi
 if test x"$clutter_pkgconfig" = xyes
        then
        echo "Clutter gui : ENABLED"
@@ -693,7 +720,7 @@ if test "x$samplemap" = "xyes"
        else
        echo "Samplemap   : DISABLED"
 fi
-if  [ test x"$gtk2_pkgconfig" != xyes ] && [ test x"$sdl" != xyes ]
+if  [ test x"$gtk2_pkgconfig" != xyes ] && [ test x"$sdl" != xyes ] && [ test x"$directfb_pkgconfig" != xyes ]
        then
        echo ""
        echo "" 

diff --git a/navit/graphics/Makefile.am b/navit/graphics/Makefile.am
index b7e0f68..a2e7f19 100644 (file)
--- a/navit/graphics/Makefile.am
+++ b/navit/graphics/Makefile.am
@@ -2,6 +2,9 @@ SUBDIRS=null
 if GRAPHICS_GTK_DRAWING_AREA
   SUBDIRS+=gtk_drawing_area
 endif
+if GRAPHICS_DIRECTFB
+  SUBDIRS+=directfb
+endif
 if GRAPHICS_OPENGL
   SUBDIRS+=opengl
 if GUI_CLUTTER

diff --git a/navit/graphics/directfb/Makefile.in b/navit/graphics/directfb/Makefile.in
index b36cf85..d33c874 100644 (file)
--- a/navit/graphics/directfb/Makefile.in
+++ b/navit/graphics/directfb/Makefile.in
@@ -106,6 +106,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CEGUI_CFLAGS = @CEGUI_CFLAGS@
 CEGUI_LIBS = @CEGUI_LIBS@
 CFLAGS = @CFLAGS@
+CLUTTER_CFLAGS = @CLUTTER_CFLAGS@
+CLUTTER_LIBS = @CLUTTER_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@

diff --git a/navit/gui/Makefile.am b/navit/gui/Makefile.am
index ee73d82..fe75bee 100644 (file)
--- a/navit/gui/Makefile.am
+++ b/navit/gui/Makefile.am
@@ -8,4 +8,6 @@ endif
 if GUI_CLUTTER
   SUBDIRS += clutter
 endif
-
+if GUI_DIRECTFB
+  SUBDIRS += directfb
+endif

diff --git a/navit/gui/directfb/Makefile.in b/navit/gui/directfb/Makefile.in
index da29e48..b61524a 100644 (file)
--- a/navit/gui/directfb/Makefile.in
+++ b/navit/gui/directfb/Makefile.in
@@ -102,6 +102,8 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
 CEGUI_CFLAGS = @CEGUI_CFLAGS@
 CEGUI_LIBS = @CEGUI_LIBS@
 CFLAGS = @CFLAGS@
+CLUTTER_CFLAGS = @CLUTTER_CFLAGS@
+CLUTTER_LIBS = @CLUTTER_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@

diff --git a/po/cs.po b/po/cs.po
index 30ea179..4561efe 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:15+0200\n"
+"POT-Creation-Date: 2008-09-01 18:32+0200\n"
 "PO-Revision-Date: 2008-06-06 06:20+0000\n"
 "Last-Translator: Vaclav Cerny <vatoz@seznam.cz>\n"
 "Language-Team: Čeština\n"
@@ -84,26 +84,31 @@ msgstr "nájezd"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name
 #: ../navit/navigation.c:498
+#, c-format
 msgid "%sinto the street %s%s%s"
 msgstr "%s do ulice %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Male form. The stuff after | doesn't have to be included
 #: ../navit/navigation.c:502
+#, c-format
 msgid "%sinto the %s%s%s|male form"
 msgstr "%s o%s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Female form. The stuff after | doesn't have to be included
 #: ../navit/navigation.c:506
+#, c-format
 msgid "%sinto the %s%s%s|female form"
 msgstr "%s do %s%s%s"
 
 #. TRANSLATORS: Arguments: 1: Prefix (Space if required) 2: Street Name 3: Separator (Space if required), 4: Systematic Street Name. Neutral form. The stuff after | doesn't have to be included
 #: ../navit/navigation.c:510
+#, c-format
 msgid "%sinto the %s%s%s|neutral form"
 msgstr "%s do %s%s%s"
 
 #. TRANSLATORS: gives the name of the next road to turn into (into the E17)
 #: ../navit/navigation.c:517
+#, c-format
 msgid "into the %s"
 msgstr "do %s"
 
@@ -155,6 +160,7 @@ msgstr "chyba"
 
 #. TRANSLATORS: The first argument is strength, the second direction, the third distance and the fourth destination Example: 'Turn 'slightly' 'left' in '100 m' 'onto baker street'
 #: ../navit/navigation.c:616
+#, c-format
 msgid "Turn %1$s%2$s %3$s%4$s"
 msgstr "Zabočte %1$s%2$s %3$s%4$s"
 
@@ -216,6 +222,7 @@ msgid "Add as bookmark"
 msgstr "Použít jako záložku"
 
 #: ../navit/popup.c:263
+#, c-format
 msgid "Point 0x%x 0x%x"
 msgstr "Bod 0x%x 0x%x"
 
@@ -1632,10 +1639,10 @@ msgid "NW"
 msgstr "SZ"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:122
+#, c-format
 msgid "Route %4.0fkm    %02d:%02d ETA"
 msgstr "Trasa %4.0fkm    %02d:%02d ETA"
 
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:167
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Trasa 0000km  0+00:00 ETA"
-

diff --git a/po/da.po b/po/da.po
index 3f91ec2..247a5da 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:15+0200\n"
+"POT-Creation-Date: 2008-09-01 18:32+0200\n"
 "PO-Revision-Date: 2008-06-21 15:54+0000\n"
 "Last-Translator: Fennek <ng@fennek.dk>\n"
 "Language-Team: Glenn Sommer <glemsom@gmail.com>\n"
@@ -59,12 +59,14 @@ msgid "in %d.%d kilometers"
 msgstr "om %d.%d kilometer"
 
 #: ../navit/navigation.c:210
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "én kilometer"
 msgstr[1] "%d kilometer"
 
 #: ../navit/navigation.c:212
+#, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "om én kilometer"
@@ -223,6 +225,7 @@ msgid "Point 0x%x 0x%x"
 msgstr "Punkt 0x%x 0x%x"
 
 #: ../navit/popup.c:264
+#, c-format
 msgid "Screen coord : %d %d"
 msgstr "Skærm koordinater %d %d"
 

diff --git a/po/es.po b/po/es.po
index 8017168..8ab5b1f 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -3,12 +3,11 @@
 # This file is distributed under the same license as the navit package.
 # Chris Eubank <cteubank@gmail.com> 2007
 # Emilio Gómez Fernández <Unknown> 2008
-
 msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:15+0200\n"
+"POT-Creation-Date: 2008-09-01 18:32+0200\n"
 "PO-Revision-Date: 2008-05-30 16:45+0000\n"
 "Last-Translator: Emilio Gómez Fernández <Unknown>\n"
 "Language-Team: Chris Eubank <cteubank@gmail.com>\n"
@@ -31,10 +30,12 @@ msgid "setting '%s' to '%s'\n"
 msgstr ""
 
 #: ../navit/navigation.c:190
+#, c-format
 msgid "%d m"
 msgstr "%d metros"
 
 #: ../navit/navigation.c:192
+#, c-format
 msgid "in %d m"
 msgstr "en %d metros"
 
@@ -59,12 +60,14 @@ msgid "in %d.%d kilometers"
 msgstr "en %d.%d kilómetros"
 
 #: ../navit/navigation.c:210
+#, c-format
 msgid "one kilometer"
 msgid_plural "%d kilometers"
 msgstr[0] "un kilómetro"
 msgstr[1] "%d kilómetro"
 
 #: ../navit/navigation.c:212
+#, c-format
 msgid "in one kilometer"
 msgid_plural "in %d kilometers"
 msgstr[0] "en un kilómetro"
@@ -223,6 +226,7 @@ msgid "Point 0x%x 0x%x"
 msgstr "Punto 0x%x 0x%x"
 
 #: ../navit/popup.c:264
+#, c-format
 msgid "Screen coord : %d %d"
 msgstr "Coordenadas de pantalla : %d %d"
 
@@ -1641,4 +1645,3 @@ msgstr "Ruta %4.0fkm    %02d:%02d TEL"
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:167
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Ruta 0000km  0+00:00 TEL"
-

diff --git a/po/fi.po b/po/fi.po
index dfefd02..6d3ce2d 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:15+0200\n"
+"POT-Creation-Date: 2008-09-01 18:32+0200\n"
 "PO-Revision-Date: 2008-08-21 07:48+0000\n"
 "Last-Translator: Ossi Berg <fso_polonez@msn.com>\n"
 "Language-Team: Ossi Berg <o.berg@mail.com>\n"
@@ -225,6 +225,7 @@ msgid "Point 0x%x 0x%x"
 msgstr "Piste 0x%x 0x%x"
 
 #: ../navit/popup.c:264
+#, c-format
 msgid "Screen coord : %d %d"
 msgstr "Ruutu %d %d"
 

diff --git a/po/it.po b/po/it.po
index 9086905..9f14c19 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:15+0200\n"
+"POT-Creation-Date: 2008-09-01 18:32+0200\n"
 "PO-Revision-Date: 2008-08-28 20:46+0000\n"
 "Last-Translator: amedeo <Unknown>\n"
 "Language-Team: Italiano\n"
@@ -19,58 +19,6 @@ msgstr ""
 "X-Launchpad-Export-Date: 2008-08-29 13:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#, c-format
-#~ msgid ""
-#~ "navit usage:\n"
-#~ "navit [options] [configfile]\n"
-#~ "\t-c <file>: use <file> as config file\n"
-#~ "\t-d <n>: set the debug output level to <n>. (TODO)\n"
-#~ "\t-h: print this usage info and exit.\n"
-#~ "\t-v: Print the version and exit.\n"
-#~ msgstr ""
-#~ "Uso: navit [OPZIONE...] [FILE]\n"
-#~ "\t-c <file>: usa <file> come file di configurazione.\n"
-#~ "\t-d <n>: imposta il livello delle informazioni di debug a <n>. (TODO)\n"
-#~ "\t-h: mostra questo aiuto.\n"
-#~ "\t-v: mostra la versione di Navit ed esce.\n"
-
-#, c-format
-#~ msgid "No config file navit.xml, navit.xml.local found\n"
-#~ msgstr "File di configurazione navit.xml o navit.xml.local non trovato\n"
-
-#, c-format
-#~ msgid "Error parsing '%s': %s\n"
-#~ msgstr "Errore di sintassi in '%s': %s\n"
-
-#, c-format
-#~ msgid "Using '%s'\n"
-#~ msgstr "Lettura di '%s'\n"
-
-#, c-format
-#~ msgid "No instance has been created, exiting\n"
-#~ msgstr "Impossbile creare un'istanza, uscita dal programma\n"
-
-#~ msgid "Refresh"
-#~ msgstr "Aggiorna"
-
-#~ msgid "Clear"
-#~ msgstr "Pulisci"
-
-#~ msgid "Tracking"
-#~ msgstr "Posizione forzata su strada"
-
-#~ msgid "Orientation"
-#~ msgstr "Orienta mappa a nord"
-
-#~ msgid "Turn %1$s%2$s %3$s"
-#~ msgstr "%3$s svoltare %1$sa %2$s"
-
-#~ msgid "Turn %1$s%2$s %3$s onto %4$s"
-#~ msgstr "%3$s svoltare %1$sa %2$s su %4$s"
-
-#~ msgid "Turn %1$s%2$s %3$s into %4$s"
-#~ msgstr "%3$s svoltare %1$sa %2$s in %4$s"
-
 #: ../navit/main.c:149
 #, c-format
 msgid "Running from source directory\n"
@@ -1698,3 +1646,50 @@ msgstr "Percorso %4.0f km, %02d:%02d ETA"
 #: ../navit/gui/gtk/gui_gtk_statusbar.c:167
 msgid "Route 0000km  0+00:00 ETA"
 msgstr "Percorso 0000 km, 00:00 ETA"
+
+#~ msgid ""
+#~ "navit usage:\n"
+#~ "navit [options] [configfile]\n"
+#~ "\t-c <file>: use <file> as config file\n"
+#~ "\t-d <n>: set the debug output level to <n>. (TODO)\n"
+#~ "\t-h: print this usage info and exit.\n"
+#~ "\t-v: Print the version and exit.\n"
+#~ msgstr ""
+#~ "Uso: navit [OPZIONE...] [FILE]\n"
+#~ "\t-c <file>: usa <file> come file di configurazione.\n"
+#~ "\t-d <n>: imposta il livello delle informazioni di debug a <n>. (TODO)\n"
+#~ "\t-h: mostra questo aiuto.\n"
+#~ "\t-v: mostra la versione di Navit ed esce.\n"
+
+#~ msgid "No config file navit.xml, navit.xml.local found\n"
+#~ msgstr "File di configurazione navit.xml o navit.xml.local non trovato\n"
+
+#~ msgid "Error parsing '%s': %s\n"
+#~ msgstr "Errore di sintassi in '%s': %s\n"
+
+#~ msgid "Using '%s'\n"
+#~ msgstr "Lettura di '%s'\n"
+
+#~ msgid "No instance has been created, exiting\n"
+#~ msgstr "Impossbile creare un'istanza, uscita dal programma\n"
+
+#~ msgid "Refresh"
+#~ msgstr "Aggiorna"
+
+#~ msgid "Clear"
+#~ msgstr "Pulisci"
+
+#~ msgid "Tracking"
+#~ msgstr "Posizione forzata su strada"
+
+#~ msgid "Orientation"
+#~ msgstr "Orienta mappa a nord"
+
+#~ msgid "Turn %1$s%2$s %3$s"
+#~ msgstr "%3$s svoltare %1$sa %2$s"
+
+#~ msgid "Turn %1$s%2$s %3$s onto %4$s"
+#~ msgstr "%3$s svoltare %1$sa %2$s su %4$s"
+
+#~ msgid "Turn %1$s%2$s %3$s into %4$s"
+#~ msgstr "%3$s svoltare %1$sa %2$s in %4$s"

diff --git a/po/ru.po b/po/ru.po
index e81e6ad..9257a62 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Navit 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-27 14:15+0200\n"
+"POT-Creation-Date: 2008-09-01 18:32+0200\n"
 "PO-Revision-Date: 2008-08-15 13:02+0000\n"
 "Last-Translator: zcc <zcc@mail.ru>\n"
 "Language-Team: Rustam T. Usmanov\n"
@@ -228,6 +228,7 @@ msgid "Point 0x%x 0x%x"
 msgstr "Точка 0x%x 0x%x"
 
 #: ../navit/popup.c:264
+#, c-format
 msgid "Screen coord : %d %d"
 msgstr "Экран %d %d"