diff --git a/configure.ac b/configure.ac index f4be475..cecb324 100644 --- a/configure.ac +++ b/configure.ac @@ -38,7 +38,7 @@ AC_ARG_ENABLE( AM_CONDITIONAL([GEONAMES_SUPPORT], [test x"$enable_geonames" = x"yes"]) if test x"$enable_geonames" = x"yes"; then AC_DEFINE([GEONAMES_SUPPORT], [], [Geonames geocoding]) - PKG_CHECK_MODULES([DEPS_GEONAMES], [libcurl >= 7.21, json >= 0.9]) + PKG_CHECK_MODULES([DEPS_GEONAMES], [libcurl >= 7.21, json-c >= 0.12]) fi diff --git a/src/calcelestial.c b/src/calcelestial.c index 20f2957..6ceedd6 100644 --- a/src/calcelestial.c +++ b/src/calcelestial.c @@ -46,6 +46,7 @@ #include "objects.h" #include "helpers.h" #include "formatter.h" +#include "geonames.h" enum moment { MOMENT_NOW, diff --git a/src/geonames.c b/src/geonames.c index edc77b8..5820748 100644 --- a/src/geonames.c +++ b/src/geonames.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include "../config.h" #include "geonames.h" @@ -59,7 +59,7 @@ static size_t json_parse_callback(void *contents, size_t size, size_t nmemb, voi json_tokener_free(jtok); } else if (jtok->err != json_tokener_continue) { - fprintf(stderr, "parse error: %s\r\n", json_tokener_errors[jtok->err]); + fprintf(stderr, "parse error: %s\r\n", json_tokener_get_error(jtok)); *(void **) userp = NULL; json_tokener_free(jtok); } diff --git a/src/geonames.h b/src/geonames.h index 9bfe457..e16f011 100644 --- a/src/geonames.h +++ b/src/geonames.h @@ -26,7 +26,7 @@ #ifndef _GEONAMES_H_ #define _GEONAMES_H_ -#include +#include #define GEONAMES_CACHE_SUPPORT 1 #define GEONAMES_CACHE_FILE ".geonames.cache" /* in users home dir */ diff --git a/src/helpers.c b/src/helpers.c index 8bf21b5..647da14 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -27,6 +27,7 @@ #include #include #include +#include #include