コミットメタ情報

リビジョン1933a3751d694efa04524bf78282f913db493fb0 (tree)
日時2019-07-22 00:16:20
作者Satoshi Yasuda <yasuda@jk1z...>
コミッターSatoshi Yasuda

ログメッセージ

modified: dstar.h
modified: xchange.c
modified: xchange.h
modified: xchange_util.c

変更サマリ

差分

--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
1-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
1+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
22
33 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4-# 2005 Free Software Foundation, Inc.
4+# 2005, 2006, 2007, 2008, 2009 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,7 +11,15 @@
1111 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1212 # PARTICULAR PURPOSE.
1313
14-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
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.
1523 #
1624 # This file is free software; the Free Software Foundation
1725 # gives unlimited permission to copy and/or distribute it,
@@ -21,14 +29,31 @@
2129 # ----------------------------
2230 # Automake X.Y traces this macro to ensure aclocal.m4 has been
2331 # generated from the m4 files accompanying Automake X.Y.
24-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
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], [])
2547
2648 # AM_SET_CURRENT_AUTOMAKE_VERSION
2749 # -------------------------------
28-# Call AM_AUTOMAKE_VERSION so it can be traced.
29-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
50+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
51+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
3052 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
31- [AM_AUTOMAKE_VERSION([1.9.6])])
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]))])
3257
3358 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
3459
@@ -85,14 +110,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
85110
86111 # AM_CONDITIONAL -*- Autoconf -*-
87112
88-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
113+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
89114 # Free Software Foundation, Inc.
90115 #
91116 # This file is free software; the Free Software Foundation
92117 # gives unlimited permission to copy and/or distribute it,
93118 # with or without modifications, as long as this notice is preserved.
94119
95-# serial 7
120+# serial 9
96121
97122 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
98123 # -------------------------------------
@@ -101,8 +126,11 @@ AC_DEFUN([AM_CONDITIONAL],
101126 [AC_PREREQ(2.52)dnl
102127 ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
103128 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
104-AC_SUBST([$1_TRUE])
105-AC_SUBST([$1_FALSE])
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
106134 if $2; then
107135 $1_TRUE=
108136 $1_FALSE='#'
@@ -116,15 +144,14 @@ AC_CONFIG_COMMANDS_PRE(
116144 Usually this means the macro was only invoked conditionally.]])
117145 fi])])
118146
119-
120-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
147+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
121148 # Free Software Foundation, Inc.
122149 #
123150 # This file is free software; the Free Software Foundation
124151 # gives unlimited permission to copy and/or distribute it,
125152 # with or without modifications, as long as this notice is preserved.
126153
127-# serial 8
154+# serial 10
128155
129156 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
130157 # written in clear, in which case automake, when reading aclocal.m4,
@@ -152,6 +179,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
152179 ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
153180 [$1], CXX, [depcc="$CXX" am_compiler_list=],
154181 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
182+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
155183 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
156184 [depcc="$$1" am_compiler_list=])
157185
@@ -180,6 +208,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
180208 if test "$am_compiler_list" = ""; then
181209 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
182210 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+
183221 for depmode in $am_compiler_list; do
184222 # Setup a source with many dependencies, because some compilers
185223 # like to wrap large dependency lists on column 80 (with \), and
@@ -197,7 +235,17 @@ AC_CACHE_CHECK([dependency style of $depcc],
197235 done
198236 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
199237
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"
200244 case $depmode in
245+ gcc)
246+ # This depmode causes a compiler race in universal mode.
247+ test "$am__universal" = false || continue
248+ ;;
201249 nosideeffect)
202250 # after this tag, mechanisms are not by side-effect, so they'll
203251 # only be used when explicitly requested
@@ -207,18 +255,23 @@ AC_CACHE_CHECK([dependency style of $depcc],
207255 break
208256 fi
209257 ;;
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+ ;;
210265 none) break ;;
211266 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.
215267 if depmode=$depmode \
216- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
268+ source=sub/conftest.c object=$am__obj \
217269 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
218- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
270+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
219271 >/dev/null 2>conftest.err &&
272+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
220273 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
221- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
274+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
222275 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
223276 # icc doesn't choke on unknown options, it will just issue warnings
224277 # or remarks (even with -Werror). So we grep stderr for any message
@@ -269,61 +322,74 @@ if test "x$enable_dependency_tracking" != xno; then
269322 AMDEPBACKSLASH='\'
270323 fi
271324 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
272-AC_SUBST([AMDEPBACKSLASH])
325+AC_SUBST([AMDEPBACKSLASH])dnl
326+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
273327 ])
274328
275329 # Generate code to set up dependency tracking. -*- Autoconf -*-
276330
277-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
331+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
278332 # Free Software Foundation, Inc.
279333 #
280334 # This file is free software; the Free Software Foundation
281335 # gives unlimited permission to copy and/or distribute it,
282336 # with or without modifications, as long as this notice is preserved.
283337
284-#serial 3
338+#serial 5
285339
286340 # _AM_OUTPUT_DEPENDENCY_COMMANDS
287341 # ------------------------------
288342 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
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"
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
325391 done
326-done
392+}
327393 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
328394
329395
@@ -342,14 +408,14 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
342408
343409 # Do all the work for Automake. -*- Autoconf -*-
344410
345-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
346-# Free Software Foundation, Inc.
411+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
412+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
347413 #
348414 # This file is free software; the Free Software Foundation
349415 # gives unlimited permission to copy and/or distribute it,
350416 # with or without modifications, as long as this notice is preserved.
351417
352-# serial 12
418+# serial 16
353419
354420 # This macro actually does too much. Some checks are only needed if
355421 # your package does certain things. But this isn't really a big deal.
@@ -366,16 +432,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
366432 # arguments mandatory, and then we can depend on a new Autoconf
367433 # release and drop the old call support.
368434 AC_DEFUN([AM_INIT_AUTOMAKE],
369-[AC_PREREQ([2.58])dnl
435+[AC_PREREQ([2.62])dnl
370436 dnl Autoconf wants to disallow AM_ names. We explicitly allow
371437 dnl the ones we care about.
372438 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
373439 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
374440 AC_REQUIRE([AC_PROG_INSTALL])dnl
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])
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
379449 fi
380450
381451 # test whether we have cygpath
@@ -395,6 +465,9 @@ m4_ifval([$2],
395465 AC_SUBST([PACKAGE], [$1])dnl
396466 AC_SUBST([VERSION], [$2])],
397467 [_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
398471 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
399472 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
400473
@@ -410,8 +483,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
410483 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
411484 AM_MISSING_PROG(AUTOHEADER, autoheader)
412485 AM_MISSING_PROG(MAKEINFO, makeinfo)
413-AM_PROG_INSTALL_SH
414-AM_PROG_INSTALL_STRIP
486+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
487+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
415488 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
416489 # We need awk for the "check" target. The system "awk" is bad on
417490 # some platforms.
@@ -419,20 +492,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl
419492 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
420493 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
421494 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
422- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
423- [_AM_PROG_TAR([v7])])])
495+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
496+ [_AM_PROG_TAR([v7])])])
424497 _AM_IF_OPTION([no-dependencies],,
425498 [AC_PROVIDE_IFELSE([AC_PROG_CC],
426- [_AM_DEPENDENCIES(CC)],
427- [define([AC_PROG_CC],
428- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
499+ [_AM_DEPENDENCIES(CC)],
500+ [define([AC_PROG_CC],
501+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
429502 AC_PROVIDE_IFELSE([AC_PROG_CXX],
430- [_AM_DEPENDENCIES(CXX)],
431- [define([AC_PROG_CXX],
432- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
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
433510 ])
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
434518 ])
435519
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+
436526
437527 # When config.status generates a header, we must update the stamp-h file.
438528 # This file resides in the same directory as the config header
@@ -443,18 +533,19 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
443533 # our stamp files there.
444534 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
445535 [# Compute $1's index in $config_headers.
536+_am_arg=$1
446537 _am_stamp_count=1
447538 for _am_header in $config_headers :; do
448539 case $_am_header in
449- $1 | $1:* )
540+ $_am_arg | $_am_arg:* )
450541 break ;;
451542 * )
452543 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
453544 esac
454545 done
455-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
546+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
456547
457-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
548+# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
458549 #
459550 # This file is free software; the Free Software Foundation
460551 # gives unlimited permission to copy and/or distribute it,
@@ -465,7 +556,14 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
465556 # Define $install_sh.
466557 AC_DEFUN([AM_PROG_INSTALL_SH],
467558 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
468-install_sh=${install_sh-"$am_aux_dir/install-sh"}
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
469567 AC_SUBST(install_sh)])
470568
471569 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
@@ -491,13 +589,13 @@ AC_SUBST([am__leading_dot])])
491589
492590 # Check to see how 'make' treats includes. -*- Autoconf -*-
493591
494-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
592+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
495593 #
496594 # This file is free software; the Free Software Foundation
497595 # gives unlimited permission to copy and/or distribute it,
498596 # with or without modifications, as long as this notice is preserved.
499597
500-# serial 3
598+# serial 4
501599
502600 # AM_MAKE_INCLUDE()
503601 # -----------------
@@ -506,7 +604,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
506604 [am_make=${MAKE-make}
507605 cat > confinc << 'END'
508606 am__doit:
509- @echo done
607+ @echo this is the am__doit target
510608 .PHONY: am__doit
511609 END
512610 # If we don't find an include directive, just comment out the code.
@@ -516,24 +614,24 @@ am__quote=
516614 _am_result=none
517615 # First try GNU make style include.
518616 echo "include confinc" > confmf
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
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
529625 # Now try BSD make style include.
530626 if test "$am__include" = "#"; then
531627 echo '.include "confinc"' > confmf
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
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
537635 fi
538636 AC_SUBST([am__include])
539637 AC_SUBST([am__quote])
@@ -543,14 +641,14 @@ rm -f confinc confmf
543641
544642 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
545643
546-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
644+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
547645 # Free Software Foundation, Inc.
548646 #
549647 # This file is free software; the Free Software Foundation
550648 # gives unlimited permission to copy and/or distribute it,
551649 # with or without modifications, as long as this notice is preserved.
552650
553-# serial 4
651+# serial 6
554652
555653 # AM_MISSING_PROG(NAME, PROGRAM)
556654 # ------------------------------
@@ -566,7 +664,15 @@ AC_SUBST($1)])
566664 # If it does, set am_missing_run to use it, otherwise, to nothing.
567665 AC_DEFUN([AM_MISSING_HAS_RUN],
568666 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
569-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
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
570676 # Use eval to expand $SHELL
571677 if eval "$MISSING --run true"; then
572678 am_missing_run="$MISSING --run "
@@ -576,7 +682,7 @@ else
576682 fi
577683 ])
578684
579-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
685+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
580686 #
581687 # This file is free software; the Free Software Foundation
582688 # gives unlimited permission to copy and/or distribute it,
@@ -584,70 +690,33 @@ fi
584690
585691 # AM_PROG_MKDIR_P
586692 # ---------------
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.)
693+# Check for `mkdir -p'.
607694 AC_DEFUN([AM_PROG_MKDIR_P],
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])])
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+])
641710
642711 # Helper functions for option handling. -*- Autoconf -*-
643712
644-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
713+# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
645714 #
646715 # This file is free software; the Free Software Foundation
647716 # gives unlimited permission to copy and/or distribute it,
648717 # with or without modifications, as long as this notice is preserved.
649718
650-# serial 3
719+# serial 4
651720
652721 # _AM_MANGLE_OPTION(NAME)
653722 # -----------------------
@@ -664,7 +733,7 @@ AC_DEFUN([_AM_SET_OPTION],
664733 # ----------------------------------
665734 # OPTIONS is a space-separated list of Automake options.
666735 AC_DEFUN([_AM_SET_OPTIONS],
667-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
736+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
668737
669738 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
670739 # -------------------------------------------
@@ -674,14 +743,14 @@ AC_DEFUN([_AM_IF_OPTION],
674743
675744 # Check to make sure that the build environment is sane. -*- Autoconf -*-
676745
677-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
746+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
678747 # Free Software Foundation, Inc.
679748 #
680749 # This file is free software; the Free Software Foundation
681750 # gives unlimited permission to copy and/or distribute it,
682751 # with or without modifications, as long as this notice is preserved.
683752
684-# serial 4
753+# serial 5
685754
686755 # AM_SANITY_CHECK
687756 # ---------------
@@ -690,16 +759,29 @@ AC_DEFUN([AM_SANITY_CHECK],
690759 # Just in case
691760 sleep 1
692761 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+
693775 # Do `set' in a subshell so we don't clobber the current shell's
694776 # arguments. Must try -L first in case configure is actually a
695777 # symlink; some systems play weird games with the mod time of symlinks
696778 # (eg FreeBSD returns the mod time of the symlink's containing
697779 # directory).
698780 if (
699- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
781+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
700782 if test "$[*]" = "X"; then
701783 # -L didn't work.
702- set X `ls -t $srcdir/configure conftest.file`
784+ set X `ls -t "$srcdir/configure" conftest.file`
703785 fi
704786 rm -f conftest.file
705787 if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -749,9 +831,28 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
749831 if test "$cross_compiling" != no; then
750832 AC_CHECK_TOOL([STRIP], [strip], :)
751833 fi
752-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
834+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
753835 AC_SUBST([INSTALL_STRIP_PROGRAM])])
754836
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+
755856 # Check how to create a tarball. -*- Autoconf -*-
756857
757858 # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
--- a/config.h.in
+++ b/config.h.in
@@ -3,21 +3,9 @@
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-
156 /* Define to 1 if you have the `gettimeofday' function. */
167 #undef HAVE_GETTIMEOFDAY
178
18-/* Define to 1 if you have the `inet_ntoa' function. */
19-#undef HAVE_INET_NTOA
20-
219 /* Define to 1 if you have the <inttypes.h> header file. */
2210 #undef HAVE_INTTYPES_H
2311
@@ -40,10 +28,6 @@
4028 /* Define to 1 if you have the `socket' function. */
4129 #undef HAVE_SOCKET
4230
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-
4731 /* Define to 1 if you have the <stdint.h> header file. */
4832 #undef HAVE_STDINT_H
4933
@@ -83,10 +67,6 @@
8367 /* Define to 1 if you have the <unistd.h> header file. */
8468 #undef HAVE_UNISTD_H
8569
86-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
87- slash. */
88-#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
89-
9070 /* Name of package */
9171 #undef PACKAGE
9272
@@ -105,23 +85,14 @@
10585 /* Define to the version of this package. */
10686 #undef PACKAGE_VERSION
10787
108-/* Define as the return type of signal handlers (`int' or `void'). */
109-#undef RETSIGTYPE
110-
11188 /* Define to 1 if you have the ANSI C header files. */
11289 #undef STDC_HEADERS
11390
11491 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
11592 #undef TIME_WITH_SYS_TIME
11693
117-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
118-#undef TM_IN_SYS_TIME
119-
12094 /* Version number of package */
12195 #undef VERSION
12296
123-/* Define to empty if `const' does not conform to ANSI C. */
124-#undef const
125-
12697 /* Define to rpl_malloc if the replacement function should be used. */
12798 #undef malloc
--- a/dstar.h
+++ b/dstar.h
@@ -18,7 +18,7 @@ struct dstar_packet
1818 char dst_rpt_id;
1919 char src_rpt_id;
2020 char src_term_id;
21- char FrameID[2];
21+ unsigned char FrameID[2];
2222 unsigned char FrameSeq; // header 0x80 last frame | 0x40
2323 } trunk;
2424 union
--- a/xchange.c
+++ b/xchange.c
@@ -5,7 +5,7 @@ void forward (struct dstar_packet ds_pkt, int length);
55 void send_zr_reply (char buff[]);
66 void send_gw_reply (char buff[]);
77 void send_zr (char buff[]);
8-void send_gw (char buff[]);
8+void send_gw (unsigned char buff[]);
99 int check_lock (char pkt[], int length);
1010 void putFifo (int length, char pkt[]);
1111 int check_block(char buff[], int length);
@@ -15,6 +15,7 @@ struct ModuleTable *module_check_ex (char FrameID[]);
1515 struct ModuleTable *module_send_frame_check (char FrameID[]);
1616 struct ModuleTable *module_recv_frame_check (char FrameID[]);
1717 struct ModuleTable *module_zr_frame_check (char FrameID[]);
18+struct ModuleTable *module_skip_frame_check (char FrameID[]);
1819
1920
2021 extern struct sockaddr_in in_sock;
@@ -189,17 +190,16 @@ void xchange_gw(void)
189190 (struct sockaddr *)&gw_in_addr, &gw_in_addr_len);
190191 if (gw_length < 10) return;
191192 if (memcmp (gw_buff.gw_buffer, "DSTR", 4)) return;
192- if (module_skip_frame_check (&gw_buff.gw_buffer[14]) == NULL)
193- {
194- if (gw_buff.gw_buffer[6] == 's')
195- {
193+ if (gw_buff.gw_buffer[6] == 's')
194+ {
196195 send_gw_reply (gw_buff.gw_buffer);
197196 gw_in_cnt++;
198197 gw_length = (gw_buff.d_packet.l[0] << 8) | gw_buff.d_packet.l[1];
199198 gw_length += 10;
200-
199+//if ((gw_length == 58) || ( gw_length == 28) || (gw_length == 32)) printf ("debug recv %d %2.2x %2.2x\n", gw_length, gw_buff.d_packet.trunk.FrameID[0], gw_buff.d_packet.trunk.FrameID[1]);
201200 if (gw_length == 58)
202201 {
202+ //if (module_skip_frame_check (gw_buff.d_packet.trunk.FrameID) == NULL) return;
203203 m_pnt = module_check (&gw_buff.gw_buffer[20]);
204204 if (m_pnt)
205205 {
@@ -216,8 +216,9 @@ void xchange_gw(void)
216216 }
217217 }
218218 //else if ((gw_length == 29) || (gw_length == 32))
219- else
219+ else if ((gw_length == 29) || (gw_length == 32))
220220 {
221+ //if (module_skip_frame_check (gw_buff.d_packet.trunk.FrameID) == NULL) return;
221222 m_pnt = module_recv_frame_check (&gw_buff.gw_buffer[14]);
222223 if (m_pnt)
223224 {
@@ -245,7 +246,6 @@ void xchange_gw(void)
245246 gw_buff.gw_buffer[7] &= 0x3f;
246247 put_zr_Fifo (gw_length, gw_buff.gw_buffer);
247248 }
248- }
249249 }
250250 else if (gw_buff.gw_buffer[6] == 'r')
251251 {
@@ -281,7 +281,7 @@ void send_gw_reply (char pkt[])
281281 }
282282 }
283283
284-void send_gw (char pkt[])
284+void send_gw (unsigned char pkt[])
285285 {
286286 int length;
287287 int err;
@@ -310,16 +310,17 @@ void send_gw (char pkt[])
310310 {
311311 if (pkt[7] == 0x12) m_pnt->gw_dv_out_cnt++;
312312 else if (pkt[7] == 0x11) m_pnt->gw_dd_out_cnt++;
313- memcpy (m_pnt->GWFrameID, &pkt[14], 2);
313+ //memcpy (m_pnt->GWFrameID, &pkt[14], 2);
314314 }
315315 }
316- else
316+ else if ((length == 29) || (length == 32))
317317 {
318318 m_pnt = module_send_frame_check (&pkt[14]);
319319 if (m_pnt)
320320 {
321321 if (pkt[7] == 0x12) m_pnt->gw_dv_out_cnt++;
322322 else if (pkt[7] == 0x11) m_pnt->gw_dd_out_cnt++;
323+ //memcpy (m_pnt->GWFrameID, &pkt[14], 2);
323324 }
324325 }
325326 }
--- a/xchange.h
+++ b/xchange.h
@@ -65,7 +65,7 @@ struct ModuleTable
6565 unsigned char DVRecvFrameID[2];
6666 unsigned char DDRecvFrameID[2];
6767 unsigned char ZrFrameID[2];
68- unsigned char GWFrameID[2];
68+ //unsigned char GWFrameID[2];
6969 unsigned char mini_header;
7070 unsigned char data_temp[5];
7171 unsigned char mycall[8];
--- a/xchange_util.c
+++ b/xchange_util.c
@@ -104,7 +104,7 @@ struct ModuleTable *module_recv_frame_check (unsigned char FrameID[])
104104 }
105105 return NULL;
106106 }
107-
107+#if 0
108108 struct ModuleTable *module_skip_frame_check (unsigned char FrameID[])
109109 {
110110 struct ModuleTable *pnt;
@@ -117,6 +117,7 @@ struct ModuleTable *module_skip_frame_check (unsigned char FrameID[])
117117 }
118118 return NULL;
119119 }
120+#endif
120121
121122 struct ModuleTable *module_zr_frame_check (unsigned char FrameID[])
122123 {
@@ -143,6 +144,7 @@ void module_init(struct ModuleTable *module, char Module[])
143144 memset (module->SendFrameID, 0x00, 2);
144145 memset (module->ZrFrameID, 0x00, 2);
145146 memset (module->FrameID, 0x00, 2);
147+ //memset (module->GWFrameID, 0x00, 2);
146148 module->ZR_on = FALSE;
147149 module->packet_cnt = 0;
148150 module->f_chain = NULL;
@@ -630,6 +632,10 @@ void put_zr_Fifo (int len, unsigned char pkt[])
630632 struct FifoPkt *ret;
631633 time_t atime;
632634
635+ if (len == zr_Wp->length)
636+ {
637+ if (!memcmp (&pkt[6], &zr_Wp->pkt[6], len-6)) return;
638+ }
633639 ret = malloc (sizeof(struct FifoPkt) - 1024 + len);
634640 if (ret == NULL)
635641 {
旧リポジトリブラウザで表示