Update lzo to 2.10

1 files changed, 36 insertions, 16 deletions

diff --git a/main/lzo/configure b/main/lzo/configure
index 06a488d2..f0356cd5 100755
--- a/main/lzo/configure
+++ b/main/lzo/configure
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for LZO 2.09.
+# Generated by GNU Autoconf 2.69 for LZO 2.10.
 #
 # Report bugs to <markus@oberhumer.com>.
 #
-# Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer.
+# Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer.
 # All Rights Reserved.
 # This configure script may be copied, distributed and modified under the
 # terms of the GNU General Public License; see COPYING for more details.
@@ -595,8 +595,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='LZO'
 PACKAGE_TARNAME='lzo'
-PACKAGE_VERSION='2.09'
-PACKAGE_STRING='LZO 2.09'
+PACKAGE_VERSION='2.10'
+PACKAGE_STRING='LZO 2.10'
 PACKAGE_BUGREPORT='markus@oberhumer.com'
 PACKAGE_URL='http://www.oberhumer.com/opensource/lzo/'
 
@@ -646,6 +646,7 @@ LZO_USE_ASM_i386_obj_elf32_FALSE
 LZO_USE_ASM_i386_obj_elf32_TRUE
 LZO_USE_ASM_i386_src_gas_FALSE
 LZO_USE_ASM_i386_src_gas_TRUE
+pkgconfigdir
 OTOOL64
 OTOOL
 LIPO
@@ -784,6 +785,7 @@ enable_fast_install
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_pkgconfigdir
 enable_asm
 '
       ac_precious_vars='build_alias
@@ -1337,7 +1339,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 LZO 2.09 to adapt to many kinds of systems.
+\`configure' configures LZO 2.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1408,7 +1410,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LZO 2.09:";;
+     short | recursive ) echo "Configuration of LZO 2.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1441,6 +1443,8 @@ Optional Packages:
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
+  --with-pkgconfigdir     pkg-config installation directory
+                          ['${libdir}/pkgconfig']
 
 Some influential environment variables:
   CC          C compiler command
@@ -1521,14 +1525,14 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LZO configure 2.09
+LZO configure 2.10
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer.
+Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer.
 All Rights Reserved.
 This configure script may be copied, distributed and modified under the
 terms of the GNU General Public License; see COPYING for more details.
@@ -2132,7 +2136,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 LZO $as_me 2.09, which was
+It was created by LZO $as_me 2.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2531,7 +2535,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -2591,7 +2595,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 # Checks for stat-related time functions.
 
-# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2015 Free Software
+# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2017 Free Software
 # Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
@@ -5465,7 +5469,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='lzo'
- VERSION='2.09'
+ VERSION='2.10'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12946,6 +12950,21 @@ CC=$lt_save_CC
 
 
 
+
+# Check whether --with-pkgconfigdir was given.
+if test "${with_pkgconfigdir+set}" = set; then :
+  withval=$with_pkgconfigdir;
+else
+  with_pkgconfigdir='${libdir}/pkgconfig'
+fi
+
+pkgconfigdir=$with_pkgconfigdir
+
+
+
+
+
+
 # /***********************************************************************
 # // Checks for header files
 # ************************************************************************/
@@ -14208,7 +14227,7 @@ if test "X$enable_asm" != Xno; then
 fi
 
 
-ac_config_files="$ac_config_files Makefile"
+ac_config_files="$ac_config_files Makefile lzo2.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -14762,7 +14781,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 LZO $as_me 2.09, which was
+This file was extended by LZO $as_me 2.10, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14829,7 +14848,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="\\
-LZO config.status 2.09
+LZO config.status 2.10
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -15240,6 +15259,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "lzo2.pc") CONFIG_FILES="$CONFIG_FILES lzo2.pc" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -16464,7 +16484,7 @@ cat <<EOF
 
    LZO ${PACKAGE_VERSION} configured.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or