Configuration options and documentation

[geeqie.git] / configure.in

diff --git a/configure.in b/configure.in
index b5c03ed..00842e2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -404,31 +404,38 @@ AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)
 
 
-#  clutter support - experimental
+#  clutter and champlain support
 # ----------------------------------------------------------------------
 
-AC_ARG_ENABLE([clutter],
-  AC_HELP_STRING([--enable-clutter], [enable clutter support - experimental]),
+AC_ARG_ENABLE([map],
+  AC_HELP_STRING([--enable-map], [enable map support]),
+    [libgps=$enableval], [libgps=no])
+
+AC_ARG_ENABLE([gpu-accel],
+  AC_HELP_STRING([--enable-gpu-accel], [enable GPU acceleration support - experimental]),
     [libclutter=$enableval], [libclutter=auto])
 
 if test "x${libclutter}" = "xyes" -o "x${libgps}" = "xyes"; then
-  PKG_CHECK_MODULES(CLUTTER, [clutter-1.0 >= 1.0],
-    [
-      PKG_CHECK_MODULES(CLUTTER_GTK, [clutter-gtk-1.0 >= 1.0],
+    if test "x${libclutter}" != "xno" -a "x${gtk3}" != "xno"; then
+      PKG_CHECK_MODULES(CLUTTER, [clutter-1.0 >= 1.0],
         [
-          HAVE_CLUTTER=yes
-          AC_DEFINE(HAVE_CLUTTER, 1, [define to enable use of clutter library])
+          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=no
-          AC_MSG_WARN([$CLUTTER_GTK_PKG_ERRORS])
+          AC_MSG_WARN([$CLUTTER_PKG_ERRORS])
         ])
-        
-    ],
-    [
-      HAVE_CLUTTER=no
-      AC_MSG_WARN([$CLUTTER_PKG_ERRORS])
-    ])
+    else
+      HAVE_CLUTTER=disabled
+    fi
 else
   HAVE_CLUTTER=disabled
 fi
@@ -439,23 +446,23 @@ AC_SUBST(CLUTTER_GTK_CFLAGS)
 AC_SUBST(CLUTTER_GTK_LIBS)
 
 
-#  Libchamplain support - used for GPS map facility - experimental
+#  Libchamplain support - used for map facility
 # ----------------------------------------------------------------------
 
-AC_ARG_ENABLE([gps],
-  AC_HELP_STRING([--enable-gps], [enable GPS map support - experimental]),
-    [libgps=$enableval], [libgps=yes])
-
-if test "x${libgps}" = "xyes" -a "x${HAVE_CLUTTER}" = "xyes" ; then
-  PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12],
-    [
-      HAVE_LIBCHAMPLAIN=yes
-      AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [define to enable use of GPS maps])
-    ],
-    [
-      HAVE_LIBCHAMPLAIN=no
-      AC_MSG_WARN([$LIBCHAMPLAIN_PKG_ERRORS])
-    ])
+if test "x${libgps}" = "xyes" -a "x${HAVE_CLUTTER}" = "xyes"; then
+    if test "x${gtk3}" != "xno"; then
+      PKG_CHECK_MODULES(LIBCHAMPLAIN, [champlain-0.12 >= 0.12],
+        [
+          HAVE_LIBCHAMPLAIN=yes
+          AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [define to enable use of maps])
+        ],
+        [
+          HAVE_LIBCHAMPLAIN=no
+          AC_MSG_WARN([$LIBCHAMPLAIN_PKG_ERRORS])
+        ])
+    else
+      HAVE_LIBCHAMPLAIN=disabled
+    fi
 else
   HAVE_LIBCHAMPLAIN=disabled
 fi
@@ -464,7 +471,7 @@ if test "x${libgps}" = "xyes" -a "x${HAVE_LIBCHAMPLAIN}" = "xyes" ; then
   PKG_CHECK_MODULES(LIBCHAMPLAIN_GTK, [champlain-gtk-0.12 >= 0.12],
     [
       HAVE_LIBCHAMPLAIN_GTK=yes
-      AC_DEFINE(HAVE_LIBCHAMPLAIN_GTK, 1, [define to enable use of GPS maps])
+      AC_DEFINE(HAVE_LIBCHAMPLAIN_GTK, 1, [define to enable use of maps])
     ],
     [
       HAVE_LIBCHAMPLAIN_GTK=no