Fix:Core:Fixed some compile bugs

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

diff --git a/navit/navit/osm2navit.c b/navit/navit/osm2navit.c
index 0e67193..abc916f 100644 (file)
--- a/navit/navit/osm2navit.c
+++ b/navit/navit/osm2navit.c
@@ -1241,6 +1241,7 @@ phase1(FILE *in, FILE *out_ways, FILE *out_nodes)
        return 1;
 }
 
+#ifdef HAVE_POSTGRESQL
 static int
 phase1_db(char *dbstr, FILE *out_ways, FILE *out_nodes)
 {
@@ -1405,6 +1406,7 @@ phase1_db(char *dbstr, FILE *out_ways, FILE *out_nodes)
        alarm(0);
        return 1;
 }
+#endif
 
 static char buffer[150000];
 
@@ -2434,7 +2436,9 @@ usage(FILE *f)
        fprintf(f,"-W (--ways-only)         : process only ways\n");
        fprintf(f,"-a (--attr-debug-level)  : control which data is included in the debug attribute\n");
        fprintf(f,"-c (--dump-coordinates)  : dump coordinates after phase 1\n");
+#ifdef HAVE_POSTGRESQL
        fprintf(f,"-d (--db)                : get osm data out of a postgresql database with osm simple scheme and given connect string\n");
+#endif
        fprintf(f,"-e (--end)               : end at specified phase\n");
        fprintf(f,"-k (--keep-tmpfiles)     : do not delete tmp files after processing. useful to reuse them\n\n");
        fprintf(f,"-o (--coverage)          : map every street to item overage\n");
@@ -2466,7 +2470,9 @@ int main(int argc, char **argv)
                        {"attr-debug-level", 1, 0, 'a'},
                        {"compression-level", 1, 0, 'z'},
                        {"coverage", 0, 0, 'o'},
+#ifdef HAVE_POSTGRESQL
                        {"db", 1, 0, 'd'},
+#endif
                        {"dedupe-ways", 0, 0, 'w'},
                        {"end", 1, 0, 'e'},
                        {"help", 0, 0, 'h'},
@@ -2478,7 +2484,11 @@ int main(int argc, char **argv)
                        {"ways-only", 0, 0, 'W'},
                        {0, 0, 0, 0}
                };
-               c = getopt_long (argc, argv, "Nni:Wa:cd:e:hks:w", long_options, &option_index);
+               c = getopt_long (argc, argv, "Nni:Wa:c"
+#ifdef HAVE_POSTGRESQL
+                                             "d:"
+#endif
+                                             "e:hks:w", long_options, &option_index);
                if (c == -1)
                        break;
                switch (c) {
@@ -2494,9 +2504,11 @@ int main(int argc, char **argv)
                case 'c':
                        dump_coordinates=1;
                        break;
+#ifdef HAVE_POSTGRESQL
                case 'd':
                        dbstr=optarg;
                        break;
+#endif
                case 'e':
                        end=atoi(optarg);
                        break;
@@ -2555,9 +2567,11 @@ int main(int argc, char **argv)
                        nodes=fopen("nodes.tmp","wb+");
                phase=1;
                fprintf(stderr,"PROGRESS: Phase 1: collecting data\n");
+#ifdef HAVE_POSTGRESQL
                if (dbstr) 
                        phase1_db(dbstr,ways,nodes);
                else
+#endif
                        phase1(input_file,ways,nodes);
                if (ways)
                        fclose(ways);

diff --git a/navit/navit/xpm/Makefile.am b/navit/navit/xpm/Makefile.am
index 88680f3..946a075 100644 (file)
--- a/navit/navit/xpm/Makefile.am
+++ b/navit/navit/xpm/Makefile.am
@@ -10,7 +10,7 @@ endif
 
 if USE_SVG2PNG
 %.png:*.svg
-       $(srcdir)/png2svg "$@"
+       $(srcdir)/svg2png "$@"
 xpm_DATA += $(addsuffix .png,$(basename $(svgs)))
 if USE_SVG2PNG_SCALES
 xpm_DATA += $(foreach scale, @SVG2PNG_SCALES@, $(addsuffix _$(scale)_$(scale).png,$(basename $(svgs))))

diff --git a/navit/navit/xpm/png2svg b/navit/navit/xpm/svg2png
similarity index 53%
rename from navit/navit/xpm/png2svg
rename to navit/navit/xpm/svg2png
index 63ff1eb..4f5b08e 100755 (executable)
--- a/navit/navit/xpm/png2svg
+++ b/navit/navit/xpm/svg2png
@@ -8,8 +8,8 @@ then
        h=${h%.png}
        w=${w##*_}
 else
-       w=$(grep 'width=".*px"' gui_actions.svg | head -1 | sed -e 's/px".*//' -e 's/.*"//')
-       h=$(grep 'height=".*px"' gui_actions.svg | head -1 | sed -e 's/px".*//' -e 's/.*"//')
+       w=$(grep 'width=".*px"' gui_actions.svg | head -n 1 | sed -e 's/px".*//' -e 's/.*"//')
+       h=$(grep 'height=".*px"' gui_actions.svg | head -n 1 | sed -e 's/px".*//' -e 's/.*"//')
        svg=${png%.png}
 fi
 ksvgtopng $w $h $svg.svg $png