Reverse autogen.sh default map option

Default is to enable libclutter and libchamplain

diff --git a/configure.in b/configure.in
index dfb4574..2b9aecb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -416,34 +416,30 @@ AC_SUBST(LDFLAGS)
 # ----------------------------------------------------------------------
 
 AC_ARG_ENABLE([map],
-  AC_HELP_STRING([--enable-map], [enable map support]),
-    [libgps=$enableval], [libgps=no])
+  AC_HELP_STRING([--disable-map], [disable map support]),
+    [libgps=$enableval], [libgps=auto])
 
 AC_ARG_ENABLE([gpu-accel],
-  AC_HELP_STRING([--enable-gpu-accel], [enable GPU acceleration support - experimental]),
+  AC_HELP_STRING([--disable-gpu-accel], [disable GPU acceleration support - experimental]),
     [libclutter=$enableval], [libclutter=auto])
 
-if test "x${libclutter}" = "xyes" -o "x${libgps}" = "xyes"; then
-    if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then
-      PKG_CHECK_MODULES(CLUTTER, [clutter-1.0 >= 1.0],
+if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then
+  PKG_CHECK_MODULES(CLUTTER, [clutter-1.0 >= 1.0],
+    [
+      PKG_CHECK_MODULES(CLUTTER_GTK, [clutter-gtk-1.0 >= 1.0],
         [
-          PKG_CHECK_MODULES(CLUTTER_GTK, [clutter-gtk-1.0 >= 1.0],
-            [
-              HAVE_CLUTTER=yes
-              AC_DEFINE(HAVE_CLUTTER, 1, [define to enable use of clutter library])
-            ],
-            [
-              HAVE_CLUTTER=no
-              AC_MSG_WARN([$CLUTTER_GTK_PKG_ERRORS])
-            ])
+          HAVE_CLUTTER=yes
+          AC_DEFINE(HAVE_CLUTTER, 1, [define to enable use of clutter library])
         ],
         [
           HAVE_CLUTTER=no
-          AC_MSG_WARN([$CLUTTER_PKG_ERRORS])
+          AC_MSG_WARN([$CLUTTER_GTK_PKG_ERRORS])
         ])
-    else
-      HAVE_CLUTTER=disabled
-    fi
+    ],
+    [
+      HAVE_CLUTTER=no
+      AC_MSG_WARN([$CLUTTER_PKG_ERRORS])
+    ])
 else
   HAVE_CLUTTER=disabled
 fi
@@ -457,7 +453,7 @@ AC_SUBST(CLUTTER_GTK_LIBS)
 #  Libchamplain support - used for map facility
 # ----------------------------------------------------------------------
 
-if test "x${libgps}" = "xyes" -a "x${HAVE_CLUTTER}" = "xyes"; then
+if test "x${libgps}" != "xno" -a "x${HAVE_CLUTTER}" == "xyes"; then
     if test "x${gtk3}" != "xno"; then
       PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12],
         [
@@ -475,7 +471,7 @@ else
   HAVE_LIBCHAMPLAIN=disabled
 fi
 
-if test "x${libgps}" = "xyes" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then
+if test "x${libgps}" != "xno" -a "x${HAVE_LIBCHAMPLAIN}" == "xyes" ; then
   PKG_CHECK_MODULES(LIBCHAMPLAIN_GTK, [champlain-gtk-0.12 >= 0.12],
     [
       HAVE_LIBCHAMPLAIN_GTK=yes