diff --git a/configure.ac b/configure.ac
index fa2806d..06f6300 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_INIT(calcelestial, 0.4, post@steffenvogel.de)
 AC_CONFIG_SRCDIR([src/calcelestial.c])
 AC_CONFIG_HEADERS([config.h])
 
-# geonames.org support
+# Extra args
 AC_ARG_ENABLE(
     [geonames], 
     [AS_HELP_STRING([--enable-geonames], [enable support geonames.org geocoding (def=yes)])],
@@ -14,13 +14,6 @@ AC_ARG_ENABLE(
     [enable_geonames=yes]
 )
 
-AM_CONDITIONAL([GEONAMES_SUPPORT], [test x"$enable_geonames" = x"yes"])
-if test x"$enable_geonames" = x"yes"; then
-    AC_DEFINE([GEONAMES_SUPPORT], [1], [compile with geonames.org lookup capabilities])
-    PKG_CHECK_MODULES([DEPS_GEONAMES], [libcurl >= 7.21, json-c >= 0.11])
-fi
-
-# debug compilation support
 AC_ARG_ENABLE(
     [debug],
     [AS_HELP_STRING([--enable-debug], [enable debug data generation (def=no)])],
@@ -28,6 +21,13 @@ AC_ARG_ENABLE(
     [debug=no]
 )
 
+AM_CONDITIONAL([GEONAMES_SUPPORT], [test x"$enable_geonames" = x"yes"])
+
+if test x"$enable_geonames" = x"yes"; then
+    AC_DEFINE([GEONAMES_SUPPORT], [1], [compile with geonames.org lookup capabilities])
+    PKG_CHECK_MODULES([DEPS_GEONAMES], [libcurl >= 7.21, json-c >= 0.11])
+fi
+
 if test x"$debug" = x"yes"; then
     AC_DEFINE([DEBUG], [], [enable debugging])
     AM_CFLAGS="$AM_CFLAGS -g -Wall -Werror -Wno-uninitialized -O0 -fno-omit-frame-pointer"