Preparing release

[geeqie.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index bcb40be..3cbc03a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.  -*- Autoconf
  -*-
 
 dnl This file is a part of Geeqie project (http://www.geeqie.org/).
-dnl Copyright (C) 2008 - 2016 The Geeqie Team
+dnl Copyright (C) 2008 - 2019 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,7 +15,7 @@ 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], m4_esyscmd_s(git rev-parse --quiet --verify --short HEAD), [geeqie@freelists.org], [], [http://www.geeqie.org/])
+AC_INIT([geeqie], 1.5, [https://github.com/BestImageViewer/geeqie/issues], [], [http://www.geeqie.org/])
 
 # Add -Werror to the default CFLAGS
 CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
@@ -198,16 +198,11 @@ else
 fi
 
 AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.))
-AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--disable-gtk3], [use gtk2 instead of gtk3]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], [auto], [no])])
+AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--enable-gtk3], [use gtk3 instead of gtk2]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], m4_ifdef([AM_PATH_GTK_2_0], [no], [auto]), [no])])
 
 if test x$gtk3 = xyes; then
     AC_MSG_WARN("Gtk3 enabled")
     m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(GTK+ >= 3.0.0 not installed.))])
-else
-    if test x$gtk3 != xno; then
-       AC_MSG_WARN("Gtk3 is preferred...")
-       m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,[gtk3=no])])
-    fi
 fi
 
 if test x$gtk3 = xno; then
@@ -529,8 +524,15 @@ if test "x${liblua}" != "xno"; then
       AC_DEFINE(HAVE_LUA, 1, [define to enable lua support])
     ],
     [
-      HAVE_LUA=no
-      AC_MSG_WARN([$LUA_PKG_ERRORS])
+      PKG_CHECK_MODULES(LUA, lua >= 5.1,
+        [
+          HAVE_LUA=yes
+          AC_DEFINE(HAVE_LUA, 1, [define to enable lua support])
+        ],
+        [
+           HAVE_LUA=no
+           AC_MSG_WARN([$LUA_PKG_ERRORS])
+        ])
     ])
 else
   HAVE_LUA=disabled
@@ -617,12 +619,12 @@ AC_CONFIG_FILES([
     plugins/symlink/Makefile
     plugins/rotate/Makefile
     plugins/ufraw/Makefile
-    plugins/import/Makefile
     plugins/geocode-parameters/Makefile
     plugins/export-jpeg/Makefile
     plugins/tethered-photography/Makefile
     plugins/camera-import/Makefile
     plugins/image-crop/Makefile
+    plugins/random-image/Makefile
     geeqie.spec
 ])