fix Travis-CI

.travis.yml

@@ -3,10 +3,8 @@ language: c
 sudo: required
 
 env:
-  - CFG_DEBUG=--enable-debug
-  - CFG_DEBUG=--disable-debug
-  - CFG_GEO=--disable-geonames
-  - CFG_GEO=--enable-geonames
+  - CFG=--enable-debug
+  - CFG=--disable-disable
 
 os:
   - linux
@@ -18,14 +16,10 @@ compiler:
 
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y libnova-dev libcurl4-openssl-dev libjson-c-dev
+  - sudo apt-get install -y libnova-dev libcurl4-openssl-dev libjson0-dev libdb4.8-dev
 
 install:
   - autoreconf -i
 
 script:
-  - ./configure
-  - make
-
-test:
-  - make test
+  - ./configure $CFG && make && make test

configure.ac

@@ -6,10 +6,6 @@ AC_INIT(calcelestial, 0.4, post@steffenvogel.de)
 AC_CONFIG_SRCDIR([src/calcelestial.c])
 AC_CONFIG_HEADERS([config.h])
 
-# Automake
-AM_INIT_AUTOMAKE
-AM_PROG_CC_C_O
-
 # Custom switches
 # geonames.org support
 AC_ARG_ENABLE(
@@ -65,6 +61,10 @@ if test x"$enable_geonames" = x"yes"; then
     fi
 fi
 
+# Automake
+AM_INIT_AUTOMAKE([foreign])
+AM_PROG_CC_C_O
+
 # Conditionals
 AM_CONDITIONAL([WITH_GEONAMES], [test x"$enable_geonames" = x"yes"])
 AM_CONDITIONAL([DEBUG], [test x"$enable_debug" = x"yes"])

src/geonames.c

@@ -237,8 +237,6 @@ cached:
 static int parser_tz(struct json_object *jobj, void *userp)
 {
 	struct ctx_tz *ctx = userp;
-	
-	json_bool exists;
 	struct json_object *jobj_offset, *jobj_tzid;
 
 
@@ -264,8 +262,6 @@ static int parser_tz(struct json_object *jobj, void *userp)
 static int parser_latlng(struct json_object *jobj, void *userp)
 {
 	struct ctx_latlng *ctx = userp;
-
-	json_bool exists;
 	struct json_object *jobj_count, *jobj_geonames, *jobj_place, *jobj_lat, *jobj_lng, *jobj_name;
 	int results;