# HG changeset patch
# User Omari Stephens <xsdg@google.com>
# Date 1499672674 0
# Node ID 17a0678aa75938a084ea4e1354fc0a25b009e148
# Parent  6e9aad93a5c0b900d3e7504bdaaa1aa7651f9cf5# Parent  73e74df0f3a3a8508e2f7634ee3be855d1e22870
Merge remote-tracking branch 'upstream/master' into view_file_po

diff -r 6e9aad93a5c0 -r 17a0678aa759 configure.in
--- a/configure.in	Sun Jul 09 05:54:05 2017 +0000
+++ b/configure.in	Mon Jul 10 07:44:34 2017 +0000
@@ -15,7 +15,7 @@
 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"
@@ -132,6 +132,7 @@
 
 AC_ISC_POSIX
 AC_PROG_CC
+AC_PROG_CC_C99
 AC_PROG_CXX
 AC_STDC_HEADERS
 AC_ARG_PROGRAM