http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/ltoptions.m4 ---------------------------------------------------------------------- diff --cc config/ltoptions.m4 index 5d9acd8,5d9acd8..34151a3 --- a/config/ltoptions.m4 +++ b/config/ltoptions.m4 @@@ -1,14 -1,14 +1,13 @@@ # Helper functions for option handling. -*- Autoconf -*- # --# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, --# Inc. ++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # 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. --# serial 7 ltoptions.m4 ++# serial 6 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@@ -126,7 -126,7 +125,7 @@@ LT_OPTION_DEFINE([LT_INIT], [win32-dll] [enable_win32_dll=yes case $host in --*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) ++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@@ -134,13 -134,13 +133,13 @@@ esac test -z "$AS" && AS=as --_LT_DECL([], [AS], [1], [Assembler program])dnl ++_LT_DECL([], [AS], [0], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool --_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl ++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump --_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl ++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], @@@ -326,24 -326,24 +325,9 @@@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL] # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], -- [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], ++ [AS_HELP_STRING([--with-pic], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -- [lt_p=${PACKAGE-default} -- case $withval in -- yes|no) pic_mode=$withval ;; -- *) -- pic_mode=default -- # Look at the argument we got. We use all the common list separators. -- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -- for lt_pkg in $withval; do -- IFS="$lt_save_ifs" -- if test "X$lt_pkg" = "X$lt_p"; then -- pic_mode=yes -- fi -- done -- IFS="$lt_save_ifs" -- ;; -- esac], ++ [pic_mode="$withval"], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/ltversion.m4 ---------------------------------------------------------------------- diff --cc config/ltversion.m4 index 07a8602,07a8602..f3c5309 --- a/config/ltversion.m4 +++ b/config/ltversion.m4 @@@ -7,17 -7,17 +7,17 @@@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. --# @configure_input@ ++# Generated from ltversion.in. --# serial 3337 ltversion.m4 ++# serial 3017 ltversion.m4 # This file is part of GNU Libtool --m4_define([LT_PACKAGE_VERSION], [2.4.2]) --m4_define([LT_PACKAGE_REVISION], [1.3337]) ++m4_define([LT_PACKAGE_VERSION], [2.2.6b]) ++m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], --[macro_version='2.4.2' --macro_revision='1.3337' ++[macro_version='2.2.6b' ++macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/lt~obsolete.m4 ---------------------------------------------------------------------- diff --cc config/lt~obsolete.m4 index c573da9,c573da9..637bb20 --- a/config/lt~obsolete.m4 +++ b/config/lt~obsolete.m4 @@@ -1,13 -1,13 +1,13 @@@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # --# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. ++# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # 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. --# serial 5 lt~obsolete.m4 ++# serial 4 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@@ -77,6 -77,6 +77,7 @@@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [A m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) ++m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@@ -89,10 -89,10 +90,3 @@@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) --m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) --m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) --m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) --m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) --m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) --m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) --m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/missing ---------------------------------------------------------------------- diff --cc config/missing index 86a8fc3,86a8fc3..28055d2 --- a/config/missing +++ b/config/missing @@@ -1,10 -1,10 +1,10 @@@ #! /bin/sh # Common stub for a few missing GNU programs while installing. --scriptversion=2012-01-06.13; # UTC ++scriptversion=2009-04-28.21; # UTC # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, --# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. ++# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@@ -84,6 -84,6 +84,7 @@@ Supported PROGRAM values help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file ++ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and @@@ -121,6 -121,6 +122,15 @@@ case $1 i # Not GNU programs, they don't have --version. ;; ++ tar*) ++ if test -n "$run"; then ++ echo 1>&2 "ERROR: \`tar' requires --run" ++ exit 1 ++ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then ++ exit 1 ++ fi ++ ;; ++ *) if test -z "$run" && ($1 --version) > /dev/null 2>&1; then # We have it, but it failed. @@@ -216,7 -216,7 +226,7 @@@ WARNING: \`$1' $msg. You should only n \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h if test $# -ne 1; then -- eval LASTARG=\${$#} ++ eval LASTARG="\${$#}" case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` @@@ -246,7 -246,7 +256,7 @@@ WARNING: \`$1' is $msg. You should onl \`Flex' from any GNU archive site." rm -f lex.yy.c if test $# -ne 1; then -- eval LASTARG=\${$#} ++ eval LASTARG="\${$#}" case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` @@@ -308,6 -308,6 +318,41 @@@ WARNING: \`$1' is $msg. You should onl touch $file ;; ++ tar*) ++ shift ++ ++ # We have already tried tar in the generic part. ++ # Look for gnutar/gtar before invocation to avoid ugly error ++ # messages. ++ if (gnutar --version > /dev/null 2>&1); then ++ gnutar "$@" && exit 0 ++ fi ++ if (gtar --version > /dev/null 2>&1); then ++ gtar "$@" && exit 0 ++ fi ++ firstarg="$1" ++ if shift; then ++ case $firstarg in ++ *o*) ++ firstarg=`echo "$firstarg" | sed s/o//` ++ tar "$firstarg" "$@" && exit 0 ++ ;; ++ esac ++ case $firstarg in ++ *h*) ++ firstarg=`echo "$firstarg" | sed s/h//` ++ tar "$firstarg" "$@" && exit 0 ++ ;; ++ esac ++ fi ++ ++ echo 1>&2 "\ ++WARNING: I can't seem to be able to run \`tar' with the given arguments. ++ You may want to install GNU tar or Free paxutils, or check the ++ command line arguments." ++ exit 1 ++ ;; ++ *) echo 1>&2 "\ WARNING: \`$1' is needed, and is $msg.
