Resolve minor conflict in merge.

diff --cc build-aux/compile
index 531136b,ec64c62..ea21c33
--- 1/build-aux/compile
--- 2/build-aux/compile
+++ b/build-aux/compile
@@@ -1,9 -1,10 +1,9 @@@
  #! /bin/sh
 -# Wrapper for compilers which do not understand `-c -o'.
 +# Wrapper for compilers which do not understand '-c -o'.
  
- scriptversion=2012-10-14.11; # UTC
 -scriptversion=2009-04-28.21; # UTC
++scriptversion=2016-06-08.14; # UTC
  
 -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
 -# Foundation, Inc.
 +# Copyright (C) 1999-2013 Free Software Foundation, Inc.
  # Written by Tom Tromey <tromey@cygnus.com>.
  #
  # This program is free software; you can redistribute it and/or modify