X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=blobdiff_plain;f=configure.in;h=bda81708e1c129fdf36114311aaaa676f70bab53;hp=c5b726c813208c98427a676ce7cc3dd7b5d316d6;hb=63a96f8504a2773d03bd8956c17eb6bb09a706c7;hpb=632d09215f133ab09c1f56de26b12cb35a794806

diff --git a/configure.in b/configure.in
index c5b726c8..bda81708 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.  -*- Autoconf
  -*-
 
-dnl This file is a part of Geeqie project (http://geeqie.sourceforge.net/).
-dnl Copyright (C) 2008 - 2012 The Geeqie Team
+dnl This file is a part of Geeqie project (http://www.geeqie.org/).
+dnl Copyright (C) 2008 - 2016 The Geeqie Team
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -15,19 +15,26 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 
 AC_PREREQ(2.57)
-AC_INIT(geeqie, 1.1, geeqie-devel@lists.sourceforge.net)
+AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short master), [geeqie-devel@lists.sourceforge.net], [], [http://www.geeqie.org/])
+
+# Add -Werror to the default CFLAGS
+CFLAGS+=" -Werror -Wno-error=deprecated-declarations"
 
 # Check for rightly dirs
 AC_CONFIG_SRCDIR([src/main.c])
 
 AC_CONFIG_AUX_DIR(auxdir)
-AM_INIT_AUTOMAKE
+# Require Automake 1.14 for %reldir% support
+AM_INIT_AUTOMAKE([1.14.1 subdir-objects])
 
 AC_CONFIG_HEADER([config.h])
 
 # Only for developers
 AM_MAINTAINER_MODE
 
+# Silent build for automake >= 1.11
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_ARG_ENABLE(developer, [
 Development options:
 AC_HELP_STRING([--enable-developer], [turn on developers mode [default=no]])],
@@ -404,31 +411,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 +453,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 +478,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
@@ -512,8 +526,8 @@ AH_TOP([
  */
 
 /*
- *  This file is a part of Geeqie project (http://geeqie.sourceforge.net/).
- *  Copyright (C) 2008 - 2012 The Geeqie Team
+ *  This file is a part of Geeqie project (http://www.geeqie.org/).
+ *  Copyright (C) 2008 - 2016 The Geeqie Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -562,8 +576,6 @@ cat > config.report << END
 Package:
   Name:          $PACKAGE_NAME
   Version:       $PACKAGE_VERSION
-  Patch version: $GQ_PATCH_VERSION
-  Date:          $GQ_PATCH_DATE
 
 Architecture:
   UNIX:          $os_unix
@@ -600,8 +612,7 @@ Support:
   Lua:	         $HAVE_LUA
 
 Documentation:
-  Doxygen:       $DOXYGEN
-  Formats:       $doxy_formats_report
+  Doxygen:       $DX_DOXYGEN
   doc-tool:      $GNOME_DOC_TOOL
 
 END