OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-CompactHash commits / 670edfa

Regenerating autoconf files
670edfa7c54c6f7762b4fdb43596afd66dd267cf
by brobey <brobey@lanl.gov> · 2015-10-21T15:51:33.000Z

Changed files (7) +201 -271

Makefile.in +15 -27
……@@ -1,7 +1,7 @@
11# Makefile.in generated by automake 1.13.4 from Makefile.am.
22# @configure_input@
33
4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
55
66# This Makefile.in is free software; the Free Software Foundation
77# gives unlimited permission to copy and/or distribute it,
……@@ -15,17 +15,7 @@
1515@SET_MAKE@
1616
1717VPATH = @srcdir@
18am__is_gnu_make = { \
19 if test -z '$(MAKELEVEL)'; then \
20 false; \
21 elif test -n '$(MAKE_HOST)'; then \
22 true; \
23 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
24 true; \
25 else \
26 false; \
27 fi; \
28}
18am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
2919am__make_running_with_option = \
3020 case $${target_option-} in \
3121 ?) ;; \
……@@ -90,6 +80,17 @@ build_triplet = @build@
9080host_triplet = @host@
9181bin_PROGRAMS = neigh2d$(EXEEXT)
9282subdir = .
83DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
84 $(top_srcdir)/configure $(am__configure_deps) \
85 $(top_srcdir)/./config/depcomp AUTHORS README ./config/compile \
86 ./config/config.guess ./config/config.sub ./config/depcomp \
87 ./config/install-sh ./config/missing ./config/ltmain.sh \
88 $(top_srcdir)/./config/compile \
89 $(top_srcdir)/./config/config.guess \
90 $(top_srcdir)/./config/config.sub \
91 $(top_srcdir)/./config/install-sh \
92 $(top_srcdir)/./config/ltmain.sh \
93 $(top_srcdir)/./config/missing
9394ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9495am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
9596 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
……@@ -97,8 +98,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
9798 $(top_srcdir)/configure.ac
9899am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
99100 $(ACLOCAL_M4)
100DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
101 $(am__configure_deps) $(am__DIST_COMMON)
102101am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
103102 configure.lineno config.status.lineno
104103mkinstalldirs = $(install_sh) -d
……@@ -194,16 +193,6 @@ ETAGS = etags
194193CTAGS = ctags
195194CSCOPE = cscope
196195DIST_SUBDIRS = $(SUBDIRS)
197am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/compile \
198 $(top_srcdir)/./config/config.guess \
199 $(top_srcdir)/./config/config.sub \
200 $(top_srcdir)/./config/depcomp \
201 $(top_srcdir)/./config/install-sh \
202 $(top_srcdir)/./config/ltmain.sh \
203 $(top_srcdir)/./config/missing ./config/compile \
204 ./config/config.guess ./config/config.sub ./config/depcomp \
205 ./config/install-sh ./config/ltmain.sh ./config/missing \
206 AUTHORS README
207196DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
208197distdir = $(PACKAGE)-$(VERSION)
209198top_distdir = $(distdir)
……@@ -399,6 +388,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
399388 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
400389 $(am__cd) $(top_srcdir) && \
401390 $(AUTOMAKE) --foreign Makefile
391.PRECIOUS: Makefile
402392Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
403393 @case '$?' in \
404394 *config.status*) \
……@@ -735,7 +725,7 @@ distcheck: dist
735725 esac
736726 chmod -R a-w $(distdir)
737727 chmod u+w $(distdir)
738 mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
728 mkdir $(distdir)/_build $(distdir)/_inst
739729 chmod a-w $(distdir)
740730 test -d $(distdir)/_build || exit 0; \
741731 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
……@@ -930,8 +920,6 @@ uninstall-am: uninstall-binPROGRAMS
930920 pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
931921 uninstall-binPROGRAMS
932922
933.PRECIOUS: Makefile
934
935923
936924kdtree/libkdtree.la:
937925 cd kdtree
aclocal.m4 +26 -25
……@@ -1,6 +1,6 @@
11# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
22
3# Copyright (C) 1996-2014 Free Software Foundation, Inc.
3# Copyright (C) 1996-2013 Free Software Foundation, Inc.
44
55# This file is free software; the Free Software Foundation
66# gives unlimited permission to copy and/or distribute it,
……@@ -14,13 +14,13 @@
1414m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1515m4_ifndef([AC_AUTOCONF_VERSION],
1616 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
17m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
18[m4_warning([this file was generated for autoconf 2.68.
17m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
18[m4_warning([this file was generated for autoconf 2.69.
1919You have another version of autoconf. It may work, but is not guaranteed to.
2020If you have problems, you may need to regenerate the build system entirely.
2121To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2222
23# Copyright (C) 2002-2014 Free Software Foundation, Inc.
23# Copyright (C) 2002-2013 Free Software Foundation, Inc.
2424#
2525# This file is free software; the Free Software Foundation
2626# gives unlimited permission to copy and/or distribute it,
……@@ -58,7 +58,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
5858
5959# AM_AUX_DIR_EXPAND -*- Autoconf -*-
6060
61# Copyright (C) 2001-2014 Free Software Foundation, Inc.
61# Copyright (C) 2001-2013 Free Software Foundation, Inc.
6262#
6363# This file is free software; the Free Software Foundation
6464# gives unlimited permission to copy and/or distribute it,
……@@ -103,14 +103,15 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
103103# configured tree to be moved without reconfiguration.
104104
105105AC_DEFUN([AM_AUX_DIR_EXPAND],
106[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
107# Expand $ac_aux_dir to an absolute path.
108am_aux_dir=`cd "$ac_aux_dir" && pwd`
106[dnl Rely on autoconf to set up CDPATH properly.
107AC_PREREQ([2.50])dnl
108# expand $ac_aux_dir to an absolute path
109am_aux_dir=`cd $ac_aux_dir && pwd`
109110])
110111
111112# AM_CONDITIONAL -*- Autoconf -*-
112113
113# Copyright (C) 1997-2014 Free Software Foundation, Inc.
114# Copyright (C) 1997-2013 Free Software Foundation, Inc.
114115#
115116# This file is free software; the Free Software Foundation
116117# gives unlimited permission to copy and/or distribute it,
……@@ -141,7 +142,7 @@ AC_CONFIG_COMMANDS_PRE(
141142Usually this means the macro was only invoked conditionally.]])
142143fi])])
143144
144# Copyright (C) 1999-2014 Free Software Foundation, Inc.
145# Copyright (C) 1999-2013 Free Software Foundation, Inc.
145146#
146147# This file is free software; the Free Software Foundation
147148# gives unlimited permission to copy and/or distribute it,
……@@ -332,7 +333,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
332333
333334# Generate code to set up dependency tracking. -*- Autoconf -*-
334335
335# Copyright (C) 1999-2014 Free Software Foundation, Inc.
336# Copyright (C) 1999-2013 Free Software Foundation, Inc.
336337#
337338# This file is free software; the Free Software Foundation
338339# gives unlimited permission to copy and/or distribute it,
……@@ -408,7 +409,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
408409
409410# Do all the work for Automake. -*- Autoconf -*-
410411
411# Copyright (C) 1996-2014 Free Software Foundation, Inc.
412# Copyright (C) 1996-2013 Free Software Foundation, Inc.
412413#
413414# This file is free software; the Free Software Foundation
414415# gives unlimited permission to copy and/or distribute it,
……@@ -492,8 +493,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
492493# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
493494# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
494495AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
495# We need awk for the "check" target (and possibly the TAP driver). The
496# system "awk" is bad on some platforms.
496# We need awk for the "check" target. The system "awk" is bad on
497# some platforms.
497498AC_REQUIRE([AC_PROG_AWK])dnl
498499AC_REQUIRE([AC_PROG_MAKE_SET])dnl
499500AC_REQUIRE([AM_SET_LEADING_DOT])dnl
……@@ -555,7 +556,7 @@ for _am_header in $config_headers :; do
555556done
556557echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
557558
558# Copyright (C) 2001-2014 Free Software Foundation, Inc.
559# Copyright (C) 2001-2013 Free Software Foundation, Inc.
559560#
560561# This file is free software; the Free Software Foundation
561562# gives unlimited permission to copy and/or distribute it,
……@@ -566,7 +567,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
566567# Define $install_sh.
567568AC_DEFUN([AM_PROG_INSTALL_SH],
568569[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
569if test x"${install_sh+set}" != xset; then
570if test x"${install_sh}" != xset; then
570571 case $am_aux_dir in
571572 *\ * | *\ *)
572573 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
……@@ -576,7 +577,7 @@ if test x"${install_sh+set}" != xset; then
576577fi
577578AC_SUBST([install_sh])])
578579
579# Copyright (C) 2003-2014 Free Software Foundation, Inc.
580# Copyright (C) 2003-2013 Free Software Foundation, Inc.
580581#
581582# This file is free software; the Free Software Foundation
582583# gives unlimited permission to copy and/or distribute it,
……@@ -597,7 +598,7 @@ AC_SUBST([am__leading_dot])])
597598
598599# Check to see how 'make' treats includes. -*- Autoconf -*-
599600
600# Copyright (C) 2001-2014 Free Software Foundation, Inc.
601# Copyright (C) 2001-2013 Free Software Foundation, Inc.
601602#
602603# This file is free software; the Free Software Foundation
603604# gives unlimited permission to copy and/or distribute it,
……@@ -679,7 +680,7 @@ m4_define([AC_PROG_CC],
679680
680681# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
681682
682# Copyright (C) 1997-2014 Free Software Foundation, Inc.
683# Copyright (C) 1997-2013 Free Software Foundation, Inc.
683684#
684685# This file is free software; the Free Software Foundation
685686# gives unlimited permission to copy and/or distribute it,
……@@ -718,7 +719,7 @@ fi
718719
719720# Helper functions for option handling. -*- Autoconf -*-
720721
721# Copyright (C) 2001-2014 Free Software Foundation, Inc.
722# Copyright (C) 2001-2013 Free Software Foundation, Inc.
722723#
723724# This file is free software; the Free Software Foundation
724725# gives unlimited permission to copy and/or distribute it,
……@@ -749,7 +750,7 @@ AC_DEFUN([_AM_IF_OPTION],
749750
750751# Check to make sure that the build environment is sane. -*- Autoconf -*-
751752
752# Copyright (C) 1996-2014 Free Software Foundation, Inc.
753# Copyright (C) 1996-2013 Free Software Foundation, Inc.
753754#
754755# This file is free software; the Free Software Foundation
755756# gives unlimited permission to copy and/or distribute it,
……@@ -830,7 +831,7 @@ AC_CONFIG_COMMANDS_PRE(
830831rm -f conftest.file
831832])
832833
833# Copyright (C) 2009-2014 Free Software Foundation, Inc.
834# Copyright (C) 2009-2013 Free Software Foundation, Inc.
834835#
835836# This file is free software; the Free Software Foundation
836837# gives unlimited permission to copy and/or distribute it,
……@@ -890,7 +891,7 @@ AC_SUBST([AM_BACKSLASH])dnl
890891_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
891892])
892893
893# Copyright (C) 2001-2014 Free Software Foundation, Inc.
894# Copyright (C) 2001-2013 Free Software Foundation, Inc.
894895#
895896# This file is free software; the Free Software Foundation
896897# gives unlimited permission to copy and/or distribute it,
……@@ -918,7 +919,7 @@ fi
918919INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
919920AC_SUBST([INSTALL_STRIP_PROGRAM])])
920921
921# Copyright (C) 2006-2014 Free Software Foundation, Inc.
922# Copyright (C) 2006-2013 Free Software Foundation, Inc.
922923#
923924# This file is free software; the Free Software Foundation
924925# gives unlimited permission to copy and/or distribute it,
……@@ -937,7 +938,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
937938
938939# Check how to create a tarball. -*- Autoconf -*-
939940
940# Copyright (C) 2004-2014 Free Software Foundation, Inc.
941# Copyright (C) 2004-2013 Free Software Foundation, Inc.
941942#
942943# This file is free software; the Free Software Foundation
943944# gives unlimited permission to copy and/or distribute it,
configure +140 -134
……@@ -1,11 +1,9 @@
11#! /bin/sh
22# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.68 for CompactHash v1.2.
3# Generated by GNU Autoconf 2.69 for CompactHash v1.2.
44#
55#
6# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
7# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
8# Foundation, Inc.
6# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
97#
108#
119# This configure script is free software; the Free Software Foundation
……@@ -134,6 +132,31 @@ export LANGUAGE
134132# CDPATH.
135133(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
136134
135# Use a proper internal environment variable to ensure we don't fall
136 # into an infinite loop, continuously re-executing ourselves.
137 if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
138 _as_can_reexec=no; export _as_can_reexec;
139 # We cannot yet assume a decent shell, so we have to provide a
140# neutralization value for shells without unset; and this also
141# works around shells that cannot unset nonexistent variables.
142# Preserve -v and -x to the replacement shell.
143BASH_ENV=/dev/null
144ENV=/dev/null
145(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
146case $- in # ((((
147 *v*x* | *x*v* ) as_opts=-vx ;;
148 *v* ) as_opts=-v ;;
149 *x* ) as_opts=-x ;;
150 * ) as_opts= ;;
151esac
152exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
153# Admittedly, this is quite paranoid, since all the known shells bail
154# out after a failed `exec'.
155$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
156as_fn_exit 255
157 fi
158 # We don't want this to propagate to other subprocesses.
159 { _as_can_reexec=; unset _as_can_reexec;}
137160if test "x$CONFIG_SHELL" = x; then
138161 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
139162 emulate sh
……@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
167190else
168191 exitcode=1; echo positional parameters were not saved.
169192fi
170test x\$exitcode = x0 || exit 1"
193test x\$exitcode = x0 || exit 1
194test -x / || exit 1"
171195 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
172196 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
173197 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
……@@ -220,21 +244,25 @@ IFS=$as_save_IFS
220244
221245
222246 if test "x$CONFIG_SHELL" != x; then :
223 # We cannot yet assume a decent shell, so we have to provide a
224 # neutralization value for shells without unset; and this also
225 # works around shells that cannot unset nonexistent variables.
226 # Preserve -v and -x to the replacement shell.
227 BASH_ENV=/dev/null
228 ENV=/dev/null
229 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
230 export CONFIG_SHELL
231 case $- in # ((((
232 *v*x* | *x*v* ) as_opts=-vx ;;
233 *v* ) as_opts=-v ;;
234 *x* ) as_opts=-x ;;
235 * ) as_opts= ;;
236 esac
237 exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
247 export CONFIG_SHELL
248 # We cannot yet assume a decent shell, so we have to provide a
249# neutralization value for shells without unset; and this also
250# works around shells that cannot unset nonexistent variables.
251# Preserve -v and -x to the replacement shell.
252BASH_ENV=/dev/null
253ENV=/dev/null
254(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
255case $- in # ((((
256 *v*x* | *x*v* ) as_opts=-vx ;;
257 *v* ) as_opts=-v ;;
258 *x* ) as_opts=-x ;;
259 * ) as_opts= ;;
260esac
261exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
262# Admittedly, this is quite paranoid, since all the known shells bail
263# out after a failed `exec'.
264$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
265exit 255
238266fi
239267
240268 if test x$as_have_required = xno; then :
……@@ -336,6 +364,14 @@ $as_echo X"$as_dir" |
336364
337365
338366} # as_fn_mkdir_p
367
368# as_fn_executable_p FILE
369# -----------------------
370# Test if FILE is an executable regular file.
371as_fn_executable_p ()
372{
373 test -f "$1" && test -x "$1"
374} # as_fn_executable_p
339375# as_fn_append VAR VALUE
340376# ----------------------
341377# Append the text in VALUE to the end of the definition contained in VAR. Take
……@@ -457,6 +493,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
457493 chmod +x "$as_me.lineno" ||
458494 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
459495
496 # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
497 # already done that, so ensure we don't try to do so again and fall
498 # in an infinite loop. This has already happened in practice.
499 _as_can_reexec=no; export _as_can_reexec
460500 # Don't try to exec as it changes $[0], causing all sort of problems
461501 # (the dirname of $[0] is not the place where we might find the
462502 # original and so on. Autoconf is especially sensitive to this).
……@@ -491,16 +531,16 @@ if (echo >conf$$.file) 2>/dev/null; then
491531 # ... but there are two gotchas:
492532 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
493533 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
494 # In both cases, we have to default to `cp -p'.
534 # In both cases, we have to default to `cp -pR'.
495535 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
496 as_ln_s='cp -p'
536 as_ln_s='cp -pR'
497537 elif ln conf$$.file conf$$ 2>/dev/null; then
498538 as_ln_s=ln
499539 else
500 as_ln_s='cp -p'
540 as_ln_s='cp -pR'
501541 fi
502542else
503 as_ln_s='cp -p'
543 as_ln_s='cp -pR'
504544fi
505545rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
506546rmdir conf$$.dir 2>/dev/null
……@@ -512,28 +552,8 @@ else
512552 as_mkdir_p=false
513553fi
514554
515if test -x / >/dev/null 2>&1; then
516 as_test_x='test -x'
517else
518 if ls -dL / >/dev/null 2>&1; then
519 as_ls_L_option=L
520 else
521 as_ls_L_option=
522 fi
523 as_test_x='
524 eval sh -c '\''
525 if test -d "$1"; then
526 test -d "$1/.";
527 else
528 case $1 in #(
529 -*)set "./$1";;
530 esac;
531 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
532 ???[sx]*):;;*)false;;esac;fi
533 '\'' sh
534 '
535fi
536as_executable_p=$as_test_x
555as_test_x='test -x'
556as_executable_p=as_fn_executable_p
537557
538558# Sed expression to map a string onto a valid CPP name.
539559as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
……@@ -1224,8 +1244,6 @@ target=$target_alias
12241244if test "x$host_alias" != x; then
12251245 if test "x$build_alias" = x; then
12261246 cross_compiling=maybe
1227 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1228 If a cross compiler is detected then cross compile mode will be used" >&2
12291247 elif test "x$build_alias" != "x$host_alias"; then
12301248 cross_compiling=yes
12311249 fi
……@@ -1500,9 +1518,9 @@ test -n "$ac_init_help" && exit $ac_status
15001518if $ac_init_version; then
15011519 cat <<\_ACEOF
15021520CompactHash configure v1.2
1503generated by GNU Autoconf 2.68
1521generated by GNU Autoconf 2.69
15041522
1505Copyright (C) 2010 Free Software Foundation, Inc.
1523Copyright (C) 2012 Free Software Foundation, Inc.
15061524This configure script is free software; the Free Software Foundation
15071525gives unlimited permission to copy, distribute and modify it.
15081526_ACEOF
……@@ -1616,7 +1634,7 @@ $as_echo "$ac_try_echo"; } >&5
16161634 test ! -s conftest.err
16171635 } && test -s conftest$ac_exeext && {
16181636 test "$cross_compiling" = yes ||
1619 $as_test_x conftest$ac_exeext
1637 test -x conftest$ac_exeext
16201638 }; then :
16211639 ac_retval=0
16221640else
……@@ -1876,7 +1894,7 @@ $as_echo "$ac_try_echo"; } >&5
18761894 test ! -s conftest.err
18771895 } && test -s conftest$ac_exeext && {
18781896 test "$cross_compiling" = yes ||
1879 $as_test_x conftest$ac_exeext
1897 test -x conftest$ac_exeext
18801898 }; then :
18811899 ac_retval=0
18821900else
……@@ -1899,7 +1917,7 @@ This file contains any messages produced by compilers while
18991917running configure, to aid debugging if configure makes a mistake.
19001918
19011919It was created by CompactHash $as_me v1.2, which was
1902generated by GNU Autoconf 2.68. Invocation command line was
1920generated by GNU Autoconf 2.69. Invocation command line was
19031921
19041922 $ $0 $@
19051923
……@@ -2316,7 +2334,7 @@ case $as_dir/ in #((
23162334 # by default.
23172335 for ac_prog in ginstall scoinst install; do
23182336 for ac_exec_ext in '' $ac_executable_extensions; do
2319 if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2337 if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
23202338 if test $ac_prog = install &&
23212339 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
23222340 # AIX install. It has an incompatible calling convention.
……@@ -2449,8 +2467,8 @@ test "$program_suffix" != NONE &&
24492467ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
24502468program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
24512469
2452# Expand $ac_aux_dir to an absolute path.
2453am_aux_dir=`cd "$ac_aux_dir" && pwd`
2470# expand $ac_aux_dir to an absolute path
2471am_aux_dir=`cd $ac_aux_dir && pwd`
24542472
24552473if test x"${MISSING+set}" != xset; then
24562474 case $am_aux_dir in
……@@ -2469,7 +2487,7 @@ else
24692487$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
24702488fi
24712489
2472if test x"${install_sh+set}" != xset; then
2490if test x"${install_sh}" != xset; then
24732491 case $am_aux_dir in
24742492 *\ * | *\ *)
24752493 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
……@@ -2500,7 +2518,7 @@ do
25002518 IFS=$as_save_IFS
25012519 test -z "$as_dir" && as_dir=.
25022520 for ac_exec_ext in '' $ac_executable_extensions; do
2503 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2521 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
25042522 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
25052523 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
25062524 break 2
……@@ -2540,7 +2558,7 @@ do
25402558 IFS=$as_save_IFS
25412559 test -z "$as_dir" && as_dir=.
25422560 for ac_exec_ext in '' $ac_executable_extensions; do
2543 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2561 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
25442562 ac_cv_prog_ac_ct_STRIP="strip"
25452563 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
25462564 break 2
……@@ -2591,7 +2609,7 @@ do
25912609 test -z "$as_dir" && as_dir=.
25922610 for ac_prog in mkdir gmkdir; do
25932611 for ac_exec_ext in '' $ac_executable_extensions; do
2594 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
2612 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
25952613 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
25962614 'mkdir (GNU coreutils) '* | \
25972615 'mkdir (coreutils) '* | \
……@@ -2638,7 +2656,7 @@ do
26382656 IFS=$as_save_IFS
26392657 test -z "$as_dir" && as_dir=.
26402658 for ac_exec_ext in '' $ac_executable_extensions; do
2641 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2659 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
26422660 ac_cv_prog_AWK="$ac_prog"
26432661 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
26442662 break 2
……@@ -2797,8 +2815,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
27972815# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
27982816mkdir_p='$(MKDIR_P)'
27992817
2800# We need awk for the "check" target (and possibly the TAP driver). The
2801# system "awk" is bad on some platforms.
2818# We need awk for the "check" target. The system "awk" is bad on
2819# some platforms.
28022820# Always define AMTAR for backward compatibility. Yes, it's still used
28032821# in the wild :-( We should find a proper way to deprecate it ...
28042822AMTAR='$${TAR-tar}'
……@@ -2817,7 +2835,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
28172835
28182836
28192837
2820
28212838#
28222839echo "Configuring hash with $ac_configure_args"
28232840#
……@@ -2902,7 +2919,7 @@ do
29022919 IFS=$as_save_IFS
29032920 test -z "$as_dir" && as_dir=.
29042921 for ac_exec_ext in '' $ac_executable_extensions; do
2905 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2922 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
29062923 ac_cv_prog_CC="${ac_tool_prefix}gcc"
29072924 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
29082925 break 2
……@@ -2942,7 +2959,7 @@ do
29422959 IFS=$as_save_IFS
29432960 test -z "$as_dir" && as_dir=.
29442961 for ac_exec_ext in '' $ac_executable_extensions; do
2945 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2962 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
29462963 ac_cv_prog_ac_ct_CC="gcc"
29472964 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
29482965 break 2
……@@ -2995,7 +3012,7 @@ do
29953012 IFS=$as_save_IFS
29963013 test -z "$as_dir" && as_dir=.
29973014 for ac_exec_ext in '' $ac_executable_extensions; do
2998 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3015 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
29993016 ac_cv_prog_CC="${ac_tool_prefix}cc"
30003017 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
30013018 break 2
……@@ -3036,7 +3053,7 @@ do
30363053 IFS=$as_save_IFS
30373054 test -z "$as_dir" && as_dir=.
30383055 for ac_exec_ext in '' $ac_executable_extensions; do
3039 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3056 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
30403057 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
30413058 ac_prog_rejected=yes
30423059 continue
……@@ -3094,7 +3111,7 @@ do
30943111 IFS=$as_save_IFS
30953112 test -z "$as_dir" && as_dir=.
30963113 for ac_exec_ext in '' $ac_executable_extensions; do
3097 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3114 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
30983115 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
30993116 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31003117 break 2
……@@ -3138,7 +3155,7 @@ do
31383155 IFS=$as_save_IFS
31393156 test -z "$as_dir" && as_dir=.
31403157 for ac_exec_ext in '' $ac_executable_extensions; do
3141 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3158 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
31423159 ac_cv_prog_ac_ct_CC="$ac_prog"
31433160 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31443161 break 2
……@@ -3584,8 +3601,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
35843601/* end confdefs.h. */
35853602#include <stdarg.h>
35863603#include <stdio.h>
3587#include <sys/types.h>
3588#include <sys/stat.h>
3604struct stat;
35893605/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
35903606struct buf { int x; };
35913607FILE * (*rcsopen) (struct buf *, struct stat *, int);
……@@ -3889,7 +3905,7 @@ do
38893905 IFS=$as_save_IFS
38903906 test -z "$as_dir" && as_dir=.
38913907 for ac_exec_ext in '' $ac_executable_extensions; do
3892 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3908 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
38933909 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
38943910 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
38953911 break 2
……@@ -3933,7 +3949,7 @@ do
39333949 IFS=$as_save_IFS
39343950 test -z "$as_dir" && as_dir=.
39353951 for ac_exec_ext in '' $ac_executable_extensions; do
3936 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3952 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
39373953 ac_cv_prog_ac_ct_CXX="$ac_prog"
39383954 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
39393955 break 2
……@@ -4591,7 +4607,7 @@ do
45914607 for ac_prog in sed gsed; do
45924608 for ac_exec_ext in '' $ac_executable_extensions; do
45934609 ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
4594 { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
4610 as_fn_executable_p "$ac_path_SED" || continue
45954611# Check for GNU ac_path_SED and select it if it is found.
45964612 # Check for GNU $ac_path_SED
45974613case `"$ac_path_SED" --version 2>&1` in
……@@ -4667,7 +4683,7 @@ do
46674683 for ac_prog in grep ggrep; do
46684684 for ac_exec_ext in '' $ac_executable_extensions; do
46694685 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4670 { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
4686 as_fn_executable_p "$ac_path_GREP" || continue
46714687# Check for GNU ac_path_GREP and select it if it is found.
46724688 # Check for GNU $ac_path_GREP
46734689case `"$ac_path_GREP" --version 2>&1` in
……@@ -4733,7 +4749,7 @@ do
47334749 for ac_prog in egrep; do
47344750 for ac_exec_ext in '' $ac_executable_extensions; do
47354751 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4736 { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
4752 as_fn_executable_p "$ac_path_EGREP" || continue
47374753# Check for GNU ac_path_EGREP and select it if it is found.
47384754 # Check for GNU $ac_path_EGREP
47394755case `"$ac_path_EGREP" --version 2>&1` in
……@@ -4800,7 +4816,7 @@ do
48004816 for ac_prog in fgrep; do
48014817 for ac_exec_ext in '' $ac_executable_extensions; do
48024818 ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
4803 { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
4819 as_fn_executable_p "$ac_path_FGREP" || continue
48044820# Check for GNU ac_path_FGREP and select it if it is found.
48054821 # Check for GNU $ac_path_FGREP
48064822case `"$ac_path_FGREP" --version 2>&1` in
……@@ -5056,7 +5072,7 @@ do
50565072 IFS=$as_save_IFS
50575073 test -z "$as_dir" && as_dir=.
50585074 for ac_exec_ext in '' $ac_executable_extensions; do
5059 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5075 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
50605076 ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
50615077 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
50625078 break 2
……@@ -5100,7 +5116,7 @@ do
51005116 IFS=$as_save_IFS
51015117 test -z "$as_dir" && as_dir=.
51025118 for ac_exec_ext in '' $ac_executable_extensions; do
5103 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5119 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
51045120 ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
51055121 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
51065122 break 2
……@@ -5524,7 +5540,7 @@ do
55245540 IFS=$as_save_IFS
55255541 test -z "$as_dir" && as_dir=.
55265542 for ac_exec_ext in '' $ac_executable_extensions; do
5527 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5543 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
55285544 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
55295545 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
55305546 break 2
……@@ -5564,7 +5580,7 @@ do
55645580 IFS=$as_save_IFS
55655581 test -z "$as_dir" && as_dir=.
55665582 for ac_exec_ext in '' $ac_executable_extensions; do
5567 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5583 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
55685584 ac_cv_prog_ac_ct_OBJDUMP="objdump"
55695585 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
55705586 break 2
……@@ -5870,7 +5886,7 @@ do
58705886 IFS=$as_save_IFS
58715887 test -z "$as_dir" && as_dir=.
58725888 for ac_exec_ext in '' $ac_executable_extensions; do
5873 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5889 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
58745890 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
58755891 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
58765892 break 2
……@@ -5910,7 +5926,7 @@ do
59105926 IFS=$as_save_IFS
59115927 test -z "$as_dir" && as_dir=.
59125928 for ac_exec_ext in '' $ac_executable_extensions; do
5913 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5929 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
59145930 ac_cv_prog_ac_ct_DLLTOOL="dlltool"
59155931 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
59165932 break 2
……@@ -6014,7 +6030,7 @@ do
60146030 IFS=$as_save_IFS
60156031 test -z "$as_dir" && as_dir=.
60166032 for ac_exec_ext in '' $ac_executable_extensions; do
6017 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6033 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
60186034 ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
60196035 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
60206036 break 2
……@@ -6058,7 +6074,7 @@ do
60586074 IFS=$as_save_IFS
60596075 test -z "$as_dir" && as_dir=.
60606076 for ac_exec_ext in '' $ac_executable_extensions; do
6061 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6077 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
60626078 ac_cv_prog_ac_ct_AR="$ac_prog"
60636079 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
60646080 break 2
……@@ -6183,7 +6199,7 @@ do
61836199 IFS=$as_save_IFS
61846200 test -z "$as_dir" && as_dir=.
61856201 for ac_exec_ext in '' $ac_executable_extensions; do
6186 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6202 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
61876203 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
61886204 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
61896205 break 2
……@@ -6223,7 +6239,7 @@ do
62236239 IFS=$as_save_IFS
62246240 test -z "$as_dir" && as_dir=.
62256241 for ac_exec_ext in '' $ac_executable_extensions; do
6226 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6242 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
62276243 ac_cv_prog_ac_ct_STRIP="strip"
62286244 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
62296245 break 2
……@@ -6282,7 +6298,7 @@ do
62826298 IFS=$as_save_IFS
62836299 test -z "$as_dir" && as_dir=.
62846300 for ac_exec_ext in '' $ac_executable_extensions; do
6285 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6301 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
62866302 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
62876303 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
62886304 break 2
……@@ -6322,7 +6338,7 @@ do
63226338 IFS=$as_save_IFS
63236339 test -z "$as_dir" && as_dir=.
63246340 for ac_exec_ext in '' $ac_executable_extensions; do
6325 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6341 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
63266342 ac_cv_prog_ac_ct_RANLIB="ranlib"
63276343 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
63286344 break 2
……@@ -6971,7 +6987,7 @@ do
69716987 IFS=$as_save_IFS
69726988 test -z "$as_dir" && as_dir=.
69736989 for ac_exec_ext in '' $ac_executable_extensions; do
6974 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
6990 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
69756991 ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
69766992 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
69776993 break 2
……@@ -7011,7 +7027,7 @@ do
70117027 IFS=$as_save_IFS
70127028 test -z "$as_dir" && as_dir=.
70137029 for ac_exec_ext in '' $ac_executable_extensions; do
7014 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7030 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
70157031 ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
70167032 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
70177033 break 2
……@@ -7091,7 +7107,7 @@ do
70917107 IFS=$as_save_IFS
70927108 test -z "$as_dir" && as_dir=.
70937109 for ac_exec_ext in '' $ac_executable_extensions; do
7094 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7110 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
70957111 ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
70967112 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
70977113 break 2
……@@ -7131,7 +7147,7 @@ do
71317147 IFS=$as_save_IFS
71327148 test -z "$as_dir" && as_dir=.
71337149 for ac_exec_ext in '' $ac_executable_extensions; do
7134 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7150 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
71357151 ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
71367152 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
71377153 break 2
……@@ -7183,7 +7199,7 @@ do
71837199 IFS=$as_save_IFS
71847200 test -z "$as_dir" && as_dir=.
71857201 for ac_exec_ext in '' $ac_executable_extensions; do
7186 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7202 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
71877203 ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
71887204 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
71897205 break 2
……@@ -7223,7 +7239,7 @@ do
72237239 IFS=$as_save_IFS
72247240 test -z "$as_dir" && as_dir=.
72257241 for ac_exec_ext in '' $ac_executable_extensions; do
7226 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7242 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
72277243 ac_cv_prog_ac_ct_NMEDIT="nmedit"
72287244 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
72297245 break 2
……@@ -7275,7 +7291,7 @@ do
72757291 IFS=$as_save_IFS
72767292 test -z "$as_dir" && as_dir=.
72777293 for ac_exec_ext in '' $ac_executable_extensions; do
7278 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7294 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
72797295 ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
72807296 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
72817297 break 2
……@@ -7315,7 +7331,7 @@ do
73157331 IFS=$as_save_IFS
73167332 test -z "$as_dir" && as_dir=.
73177333 for ac_exec_ext in '' $ac_executable_extensions; do
7318 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7334 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
73197335 ac_cv_prog_ac_ct_LIPO="lipo"
73207336 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
73217337 break 2
……@@ -7367,7 +7383,7 @@ do
73677383 IFS=$as_save_IFS
73687384 test -z "$as_dir" && as_dir=.
73697385 for ac_exec_ext in '' $ac_executable_extensions; do
7370 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7386 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
73717387 ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
73727388 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
73737389 break 2
……@@ -7407,7 +7423,7 @@ do
74077423 IFS=$as_save_IFS
74087424 test -z "$as_dir" && as_dir=.
74097425 for ac_exec_ext in '' $ac_executable_extensions; do
7410 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7426 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
74117427 ac_cv_prog_ac_ct_OTOOL="otool"
74127428 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
74137429 break 2
……@@ -7459,7 +7475,7 @@ do
74597475 IFS=$as_save_IFS
74607476 test -z "$as_dir" && as_dir=.
74617477 for ac_exec_ext in '' $ac_executable_extensions; do
7462 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7478 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
74637479 ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
74647480 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
74657481 break 2
……@@ -7499,7 +7515,7 @@ do
74997515 IFS=$as_save_IFS
75007516 test -z "$as_dir" && as_dir=.
75017517 for ac_exec_ext in '' $ac_executable_extensions; do
7502 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
7518 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
75037519 ac_cv_prog_ac_ct_OTOOL64="otool64"
75047520 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
75057521 break 2
……@@ -15207,7 +15223,7 @@ do
1520715223 IFS=$as_save_IFS
1520815224 test -z "$as_dir" && as_dir=.
1520915225 for ac_exec_ext in '' $ac_executable_extensions; do
15210 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15226 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1521115227 ac_cv_prog_HAVE_ADDR2LINE="yes"
1521215228 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1521315229 break 2
……@@ -15545,6 +15561,8 @@ _ACEOF
1554515561esac
1554615562rm -rf conftest*
1554715563 fi
15564
15565
1554815566fi
1554915567
1555015568
……@@ -15653,7 +15671,7 @@ do
1565315671 IFS=$as_save_IFS
1565415672 test -z "$as_dir" && as_dir=.
1565515673 for ac_exec_ext in '' $ac_executable_extensions; do
15656 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
15674 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
1565715675 ac_cv_prog_lspci_found="yes"
1565815676 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1565915677 break 2
……@@ -16685,16 +16703,16 @@ if (echo >conf$$.file) 2>/dev/null; then
1668516703 # ... but there are two gotchas:
1668616704 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1668716705 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
16688 # In both cases, we have to default to `cp -p'.
16706 # In both cases, we have to default to `cp -pR'.
1668916707 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
16690 as_ln_s='cp -p'
16708 as_ln_s='cp -pR'
1669116709 elif ln conf$$.file conf$$ 2>/dev/null; then
1669216710 as_ln_s=ln
1669316711 else
16694 as_ln_s='cp -p'
16712 as_ln_s='cp -pR'
1669516713 fi
1669616714else
16697 as_ln_s='cp -p'
16715 as_ln_s='cp -pR'
1669816716fi
1669916717rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
1670016718rmdir conf$$.dir 2>/dev/null
……@@ -16754,28 +16772,16 @@ else
1675416772 as_mkdir_p=false
1675516773fi
1675616774
16757if test -x / >/dev/null 2>&1; then
16758 as_test_x='test -x'
16759else
16760 if ls -dL / >/dev/null 2>&1; then
16761 as_ls_L_option=L
16762 else
16763 as_ls_L_option=
16764 fi
16765 as_test_x='
16766 eval sh -c '\''
16767 if test -d "$1"; then
16768 test -d "$1/.";
16769 else
16770 case $1 in #(
16771 -*)set "./$1";;
16772 esac;
16773 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
16774 ???[sx]*):;;*)false;;esac;fi
16775 '\'' sh
16776 '
16777fi
16778as_executable_p=$as_test_x
16775
16776# as_fn_executable_p FILE
16777# -----------------------
16778# Test if FILE is an executable regular file.
16779as_fn_executable_p ()
16780{
16781 test -f "$1" && test -x "$1"
16782} # as_fn_executable_p
16783as_test_x='test -x'
16784as_executable_p=as_fn_executable_p
1677916785
1678016786# Sed expression to map a string onto a valid CPP name.
1678116787as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
……@@ -16797,7 +16803,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1679716803# values after options handling.
1679816804ac_log="
1679916805This file was extended by CompactHash $as_me v1.2, which was
16800generated by GNU Autoconf 2.68. Invocation command line was
16806generated by GNU Autoconf 2.69. Invocation command line was
1680116807
1680216808 CONFIG_FILES = $CONFIG_FILES
1680316809 CONFIG_HEADERS = $CONFIG_HEADERS
……@@ -16854,10 +16860,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1685416860ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1685516861ac_cs_version="\\
1685616862CompactHash config.status v1.2
16857configured by $0, generated by GNU Autoconf 2.68,
16863configured by $0, generated by GNU Autoconf 2.69,
1685816864 with options \\"\$ac_cs_config\\"
1685916865
16860Copyright (C) 2010 Free Software Foundation, Inc.
16866Copyright (C) 2012 Free Software Foundation, Inc.
1686116867This config.status script is free software; the Free Software Foundation
1686216868gives unlimited permission to copy, distribute and modify it."
1686316869
……@@ -16937,7 +16943,7 @@ fi
1693716943_ACEOF
1693816944cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1693916945if \$ac_cs_recheck; then
16940 set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
16946 set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
1694116947 shift
1694216948 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
1694316949 CONFIG_SHELL='$SHELL'
hash/Makefile.in +5 -22
……@@ -1,11 +1,7 @@
1<<<<<<< HEAD
21# Makefile.in generated by automake 1.13.4 from Makefile.am.
3=======
4# Makefile.in generated by automake 1.15 from Makefile.am.
5>>>>>>> d3520d2c37161cbfc57a45e89e5f412af4be0efc
62# @configure_input@
73
8# Copyright (C) 1994-2014 Free Software Foundation, Inc.
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
95
106# This Makefile.in is free software; the Free Software Foundation
117# gives unlimited permission to copy and/or distribute it,
……@@ -21,17 +17,7 @@
2117
2218
2319VPATH = @srcdir@
24am__is_gnu_make = { \
25 if test -z '$(MAKELEVEL)'; then \
26 false; \
27 elif test -n '$(MAKE_HOST)'; then \
28 true; \
29 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
30 true; \
31 else \
32 false; \
33 fi; \
34}
20am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
3521am__make_running_with_option = \
3622 case $${target_option-} in \
3723 ?) ;; \
……@@ -96,6 +82,8 @@ build_triplet = @build@
9682host_triplet = @host@
9783bin_PROGRAMS = hashTest$(EXEEXT)
9884subdir = hash
85DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
86 $(top_srcdir)/./config/depcomp $(include_HEADERS) README
9987ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
10088am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
10189 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
……@@ -103,8 +91,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
10391 $(top_srcdir)/configure.ac
10492am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10593 $(ACLOCAL_M4)
106DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
107 $(am__DIST_COMMON)
10894mkinstalldirs = $(install_sh) -d
10995CONFIG_CLEAN_FILES =
11096CONFIG_CLEAN_VPATH_FILES =
……@@ -212,8 +198,6 @@ am__define_uniq_tagged_files = \
212198 done | $(am__uniquify_input)`
213199ETAGS = etags
214200CTAGS = ctags
215am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp \
216 README
217201DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
218202ACLOCAL = @ACLOCAL@
219203AMTAR = @AMTAR@
……@@ -369,6 +353,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
369353 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign hash/Makefile'; \
370354 $(am__cd) $(top_srcdir) && \
371355 $(AUTOMAKE) --foreign hash/Makefile
356.PRECIOUS: Makefile
372357Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
373358 @case '$?' in \
374359 *config.status*) \
……@@ -777,8 +762,6 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
777762 tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
778763 uninstall-includeHEADERS uninstall-libLTLIBRARIES
779764
780.PRECIOUS: Makefile
781
782765default: hash.c CLHash_Utilities.c hash.cl libhash.la
783766all: hash.c CLHash_Utilities.c hash.cl libhash.la
784767test: hashTest
kdtree/Makefile.in +5 -21
……@@ -1,11 +1,7 @@
1<<<<<<< HEAD
21# Makefile.in generated by automake 1.13.4 from Makefile.am.
3=======
4# Makefile.in generated by automake 1.15 from Makefile.am.
5>>>>>>> d3520d2c37161cbfc57a45e89e5f412af4be0efc
62# @configure_input@
73
8# Copyright (C) 1994-2014 Free Software Foundation, Inc.
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
95
106# This Makefile.in is free software; the Free Software Foundation
117# gives unlimited permission to copy and/or distribute it,
……@@ -20,17 +16,7 @@
2016
2117
2218VPATH = @srcdir@
23am__is_gnu_make = { \
24 if test -z '$(MAKELEVEL)'; then \
25 false; \
26 elif test -n '$(MAKE_HOST)'; then \
27 true; \
28 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
29 true; \
30 else \
31 false; \
32 fi; \
33}
19am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
3420am__make_running_with_option = \
3521 case $${target_option-} in \
3622 ?) ;; \
……@@ -94,6 +80,8 @@ POST_UNINSTALL = :
9480build_triplet = @build@
9581host_triplet = @host@
9682subdir = kdtree
83DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
84 $(top_srcdir)/./config/depcomp $(include_HEADERS)
9785ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9886am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
9987 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
……@@ -101,8 +89,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
10189 $(top_srcdir)/configure.ac
10290am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10391 $(ACLOCAL_M4)
104DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
105 $(am__DIST_COMMON)
10692mkinstalldirs = $(install_sh) -d
10793CONFIG_CLEAN_FILES =
10894CONFIG_CLEAN_VPATH_FILES =
……@@ -204,7 +190,6 @@ am__define_uniq_tagged_files = \
204190 done | $(am__uniquify_input)`
205191ETAGS = etags
206192CTAGS = ctags
207am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
208193DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
209194ACLOCAL = @ACLOCAL@
210195AMTAR = @AMTAR@
……@@ -353,6 +338,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
353338 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign kdtree/Makefile'; \
354339 $(am__cd) $(top_srcdir) && \
355340 $(AUTOMAKE) --foreign kdtree/Makefile
341.PRECIOUS: Makefile
356342Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
357343 @case '$?' in \
358344 *config.status*) \
……@@ -676,8 +662,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
676662 tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
677663 uninstall-libLTLIBRARIES
678664
679.PRECIOUS: Makefile
680
681665default: libkdtree.la
682666all: libkdtree.la
683667
oldHash/Makefile.in +5 -21
……@@ -1,11 +1,7 @@
1<<<<<<< HEAD
21# Makefile.in generated by automake 1.13.4 from Makefile.am.
3=======
4# Makefile.in generated by automake 1.15 from Makefile.am.
5>>>>>>> d3520d2c37161cbfc57a45e89e5f412af4be0efc
62# @configure_input@
73
8# Copyright (C) 1994-2014 Free Software Foundation, Inc.
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
95
106# This Makefile.in is free software; the Free Software Foundation
117# gives unlimited permission to copy and/or distribute it,
……@@ -20,17 +16,7 @@
2016
2117
2218VPATH = @srcdir@
23am__is_gnu_make = { \
24 if test -z '$(MAKELEVEL)'; then \
25 false; \
26 elif test -n '$(MAKE_HOST)'; then \
27 true; \
28 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
29 true; \
30 else \
31 false; \
32 fi; \
33}
19am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
3420am__make_running_with_option = \
3521 case $${target_option-} in \
3622 ?) ;; \
……@@ -94,6 +80,8 @@ POST_UNINSTALL = :
9480build_triplet = @build@
9581host_triplet = @host@
9682subdir = oldHash
83DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
84 $(top_srcdir)/./config/depcomp $(include_HEADERS)
9785ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9886am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
9987 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
……@@ -101,8 +89,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
10189 $(top_srcdir)/configure.ac
10290am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10391 $(ACLOCAL_M4)
104DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
105 $(am__DIST_COMMON)
10692mkinstalldirs = $(install_sh) -d
10793CONFIG_CLEAN_FILES =
10894CONFIG_CLEAN_VPATH_FILES =
……@@ -204,7 +190,6 @@ am__define_uniq_tagged_files = \
204190 done | $(am__uniquify_input)`
205191ETAGS = etags
206192CTAGS = ctags
207am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
208193DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
209194ACLOCAL = @ACLOCAL@
210195AMTAR = @AMTAR@
……@@ -354,6 +339,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
354339 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign oldHash/Makefile'; \
355340 $(am__cd) $(top_srcdir) && \
356341 $(AUTOMAKE) --foreign oldHash/Makefile
342.PRECIOUS: Makefile
357343Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
358344 @case '$?' in \
359345 *config.status*) \
……@@ -675,8 +661,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
675661 tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
676662 uninstall-libLTLIBRARIES
677663
678.PRECIOUS: Makefile
679
680664default: hashit.c hasholdlib.c libhashold.la
681665all: hashit.c hasholdlib.c libhashold.la
682666
timer/Makefile.in +5 -21
……@@ -1,11 +1,7 @@
1<<<<<<< HEAD
21# Makefile.in generated by automake 1.13.4 from Makefile.am.
3=======
4# Makefile.in generated by automake 1.15 from Makefile.am.
5>>>>>>> d3520d2c37161cbfc57a45e89e5f412af4be0efc
62# @configure_input@
73
8# Copyright (C) 1994-2014 Free Software Foundation, Inc.
4# Copyright (C) 1994-2013 Free Software Foundation, Inc.
95
106# This Makefile.in is free software; the Free Software Foundation
117# gives unlimited permission to copy and/or distribute it,
……@@ -20,17 +16,7 @@
2016
2117
2218VPATH = @srcdir@
23am__is_gnu_make = { \
24 if test -z '$(MAKELEVEL)'; then \
25 false; \
26 elif test -n '$(MAKE_HOST)'; then \
27 true; \
28 elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
29 true; \
30 else \
31 false; \
32 fi; \
33}
19am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
3420am__make_running_with_option = \
3521 case $${target_option-} in \
3622 ?) ;; \
……@@ -94,6 +80,8 @@ POST_UNINSTALL = :
9480build_triplet = @build@
9581host_triplet = @host@
9682subdir = timer
83DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
84 $(top_srcdir)/./config/depcomp $(include_HEADERS)
9785ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
9886am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
9987 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
……@@ -101,8 +89,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
10189 $(top_srcdir)/configure.ac
10290am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
10391 $(ACLOCAL_M4)
104DIST_COMMON = $(srcdir)/Makefile.am $(include_HEADERS) \
105 $(am__DIST_COMMON)
10692mkinstalldirs = $(install_sh) -d
10793CONFIG_CLEAN_FILES =
10894CONFIG_CLEAN_VPATH_FILES =
……@@ -204,7 +190,6 @@ am__define_uniq_tagged_files = \
204190 done | $(am__uniquify_input)`
205191ETAGS = etags
206192CTAGS = ctags
207am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/./config/depcomp
208193DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
209194ACLOCAL = @ACLOCAL@
210195AMTAR = @AMTAR@
……@@ -352,6 +337,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
352337 echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign timer/Makefile'; \
353338 $(am__cd) $(top_srcdir) && \
354339 $(AUTOMAKE) --foreign timer/Makefile
340.PRECIOUS: Makefile
355341Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
356342 @case '$?' in \
357343 *config.status*) \
……@@ -672,8 +658,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES
672658 tags tags-am uninstall uninstall-am uninstall-includeHEADERS \
673659 uninstall-libLTLIBRARIES
674660
675.PRECIOUS: Makefile
676
677661default: libtimer.la
678662all: libtimer.la
679663