-*-
dnl This file is a part of Geeqie project (http://www.geeqie.org/).
-dnl Copyright (C) 2008 - 2012 The Geeqie Team
+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
dnl GNU General Public License for more details.
AC_PREREQ(2.57)
-AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short master), [geeqie-devel@lists.sourceforge.net], [], [http://www.geeqie.org/])
+AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short HEAD), [geeqie-devel@lists.sourceforge.net], [], [http://www.geeqie.org/])
+
+# Add -Werror to the default CFLAGS
+CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
# 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 foreign])
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]])],
AC_ISC_POSIX
AC_PROG_CC
+AC_PROG_CC_C99
AC_PROG_CXX
AC_STDC_HEADERS
AC_ARG_PROGRAM
# ----------------------------------------------------------------------
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
# 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],
[
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
/*
* This file is a part of Geeqie project (http://www.geeqie.org/).
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * 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
plugins/rotate/Makefile
plugins/ufraw/Makefile
plugins/import/Makefile
+ plugins/geocode-parameters/Makefile
geeqie.spec
])