changeset 2551:17a0678aa759

Merge remote-tracking branch 'upstream/master' into view_file_po
author Omari Stephens <xsdg@google.com>
date Mon, 10 Jul 2017 07:44:34 +0000
parents 6e9aad93a5c0 (current diff) 73e74df0f3a3 (diff)
children 50591e6aec98
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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