aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoropenvcdiff@gmail.com <openvcdiff@gmail.com@132ac840-3546-0410-a738-d3f8764196be>2010-08-06 22:43:27 +0000
committeropenvcdiff@gmail.com <openvcdiff@gmail.com@132ac840-3546-0410-a738-d3f8764196be>2010-08-06 22:43:27 +0000
commita97d4eda31d4882ebcc1922ccabcabdd198f898f (patch)
tree13b2366d5389a10ebe30ff224a7800664ffe041e
parent732fff248e662ec47aa27c124632f406f27b6c8d (diff)
downloadopen-vcdiff-a97d4eda31d4882ebcc1922ccabcabdd198f898f.tar.gz
Fri, 6 Aug 2010 11:36:36 -0800 Google Inc. <opensource@google.com>
Release version 0.8.1 with the following change: * Issue #24: Revert the fix for Issue #21, which caused a regression (the Debian package did not properly install the vcdiff executable.) This version of open-vcdiff builds and tests successfully using MinGW 5.1.6, so Issue #21 is no longer a problem. * Fix warning in autogen.sh by providing only one directory argument to AC_CONFIG_MACRO_DIR. The subordinate directory gflags/m4 is still specified as an -I argument to aclocal. git-svn-id: http://open-vcdiff.googlecode.com/svn/trunk@37 132ac840-3546-0410-a738-d3f8764196be
-rw-r--r--ChangeLog10
-rwxr-xr-xconfigure139
-rw-r--r--configure.ac10
-rw-r--r--packages/deb/changelog6
-rw-r--r--vsprojects/config.h6
5 files changed, 87 insertions, 84 deletions
diff --git a/ChangeLog b/ChangeLog
index f407a59..57c1eec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri, 6 Aug 2010 11:36:36 -0800 Google Inc. <opensource@google.com>
+ Release version 0.8.1 with the following change:
+ * Issue #24: Revert the fix for Issue #21, which caused a regression
+ (the Debian package did not properly install the vcdiff executable.)
+ This version of open-vcdiff builds and tests successfully using MinGW 5.1.6,
+ so Issue #21 is no longer a problem.
+ * Fix warning in autogen.sh by providing only one directory argument to
+ AC_CONFIG_MACRO_DIR. The subordinate directory gflags/m4 is still
+ specified as an -I argument to aclocal.
+
Tue, 3 Aug 2010 10:44:32 -0800 Google Inc. <opensource@google.com>
Release version 0.8 with the following changes:
* Issue #12: Truncate decoded_target_ after decoding each window, rather than
diff --git a/configure b/configure
index 3aa8d2b..2d49005 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for open-vcdiff 0.8.
+# Generated by GNU Autoconf 2.65 for open-vcdiff 0.8.1.
#
# Report bugs to <opensource@google.com>.
#
@@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='open-vcdiff'
PACKAGE_TARNAME='open-vcdiff'
-PACKAGE_VERSION='0.8'
-PACKAGE_STRING='open-vcdiff 0.8'
+PACKAGE_VERSION='0.8.1'
+PACKAGE_STRING='open-vcdiff 0.8.1'
PACKAGE_BUGREPORT='opensource@google.com'
PACKAGE_URL=''
@@ -881,10 +881,10 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_dependency_tracking
-enable_fast_install
enable_shared
enable_static
with_pic
+enable_fast_install
with_gnu_ld
enable_libtool_lock
enable_namespace
@@ -1443,7 +1443,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures open-vcdiff 0.8 to adapt to many kinds of systems.
+\`configure' configures open-vcdiff 0.8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1513,7 +1513,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of open-vcdiff 0.8:";;
+ short | recursive ) echo "Configuration of open-vcdiff 0.8.1:";;
esac
cat <<\_ACEOF
@@ -1523,10 +1523,10 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
- --enable-fast-install[=PKGS]
- optimize for fast installation [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
+ --enable-fast-install[=PKGS]
+ optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-namespace=FOO to define these Google
classes in the FOO namespace. --disable-namespace
@@ -1619,7 +1619,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-open-vcdiff configure 0.8
+open-vcdiff configure 0.8.1
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2165,7 +2165,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by open-vcdiff $as_me 0.8, which was
+It was created by open-vcdiff $as_me 0.8.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2975,7 +2975,7 @@ fi
# Define the identity of the package.
PACKAGE='open-vcdiff'
- VERSION='0.8'
+ VERSION='0.8.1'
cat >>confdefs.h <<_ACEOF
@@ -4600,42 +4600,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-# Issue #21: Fail to test on MinGW 5.1.4
-# Disabling fast install keeps libtool from creating wrapper scripts around
-# the executables it builds. Such scripts have caused failures on MinGW.
-# Using this option means an extra link step is executed during "make install".
-# Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
- enableval=$enable_fast_install; p=${PACKAGE-default}
- case $enableval in
- yes) enable_fast_install=yes ;;
- no) enable_fast_install=no ;;
- *)
- enable_fast_install=no
- # Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
- for pkg in $enableval; do
- IFS="$lt_save_ifs"
- if test "X$pkg" = "X$p"; then
- enable_fast_install=yes
- fi
- done
- IFS="$lt_save_ifs"
- ;;
- esac
-else
- enable_fast_install=no
-fi
-
-
-
-
-
-
-
-
-
-
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -5245,13 +5209,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5248: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5212: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5251: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5215: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5254: output\"" >&5)
+ (eval echo "\"\$as_me:5218: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6457,7 +6421,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6460 "configure"' > conftest.$ac_ext
+ echo '#line 6424 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7966,6 +7930,35 @@ test -z "$pic_mode" && pic_mode=default
+ # Check whether --enable-fast-install was given.
+if test "${enable_fast_install+set}" = set; then :
+ enableval=$enable_fast_install; p=${PACKAGE-default}
+ case $enableval in
+ yes) enable_fast_install=yes ;;
+ no) enable_fast_install=no ;;
+ *)
+ enable_fast_install=no
+ # Look at the argument we got. We use all the common list separators.
+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ for pkg in $enableval; do
+ IFS="$lt_save_ifs"
+ if test "X$pkg" = "X$p"; then
+ enable_fast_install=yes
+ fi
+ done
+ IFS="$lt_save_ifs"
+ ;;
+ esac
+else
+ enable_fast_install=yes
+fi
+
+
+
+
+
+
+
@@ -8348,11 +8341,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8351: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8344: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8355: \$? = $ac_status" >&5
+ echo "$as_me:8348: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8687,11 +8680,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8690: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8683: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8694: \$? = $ac_status" >&5
+ echo "$as_me:8687: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8792,11 +8785,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8795: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8788: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8799: \$? = $ac_status" >&5
+ echo "$as_me:8792: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8847,11 +8840,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8850: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8843: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8854: \$? = $ac_status" >&5
+ echo "$as_me:8847: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11231,7 +11224,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11234 "configure"
+#line 11227 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11327,7 +11320,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11330 "configure"
+#line 11323 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13283,11 +13276,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13286: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13279: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13290: \$? = $ac_status" >&5
+ echo "$as_me:13283: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13382,11 +13375,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13385: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13378: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13389: \$? = $ac_status" >&5
+ echo "$as_me:13382: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13434,11 +13427,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13437: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13430: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13441: \$? = $ac_status" >&5
+ echo "$as_me:13434: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16021,7 +16014,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by open-vcdiff $as_me 0.8, which was
+This file was extended by open-vcdiff $as_me 0.8.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16087,7 +16080,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-open-vcdiff config.status 0.8
+open-vcdiff config.status 0.8.1
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
@@ -16210,12 +16203,12 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
@@ -17299,9 +17292,6 @@ available_tags="CXX "
# ### BEGIN LIBTOOL CONFIG
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
# Which release of libtool.m4 was used?
macro_version=$macro_version
macro_revision=$macro_revision
@@ -17315,6 +17305,9 @@ build_old_libs=$enable_static
# What type of objects to build.
pic_mode=$pic_mode
+# Whether or not to optimize for fast installation.
+fast_install=$enable_fast_install
+
# The host system.
host_alias=$host_alias
host=$host
diff --git a/configure.ac b/configure.ac
index a71136a..5b68570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,9 @@
# make sure we're interpreted by some minimal autoconf
AC_PREREQ(2.57)
-AC_INIT(open-vcdiff, 0.8, opensource@google.com)
+AC_INIT(open-vcdiff, 0.8.1, opensource@google.com)
AC_CONFIG_SRCDIR(README)
-AC_CONFIG_MACRO_DIR([m4 gflags/m4])
+AC_CONFIG_MACRO_DIR(m4)
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(src/config.h)
@@ -17,12 +17,6 @@ AC_PROG_CXX
AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc
AC_CANONICAL_HOST
-# Issue #21: Fail to test on MinGW 5.1.4
-# Disabling fast install keeps libtool from creating wrapper scripts around
-# the executables it builds. Such scripts have caused failures on MinGW.
-# Using this option means an extra link step is executed during "make install".
-AC_DISABLE_FAST_INSTALL
-
LT_INIT
AC_PROG_LIBTOOL
AC_SUBST(LIBTOOL_DEPS)
diff --git a/packages/deb/changelog b/packages/deb/changelog
index eee1d6e..bfd706a 100644
--- a/packages/deb/changelog
+++ b/packages/deb/changelog
@@ -1,3 +1,9 @@
+open-vcdiff (0.8.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Google Inc. <opensource@google.com> Fri, 06 Aug 2010 11:36:36 -0800
+
open-vcdiff (0.8-1) unstable; urgency=low
* New upstream release.
diff --git a/vsprojects/config.h b/vsprojects/config.h
index 0d99201..755320a 100644
--- a/vsprojects/config.h
+++ b/vsprojects/config.h
@@ -52,13 +52,13 @@
#define PACKAGE_NAME "open-vcdiff"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "open-vcdiff 0.8"
+#define PACKAGE_STRING "open-vcdiff 0.8.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "open-vcdiff"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.8"
+#define PACKAGE_VERSION "0.8.1"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
@@ -67,7 +67,7 @@
#define STL_NAMESPACE std
/* Version number of package */
-#define VERSION "0.8"
+#define VERSION "0.8.1"
/* Stops putting the code inside the Google namespace */
#define _END_GOOGLE_NAMESPACE_ }