Add Collections to Shortcuts bar

[geeqie.git] / configure.in

diff --git a/configure.in b/configure.in
index bda8170..2b9aecb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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 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"
@@ -25,7 +25,7 @@ AC_CONFIG_SRCDIR([src/main.c])
 
 AC_CONFIG_AUX_DIR(auxdir)
 # Require Automake 1.14 for %reldir% support
-AM_INIT_AUTOMAKE([1.14.1 subdir-objects])
+AM_INIT_AUTOMAKE([1.14.1 subdir-objects foreign])
 
 AC_CONFIG_HEADER([config.h])
 
@@ -132,6 +132,7 @@ fi
 
 AC_ISC_POSIX
 AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_CXX
 AC_STDC_HEADERS
 AC_ARG_PROGRAM
@@ -415,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
@@ -456,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],
         [
@@ -474,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
@@ -561,6 +558,7 @@ AC_CONFIG_FILES([
     plugins/rotate/Makefile
     plugins/ufraw/Makefile
     plugins/import/Makefile
+    plugins/geocode-parameters/Makefile
     geeqie.spec
 ])