コミットメタ情報

リビジョン366dd15bea6bcbe6ecc7a9dbb89911bf80942d63 (tree)
日時2019-07-26 11:23:56
作者Satoshi Yasuda <7m3tjz@jarl...>
コミッターSatoshi Yasuda

ログメッセージ

modified: xchange.c
modified: xchange_util.c

変更サマリ

差分

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
1-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
1+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
22
33 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
4+# 2005 Free Software Foundation, Inc.
55 # This file is free software; the Free Software Foundation
66 # gives unlimited permission to copy and/or distribute it,
77 # with or without modifications, as long as this notice is preserved.
@@ -11,15 +11,7 @@
1111 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1212 # PARTICULAR PURPOSE.
1313
14-m4_ifndef([AC_AUTOCONF_VERSION],
15- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
17-[m4_warning([this file was generated for autoconf 2.63.
18-You have another version of autoconf. It may work, but is not guaranteed to.
19-If you have problems, you may need to regenerate the build system entirely.
20-To do so, use the procedure documented by the package, typically `autoreconf'.])])
21-
22-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
14+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
2315 #
2416 # This file is free software; the Free Software Foundation
2517 # gives unlimited permission to copy and/or distribute it,
@@ -29,31 +21,14 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
2921 # ----------------------------
3022 # Automake X.Y traces this macro to ensure aclocal.m4 has been
3123 # generated from the m4 files accompanying Automake X.Y.
32-# (This private macro should not be called outside this file.)
33-AC_DEFUN([AM_AUTOMAKE_VERSION],
34-[am__api_version='1.11'
35-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
36-dnl require some minimum version. Point them to the right macro.
37-m4_if([$1], [1.11.1], [],
38- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
39-])
40-
41-# _AM_AUTOCONF_VERSION(VERSION)
42-# -----------------------------
43-# aclocal traces this macro to find the Autoconf version.
44-# This is a private macro too. Using m4_define simplifies
45-# the logic in aclocal, which can simply ignore this definition.
46-m4_define([_AM_AUTOCONF_VERSION], [])
24+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
4725
4826 # AM_SET_CURRENT_AUTOMAKE_VERSION
4927 # -------------------------------
50-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
51-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
28+# Call AM_AUTOMAKE_VERSION so it can be traced.
29+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
5230 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
53-[AM_AUTOMAKE_VERSION([1.11.1])dnl
54-m4_ifndef([AC_AUTOCONF_VERSION],
55- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
56-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
31+ [AM_AUTOMAKE_VERSION([1.9.6])])
5732
5833 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
5934
@@ -110,14 +85,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
11085
11186 # AM_CONDITIONAL -*- Autoconf -*-
11287
113-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
88+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
11489 # Free Software Foundation, Inc.
11590 #
11691 # This file is free software; the Free Software Foundation
11792 # gives unlimited permission to copy and/or distribute it,
11893 # with or without modifications, as long as this notice is preserved.
11994
120-# serial 9
95+# serial 7
12196
12297 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
12398 # -------------------------------------
@@ -126,11 +101,8 @@ AC_DEFUN([AM_CONDITIONAL],
126101 [AC_PREREQ(2.52)dnl
127102 ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
128103 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
129-AC_SUBST([$1_TRUE])dnl
130-AC_SUBST([$1_FALSE])dnl
131-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
132-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
133-m4_define([_AM_COND_VALUE_$1], [$2])dnl
104+AC_SUBST([$1_TRUE])
105+AC_SUBST([$1_FALSE])
134106 if $2; then
135107 $1_TRUE=
136108 $1_FALSE='#'
@@ -144,14 +116,15 @@ AC_CONFIG_COMMANDS_PRE(
144116 Usually this means the macro was only invoked conditionally.]])
145117 fi])])
146118
147-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
119+
120+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
148121 # Free Software Foundation, Inc.
149122 #
150123 # This file is free software; the Free Software Foundation
151124 # gives unlimited permission to copy and/or distribute it,
152125 # with or without modifications, as long as this notice is preserved.
153126
154-# serial 10
127+# serial 8
155128
156129 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
157130 # written in clear, in which case automake, when reading aclocal.m4,
@@ -179,7 +152,6 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
179152 ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
180153 [$1], CXX, [depcc="$CXX" am_compiler_list=],
181154 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
182- [$1], UPC, [depcc="$UPC" am_compiler_list=],
183155 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
184156 [depcc="$$1" am_compiler_list=])
185157
@@ -208,16 +180,6 @@ AC_CACHE_CHECK([dependency style of $depcc],
208180 if test "$am_compiler_list" = ""; then
209181 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
210182 fi
211- am__universal=false
212- m4_case([$1], [CC],
213- [case " $depcc " in #(
214- *\ -arch\ *\ -arch\ *) am__universal=true ;;
215- esac],
216- [CXX],
217- [case " $depcc " in #(
218- *\ -arch\ *\ -arch\ *) am__universal=true ;;
219- esac])
220-
221183 for depmode in $am_compiler_list; do
222184 # Setup a source with many dependencies, because some compilers
223185 # like to wrap large dependency lists on column 80 (with \), and
@@ -235,17 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
235197 done
236198 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
237199
238- # We check with `-c' and `-o' for the sake of the "dashmstdout"
239- # mode. It turns out that the SunPro C++ compiler does not properly
240- # handle `-M -o', and we need to detect this. Also, some Intel
241- # versions had trouble with output in subdirs
242- am__obj=sub/conftest.${OBJEXT-o}
243- am__minus_obj="-o $am__obj"
244200 case $depmode in
245- gcc)
246- # This depmode causes a compiler race in universal mode.
247- test "$am__universal" = false || continue
248- ;;
249201 nosideeffect)
250202 # after this tag, mechanisms are not by side-effect, so they'll
251203 # only be used when explicitly requested
@@ -255,23 +207,18 @@ AC_CACHE_CHECK([dependency style of $depcc],
255207 break
256208 fi
257209 ;;
258- msvisualcpp | msvcmsys)
259- # This compiler won't grok `-c -o', but also, the minuso test has
260- # not run yet. These depmodes are late enough in the game, and
261- # so weak that their functioning should not be impacted.
262- am__obj=conftest.${OBJEXT-o}
263- am__minus_obj=
264- ;;
265210 none) break ;;
266211 esac
212+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
213+ # mode. It turns out that the SunPro C++ compiler does not properly
214+ # handle `-M -o', and we need to detect this.
267215 if depmode=$depmode \
268- source=sub/conftest.c object=$am__obj \
216+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
269217 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
270- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
218+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
271219 >/dev/null 2>conftest.err &&
272- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
273220 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
274- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
221+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
275222 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
276223 # icc doesn't choke on unknown options, it will just issue warnings
277224 # or remarks (even with -Werror). So we grep stderr for any message
@@ -322,74 +269,61 @@ if test "x$enable_dependency_tracking" != xno; then
322269 AMDEPBACKSLASH='\'
323270 fi
324271 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
325-AC_SUBST([AMDEPBACKSLASH])dnl
326-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
272+AC_SUBST([AMDEPBACKSLASH])
327273 ])
328274
329275 # Generate code to set up dependency tracking. -*- Autoconf -*-
330276
331-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
277+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
332278 # Free Software Foundation, Inc.
333279 #
334280 # This file is free software; the Free Software Foundation
335281 # gives unlimited permission to copy and/or distribute it,
336282 # with or without modifications, as long as this notice is preserved.
337283
338-#serial 5
284+#serial 3
339285
340286 # _AM_OUTPUT_DEPENDENCY_COMMANDS
341287 # ------------------------------
342288 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
343-[{
344- # Autoconf 2.62 quotes --file arguments for eval, but not when files
345- # are listed without --file. Let's play safe and only enable the eval
346- # if we detect the quoting.
347- case $CONFIG_FILES in
348- *\'*) eval set x "$CONFIG_FILES" ;;
349- *) set x $CONFIG_FILES ;;
350- esac
351- shift
352- for mf
353- do
354- # Strip MF so we end up with the name of the file.
355- mf=`echo "$mf" | sed -e 's/:.*$//'`
356- # Check whether this is an Automake generated Makefile or not.
357- # We used to match only the files named `Makefile.in', but
358- # some people rename them; so instead we look at the file content.
359- # Grep'ing the first line is not enough: some people post-process
360- # each Makefile.in and add a new line on top of each file to say so.
361- # Grep'ing the whole file is not good either: AIX grep has a line
362- # limit of 2048, but all sed's we know have understand at least 4000.
363- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
364- dirpart=`AS_DIRNAME("$mf")`
365- else
366- continue
367- fi
368- # Extract the definition of DEPDIR, am__include, and am__quote
369- # from the Makefile without running `make'.
370- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
371- test -z "$DEPDIR" && continue
372- am__include=`sed -n 's/^am__include = //p' < "$mf"`
373- test -z "am__include" && continue
374- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
375- # When using ansi2knr, U may be empty or an underscore; expand it
376- U=`sed -n 's/^U = //p' < "$mf"`
377- # Find all dependency output files, they are included files with
378- # $(DEPDIR) in their names. We invoke sed twice because it is the
379- # simplest approach to changing $(DEPDIR) to its actual value in the
380- # expansion.
381- for file in `sed -n "
382- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
383- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
384- # Make sure the directory exists.
385- test -f "$dirpart/$file" && continue
386- fdir=`AS_DIRNAME(["$file"])`
387- AS_MKDIR_P([$dirpart/$fdir])
388- # echo "creating $dirpart/$file"
389- echo '# dummy' > "$dirpart/$file"
390- done
289+[for mf in $CONFIG_FILES; do
290+ # Strip MF so we end up with the name of the file.
291+ mf=`echo "$mf" | sed -e 's/:.*$//'`
292+ # Check whether this is an Automake generated Makefile or not.
293+ # We used to match only the files named `Makefile.in', but
294+ # some people rename them; so instead we look at the file content.
295+ # Grep'ing the first line is not enough: some people post-process
296+ # each Makefile.in and add a new line on top of each file to say so.
297+ # So let's grep whole file.
298+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
299+ dirpart=`AS_DIRNAME("$mf")`
300+ else
301+ continue
302+ fi
303+ # Extract the definition of DEPDIR, am__include, and am__quote
304+ # from the Makefile without running `make'.
305+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
306+ test -z "$DEPDIR" && continue
307+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
308+ test -z "am__include" && continue
309+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
310+ # When using ansi2knr, U may be empty or an underscore; expand it
311+ U=`sed -n 's/^U = //p' < "$mf"`
312+ # Find all dependency output files, they are included files with
313+ # $(DEPDIR) in their names. We invoke sed twice because it is the
314+ # simplest approach to changing $(DEPDIR) to its actual value in the
315+ # expansion.
316+ for file in `sed -n "
317+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
318+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
319+ # Make sure the directory exists.
320+ test -f "$dirpart/$file" && continue
321+ fdir=`AS_DIRNAME(["$file"])`
322+ AS_MKDIR_P([$dirpart/$fdir])
323+ # echo "creating $dirpart/$file"
324+ echo '# dummy' > "$dirpart/$file"
391325 done
392-}
326+done
393327 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
394328
395329
@@ -408,14 +342,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
408342
409343 # Do all the work for Automake. -*- Autoconf -*-
410344
411-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
412-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
345+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
346+# Free Software Foundation, Inc.
413347 #
414348 # This file is free software; the Free Software Foundation
415349 # gives unlimited permission to copy and/or distribute it,
416350 # with or without modifications, as long as this notice is preserved.
417351
418-# serial 16
352+# serial 12
419353
420354 # This macro actually does too much. Some checks are only needed if
421355 # your package does certain things. But this isn't really a big deal.
@@ -432,20 +366,16 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
432366 # arguments mandatory, and then we can depend on a new Autoconf
433367 # release and drop the old call support.
434368 AC_DEFUN([AM_INIT_AUTOMAKE],
435-[AC_PREREQ([2.62])dnl
369+[AC_PREREQ([2.58])dnl
436370 dnl Autoconf wants to disallow AM_ names. We explicitly allow
437371 dnl the ones we care about.
438372 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
439373 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
440374 AC_REQUIRE([AC_PROG_INSTALL])dnl
441-if test "`cd $srcdir && pwd`" != "`pwd`"; then
442- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
443- # is not polluted with repeated "-I."
444- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
445- # test to see if srcdir already configured
446- if test -f $srcdir/config.status; then
447- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
448- fi
375+# test to see if srcdir already configured
376+if test "`cd $srcdir && pwd`" != "`pwd`" &&
377+ test -f $srcdir/config.status; then
378+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
449379 fi
450380
451381 # test whether we have cygpath
@@ -465,9 +395,6 @@ m4_ifval([$2],
465395 AC_SUBST([PACKAGE], [$1])dnl
466396 AC_SUBST([VERSION], [$2])],
467397 [_AM_SET_OPTIONS([$1])dnl
468-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
469-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
470- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
471398 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
472399 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
473400
@@ -483,8 +410,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
483410 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
484411 AM_MISSING_PROG(AUTOHEADER, autoheader)
485412 AM_MISSING_PROG(MAKEINFO, makeinfo)
486-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
487-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
413+AM_PROG_INSTALL_SH
414+AM_PROG_INSTALL_STRIP
488415 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
489416 # We need awk for the "check" target. The system "awk" is bad on
490417 # some platforms.
@@ -492,37 +419,20 @@ AC_REQUIRE([AC_PROG_AWK])dnl
492419 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
493420 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
494421 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
495- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
496- [_AM_PROG_TAR([v7])])])
422+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
423+ [_AM_PROG_TAR([v7])])])
497424 _AM_IF_OPTION([no-dependencies],,
498425 [AC_PROVIDE_IFELSE([AC_PROG_CC],
499- [_AM_DEPENDENCIES(CC)],
500- [define([AC_PROG_CC],
501- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
426+ [_AM_DEPENDENCIES(CC)],
427+ [define([AC_PROG_CC],
428+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
502429 AC_PROVIDE_IFELSE([AC_PROG_CXX],
503- [_AM_DEPENDENCIES(CXX)],
504- [define([AC_PROG_CXX],
505- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
506-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
507- [_AM_DEPENDENCIES(OBJC)],
508- [define([AC_PROG_OBJC],
509- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
430+ [_AM_DEPENDENCIES(CXX)],
431+ [define([AC_PROG_CXX],
432+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
510433 ])
511-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
512-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
513-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
514-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
515-AC_CONFIG_COMMANDS_PRE(dnl
516-[m4_provide_if([_AM_COMPILER_EXEEXT],
517- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
518434 ])
519435
520-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
521-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
522-dnl mangled by Autoconf and run in a shell conditional statement.
523-m4_define([_AC_COMPILER_EXEEXT],
524-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
525-
526436
527437 # When config.status generates a header, we must update the stamp-h file.
528438 # This file resides in the same directory as the config header
@@ -533,19 +443,18 @@ m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
533443 # our stamp files there.
534444 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
535445 [# Compute $1's index in $config_headers.
536-_am_arg=$1
537446 _am_stamp_count=1
538447 for _am_header in $config_headers :; do
539448 case $_am_header in
540- $_am_arg | $_am_arg:* )
449+ $1 | $1:* )
541450 break ;;
542451 * )
543452 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
544453 esac
545454 done
546-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
455+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
547456
548-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
457+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
549458 #
550459 # This file is free software; the Free Software Foundation
551460 # gives unlimited permission to copy and/or distribute it,
@@ -556,14 +465,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
556465 # Define $install_sh.
557466 AC_DEFUN([AM_PROG_INSTALL_SH],
558467 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
559-if test x"${install_sh}" != xset; then
560- case $am_aux_dir in
561- *\ * | *\ *)
562- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
563- *)
564- install_sh="\${SHELL} $am_aux_dir/install-sh"
565- esac
566-fi
468+install_sh=${install_sh-"$am_aux_dir/install-sh"}
567469 AC_SUBST(install_sh)])
568470
569471 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -589,13 +491,13 @@ AC_SUBST([am__leading_dot])])
589491
590492 # Check to see how 'make' treats includes. -*- Autoconf -*-
591493
592-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
494+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
593495 #
594496 # This file is free software; the Free Software Foundation
595497 # gives unlimited permission to copy and/or distribute it,
596498 # with or without modifications, as long as this notice is preserved.
597499
598-# serial 4
500+# serial 3
599501
600502 # AM_MAKE_INCLUDE()
601503 # -----------------
@@ -604,7 +506,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
604506 [am_make=${MAKE-make}
605507 cat > confinc << 'END'
606508 am__doit:
607- @echo this is the am__doit target
509+ @echo done
608510 .PHONY: am__doit
609511 END
610512 # If we don't find an include directive, just comment out the code.
@@ -614,24 +516,24 @@ am__quote=
614516 _am_result=none
615517 # First try GNU make style include.
616518 echo "include confinc" > confmf
617-# Ignore all kinds of additional output from `make'.
618-case `$am_make -s -f confmf 2> /dev/null` in #(
619-*the\ am__doit\ target*)
620- am__include=include
621- am__quote=
622- _am_result=GNU
623- ;;
624-esac
519+# We grep out `Entering directory' and `Leaving directory'
520+# messages which can occur if `w' ends up in MAKEFLAGS.
521+# In particular we don't look at `^make:' because GNU make might
522+# be invoked under some other name (usually "gmake"), in which
523+# case it prints its new name instead of `make'.
524+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
525+ am__include=include
526+ am__quote=
527+ _am_result=GNU
528+fi
625529 # Now try BSD make style include.
626530 if test "$am__include" = "#"; then
627531 echo '.include "confinc"' > confmf
628- case `$am_make -s -f confmf 2> /dev/null` in #(
629- *the\ am__doit\ target*)
630- am__include=.include
631- am__quote="\""
632- _am_result=BSD
633- ;;
634- esac
532+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
533+ am__include=.include
534+ am__quote="\""
535+ _am_result=BSD
536+ fi
635537 fi
636538 AC_SUBST([am__include])
637539 AC_SUBST([am__quote])
@@ -641,14 +543,14 @@ rm -f confinc confmf
641543
642544 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
643545
644-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
546+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
645547 # Free Software Foundation, Inc.
646548 #
647549 # This file is free software; the Free Software Foundation
648550 # gives unlimited permission to copy and/or distribute it,
649551 # with or without modifications, as long as this notice is preserved.
650552
651-# serial 6
553+# serial 4
652554
653555 # AM_MISSING_PROG(NAME, PROGRAM)
654556 # ------------------------------
@@ -664,15 +566,7 @@ AC_SUBST($1)])
664566 # If it does, set am_missing_run to use it, otherwise, to nothing.
665567 AC_DEFUN([AM_MISSING_HAS_RUN],
666568 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
667-AC_REQUIRE_AUX_FILE([missing])dnl
668-if test x"${MISSING+set}" != xset; then
669- case $am_aux_dir in
670- *\ * | *\ *)
671- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
672- *)
673- MISSING="\${SHELL} $am_aux_dir/missing" ;;
674- esac
675-fi
569+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
676570 # Use eval to expand $SHELL
677571 if eval "$MISSING --run true"; then
678572 am_missing_run="$MISSING --run "
@@ -682,7 +576,7 @@ else
682576 fi
683577 ])
684578
685-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
579+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
686580 #
687581 # This file is free software; the Free Software Foundation
688582 # gives unlimited permission to copy and/or distribute it,
@@ -690,33 +584,70 @@ fi
690584
691585 # AM_PROG_MKDIR_P
692586 # ---------------
693-# Check for `mkdir -p'.
587+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
588+#
589+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
590+# created by `make install' are always world readable, even if the
591+# installer happens to have an overly restrictive umask (e.g. 077).
592+# This was a mistake. There are at least two reasons why we must not
593+# use `-m 0755':
594+# - it causes special bits like SGID to be ignored,
595+# - it may be too restrictive (some setups expect 775 directories).
596+#
597+# Do not use -m 0755 and let people choose whatever they expect by
598+# setting umask.
599+#
600+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
601+# Some implementations (such as Solaris 8's) are not thread-safe: if a
602+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
603+# concurrently, both version can detect that a/ is missing, but only
604+# one can create it and the other will error out. Consequently we
605+# restrict ourselves to GNU make (using the --version option ensures
606+# this.)
694607 AC_DEFUN([AM_PROG_MKDIR_P],
695-[AC_PREREQ([2.60])dnl
696-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
697-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
698-dnl while keeping a definition of mkdir_p for backward compatibility.
699-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
700-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
701-dnl Makefile.ins that do not define MKDIR_P, so we do our own
702-dnl adjustment using top_builddir (which is defined more often than
703-dnl MKDIR_P).
704-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
705-case $mkdir_p in
706- [[\\/$]]* | ?:[[\\/]]*) ;;
707- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
708-esac
709-])
608+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
609+ # We used to keeping the `.' as first argument, in order to
610+ # allow $(mkdir_p) to be used without argument. As in
611+ # $(mkdir_p) $(somedir)
612+ # where $(somedir) is conditionally defined. However this is wrong
613+ # for two reasons:
614+ # 1. if the package is installed by a user who cannot write `.'
615+ # make install will fail,
616+ # 2. the above comment should most certainly read
617+ # $(mkdir_p) $(DESTDIR)$(somedir)
618+ # so it does not work when $(somedir) is undefined and
619+ # $(DESTDIR) is not.
620+ # To support the latter case, we have to write
621+ # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
622+ # so the `.' trick is pointless.
623+ mkdir_p='mkdir -p --'
624+else
625+ # On NextStep and OpenStep, the `mkdir' command does not
626+ # recognize any option. It will interpret all options as
627+ # directories to create, and then abort because `.' already
628+ # exists.
629+ for d in ./-p ./--version;
630+ do
631+ test -d $d && rmdir $d
632+ done
633+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
634+ if test -f "$ac_aux_dir/mkinstalldirs"; then
635+ mkdir_p='$(mkinstalldirs)'
636+ else
637+ mkdir_p='$(install_sh) -d'
638+ fi
639+fi
640+AC_SUBST([mkdir_p])])
710641
711642 # Helper functions for option handling. -*- Autoconf -*-
712643
713-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
644+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
714645 #
715646 # This file is free software; the Free Software Foundation
716647 # gives unlimited permission to copy and/or distribute it,
717648 # with or without modifications, as long as this notice is preserved.
718649
719-# serial 4
650+# serial 3
720651
721652 # _AM_MANGLE_OPTION(NAME)
722653 # -----------------------
@@ -733,7 +664,7 @@ AC_DEFUN([_AM_SET_OPTION],
733664 # ----------------------------------
734665 # OPTIONS is a space-separated list of Automake options.
735666 AC_DEFUN([_AM_SET_OPTIONS],
736-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
667+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
737668
738669 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
739670 # -------------------------------------------
@@ -743,14 +674,14 @@ AC_DEFUN([_AM_IF_OPTION],
743674
744675 # Check to make sure that the build environment is sane. -*- Autoconf -*-
745676
746-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
677+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
747678 # Free Software Foundation, Inc.
748679 #
749680 # This file is free software; the Free Software Foundation
750681 # gives unlimited permission to copy and/or distribute it,
751682 # with or without modifications, as long as this notice is preserved.
752683
753-# serial 5
684+# serial 4
754685
755686 # AM_SANITY_CHECK
756687 # ---------------
@@ -759,29 +690,16 @@ AC_DEFUN([AM_SANITY_CHECK],
759690 # Just in case
760691 sleep 1
761692 echo timestamp > conftest.file
762-# Reject unsafe characters in $srcdir or the absolute working directory
763-# name. Accept space and tab only in the latter.
764-am_lf='
765-'
766-case `pwd` in
767- *[[\\\"\#\$\&\'\`$am_lf]]*)
768- AC_MSG_ERROR([unsafe absolute working directory name]);;
769-esac
770-case $srcdir in
771- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
772- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
773-esac
774-
775693 # Do `set' in a subshell so we don't clobber the current shell's
776694 # arguments. Must try -L first in case configure is actually a
777695 # symlink; some systems play weird games with the mod time of symlinks
778696 # (eg FreeBSD returns the mod time of the symlink's containing
779697 # directory).
780698 if (
781- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
699+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
782700 if test "$[*]" = "X"; then
783701 # -L didn't work.
784- set X `ls -t "$srcdir/configure" conftest.file`
702+ set X `ls -t $srcdir/configure conftest.file`
785703 fi
786704 rm -f conftest.file
787705 if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -831,28 +749,9 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
831749 if test "$cross_compiling" != no; then
832750 AC_CHECK_TOOL([STRIP], [strip], :)
833751 fi
834-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
752+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
835753 AC_SUBST([INSTALL_STRIP_PROGRAM])])
836754
837-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
838-#
839-# This file is free software; the Free Software Foundation
840-# gives unlimited permission to copy and/or distribute it,
841-# with or without modifications, as long as this notice is preserved.
842-
843-# serial 2
844-
845-# _AM_SUBST_NOTMAKE(VARIABLE)
846-# ---------------------------
847-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
848-# This macro is traced by Automake.
849-AC_DEFUN([_AM_SUBST_NOTMAKE])
850-
851-# AM_SUBST_NOTMAKE(VARIABLE)
852-# ---------------------------
853-# Public sister of _AM_SUBST_NOTMAKE.
854-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
855-
856755 # Check how to create a tarball. -*- Autoconf -*-
857756
858757 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
--- a/config.h.in
+++ b/config.h.in
@@ -3,9 +3,21 @@
33 /* Define to 1 if you have the `alarm' function. */
44 #undef HAVE_ALARM
55
6+/* Define to 1 if you have the <arpa/inet.h> header file. */
7+#undef HAVE_ARPA_INET_H
8+
9+/* Define to 1 if you have the <fcntl.h> header file. */
10+#undef HAVE_FCNTL_H
11+
12+/* Define to 1 if you have the `gethostbyname' function. */
13+#undef HAVE_GETHOSTBYNAME
14+
615 /* Define to 1 if you have the `gettimeofday' function. */
716 #undef HAVE_GETTIMEOFDAY
817
18+/* Define to 1 if you have the `inet_ntoa' function. */
19+#undef HAVE_INET_NTOA
20+
921 /* Define to 1 if you have the <inttypes.h> header file. */
1022 #undef HAVE_INTTYPES_H
1123
@@ -28,6 +40,10 @@
2840 /* Define to 1 if you have the `socket' function. */
2941 #undef HAVE_SOCKET
3042
43+/* Define to 1 if `stat' has the bug that it succeeds when given the
44+ zero-length file name argument. */
45+#undef HAVE_STAT_EMPTY_STRING_BUG
46+
3147 /* Define to 1 if you have the <stdint.h> header file. */
3248 #undef HAVE_STDINT_H
3349
@@ -67,6 +83,10 @@
6783 /* Define to 1 if you have the <unistd.h> header file. */
6884 #undef HAVE_UNISTD_H
6985
86+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
87+ slash. */
88+#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
89+
7090 /* Name of package */
7191 #undef PACKAGE
7292
@@ -85,14 +105,23 @@
85105 /* Define to the version of this package. */
86106 #undef PACKAGE_VERSION
87107
108+/* Define as the return type of signal handlers (`int' or `void'). */
109+#undef RETSIGTYPE
110+
88111 /* Define to 1 if you have the ANSI C header files. */
89112 #undef STDC_HEADERS
90113
91114 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
92115 #undef TIME_WITH_SYS_TIME
93116
117+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
118+#undef TM_IN_SYS_TIME
119+
94120 /* Version number of package */
95121 #undef VERSION
96122
123+/* Define to empty if `const' does not conform to ANSI C. */
124+#undef const
125+
97126 /* Define to rpl_malloc if the replacement function should be used. */
98127 #undef malloc
--- a/xchange.c
+++ b/xchange.c
@@ -67,14 +67,14 @@ void xchange_zr(void)
6767
6868 zr_length = (zr_buff.d_packet.l[0] << 8) | zr_buff.d_packet.l[1];
6969 zr_length += 10;
70- if (zr_buff.zr_buffer[6] == 's')
70+ if ((zr_buff.zr_buffer[6] == 's') && (zr_length > 10))
7171 {
7272 zr_in_cnt++;
7373 send_zr_reply (zr_buff.zr_buffer);
7474 /* Location information update packet */
75- if (zr_buff.zr_buffer[7] == 0x21)
75+ if ((zr_buff.zr_buffer[7] == 0x21) && (zr_length == 26))
7676 {
77- if ((zr_buff.zr_buffer[10] != 0x20)
77+ if ((zr_buff.zr_buffer[10] != 0x20)
7878 && (memcmp (&zr_buff.zr_buffer[10], "CQCQCQ", 6)))
7979 {
8080 putFifo (zr_length, zr_buff.zr_buffer);
--- a/xchange_util.c
+++ b/xchange_util.c
@@ -393,7 +393,6 @@ void putFifo (int len, unsigned char pkt[])
393393 {
394394 struct FifoPkt *ret;
395395 time_t atime;
396-
397396 if (gw_Fifo_cnt > 20)
398397 {
399398 if (gw_down_cnt < 12)
@@ -406,7 +405,7 @@ void putFifo (int len, unsigned char pkt[])
406405 //sleep (5);
407406 return; /* dsgwd down */
408407 }
409- if (len == Wp->length)
408+ if ((len == Wp->length) && (len != 26))
410409 {
411410 if (!memcmp (&pkt[6], &Wp->pkt[6], len-6)) return;
412411 }
旧リポジトリブラウザで表示