projects / openwrt.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
add scdp package (thanks to Florian Fainelli)
[openwrt.git] / openwrt / package / linux-atm / patches / 000-debian_16.patch
1 --- linux-atm-2.4.1.orig/Makefile.in
2 +++ linux-atm-2.4.1/Makefile.in
3 @@ -1,4 +1,4 @@
4 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
5 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
6
7 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
8 # This Makefile.in is free software; the Free Software Foundation
9 @@ -100,14 +100,14 @@
10
11 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
12
13 -TAR = gtar
14 +TAR = tar
15 GZIP_ENV = --best
16 all: all-redirect
17 .SUFFIXES:
18 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
19 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
20 + cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
21
22 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
23 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
24 cd $(top_builddir) \
25 && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
26
27 @@ -225,7 +225,7 @@
28 awk ' { files[$$0] = 1; } \
29 END { for (i in files) print i; }'`; \
30 test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
31 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
32 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
33
34 mostlyclean-tags:
35
36 @@ -274,6 +274,11 @@
37 -rm -rf $(distdir)
38 mkdir $(distdir)
39 -chmod 777 $(distdir)
40 + here=`cd $(top_builddir) && pwd`; \
41 + top_distdir=`cd $(distdir) && pwd`; \
42 + distdir=`cd $(distdir) && pwd`; \
43 + cd $(top_srcdir) \
44 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
45 @for file in $(DISTFILES); do \
46 d=$(srcdir); \
47 if test -d $$d/$$file; then \
48 --- linux-atm-2.4.1.orig/aclocal.m4
49 +++ linux-atm-2.4.1/aclocal.m4
50 @@ -1,4 +1,4 @@
51 -dnl aclocal.m4 generated automatically by aclocal 1.4-p5
52 +dnl aclocal.m4 generated automatically by aclocal 1.4-p6
53
54 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
55 dnl This file is free software; the Free Software Foundation
56 @@ -43,7 +43,8 @@
57 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
58
59 AC_DEFUN([AM_INIT_AUTOMAKE],
60 -[AC_REQUIRE([AC_PROG_INSTALL])
61 +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
62 +AC_REQUIRE([AC_PROG_INSTALL])
63 PACKAGE=[$1]
64 AC_SUBST(PACKAGE)
65 VERSION=[$2]
66 @@ -59,13 +60,42 @@
67 AC_REQUIRE([AC_ARG_PROGRAM])
68 dnl FIXME This is truly gross.
69 missing_dir=`cd $ac_aux_dir && pwd`
70 -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
71 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
72 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
73 -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
74 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
75 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
76 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
77 AC_REQUIRE([AC_PROG_MAKE_SET])])
78
79 +# Copyright 2002 Free Software Foundation, Inc.
80 +
81 +# This program is free software; you can redistribute it and/or modify
82 +# it under the terms of the GNU General Public License as published by
83 +# the Free Software Foundation; either version 2, or (at your option)
84 +# any later version.
85 +
86 +# This program is distributed in the hope that it will be useful,
87 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
88 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
89 +# GNU General Public License for more details.
90 +
91 +# You should have received a copy of the GNU General Public License
92 +# along with this program; if not, write to the Free Software
93 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
94 +
95 +# AM_AUTOMAKE_VERSION(VERSION)
96 +# ----------------------------
97 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
98 +# generated from the m4 files accompanying Automake X.Y.
99 +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
100 +
101 +# AM_SET_CURRENT_AUTOMAKE_VERSION
102 +# -------------------------------
103 +# Call AM_AUTOMAKE_VERSION so it can be traced.
104 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
105 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
106 + [AM_AUTOMAKE_VERSION([1.4-p6])])
107 +
108 #
109 # Check to make sure that the build environment is sane.
110 #
111 @@ -130,13 +160,14 @@
112 dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
113 AC_DEFUN([AM_PROG_LEX],
114 [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
115 -AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
116 +AC_CHECK_PROGS(LEX, flex lex, $missing_dir/missing flex)
117 AC_PROG_LEX
118 AC_DECL_YYTEXT])
119
120 # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
121
122 # serial 46 AC_PROG_LIBTOOL
123 +
124 AC_DEFUN([AC_PROG_LIBTOOL],
125 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
126
127 @@ -162,6 +193,8 @@
128 AC_REQUIRE([AC_PROG_LD])dnl
129 AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
130 AC_REQUIRE([AC_PROG_NM])dnl
131 +AC_REQUIRE([LT_AC_PROG_SED])dnl
132 +
133 AC_REQUIRE([AC_PROG_LN_S])dnl
134 AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
135 AC_REQUIRE([AC_OBJEXT])dnl
136 @@ -262,9 +295,30 @@
137
138 ])
139
140 +# AC_LIBTOOL_HEADER_ASSERT
141 +# ------------------------
142 +AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
143 +[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
144 + [lt_cv_func_assert_works],
145 + [case $host in
146 + *-*-solaris*)
147 + if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
148 + case `$CC --version 2>/dev/null` in
149 + [[12]].*) lt_cv_func_assert_works=no ;;
150 + *) lt_cv_func_assert_works=yes ;;
151 + esac
152 + fi
153 + ;;
154 + esac])
155 +
156 +if test "x$lt_cv_func_assert_works" = xyes; then
157 + AC_CHECK_HEADERS(assert.h)
158 +fi
159 +])# AC_LIBTOOL_HEADER_ASSERT
160 +
161 # _LT_AC_CHECK_DLFCN
162 # --------------------
163 -AC_DEFUN(_LT_AC_CHECK_DLFCN,
164 +AC_DEFUN([_LT_AC_CHECK_DLFCN],
165 [AC_CHECK_HEADERS(dlfcn.h)
166 ])# _LT_AC_CHECK_DLFCN
167
168 @@ -282,10 +336,10 @@
169 # [They come from Ultrix. What could be older than Ultrix?!! ;)]
170
171 # Character class describing NM global symbol codes.
172 -[symcode='[BCDEGRST]']
173 +symcode='[[BCDEGRST]]'
174
175 # Regexp to match symbols that can be accessed directly from C.
176 -[sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
177 +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
178
179 # Transform the above into a raw symbol and a C symbol.
180 symxfrm='\1 \2\3 \3'
181 @@ -293,25 +347,32 @@
182 # Transform an extracted symbol line into a proper C declaration
183 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
184
185 +# Transform an extracted symbol line into symbol name and symbol address
186 +lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
187 +
188 # Define system-specific variables.
189 case $host_os in
190 aix*)
191 - [symcode='[BCDT]']
192 + symcode='[[BCDT]]'
193 ;;
194 cygwin* | mingw* | pw32*)
195 - [symcode='[ABCDGISTW]']
196 + symcode='[[ABCDGISTW]]'
197 ;;
198 hpux*) # Its linker distinguishes data from code symbols
199 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
200 + lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
201 + ;;
202 +irix* | nonstopux*)
203 + symcode='[[BCDEGRST]]'
204 ;;
205 -irix*)
206 - [symcode='[BCDEGRST]']
207 +osf*)
208 + symcode='[[BCDEGQRST]]'
209 ;;
210 solaris* | sysv5*)
211 - [symcode='[BDT]']
212 + symcode='[[BDT]]'
213 ;;
214 sysv4)
215 - [symcode='[DFNSTU]']
216 + symcode='[[DFNSTU]]'
217 ;;
218 esac
219
220 @@ -325,14 +386,14 @@
221
222 # If we're using GNU nm, then use its standard symbol codes.
223 if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
224 - [symcode='[ABCDGISTW]']
225 + symcode='[[ABCDGISTW]]'
226 fi
227
228 # Try without a prefix undercore, then with it.
229 for ac_symprfx in "" "_"; do
230
231 # Write the raw and C identifiers.
232 -[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
233 +lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
234
235 # Check to see that the pipe works correctly.
236 pipe_works=no
237 @@ -374,23 +435,23 @@
238
239 cat <<EOF >> conftest.$ac_ext
240 #if defined (__STDC__) && __STDC__
241 -# define lt_ptr_t void *
242 +# define lt_ptr void *
243 #else
244 -# define lt_ptr_t char *
245 +# define lt_ptr char *
246 # define const
247 #endif
248
249 /* The mapping between symbol names and symbols. */
250 const struct {
251 const char *name;
252 - lt_ptr_t address;
253 + lt_ptr address;
254 }
255 -[lt_preloaded_symbols[] =]
256 +lt_preloaded_symbols[[]] =
257 {
258 EOF
259 - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
260 + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
261 cat <<\EOF >> conftest.$ac_ext
262 - {0, (lt_ptr_t) 0}
263 + {0, (lt_ptr) 0}
264 };
265
266 #ifdef __cplusplus
267 @@ -403,7 +464,7 @@
268 save_CFLAGS="$CFLAGS"
269 LIBS="conftstm.$ac_objext"
270 CFLAGS="$CFLAGS$no_builtin_flag"
271 - if AC_TRY_EVAL(ac_link) && test -s conftest; then
272 + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
273 pipe_works=yes
274 fi
275 LIBS="$save_LIBS"
276 @@ -434,10 +495,13 @@
277 global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
278 if test -z "$lt_cv_sys_global_symbol_pipe"; then
279 global_symbol_to_cdecl=
280 + global_symbol_to_c_name_address=
281 else
282 global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
283 + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
284 fi
285 -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
286 +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
287 +then
288 AC_MSG_RESULT(failed)
289 else
290 AC_MSG_RESULT(ok)
291 @@ -455,16 +519,17 @@
292 *-DOS) lt_cv_sys_path_separator=';' ;;
293 *) lt_cv_sys_path_separator=':' ;;
294 esac
295 + PATH_SEPARATOR=$lt_cv_sys_path_separator
296 fi
297 ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
298
299 # _LT_AC_PROG_ECHO_BACKSLASH
300 # --------------------------
301 # Add some code to the start of the generated configure script which
302 -# will find an echo command which doesn;t interpret backslashes.
303 +# will find an echo command which doesn't interpret backslashes.
304 AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
305 [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
306 - [AC_DIVERT_PUSH(NOTICE)])
307 + [AC_DIVERT_PUSH(NOTICE)])
308 _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
309
310 # Check that we are running under the correct shell.
311 @@ -530,7 +595,7 @@
312 #
313 # So, first we look for a working echo in the user's PATH.
314
315 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
316 + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
317 for dir in $PATH /usr/ucb; do
318 if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
319 test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
320 @@ -619,7 +684,7 @@
321 # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
322 # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
323 # ------------------------------------------------------------------
324 -AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF,
325 +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
326 [if test "$cross_compiling" = yes; then :
327 [$4]
328 else
329 @@ -706,7 +771,7 @@
330
331 # AC_LIBTOOL_DLOPEN_SELF
332 # -------------------
333 -AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
334 +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
335 [if test "x$enable_dlopen" != xyes; then
336 enable_dlopen=unknown
337 enable_dlopen_self=unknown
338 @@ -728,16 +793,22 @@
339 ;;
340
341 *)
342 - AC_CHECK_LIB(dl, dlopen, [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
343 - [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen",
344 - [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
345 - [AC_CHECK_LIB(svld, dlopen,
346 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
347 - [AC_CHECK_LIB(dld, shl_load,
348 - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
349 + AC_CHECK_FUNC([shl_load],
350 + [lt_cv_dlopen="shl_load"],
351 + [AC_CHECK_LIB([dld], [shl_load],
352 + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
353 + [AC_CHECK_FUNC([dlopen],
354 + [lt_cv_dlopen="dlopen"],
355 + [AC_CHECK_LIB([dl], [dlopen],
356 + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
357 + [AC_CHECK_LIB([svld], [dlopen],
358 + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
359 + [AC_CHECK_LIB([dld], [dld_link],
360 + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
361 + ])
362 ])
363 - ])
364 - ])
365 + ])
366 + ])
367 ])
368 ;;
369 esac
370 @@ -800,10 +871,10 @@
371 # Sed substitution that helps us do robust quoting. It backslashifies
372 # metacharacters that are still active within double-quoted strings.
373 Xsed='sed -e s/^X//'
374 -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
375 +sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
376
377 # Same as above, but do not quote variable references.
378 -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
379 +double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
380
381 # Sed substitution to delay expansion of an escaped shell variable in a
382 # double_quote_subst'ed string.
383 @@ -872,8 +943,15 @@
384 old_postuninstall_cmds=
385
386 if test -n "$RANLIB"; then
387 + case $host_os in
388 + openbsd*)
389 + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
390 + ;;
391 + *)
392 + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
393 + ;;
394 + esac
395 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
396 - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
397 fi
398
399 # Allow CC to be a program name with arguments.
400 @@ -893,7 +971,7 @@
401 AC_MSG_RESULT($objdir)
402
403
404 -AC_ARG_WITH(pic,
405 +AC_ARG_WITH(pic,
406 [ --with-pic try to use only PIC/non-PIC objects [default=use both]],
407 pic_mode="$withval", pic_mode=default)
408 test -z "$pic_mode" && pic_mode=default
409 @@ -921,7 +999,7 @@
410 # libC (AIX C++ library), which obviously doesn't included in libraries
411 # list by gcc. This cause undefined symbols with -static flags.
412 # This hack allows C programs to be linked with "-static -ldl", but
413 - # we not sure about C++ programs.
414 + # not sure about C++ programs.
415 lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
416 ;;
417 amigaos*)
418 @@ -930,7 +1008,7 @@
419 # like `-m68040'.
420 lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
421 ;;
422 - beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
423 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
424 # PIC is the default for these OSes.
425 ;;
426 darwin* | rhapsody*)
427 @@ -956,13 +1034,13 @@
428 # PORTME Check for PIC flags for the system compiler.
429 case $host_os in
430 aix3* | aix4* | aix5*)
431 + lt_cv_prog_cc_wl='-Wl,'
432 # All AIX code is PIC.
433 if test "$host_cpu" = ia64; then
434 - # AIX 5 now supports IA64 processor
435 - lt_cv_prog_cc_static='-Bstatic'
436 - lt_cv_prog_cc_wl='-Wl,'
437 + # AIX 5 now supports IA64 processor
438 + lt_cv_prog_cc_static='-Bstatic'
439 else
440 - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
441 + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
442 fi
443 ;;
444
445 @@ -973,7 +1051,7 @@
446 lt_cv_prog_cc_pic='+Z'
447 ;;
448
449 - irix5* | irix6*)
450 + irix5* | irix6* | nonstopux*)
451 lt_cv_prog_cc_wl='-Wl,'
452 lt_cv_prog_cc_static='-non_shared'
453 # PIC (with -KPIC) is the default.
454 @@ -1017,11 +1095,7 @@
455 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
456 lt_cv_prog_cc_pic='-KPIC'
457 lt_cv_prog_cc_static='-Bstatic'
458 - if test "x$host_vendor" = xsni; then
459 - lt_cv_prog_cc_wl='-LD'
460 - else
461 - lt_cv_prog_cc_wl='-Wl,'
462 - fi
463 + lt_cv_prog_cc_wl='-Wl,'
464 ;;
465
466 uts4*)
467 @@ -1087,7 +1161,7 @@
468 # Check for any special shared library compilation flags.
469 if test -n "$lt_cv_prog_cc_shlib"; then
470 AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
471 - if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then :
472 + if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then :
473 else
474 AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
475 lt_cv_prog_cc_can_build_shared=no
476 @@ -1163,6 +1237,8 @@
477 lt_cv_compiler_o_lo=no
478 save_CFLAGS="$CFLAGS"
479 CFLAGS="$CFLAGS -c -o conftest.lo"
480 + save_objext="$ac_objext"
481 + ac_objext=lo
482 AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
483 # The compiler can only warn and ignore the option if not recognized
484 # So say no if there are warnings
485 @@ -1172,6 +1248,7 @@
486 lt_cv_compiler_o_lo=yes
487 fi
488 ])
489 + ac_objext="$save_objext"
490 CFLAGS="$save_CFLAGS"
491 ])
492 compiler_o_lo=$lt_cv_compiler_o_lo
493 @@ -1268,7 +1345,7 @@
494 extract_expsyms_cmds=
495
496 case $host_os in
497 -cygwin* | mingw* | pw32* )
498 +cygwin* | mingw* | pw32*)
499 # FIXME: the MSVC++ port hasn't been tested in a loooong time
500 # When not using gcc, we currently assume that we are using
501 # Microsoft Visual C++.
502 @@ -1276,7 +1353,9 @@
503 with_gnu_ld=no
504 fi
505 ;;
506 -
507 +openbsd*)
508 + with_gnu_ld=no
509 + ;;
510 esac
511
512 ld_shlibs=yes
513 @@ -1363,7 +1442,7 @@
514 # can override, but on older systems we have to supply one (in ltdll.c)
515 if test "x$lt_cv_need_dllmain" = "xyes"; then
516 ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
517 - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
518 + ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
519 test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
520 else
521 ltdll_obj=
522 @@ -1376,24 +1455,25 @@
523 # Be careful not to strip the DATA tag left be newer dlltools.
524 export_symbols_cmds="$ltdll_cmds"'
525 $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
526 - [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols'
527 + sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
528
529 # If the export-symbols file already is a .def file (1st line
530 # is EXPORTS), use it as is.
531 # If DATA tags from a recent dlltool are present, honour them!
532 - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
533 - cp $export_symbols $output_objdir/$soname-def;
534 + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
535 + cp $export_symbols $output_objdir/$soname-def;
536 else
537 - echo EXPORTS > $output_objdir/$soname-def;
538 - _lt_hint=1;
539 - cat $export_symbols | while read symbol; do
540 - set dummy \$symbol;
541 - case \[$]# in
542 - 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
543 - *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
544 - esac;
545 - _lt_hint=`expr 1 + \$_lt_hint`;
546 - done;
547 + echo EXPORTS > $output_objdir/$soname-def;
548 + _lt_hint=1;
549 + cat $export_symbols | while read symbol; do
550 + set dummy \$symbol;
551 + case \[$]# in
552 + 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
553 + 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
554 + *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
555 + esac;
556 + _lt_hint=`expr 1 + \$_lt_hint`;
557 + done;
558 fi~
559 '"$ltdll_cmds"'
560 $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
561 @@ -1488,80 +1568,98 @@
562 ;;
563
564 aix4* | aix5*)
565 + if test "$host_cpu" = ia64; then
566 + # On IA64, the linker does run time linking by default, so we don't
567 + # have to do anything special.
568 + aix_use_runtimelinking=no
569 + exp_sym_flag='-Bexport'
570 + no_entry_flag=""
571 + else
572 + aix_use_runtimelinking=no
573 +
574 + # Test if we are trying to use run time linking or normal
575 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
576 + # need to do runtime linking.
577 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
578 + for ld_flag in $LDFLAGS; do
579 + case $ld_flag in
580 + *-brtl*)
581 + aix_use_runtimelinking=yes
582 + break
583 + ;;
584 + esac
585 + done
586 + esac
587 +
588 + exp_sym_flag='-bexport'
589 + no_entry_flag='-bnoentry'
590 + fi
591 +
592 # When large executables or shared objects are built, AIX ld can
593 # have problems creating the table of contents. If linking a library
594 # or program results in "error TOC overflow" add -mminimal-toc to
595 # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
596 # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
597
598 + hardcode_direct=yes
599 archive_cmds=''
600 hardcode_libdir_separator=':'
601 if test "$GCC" = yes; then
602 - collect2name=`${CC} -print-prog-name=collect2`
603 - if test -f "$collect2name" && \
604 - strings "$collect2name" | grep resolve_lib_name >/dev/null
605 - then
606 - # We have reworked collect2
607 - hardcode_direct=yes
608 - else
609 - # We have old collect2
610 - hardcode_direct=unsupported
611 - # It fails to find uninstalled libraries when the uninstalled
612 - # path is not listed in the libpath. Setting hardcode_minus_L
613 - # to unsupported forces relinking
614 - hardcode_minus_L=yes
615 - hardcode_libdir_flag_spec='-L$libdir'
616 - hardcode_libdir_separator=
617 - fi
618 + case $host_os in aix4.[[012]]|aix4.[[012]].*)
619 + collect2name=`${CC} -print-prog-name=collect2`
620 + if test -f "$collect2name" && \
621 + strings "$collect2name" | grep resolve_lib_name >/dev/null
622 + then
623 + # We have reworked collect2
624 + hardcode_direct=yes
625 + else
626 + # We have old collect2
627 + hardcode_direct=unsupported
628 + # It fails to find uninstalled libraries when the uninstalled
629 + # path is not listed in the libpath. Setting hardcode_minus_L
630 + # to unsupported forces relinking
631 + hardcode_minus_L=yes
632 + hardcode_libdir_flag_spec='-L$libdir'
633 + hardcode_libdir_separator=
634 + fi
635 + esac
636 +
637 shared_flag='-shared'
638 else
639 + # not using gcc
640 if test "$host_cpu" = ia64; then
641 - shared_flag='-G'
642 + shared_flag='${wl}-G'
643 else
644 - shared_flag='${wl}-bM:SRE'
645 + if test "$aix_use_runtimelinking" = yes; then
646 + shared_flag='${wl}-G'
647 + else
648 + shared_flag='${wl}-bM:SRE'
649 + fi
650 fi
651 - hardcode_direct=yes
652 fi
653
654 - if test "$host_cpu" = ia64; then
655 - # On IA64, the linker does run time linking by default, so we don't
656 - # have to do anything special.
657 - aix_use_runtimelinking=no
658 - exp_sym_flag='-Bexport'
659 - no_entry_flag=""
660 - else
661 - # Test if we are trying to use run time linking, or normal AIX style linking.
662 - # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
663 - aix_use_runtimelinking=no
664 - for ld_flag in $LDFLAGS; do
665 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
666 - aix_use_runtimelinking=yes
667 - break
668 - fi
669 - done
670 - exp_sym_flag='-bexport'
671 - no_entry_flag='-bnoentry'
672 - fi
673 # It seems that -bexpall can do strange things, so it is better to
674 # generate a list of symbols to export.
675 always_export_symbols=yes
676 if test "$aix_use_runtimelinking" = yes; then
677 + # Warning - without using the other runtime loading flags (-brtl),
678 + # -berok will link without error, but may produce a broken library.
679 + allow_undefined_flag='-berok'
680 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
681 - allow_undefined_flag=' -Wl,-G'
682 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
683 + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
684 else
685 if test "$host_cpu" = ia64; then
686 - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
687 - allow_undefined_flag="-znodefs"
688 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
689 + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
690 + allow_undefined_flag="-z nodefs"
691 + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
692 else
693 - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
694 - # Warning - without using the other run time loading flags, -berok will
695 - # link without error, but may produce a broken library.
696 - allow_undefined_flag='${wl}-berok'
697 - # This is a bit strange, but is similar to how AIX traditionally builds
698 - # it's shared libraries.
699 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
700 + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
701 + # Warning - without using the other run time loading flags,
702 + # -berok will link without error, but may produce a broken library.
703 + allow_undefined_flag='${wl}-berok'
704 + # This is a bit strange, but is similar to how AIX traditionally builds
705 + # it's shared libraries.
706 + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
707 fi
708 fi
709 ;;
710 @@ -1593,11 +1691,19 @@
711 ;;
712
713 darwin* | rhapsody*)
714 - allow_undefined_flag='-undefined suppress'
715 + case "$host_os" in
716 + rhapsody* | darwin1.[[012]])
717 + allow_undefined_flag='-undefined suppress'
718 + ;;
719 + *) # Darwin 1.3 on
720 + allow_undefined_flag='-flat_namespace -undefined suppress'
721 + ;;
722 + esac
723 # FIXME: Relying on posixy $() will cause problems for
724 # cross-compilation, but unfortunately the echo tests do not
725 - # yet detect zsh echo's removal of \ escapes.
726 - archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
727 + # yet detect zsh echo's removal of \ escapes. Also zsh mangles
728 + # `"' quotes if we put them in here... so don't!
729 + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
730 # We need to add '_' to the symbols in $export_symbols first
731 #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
732 hardcode_direct=yes
733 @@ -1649,13 +1755,14 @@
734 export_dynamic_flag_spec='${wl}-E'
735 ;;
736
737 - irix5* | irix6*)
738 + irix5* | irix6* | nonstopux*)
739 if test "$GCC" = yes; then
740 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
741 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
742 else
743 archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
744 + hardcode_libdir_flag_spec='-rpath $libdir'
745 fi
746 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
747 hardcode_libdir_separator=:
748 link_all_deplibs=yes
749 ;;
750 @@ -1672,7 +1779,7 @@
751 ;;
752
753 newsos6)
754 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
755 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
756 hardcode_direct=yes
757 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
758 hardcode_libdir_separator=:
759 @@ -1680,10 +1787,24 @@
760 ;;
761
762 openbsd*)
763 - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
764 - hardcode_libdir_flag_spec='-R$libdir'
765 hardcode_direct=yes
766 hardcode_shlibpath_var=no
767 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
768 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
769 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
770 + export_dynamic_flag_spec='${wl}-E'
771 + else
772 + case "$host_os" in
773 + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
774 + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
775 + hardcode_libdir_flag_spec='-R$libdir'
776 + ;;
777 + *)
778 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
779 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
780 + ;;
781 + esac
782 + fi
783 ;;
784
785 os2*)
786 @@ -1728,10 +1849,39 @@
787 hardcode_shlibpath_var=no
788 runpath_var=LD_RUN_PATH
789 hardcode_runpath_var=yes
790 + export_dynamic_flag_spec='${wl}-Bexport'
791 ;;
792
793 solaris*)
794 + # gcc --version < 3.0 without binutils cannot create self contained
795 + # shared libraries reliably, requiring libgcc.a to resolve some of
796 + # the object symbols generated in some cases. Libraries that use
797 + # assert need libgcc.a to resolve __eprintf, for example. Linking
798 + # a copy of libgcc.a into every shared library to guarantee resolving
799 + # such symbols causes other problems: According to Tim Van Holder
800 + # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
801 + # (to the application) exception stack for one thing.
802 no_undefined_flag=' -z defs'
803 + if test "$GCC" = yes; then
804 + case `$CC --version 2>/dev/null` in
805 + [[12]].*)
806 + cat <<EOF 1>&2
807 +
808 +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
809 +*** create self contained shared libraries on Solaris systems, without
810 +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
811 +*** -no-undefined support, which will at least allow you to build shared
812 +*** libraries. However, you may find that when you link such libraries
813 +*** into an application without using GCC, you have to manually add
814 +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
815 +*** upgrade to a newer version of GCC. Another option is to rebuild your
816 +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
817 +
818 +EOF
819 + no_undefined_flag=
820 + ;;
821 + esac
822 + fi
823 # $CC -shared without GNU ld will not create a library from C++
824 # object files and a static libstdc++, better avoid it by now
825 archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
826 @@ -1740,7 +1890,7 @@
827 hardcode_libdir_flag_spec='-R$libdir'
828 hardcode_shlibpath_var=no
829 case $host_os in
830 - [solaris2.[0-5] | solaris2.[0-5].*]) ;;
831 + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
832 *) # Supported since Solaris 2.6 (maybe 2.5.1?)
833 whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
834 esac
835 @@ -1762,13 +1912,23 @@
836 ;;
837
838 sysv4)
839 - if test "x$host_vendor" = xsno; then
840 - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
841 - hardcode_direct=yes # is this really true???
842 - else
843 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
844 - hardcode_direct=no #Motorola manual says yes, but my tests say they lie
845 - fi
846 + case $host_vendor in
847 + sni)
848 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
849 + hardcode_direct=yes # is this really true???
850 + ;;
851 + siemens)
852 + ## LD is ld it makes a PLAMLIB
853 + ## CC just makes a GrossModule.
854 + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
855 + reload_cmds='$CC -r -o $output$reload_objs'
856 + hardcode_direct=no
857 + ;;
858 + motorola)
859 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
860 + hardcode_direct=no #Motorola manual says yes, but my tests say they lie
861 + ;;
862 + esac
863 runpath_var='LD_RUN_PATH'
864 hardcode_shlibpath_var=no
865 ;;
866 @@ -1909,6 +2069,9 @@
867
868 aix4* | aix5*)
869 version_type=linux
870 + need_lib_prefix=no
871 + need_version=no
872 + hardcode_into_libs=yes
873 if test "$host_cpu" = ia64; then
874 # AIX 5 supports IA64
875 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
876 @@ -1920,22 +2083,24 @@
877 # depend on `.', always an invalid library. This was fixed in
878 # development snapshots of GCC prior to 3.0.
879 case $host_os in
880 - [ aix4 | aix4.[01] | aix4.[01].*)]
881 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
882 - echo ' yes '
883 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
884 - :
885 - else
886 - can_build_shared=no
887 - fi
888 - ;;
889 + aix4 | aix4.[[01]] | aix4.[[01]].*)
890 + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
891 + echo ' yes '
892 + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
893 + :
894 + else
895 + can_build_shared=no
896 + fi
897 + ;;
898 esac
899 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
900 - # soname into executable. Probably we can add versioning support to
901 - # collect2, so additional links can be useful in future.
902 + # AIX (on Power*) has no versioning support, so currently we can
903 + # not hardcode correct soname into executable. Probably we can
904 + # add versioning support to collect2, so additional links can
905 + # be useful in future.
906 if test "$aix_use_runtimelinking" = yes; then
907 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
908 - # lib<name>.a to let people know that these are not typical AIX shared libraries.
909 + # If using run time linking (on AIX 4.2 or later) use lib<name>.so
910 + # instead of lib<name>.a to let people know that these are not
911 + # typical AIX shared libraries.
912 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
913 else
914 # We preserve .a as extension for shared libraries through AIX4.2
915 @@ -1944,14 +2109,14 @@
916 soname_spec='${libname}${release}.so$major'
917 fi
918 shlibpath_var=LIBPATH
919 - deplibs_check_method=pass_all
920 fi
921 + hardcode_into_libs=yes
922 ;;
923
924 amigaos*)
925 library_names_spec='$libname.ixlibrary $libname.a'
926 # Create ${libname}_ixlibrary.a entries in /sys/libs.
927 - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | [$Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\'']`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
928 + finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
929 ;;
930
931 beos*)
932 @@ -1982,7 +2147,7 @@
933 case $GCC,$host_os in
934 yes,cygwin*)
935 library_names_spec='$libname.dll.a'
936 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
937 + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
938 postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
939 dldir=$destdir/`dirname \$dlpath`~
940 test -d \$dldir || mkdir -p \$dldir~
941 @@ -1992,14 +2157,14 @@
942 $rm \$dlpath'
943 ;;
944 yes,mingw*)
945 - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
946 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
947 + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
948 + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
949 ;;
950 yes,pw32*)
951 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
952 ;;
953 *)
954 - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib'
955 + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
956 ;;
957 esac
958 dynamic_linker='Win32 ld.exe'
959 @@ -2025,6 +2190,18 @@
960 dynamic_linker=no
961 ;;
962
963 +freebsd*-gnu*)
964 + version_type=linux
965 + need_lib_prefix=no
966 + need_version=no
967 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
968 + soname_spec='${libname}${release}.so$major'
969 + shlibpath_var=LD_LIBRARY_PATH
970 + shlibpath_overrides_runpath=no
971 + hardcode_into_libs=yes
972 + dynamic_linker='GNU/FreeBSD ld.so'
973 + ;;
974 +
975 freebsd*)
976 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
977 version_type=freebsd-$objformat
978 @@ -2076,14 +2253,17 @@
979 postinstall_cmds='chmod 555 $lib'
980 ;;
981
982 -irix5* | irix6*)
983 - version_type=irix
984 +irix5* | irix6* | nonstopux*)
985 + case $host_os in
986 + nonstopux*) version_type=nonstopux ;;
987 + *) version_type=irix ;;
988 + esac
989 need_lib_prefix=no
990 need_version=no
991 soname_spec='${libname}${release}.so$major'
992 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
993 case $host_os in
994 - irix5*)
995 + irix5* | nonstopux*)
996 libsuff= shlibsuff=
997 ;;
998 *)
999 @@ -2157,9 +2337,19 @@
1000
1001 openbsd*)
1002 version_type=sunos
1003 - if test "$with_gnu_ld" = yes; then
1004 - need_lib_prefix=no
1005 - need_version=no
1006 + need_lib_prefix=no
1007 + need_version=no
1008 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
1009 + case "$host_os" in
1010 + openbsd2.[[89]] | openbsd2.[[89]].*)
1011 + shlibpath_overrides_runpath=no
1012 + ;;
1013 + *)
1014 + shlibpath_overrides_runpath=yes
1015 + ;;
1016 + esac
1017 + else
1018 + shlibpath_overrides_runpath=yes
1019 fi
1020 library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
1021 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
1022 @@ -2177,11 +2367,13 @@
1023 osf3* | osf4* | osf5*)
1024 version_type=osf
1025 need_version=no
1026 - soname_spec='${libname}${release}.so'
1027 - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
1028 + need_lib_prefix=no
1029 + soname_spec='${libname}${release}.so$major'
1030 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
1031 shlibpath_var=LD_LIBRARY_PATH
1032 sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
1033 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
1034 + hardcode_into_libs=yes
1035 ;;
1036
1037 sco3.2v5*)
1038 @@ -2224,6 +2416,12 @@
1039 case $host_vendor in
1040 sni)
1041 shlibpath_overrides_runpath=no
1042 + need_lib_prefix=no
1043 + export_dynamic_flag_spec='${wl}-Blargedynsym'
1044 + runpath_var=LD_RUN_PATH
1045 + ;;
1046 + siemens)
1047 + need_lib_prefix=no
1048 ;;
1049 motorola)
1050 need_lib_prefix=no
1051 @@ -2270,6 +2468,33 @@
1052 AC_MSG_CHECKING([if libtool supports shared libraries])
1053 AC_MSG_RESULT([$can_build_shared])
1054
1055 +AC_MSG_CHECKING([whether to build shared libraries])
1056 +test "$can_build_shared" = "no" && enable_shared=no
1057 +
1058 +# On AIX, shared libraries and static libraries use the same namespace, and
1059 +# are all built from PIC.
1060 +case "$host_os" in
1061 +aix3*)
1062 + test "$enable_shared" = yes && enable_static=no
1063 + if test -n "$RANLIB"; then
1064 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
1065 + postinstall_cmds='$RANLIB $lib'
1066 + fi
1067 + ;;
1068 +
1069 +aix4*)
1070 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
1071 + test "$enable_shared" = yes && enable_static=no
1072 + fi
1073 + ;;
1074 +esac
1075 +AC_MSG_RESULT([$enable_shared])
1076 +
1077 +AC_MSG_CHECKING([whether to build static libraries])
1078 +# Make sure either enable_shared or enable_static is yes.
1079 +test "$enable_shared" = yes || enable_static=yes
1080 +AC_MSG_RESULT([$enable_static])
1081 +
1082 if test "$hardcode_action" = relink; then
1083 # Fast installation is not supported
1084 enable_fast_install=no
1085 @@ -2351,7 +2576,7 @@
1086 # Now quote all the things that may contain metacharacters while being
1087 # careful not to overquote the AC_SUBSTed values. We take copies of the
1088 # variables and quote the copies for generation of the libtool script.
1089 - for var in echo old_CC old_CFLAGS \
1090 + for var in echo old_CC old_CFLAGS SED \
1091 AR AR_FLAGS CC LD LN_S NM SHELL \
1092 reload_flag reload_cmds wl \
1093 pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
1094 @@ -2363,6 +2588,7 @@
1095 old_striplib striplib file_magic_cmd export_symbols_cmds \
1096 deplibs_check_method allow_undefined_flag no_undefined_flag \
1097 finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
1098 + global_symbol_to_c_name_address \
1099 hardcode_libdir_flag_spec hardcode_libdir_separator \
1100 sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
1101 compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
1102 @@ -2412,8 +2638,11 @@
1103 # configuration script generated by Autoconf, you may include it under
1104 # the same distribution terms that you use for the rest of that program.
1105
1106 +# A sed that does not truncate output.
1107 +SED=$lt_SED
1108 +
1109 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
1110 -Xsed="sed -e s/^X//"
1111 +Xsed="${SED} -e s/^X//"
1112
1113 # The HP-UX ksh and POSIX shell print the target directory to stdout
1114 # if CDPATH is set.
1115 @@ -2429,12 +2658,12 @@
1116 # Whether or not to build shared libraries.
1117 build_libtool_libs=$enable_shared
1118
1119 -# Whether or not to add -lc for building shared libraries.
1120 -build_libtool_need_lc=$need_lc
1121 -
1122 # Whether or not to build static libraries.
1123 build_old_libs=$enable_static
1124
1125 +# Whether or not to add -lc for building shared libraries.
1126 +build_libtool_need_lc=$need_lc
1127 +
1128 # Whether or not to optimize for fast installation.
1129 fast_install=$enable_fast_install
1130
1131 @@ -2600,6 +2829,9 @@
1132 # Transform the output of nm in a proper C declaration
1133 global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
1134
1135 +# Transform the output of nm in a C name address pair
1136 +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
1137 +
1138 # This is the shared library runtime path variable.
1139 runpath_var=$runpath_var
1140
1141 @@ -2722,9 +2954,9 @@
1142 # return TRUE;
1143 # }
1144 # /* ltdll.c ends here */
1145 - # This is a source program that is used to create import libraries
1146 - # on Windows for dlls which lack them. Don't remove nor modify the
1147 - # starting and closing comments
1148 + # This is a source program that is used to create import libraries
1149 + # on Windows for dlls which lack them. Don't remove nor modify the
1150 + # starting and closing comments
1151 # /* impgen.c starts here */
1152 # /* Copyright (C) 1999-2000 Free Software Foundation, Inc.
1153 #
1154 @@ -3079,6 +3311,7 @@
1155 AC_REQUIRE([AC_PROG_CC])dnl
1156 AC_REQUIRE([AC_CANONICAL_HOST])dnl
1157 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1158 +AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
1159 ac_prog=ld
1160 if test "$GCC" = yes; then
1161 # Check if gcc -print-prog-name=ld gives a path.
1162 @@ -3092,8 +3325,8 @@
1163 esac
1164 case $ac_prog in
1165 # Accept absolute paths.
1166 - [[\\/]* | [A-Za-z]:[\\/]*)]
1167 - [re_direlt='/[^/][^/]*/\.\./']
1168 + [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
1169 + re_direlt='/[[^/]][[^/]]*/\.\./'
1170 # Canonicalize the path of ld
1171 ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
1172 while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
1173 @@ -3117,7 +3350,7 @@
1174 fi
1175 AC_CACHE_VAL(lt_cv_path_LD,
1176 [if test -z "$LD"; then
1177 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
1178 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1179 for ac_dir in $PATH; do
1180 test -z "$ac_dir" && ac_dir=.
1181 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
1182 @@ -3170,7 +3403,7 @@
1183 # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
1184 # -- PORTME fill in with the dynamic library characteristics
1185 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
1186 -[AC_CACHE_CHECK([how to recognise dependant libraries],
1187 +[AC_CACHE_CHECK([how to recognise dependent libraries],
1188 lt_cv_deplibs_check_method,
1189 [lt_cv_file_magic_cmd='$MAGIC_CMD'
1190 lt_cv_file_magic_test_file=
1191 @@ -3181,7 +3414,7 @@
1192 # `unknown' -- same as none, but documents that we really don't know.
1193 # 'pass_all' -- all dependencies passed with no checks.
1194 # 'test_compile' -- check by making test program.
1195 -# ['file_magic [regex]'] -- check by looking for files in library path
1196 +# 'file_magic [[regex]]' -- check by looking for files in library path
1197 # which responds to the $file_magic_cmd with a given egrep regex.
1198 # If you have `file' or equivalent on your system and you're not sure
1199 # whether `pass_all' will *always* work, you probably want this one.
1200 @@ -3196,7 +3429,7 @@
1201 ;;
1202
1203 bsdi4*)
1204 - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
1205 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
1206 lt_cv_file_magic_cmd='/usr/bin/file -L'
1207 lt_cv_file_magic_test_file=/shlib/libc.so
1208 ;;
1209 @@ -3210,7 +3443,7 @@
1210 lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
1211 lt_cv_file_magic_cmd='/usr/bin/file -L'
1212 case "$host_os" in
1213 - rhapsody* | darwin1.[012])
1214 + rhapsody* | darwin1.[[012]])
1215 lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
1216 ;;
1217 *) # Darwin 1.3 on
1218 @@ -3225,7 +3458,7 @@
1219 i*86 )
1220 # Not sure whether the presence of OpenBSD here was a mistake.
1221 # Let's accept both of them until this is cleared up.
1222 - [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
1223 + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
1224 lt_cv_file_magic_cmd=/usr/bin/file
1225 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
1226 ;;
1227 @@ -3240,14 +3473,14 @@
1228 ;;
1229
1230 hpux10.20*|hpux11*)
1231 - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
1232 + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
1233 lt_cv_file_magic_cmd=/usr/bin/file
1234 lt_cv_file_magic_test_file=/usr/lib/libc.sl
1235 ;;
1236
1237 -irix5* | irix6*)
1238 +irix5* | irix6* | nonstopux*)
1239 case $host_os in
1240 - irix5*)
1241 + irix5* | nonstopux*)
1242 # this will be overridden with pass_all, but let us keep it just in case
1243 lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
1244 ;;
1245 @@ -3259,7 +3492,7 @@
1246 *) libmagic=never-match;;
1247 esac
1248 # this will be overridden with pass_all, but let us keep it just in case
1249 - [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
1250 + lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
1251 ;;
1252 esac
1253 lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
1254 @@ -3269,29 +3502,39 @@
1255 # This must be Linux ELF.
1256 linux-gnu*)
1257 case $host_cpu in
1258 - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
1259 + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k)
1260 lt_cv_deplibs_check_method=pass_all ;;
1261 *)
1262 # glibc up to 2.1.1 does not perform some relocations on ARM
1263 - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;]
1264 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
1265 esac
1266 lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
1267 ;;
1268
1269 netbsd*)
1270 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
1271 - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
1272 + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
1273 else
1274 - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
1275 + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
1276 fi
1277 ;;
1278
1279 newos6*)
1280 - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
1281 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
1282 lt_cv_file_magic_cmd=/usr/bin/file
1283 lt_cv_file_magic_test_file=/usr/lib/libnls.so
1284 ;;
1285
1286 +openbsd*)
1287 + lt_cv_file_magic_cmd=/usr/bin/file
1288 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
1289 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
1290 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
1291 + else
1292 + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
1293 + fi
1294 + ;;
1295 +
1296 osf3* | osf4* | osf5*)
1297 # this will be overridden with pass_all, but let us keep it just in case
1298 lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
1299 @@ -3308,14 +3551,14 @@
1300 lt_cv_file_magic_test_file=/lib/libc.so
1301 ;;
1302
1303 -[sysv5uw[78]* | sysv4*uw2*)]
1304 +sysv5uw[[78]]* | sysv4*uw2*)
1305 lt_cv_deplibs_check_method=pass_all
1306 ;;
1307
1308 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
1309 case $host_vendor in
1310 motorola)
1311 - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]']
1312 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
1313 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
1314 ;;
1315 ncr)
1316 @@ -3323,13 +3566,16 @@
1317 ;;
1318 sequent)
1319 lt_cv_file_magic_cmd='/bin/file'
1320 - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )']
1321 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
1322 ;;
1323 sni)
1324 lt_cv_file_magic_cmd='/bin/file'
1325 - [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"]
1326 + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
1327 lt_cv_file_magic_test_file=/lib/libc.so
1328 ;;
1329 + siemens)
1330 + lt_cv_deplibs_check_method=pass_all
1331 + ;;
1332 esac
1333 ;;
1334 esac
1335 @@ -3341,13 +3587,14 @@
1336
1337 # AC_PROG_NM - find the path to a BSD-compatible name lister
1338 AC_DEFUN([AC_PROG_NM],
1339 -[AC_MSG_CHECKING([for BSD-compatible nm])
1340 +[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
1341 +AC_MSG_CHECKING([for BSD-compatible nm])
1342 AC_CACHE_VAL(lt_cv_path_NM,
1343 [if test -n "$NM"; then
1344 # Let the user override the test.
1345 lt_cv_path_NM="$NM"
1346 else
1347 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
1348 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1349 for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
1350 test -z "$ac_dir" && ac_dir=.
1351 tmp_nm=$ac_dir/${ac_tool_prefix}nm
1352 @@ -3394,12 +3641,12 @@
1353 ])
1354
1355 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
1356 -# the libltdl convenience library and INCLTDL to the include flags for
1357 +# the libltdl convenience library and LTDLINCL to the include flags for
1358 # the libltdl header and adds --enable-ltdl-convenience to the
1359 -# configure arguments. Note that LIBLTDL and INCLTDL are not
1360 +# configure arguments. Note that LIBLTDL and LTDLINCL are not
1361 # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
1362 # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
1363 -# with '${top_builddir}/' and INCLTDL will be prefixed with
1364 +# with '${top_builddir}/' and LTDLINCL will be prefixed with
1365 # '${top_srcdir}/' (note the single quotes!). If your package is not
1366 # flat and you're not using automake, define top_builddir and
1367 # top_srcdir appropriately in the Makefiles.
1368 @@ -3411,16 +3658,18 @@
1369 ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
1370 esac
1371 LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
1372 - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
1373 + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
1374 + # For backwards non-gettext consistent compatibility...
1375 + INCLTDL="$LTDLINCL"
1376 ])
1377
1378 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
1379 -# the libltdl installable library and INCLTDL to the include flags for
1380 +# the libltdl installable library and LTDLINCL to the include flags for
1381 # the libltdl header and adds --enable-ltdl-install to the configure
1382 -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
1383 +# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
1384 # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
1385 # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
1386 -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
1387 +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
1388 # with '${top_srcdir}/' (note the single quotes!). If your package is
1389 # not flat and you're not using automake, define top_builddir and
1390 # top_srcdir appropriately in the Makefiles.
1391 @@ -3438,12 +3687,14 @@
1392 if test x"$enable_ltdl_install" = x"yes"; then
1393 ac_configure_args="$ac_configure_args --enable-ltdl-install"
1394 LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
1395 - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
1396 + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
1397 else
1398 ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
1399 LIBLTDL="-lltdl"
1400 - INCLTDL=
1401 + LTDLINCL=
1402 fi
1403 + # For backwards non-gettext consistent compatibility...
1404 + INCLTDL="$LTDLINCL"
1405 ])
1406
1407 # old names
1408 @@ -3458,3 +3709,92 @@
1409 # This is just to silence aclocal about the macro not being used
1410 ifelse([AC_DISABLE_FAST_INSTALL])
1411
1412 +# NOTE: This macro has been submitted for inclusion into #
1413 +# GNU Autoconf as AC_PROG_SED. When it is available in #
1414 +# a released version of Autoconf we should remove this #
1415 +# macro and use it instead. #
1416 +# LT_AC_PROG_SED
1417 +# --------------
1418 +# Check for a fully-functional sed program, that truncates
1419 +# as few characters as possible. Prefer GNU sed if found.
1420 +AC_DEFUN([LT_AC_PROG_SED],
1421 +[AC_MSG_CHECKING([for a sed that does not truncate output])
1422 +AC_CACHE_VAL(lt_cv_path_SED,
1423 +[# Loop through the user's path and test for sed and gsed.
1424 +# Then use that list of sed's as ones to test for truncation.
1425 +as_executable_p="test -f"
1426 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1427 +for as_dir in $PATH
1428 +do
1429 + IFS=$as_save_IFS
1430 + test -z "$as_dir" && as_dir=.
1431 + for ac_prog in sed gsed; do
1432 + for ac_exec_ext in '' $ac_executable_extensions; do
1433 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
1434 + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
1435 + fi
1436 + done
1437 + done
1438 +done
1439 +
1440 + # Create a temporary directory, and hook for its removal unless debugging.
1441 +$debug ||
1442 +{
1443 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
1444 + trap '{ (exit 1); exit 1; }' 1 2 13 15
1445 +}
1446 +
1447 +# Create a (secure) tmp directory for tmp files.
1448 +: ${TMPDIR=/tmp}
1449 +{
1450 + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
1451 + test -n "$tmp" && test -d "$tmp"
1452 +} ||
1453 +{
1454 + tmp=$TMPDIR/sed$$-$RANDOM
1455 + (umask 077 && mkdir $tmp)
1456 +} ||
1457 +{
1458 + echo "$me: cannot create a temporary directory in $TMPDIR" >&2
1459 + { (exit 1); exit 1; }
1460 +}
1461 + _max=0
1462 + _count=0
1463 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris
1464 + # along with /bin/sed that truncates output.
1465 + for _sed in $_sed_list /usr/xpg4/bin/sed; do
1466 + test ! -f ${_sed} && break
1467 + cat /dev/null > "$tmp/sed.in"
1468 + _count=0
1469 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
1470 + # Check for GNU sed and select it if it is found.
1471 + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
1472 + lt_cv_path_SED=${_sed}
1473 + break
1474 + fi
1475 + while true; do
1476 + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
1477 + mv "$tmp/sed.tmp" "$tmp/sed.in"
1478 + cp "$tmp/sed.in" "$tmp/sed.nl"
1479 + echo >>"$tmp/sed.nl"
1480 + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
1481 + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
1482 + # 40000 chars as input seems more than enough
1483 + test $_count -gt 10 && break
1484 + _count=`expr $_count + 1`
1485 + if test $_count -gt $_max; then
1486 + _max=$_count
1487 + lt_cv_path_SED=$_sed
1488 + fi
1489 + done
1490 + done
1491 + rm -rf "$tmp"
1492 +])
1493 +if test "X$SED" != "X"; then
1494 + lt_cv_path_SED=$SED
1495 +else
1496 + SED=$lt_cv_path_SED
1497 +fi
1498 +AC_MSG_RESULT([$SED])
1499 +])
1500 +
1501 --- linux-atm-2.4.1.orig/config.guess
1502 +++ linux-atm-2.4.1/config.guess
1503 @@ -1,9 +1,9 @@
1504 #! /bin/sh
1505 # Attempt to guess a canonical system name.
1506 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1507 -# Free Software Foundation, Inc.
1508 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1509 +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
1510
1511 -timestamp='2001-04-20'
1512 +timestamp='2003-05-19'
1513
1514 # This file is free software; you can redistribute it and/or modify it
1515 # under the terms of the GNU General Public License as published by
1516 @@ -24,8 +24,9 @@
1517 # configuration script generated by Autoconf, you may include it under
1518 # the same distribution terms that you use for the rest of that program.
1519
1520 -# Written by Per Bothner <bothner@cygnus.com>.
1521 -# Please send patches to <config-patches@gnu.org>.
1522 +# Originally written by Per Bothner <per@bothner.com>.
1523 +# Please send patches to <config-patches@gnu.org>. Submit a context
1524 +# diff and a properly formatted ChangeLog entry.
1525 #
1526 # This script attempts to guess a canonical system name similar to
1527 # config.sub. If it succeeds, it prints the system name on stdout, and
1528 @@ -52,7 +53,7 @@
1529 GNU config.guess ($timestamp)
1530
1531 Originally written by Per Bothner.
1532 -Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
1533 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1534 Free Software Foundation, Inc.
1535
1536 This is free software; see the source for copying conditions. There is NO
1537 @@ -87,33 +88,44 @@
1538 exit 1
1539 fi
1540
1541 +trap 'exit 1' 1 2 15
1542
1543 -dummy=dummy-$$
1544 -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
1545 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
1546 +# compiler to aid in system detection is discouraged as it requires
1547 +# temporary files to be created and, as you can see below, it is a
1548 +# headache to deal with in a portable fashion.
1549
1550 -# CC_FOR_BUILD -- compiler used by this script.
1551 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
1552 # use `HOST_CC' if defined, but it is deprecated.
1553
1554 +# Portable tmp directory creation inspired by the Autoconf team.
1555 +
1556 +set_cc_for_build='
1557 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
1558 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
1559 +: ${TMPDIR=/tmp} ;
1560 + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
1561 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
1562 + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
1563 +dummy=$tmp/dummy ;
1564 +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
1565 case $CC_FOR_BUILD,$HOST_CC,$CC in
1566 - ,,) echo "int dummy(){}" > $dummy.c
1567 - for c in cc gcc c89 ; do
1568 - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
1569 - if test $? = 0 ; then
1570 - CC_FOR_BUILD="$c"; break
1571 - fi
1572 - done
1573 - rm -f $dummy.c $dummy.o $dummy.rel
1574 + ,,) echo "int x;" > $dummy.c ;
1575 + for c in cc gcc c89 c99 ; do
1576 + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
1577 + CC_FOR_BUILD="$c"; break ;
1578 + fi ;
1579 + done ;
1580 if test x"$CC_FOR_BUILD" = x ; then
1581 - CC_FOR_BUILD=no_compiler_found
1582 + CC_FOR_BUILD=no_compiler_found ;
1583 fi
1584 ;;
1585 ,,*) CC_FOR_BUILD=$CC ;;
1586 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
1587 -esac
1588 +esac ;'
1589
1590 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
1591 -# (ghazi@noc.rutgers.edu 8/24/94.)
1592 +# (ghazi@noc.rutgers.edu 1994-08-24)
1593 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
1594 PATH=$PATH:/.attbin ; export PATH
1595 fi
1596 @@ -127,29 +139,31 @@
1597
1598 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1599 *:NetBSD:*:*)
1600 - # Netbsd (nbsd) targets should (where applicable) match one or
1601 + # NetBSD (nbsd) targets should (where applicable) match one or
1602 # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
1603 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
1604 # switched to ELF, *-*-netbsd* would select the old
1605 # object file format. This provides both forward
1606 # compatibility and a consistent mechanism for selecting the
1607 # object file format.
1608 - # Determine the machine/vendor (is the vendor relevant).
1609 - case "${UNAME_MACHINE}" in
1610 - amiga) machine=m68k-unknown ;;
1611 - arm32) machine=arm-unknown ;;
1612 - atari*) machine=m68k-atari ;;
1613 - sun3*) machine=m68k-sun ;;
1614 - mac68k) machine=m68k-apple ;;
1615 - macppc) machine=powerpc-apple ;;
1616 - hp3[0-9][05]) machine=m68k-hp ;;
1617 - ibmrt|romp-ibm) machine=romp-ibm ;;
1618 - *) machine=${UNAME_MACHINE}-unknown ;;
1619 + #
1620 + # Note: NetBSD doesn't particularly care about the vendor
1621 + # portion of the name. We always set it to "unknown".
1622 + sysctl="sysctl -n hw.machine_arch"
1623 + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
1624 + /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
1625 + case "${UNAME_MACHINE_ARCH}" in
1626 + armeb) machine=armeb-unknown ;;
1627 + arm*) machine=arm-unknown ;;
1628 + sh3el) machine=shl-unknown ;;
1629 + sh3eb) machine=sh-unknown ;;
1630 + *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
1631 esac
1632 # The Operating System including object format, if it has switched
1633 # to ELF recently, or will in the future.
1634 - case "${UNAME_MACHINE}" in
1635 - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
1636 + case "${UNAME_MACHINE_ARCH}" in
1637 + arm*|i386|m68k|ns32k|sh3*|sparc|vax)
1638 + eval $set_cc_for_build
1639 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
1640 | grep __ELF__ >/dev/null
1641 then
1642 @@ -165,69 +179,107 @@
1643 ;;
1644 esac
1645 # The OS release
1646 - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
1647 + # Debian GNU/NetBSD machines have a different userland, and
1648 + # thus, need a distinct triplet. However, they do not need
1649 + # kernel version information, so it can be replaced with a
1650 + # suitable tag, in the style of linux-gnu.
1651 + case "${UNAME_VERSION}" in
1652 + Debian*)
1653 + release='-gnu'
1654 + ;;
1655 + *)
1656 + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
1657 + ;;
1658 + esac
1659 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
1660 # contains redundant information, the shorter form:
1661 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
1662 echo "${machine}-${os}${release}"
1663 exit 0 ;;
1664 + amiga:OpenBSD:*:*)
1665 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1666 + exit 0 ;;
1667 + arc:OpenBSD:*:*)
1668 + echo mipsel-unknown-openbsd${UNAME_RELEASE}
1669 + exit 0 ;;
1670 + hp300:OpenBSD:*:*)
1671 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1672 + exit 0 ;;
1673 + mac68k:OpenBSD:*:*)
1674 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1675 + exit 0 ;;
1676 + macppc:OpenBSD:*:*)
1677 + echo powerpc-unknown-openbsd${UNAME_RELEASE}
1678 + exit 0 ;;
1679 + mvme68k:OpenBSD:*:*)
1680 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1681 + exit 0 ;;
1682 + mvme88k:OpenBSD:*:*)
1683 + echo m88k-unknown-openbsd${UNAME_RELEASE}
1684 + exit 0 ;;
1685 + mvmeppc:OpenBSD:*:*)
1686 + echo powerpc-unknown-openbsd${UNAME_RELEASE}
1687 + exit 0 ;;
1688 + pmax:OpenBSD:*:*)
1689 + echo mipsel-unknown-openbsd${UNAME_RELEASE}
1690 + exit 0 ;;
1691 + sgi:OpenBSD:*:*)
1692 + echo mipseb-unknown-openbsd${UNAME_RELEASE}
1693 + exit 0 ;;
1694 + sun3:OpenBSD:*:*)
1695 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1696 + exit 0 ;;
1697 + wgrisc:OpenBSD:*:*)
1698 + echo mipsel-unknown-openbsd${UNAME_RELEASE}
1699 + exit 0 ;;
1700 + *:OpenBSD:*:*)
1701 + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
1702 + exit 0 ;;
1703 alpha:OSF1:*:*)
1704 if test $UNAME_RELEASE = "V4.0"; then
1705 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
1706 fi
1707 + # According to Compaq, /usr/sbin/psrinfo has been available on
1708 + # OSF/1 and Tru64 systems produced since 1995. I hope that
1709 + # covers most systems running today. This code pipes the CPU
1710 + # types through head -n 1, so we only detect the type of CPU 0.
1711 + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
1712 + case "$ALPHA_CPU_TYPE" in
1713 + "EV4 (21064)")
1714 + UNAME_MACHINE="alpha" ;;
1715 + "EV4.5 (21064)")
1716 + UNAME_MACHINE="alpha" ;;
1717 + "LCA4 (21066/21068)")
1718 + UNAME_MACHINE="alpha" ;;
1719 + "EV5 (21164)")
1720 + UNAME_MACHINE="alphaev5" ;;
1721 + "EV5.6 (21164A)")
1722 + UNAME_MACHINE="alphaev56" ;;
1723 + "EV5.6 (21164PC)")
1724 + UNAME_MACHINE="alphapca56" ;;
1725 + "EV5.7 (21164PC)")
1726 + UNAME_MACHINE="alphapca57" ;;
1727 + "EV6 (21264)")
1728 + UNAME_MACHINE="alphaev6" ;;
1729 + "EV6.7 (21264A)")
1730 + UNAME_MACHINE="alphaev67" ;;
1731 + "EV6.8CB (21264C)")
1732 + UNAME_MACHINE="alphaev68" ;;
1733 + "EV6.8AL (21264B)")
1734 + UNAME_MACHINE="alphaev68" ;;
1735 + "EV6.8CX (21264D)")
1736 + UNAME_MACHINE="alphaev68" ;;
1737 + "EV6.9A (21264/EV69A)")
1738 + UNAME_MACHINE="alphaev69" ;;
1739 + "EV7 (21364)")
1740 + UNAME_MACHINE="alphaev7" ;;
1741 + "EV7.9 (21364A)")
1742 + UNAME_MACHINE="alphaev79" ;;
1743 + esac
1744 # A Vn.n version is a released version.
1745 # A Tn.n version is a released field test version.
1746 # A Xn.n version is an unreleased experimental baselevel.
1747 # 1.2 uses "1.2" for uname -r.
1748 - cat <<EOF >$dummy.s
1749 - .data
1750 -\$Lformat:
1751 - .byte 37,100,45,37,120,10,0 # "%d-%x\n"
1752 -
1753 - .text
1754 - .globl main
1755 - .align 4
1756 - .ent main
1757 -main:
1758 - .frame \$30,16,\$26,0
1759 - ldgp \$29,0(\$27)
1760 - .prologue 1
1761 - .long 0x47e03d80 # implver \$0
1762 - lda \$2,-1
1763 - .long 0x47e20c21 # amask \$2,\$1
1764 - lda \$16,\$Lformat
1765 - mov \$0,\$17
1766 - not \$1,\$18
1767 - jsr \$26,printf
1768 - ldgp \$29,0(\$26)
1769 - mov 0,\$16
1770 - jsr \$26,exit
1771 - .end main
1772 -EOF
1773 - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
1774 - if test "$?" = 0 ; then
1775 - case `./$dummy` in
1776 - 0-0)
1777 - UNAME_MACHINE="alpha"
1778 - ;;
1779 - 1-0)
1780 - UNAME_MACHINE="alphaev5"
1781 - ;;
1782 - 1-1)
1783 - UNAME_MACHINE="alphaev56"
1784 - ;;
1785 - 1-101)
1786 - UNAME_MACHINE="alphapca56"
1787 - ;;
1788 - 2-303)
1789 - UNAME_MACHINE="alphaev6"
1790 - ;;
1791 - 2-307)
1792 - UNAME_MACHINE="alphaev67"
1793 - ;;
1794 - esac
1795 - fi
1796 - rm -f $dummy.s $dummy
1797 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1798 exit 0 ;;
1799 Alpha\ *:Windows_NT*:*)
1800 @@ -242,29 +294,11 @@
1801 Amiga*:UNIX_System_V:4.0:*)
1802 echo m68k-unknown-sysv4
1803 exit 0;;
1804 - amiga:OpenBSD:*:*)
1805 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1806 - exit 0 ;;
1807 *:[Aa]miga[Oo][Ss]:*:*)
1808 echo ${UNAME_MACHINE}-unknown-amigaos
1809 exit 0 ;;
1810 - arc64:OpenBSD:*:*)
1811 - echo mips64el-unknown-openbsd${UNAME_RELEASE}
1812 - exit 0 ;;
1813 - arc:OpenBSD:*:*)
1814 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
1815 - exit 0 ;;
1816 - hkmips:OpenBSD:*:*)
1817 - echo mips-unknown-openbsd${UNAME_RELEASE}
1818 - exit 0 ;;
1819 - pmax:OpenBSD:*:*)
1820 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
1821 - exit 0 ;;
1822 - sgi:OpenBSD:*:*)
1823 - echo mips-unknown-openbsd${UNAME_RELEASE}
1824 - exit 0 ;;
1825 - wgrisc:OpenBSD:*:*)
1826 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
1827 + *:[Mm]orph[Oo][Ss]:*:*)
1828 + echo ${UNAME_MACHINE}-unknown-morphos
1829 exit 0 ;;
1830 *:OS/390:*:*)
1831 echo i370-ibm-openedition
1832 @@ -286,6 +320,10 @@
1833 NILE*:*:*:dcosx)
1834 echo pyramid-pyramid-svr4
1835 exit 0 ;;
1836 + DRS?6000:UNIX_SV:4.2*:7*)
1837 + case `/usr/bin/uname -p` in
1838 + sparc) echo sparc-icl-nx7 && exit 0 ;;
1839 + esac ;;
1840 sun4H:SunOS:5.*:*)
1841 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1842 exit 0 ;;
1843 @@ -314,7 +352,7 @@
1844 echo m68k-sun-sunos${UNAME_RELEASE}
1845 exit 0 ;;
1846 sun*:*:4.2BSD:*)
1847 - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
1848 + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
1849 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
1850 case "`/bin/arch`" in
1851 sun3)
1852 @@ -328,9 +366,6 @@
1853 aushp:SunOS:*:*)
1854 echo sparc-auspex-sunos${UNAME_RELEASE}
1855 exit 0 ;;
1856 - atari*:OpenBSD:*:*)
1857 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1858 - exit 0 ;;
1859 # The situation for MiNT is a little confusing. The machine name
1860 # can be virtually everything (everything which is not
1861 # "atarist" or "atariste" at least should have a processor
1862 @@ -357,18 +392,6 @@
1863 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
1864 echo m68k-unknown-mint${UNAME_RELEASE}
1865 exit 0 ;;
1866 - sun3*:OpenBSD:*:*)
1867 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1868 - exit 0 ;;
1869 - mac68k:OpenBSD:*:*)
1870 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1871 - exit 0 ;;
1872 - mvme68k:OpenBSD:*:*)
1873 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1874 - exit 0 ;;
1875 - mvme88k:OpenBSD:*:*)
1876 - echo m88k-unknown-openbsd${UNAME_RELEASE}
1877 - exit 0 ;;
1878 powerpc:machten:*:*)
1879 echo powerpc-apple-machten${UNAME_RELEASE}
1880 exit 0 ;;
1881 @@ -385,6 +408,7 @@
1882 echo clipper-intergraph-clix${UNAME_RELEASE}
1883 exit 0 ;;
1884 mips:*:*:UMIPS | mips:*:*:RISCos)
1885 + eval $set_cc_for_build
1886 sed 's/^ //' << EOF >$dummy.c
1887 #ifdef __cplusplus
1888 #include <stdio.h> /* for printf() prototype */
1889 @@ -406,15 +430,20 @@
1890 exit (-1);
1891 }
1892 EOF
1893 - $CC_FOR_BUILD $dummy.c -o $dummy \
1894 - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
1895 - && rm -f $dummy.c $dummy && exit 0
1896 - rm -f $dummy.c $dummy
1897 + $CC_FOR_BUILD -o $dummy $dummy.c \
1898 + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
1899 + && exit 0
1900 echo mips-mips-riscos${UNAME_RELEASE}
1901 exit 0 ;;
1902 Motorola:PowerMAX_OS:*:*)
1903 echo powerpc-motorola-powermax
1904 exit 0 ;;
1905 + Motorola:*:4.3:PL8-*)
1906 + echo powerpc-harris-powermax
1907 + exit 0 ;;
1908 + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
1909 + echo powerpc-harris-powermax
1910 + exit 0 ;;
1911 Night_Hawk:Power_UNIX:*:*)
1912 echo powerpc-harris-powerunix
1913 exit 0 ;;
1914 @@ -475,6 +504,7 @@
1915 exit 0 ;;
1916 *:AIX:2:3)
1917 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
1918 + eval $set_cc_for_build
1919 sed 's/^ //' << EOF >$dummy.c
1920 #include <sys/systemcfg.h>
1921
1922 @@ -486,8 +516,7 @@
1923 exit(0);
1924 }
1925 EOF
1926 - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
1927 - rm -f $dummy.c $dummy
1928 + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
1929 echo rs6000-ibm-aix3.2.5
1930 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
1931 echo rs6000-ibm-aix3.2.4
1932 @@ -496,7 +525,7 @@
1933 fi
1934 exit 0 ;;
1935 *:AIX:*:[45])
1936 - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
1937 + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
1938 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
1939 IBM_ARCH=rs6000
1940 else
1941 @@ -536,10 +565,8 @@
1942 9000/31? ) HP_ARCH=m68000 ;;
1943 9000/[34]?? ) HP_ARCH=m68k ;;
1944 9000/[678][0-9][0-9])
1945 - case "${HPUX_REV}" in
1946 - 11.[0-9][0-9])
1947 - if [ -x /usr/bin/getconf ]; then
1948 - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
1949 + if [ -x /usr/bin/getconf ]; then
1950 + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
1951 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
1952 case "${sc_cpu_version}" in
1953 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
1954 @@ -548,12 +575,13 @@
1955 case "${sc_kernel_bits}" in
1956 32) HP_ARCH="hppa2.0n" ;;
1957 64) HP_ARCH="hppa2.0w" ;;
1958 + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
1959 esac ;;
1960 esac
1961 - fi ;;
1962 - esac
1963 - if [ "${HP_ARCH}" = "" ]; then
1964 - sed 's/^ //' << EOF >$dummy.c
1965 + fi
1966 + if [ "${HP_ARCH}" = "" ]; then
1967 + eval $set_cc_for_build
1968 + sed 's/^ //' << EOF >$dummy.c
1969
1970 #define _HPUX_SOURCE
1971 #include <stdlib.h>
1972 @@ -586,11 +614,21 @@
1973 exit (0);
1974 }
1975 EOF
1976 - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
1977 - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
1978 - rm -f $dummy.c $dummy
1979 - fi ;;
1980 + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
1981 + test -z "$HP_ARCH" && HP_ARCH=hppa
1982 + fi ;;
1983 esac
1984 + if [ ${HP_ARCH} = "hppa2.0w" ]
1985 + then
1986 + # avoid double evaluation of $set_cc_for_build
1987 + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
1988 + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
1989 + then
1990 + HP_ARCH="hppa2.0w"
1991 + else
1992 + HP_ARCH="hppa64"
1993 + fi
1994 + fi
1995 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
1996 exit 0 ;;
1997 ia64:HP-UX:*:*)
1998 @@ -598,6 +636,7 @@
1999 echo ia64-hp-hpux${HPUX_REV}
2000 exit 0 ;;
2001 3050*:HI-UX:*:*)
2002 + eval $set_cc_for_build
2003 sed 's/^ //' << EOF >$dummy.c
2004 #include <unistd.h>
2005 int
2006 @@ -623,8 +662,7 @@
2007 exit (0);
2008 }
2009 EOF
2010 - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
2011 - rm -f $dummy.c $dummy
2012 + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
2013 echo unknown-hitachi-hiuxwe2
2014 exit 0 ;;
2015 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
2016 @@ -633,7 +671,7 @@
2017 9000/8??:4.3bsd:*:*)
2018 echo hppa1.0-hp-bsd
2019 exit 0 ;;
2020 - *9??*:MPE/iX:*:*)
2021 + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
2022 echo hppa1.0-hp-mpeix
2023 exit 0 ;;
2024 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
2025 @@ -652,9 +690,6 @@
2026 parisc*:Lites*:*:*)
2027 echo hppa1.1-hp-lites
2028 exit 0 ;;
2029 - hppa*:OpenBSD:*:*)
2030 - echo hppa-unknown-openbsd
2031 - exit 0 ;;
2032 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
2033 echo c1-convex-bsd
2034 exit 0 ;;
2035 @@ -673,41 +708,33 @@
2036 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
2037 echo c4-convex-bsd
2038 exit 0 ;;
2039 - CRAY*X-MP:*:*:*)
2040 - echo xmp-cray-unicos
2041 - exit 0 ;;
2042 CRAY*Y-MP:*:*:*)
2043 - echo ymp-cray-unicos${UNAME_RELEASE}
2044 + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2045 exit 0 ;;
2046 CRAY*[A-Z]90:*:*:*)
2047 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
2048 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
2049 - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
2050 + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
2051 + -e 's/\.[^.]*$/.X/'
2052 exit 0 ;;
2053 CRAY*TS:*:*:*)
2054 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2055 exit 0 ;;
2056 - CRAY*T3D:*:*:*)
2057 - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2058 - exit 0 ;;
2059 CRAY*T3E:*:*:*)
2060 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2061 exit 0 ;;
2062 CRAY*SV1:*:*:*)
2063 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2064 exit 0 ;;
2065 - CRAY-2:*:*:*)
2066 - echo cray2-cray-unicos
2067 - exit 0 ;;
2068 + *:UNICOS/mp:*:*)
2069 + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2070 + exit 0 ;;
2071 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
2072 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
2073 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
2074 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
2075 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
2076 exit 0 ;;
2077 - hp300:OpenBSD:*:*)
2078 - echo m68k-unknown-openbsd${UNAME_RELEASE}
2079 - exit 0 ;;
2080 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
2081 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
2082 exit 0 ;;
2083 @@ -717,11 +744,19 @@
2084 *:BSD/OS:*:*)
2085 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
2086 exit 0 ;;
2087 - *:FreeBSD:*:*)
2088 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
2089 - exit 0 ;;
2090 - *:OpenBSD:*:*)
2091 - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
2092 + *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
2093 + # Determine whether the default compiler uses glibc.
2094 + eval $set_cc_for_build
2095 + sed 's/^ //' << EOF >$dummy.c
2096 + #include <features.h>
2097 + #if __GLIBC__ >= 2
2098 + LIBC=gnu
2099 + #else
2100 + LIBC=
2101 + #endif
2102 +EOF
2103 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
2104 + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
2105 exit 0 ;;
2106 i*:CYGWIN*:*)
2107 echo ${UNAME_MACHINE}-pc-cygwin
2108 @@ -732,11 +767,17 @@
2109 i*:PW*:*)
2110 echo ${UNAME_MACHINE}-pc-pw32
2111 exit 0 ;;
2112 + x86:Interix*:3*)
2113 + echo i586-pc-interix3
2114 + exit 0 ;;
2115 + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
2116 + echo i${UNAME_MACHINE}-pc-mks
2117 + exit 0 ;;
2118 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
2119 # How do we know it's Interix rather than the generic POSIX subsystem?
2120 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
2121 # UNAME_MACHINE based on the output of uname instead of i386?
2122 - echo i386-pc-interix
2123 + echo i586-pc-interix
2124 exit 0 ;;
2125 i*:UWIN*:*)
2126 echo ${UNAME_MACHINE}-pc-uwin
2127 @@ -756,104 +797,71 @@
2128 arm*:Linux:*:*)
2129 echo ${UNAME_MACHINE}-unknown-linux-gnu
2130 exit 0 ;;
2131 + cris:Linux:*:*)
2132 + echo cris-axis-linux-gnu
2133 + exit 0 ;;
2134 ia64:Linux:*:*)
2135 - echo ${UNAME_MACHINE}-unknown-linux
2136 + echo ${UNAME_MACHINE}-unknown-linux-gnu
2137 exit 0 ;;
2138 m68*:Linux:*:*)
2139 echo ${UNAME_MACHINE}-unknown-linux-gnu
2140 exit 0 ;;
2141 mips:Linux:*:*)
2142 - cat >$dummy.c <<EOF
2143 -#ifdef __cplusplus
2144 -#include <stdio.h> /* for printf() prototype */
2145 -int main (int argc, char *argv[]) {
2146 -#else
2147 -int main (argc, argv) int argc; char *argv[]; {
2148 -#endif
2149 -#ifdef __MIPSEB__
2150 - printf ("%s-unknown-linux-gnu\n", argv[1]);
2151 -#endif
2152 -#ifdef __MIPSEL__
2153 - printf ("%sel-unknown-linux-gnu\n", argv[1]);
2154 -#endif
2155 - return 0;
2156 -}
2157 + eval $set_cc_for_build
2158 + sed 's/^ //' << EOF >$dummy.c
2159 + #undef CPU
2160 + #undef mips
2161 + #undef mipsel
2162 + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
2163 + CPU=mipsel
2164 + #else
2165 + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
2166 + CPU=mips
2167 + #else
2168 + CPU=
2169 + #endif
2170 + #endif
2171 EOF
2172 - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
2173 - rm -f $dummy.c $dummy
2174 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
2175 + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
2176 ;;
2177 - ppc:Linux:*:*)
2178 - # Determine Lib Version
2179 - cat >$dummy.c <<EOF
2180 -#include <features.h>
2181 -#if defined(__GLIBC__)
2182 -extern char __libc_version[];
2183 -extern char __libc_release[];
2184 -#endif
2185 -main(argc, argv)
2186 - int argc;
2187 - char *argv[];
2188 -{
2189 -#if defined(__GLIBC__)
2190 - printf("%s %s\n", __libc_version, __libc_release);
2191 -#else
2192 - printf("unknown\n");
2193 -#endif
2194 - return 0;
2195 -}
2196 + mips64:Linux:*:*)
2197 + eval $set_cc_for_build
2198 + sed 's/^ //' << EOF >$dummy.c
2199 + #undef CPU
2200 + #undef mips64
2201 + #undef mips64el
2202 + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
2203 + CPU=mips64el
2204 + #else
2205 + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
2206 + CPU=mips64
2207 + #else
2208 + CPU=
2209 + #endif
2210 + #endif
2211 EOF
2212 - LIBC=""
2213 - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
2214 - if test "$?" = 0 ; then
2215 - ./$dummy | grep 1\.99 > /dev/null
2216 - if test "$?" = 0 ; then LIBC="libc1" ; fi
2217 - fi
2218 - rm -f $dummy.c $dummy
2219 - echo powerpc-unknown-linux-gnu${LIBC}
2220 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
2221 + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
2222 + ;;
2223 + ppc:Linux:*:*)
2224 + echo powerpc-unknown-linux-gnu
2225 + exit 0 ;;
2226 + ppc64:Linux:*:*)
2227 + echo powerpc64-unknown-linux-gnu
2228 exit 0 ;;
2229 alpha:Linux:*:*)
2230 - cat <<EOF >$dummy.s
2231 - .data
2232 - \$Lformat:
2233 - .byte 37,100,45,37,120,10,0 # "%d-%x\n"
2234 - .text
2235 - .globl main
2236 - .align 4
2237 - .ent main
2238 - main:
2239 - .frame \$30,16,\$26,0
2240 - ldgp \$29,0(\$27)
2241 - .prologue 1
2242 - .long 0x47e03d80 # implver \$0
2243 - lda \$2,-1
2244 - .long 0x47e20c21 # amask \$2,\$1
2245 - lda \$16,\$Lformat
2246 - mov \$0,\$17
2247 - not \$1,\$18
2248 - jsr \$26,printf
2249 - ldgp \$29,0(\$26)
2250 - mov 0,\$16
2251 - jsr \$26,exit
2252 - .end main
2253 -EOF
2254 - LIBC=""
2255 - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
2256 - if test "$?" = 0 ; then
2257 - case `./$dummy` in
2258 - 0-0) UNAME_MACHINE="alpha" ;;
2259 - 1-0) UNAME_MACHINE="alphaev5" ;;
2260 - 1-1) UNAME_MACHINE="alphaev56" ;;
2261 - 1-101) UNAME_MACHINE="alphapca56" ;;
2262 - 2-303) UNAME_MACHINE="alphaev6" ;;
2263 - 2-307) UNAME_MACHINE="alphaev67" ;;
2264 - esac
2265 - objdump --private-headers $dummy | \
2266 - grep ld.so.1 > /dev/null
2267 - if test "$?" = 0 ; then
2268 - LIBC="libc1"
2269 - fi
2270 - fi
2271 - rm -f $dummy.s $dummy
2272 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
2273 + EV5) UNAME_MACHINE=alphaev5 ;;
2274 + EV56) UNAME_MACHINE=alphaev56 ;;
2275 + PCA56) UNAME_MACHINE=alphapca56 ;;
2276 + PCA57) UNAME_MACHINE=alphapca56 ;;
2277 + EV6) UNAME_MACHINE=alphaev6 ;;
2278 + EV67) UNAME_MACHINE=alphaev67 ;;
2279 + EV68*) UNAME_MACHINE=alphaev68 ;;
2280 + esac
2281 + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
2282 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
2283 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
2284 exit 0 ;;
2285 parisc:Linux:*:* | hppa:Linux:*:*)
2286 @@ -883,71 +891,59 @@
2287 # The BFD linker knows what the default object file format is, so
2288 # first see if it will tell us. cd to the root directory to prevent
2289 # problems with other programs or directories called `ld' in the path.
2290 - ld_supported_emulations=`cd /; ld --help 2>&1 \
2291 - | sed -ne '/supported emulations:/!d
2292 + # Set LC_ALL=C to ensure ld outputs messages in English.
2293 + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
2294 + | sed -ne '/supported targets:/!d
2295 s/[ ][ ]*/ /g
2296 - s/.*supported emulations: *//
2297 + s/.*supported targets: *//
2298 s/ .*//
2299 p'`
2300 - case "$ld_supported_emulations" in
2301 - i*86linux)
2302 - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
2303 - exit 0
2304 - ;;
2305 - elf_i*86)
2306 + case "$ld_supported_targets" in
2307 + elf32-i386)
2308 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
2309 ;;
2310 - i*86coff)
2311 + a.out-i386-linux)
2312 + echo "${UNAME_MACHINE}-pc-linux-gnuaout"
2313 + exit 0 ;;
2314 + coff-i386)
2315 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
2316 - exit 0
2317 - ;;
2318 - esac
2319 - # Either a pre-BFD a.out linker (linux-gnuoldld)
2320 - # or one that does not give us useful --help.
2321 - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
2322 - # If ld does not provide *any* "supported emulations:"
2323 - # that means it is gnuoldld.
2324 - test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
2325 - case "${UNAME_MACHINE}" in
2326 - i*86)
2327 - VENDOR=pc;
2328 - ;;
2329 - *)
2330 - VENDOR=unknown;
2331 - ;;
2332 + exit 0 ;;
2333 + "")
2334 + # Either a pre-BFD a.out linker (linux-gnuoldld) or
2335 + # one that does not give us useful --help.
2336 + echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
2337 + exit 0 ;;
2338 esac
2339 # Determine whether the default compiler is a.out or elf
2340 - cat >$dummy.c <<EOF
2341 -#include <features.h>
2342 -#ifdef __cplusplus
2343 -#include <stdio.h> /* for printf() prototype */
2344 - int main (int argc, char *argv[]) {
2345 -#else
2346 - int main (argc, argv) int argc; char *argv[]; {
2347 -#endif
2348 -#ifdef __ELF__
2349 -# ifdef __GLIBC__
2350 -# if __GLIBC__ >= 2
2351 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
2352 -# else
2353 - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
2354 -# endif
2355 -# else
2356 - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
2357 -# endif
2358 -#else
2359 - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
2360 -#endif
2361 - return 0;
2362 -}
2363 + eval $set_cc_for_build
2364 + sed 's/^ //' << EOF >$dummy.c
2365 + #include <features.h>
2366 + #ifdef __ELF__
2367 + # ifdef __GLIBC__
2368 + # if __GLIBC__ >= 2
2369 + LIBC=gnu
2370 + # else
2371 + LIBC=gnulibc1
2372 + # endif
2373 + # else
2374 + LIBC=gnulibc1
2375 + # endif
2376 + #else
2377 + #ifdef __INTEL_COMPILER
2378 + LIBC=gnu
2379 + #else
2380 + LIBC=gnuaout
2381 + #endif
2382 + #endif
2383 EOF
2384 - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
2385 - rm -f $dummy.c $dummy
2386 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
2387 + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
2388 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
2389 ;;
2390 -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
2391 -# are messed up and put the nodename in both sysname and nodename.
2392 i*86:DYNIX/ptx:4*:*)
2393 + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
2394 + # earlier versions are messed up and put the nodename in both
2395 + # sysname and nodename.
2396 echo i386-sequent-sysv4
2397 exit 0 ;;
2398 i*86:UNIX_SV:4.2MP:2.*)
2399 @@ -958,6 +954,23 @@
2400 # Use sysv4.2uw... so that sysv4* matches it.
2401 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
2402 exit 0 ;;
2403 + i*86:OS/2:*:*)
2404 + # If we were able to find `uname', then EMX Unix compatibility
2405 + # is probably installed.
2406 + echo ${UNAME_MACHINE}-pc-os2-emx
2407 + exit 0 ;;
2408 + i*86:XTS-300:*:STOP)
2409 + echo ${UNAME_MACHINE}-unknown-stop
2410 + exit 0 ;;
2411 + i*86:atheos:*:*)
2412 + echo ${UNAME_MACHINE}-unknown-atheos
2413 + exit 0 ;;
2414 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
2415 + echo i386-unknown-lynxos${UNAME_RELEASE}
2416 + exit 0 ;;
2417 + i*86:*DOS:*:*)
2418 + echo ${UNAME_MACHINE}-pc-msdosdjgpp
2419 + exit 0 ;;
2420 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
2421 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
2422 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
2423 @@ -966,36 +979,32 @@
2424 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
2425 fi
2426 exit 0 ;;
2427 - i*86:*:5:7*)
2428 - # Fixed at (any) Pentium or better
2429 - UNAME_MACHINE=i586
2430 - if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
2431 - echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
2432 - else
2433 - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
2434 - fi
2435 + i*86:*:5:[78]*)
2436 + case `/bin/uname -X | grep "^Machine"` in
2437 + *486*) UNAME_MACHINE=i486 ;;
2438 + *Pentium) UNAME_MACHINE=i586 ;;
2439 + *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
2440 + esac
2441 + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
2442 exit 0 ;;
2443 i*86:*:3.2:*)
2444 if test -f /usr/options/cb.name; then
2445 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
2446 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
2447 elif /bin/uname -X 2>/dev/null >/dev/null ; then
2448 - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
2449 - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
2450 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
2451 + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
2452 + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
2453 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
2454 && UNAME_MACHINE=i586
2455 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
2456 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
2457 && UNAME_MACHINE=i686
2458 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
2459 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
2460 && UNAME_MACHINE=i686
2461 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
2462 else
2463 echo ${UNAME_MACHINE}-pc-sysv32
2464 fi
2465 exit 0 ;;
2466 - i*86:*DOS:*:*)
2467 - echo ${UNAME_MACHINE}-pc-msdosdjgpp
2468 - exit 0 ;;
2469 pc:*:*:*)
2470 # Left here for compatibility:
2471 # uname -m prints for DJGPP always 'pc', but it prints nothing about
2472 @@ -1019,9 +1028,15 @@
2473 # "miniframe"
2474 echo m68010-convergent-sysv
2475 exit 0 ;;
2476 + mc68k:UNIX:SYSTEM5:3.51m)
2477 + echo m68k-convergent-sysv
2478 + exit 0 ;;
2479 + M680?0:D-NIX:5.3:*)
2480 + echo m68k-diab-dnix
2481 + exit 0 ;;
2482 M68*:*:R3V[567]*:*)
2483 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
2484 - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
2485 + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
2486 OS_REL=''
2487 test -r /etc/.relid \
2488 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
2489 @@ -1038,9 +1053,6 @@
2490 mc68030:UNIX_System_V:4.*:*)
2491 echo m68k-atari-sysv4
2492 exit 0 ;;
2493 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
2494 - echo i386-unknown-lynxos${UNAME_RELEASE}
2495 - exit 0 ;;
2496 TSUNAMI:LynxOS:2.*:*)
2497 echo sparc-unknown-lynxos${UNAME_RELEASE}
2498 exit 0 ;;
2499 @@ -1067,8 +1079,8 @@
2500 echo ns32k-sni-sysv
2501 fi
2502 exit 0 ;;
2503 - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
2504 - # says <Richard.M.Bartel@ccMail.Census.GOV>
2505 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
2506 + # says <Richard.M.Bartel@ccMail.Census.GOV>
2507 echo i586-unisys-sysv4
2508 exit 0 ;;
2509 *:UNIX_System_V:4*:FTX*)
2510 @@ -1080,6 +1092,10 @@
2511 # From seanf@swdc.stratus.com.
2512 echo i860-stratus-sysv4
2513 exit 0 ;;
2514 + *:VOS:*:*)
2515 + # From Paul.Green@stratus.com.
2516 + echo hppa1.1-stratus-vos
2517 + exit 0 ;;
2518 mc68*:A/UX:*:*)
2519 echo m68k-apple-aux${UNAME_RELEASE}
2520 exit 0 ;;
2521 @@ -1108,6 +1124,9 @@
2522 SX-5:SUPER-UX:*:*)
2523 echo sx5-nec-superux${UNAME_RELEASE}
2524 exit 0 ;;
2525 + SX-6:SUPER-UX:*:*)
2526 + echo sx6-nec-superux${UNAME_RELEASE}
2527 + exit 0 ;;
2528 Power*:Rhapsody:*:*)
2529 echo powerpc-apple-rhapsody${UNAME_RELEASE}
2530 exit 0 ;;
2531 @@ -1115,18 +1134,24 @@
2532 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
2533 exit 0 ;;
2534 *:Darwin:*:*)
2535 - echo `uname -p`-apple-darwin${UNAME_RELEASE}
2536 + case `uname -p` in
2537 + *86) UNAME_PROCESSOR=i686 ;;
2538 + powerpc) UNAME_PROCESSOR=powerpc ;;
2539 + esac
2540 + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
2541 exit 0 ;;
2542 *:procnto*:*:* | *:QNX:[0123456789]*:*)
2543 - if test "${UNAME_MACHINE}" = "x86pc"; then
2544 + UNAME_PROCESSOR=`uname -p`
2545 + if test "$UNAME_PROCESSOR" = "x86"; then
2546 + UNAME_PROCESSOR=i386
2547 UNAME_MACHINE=pc
2548 fi
2549 - echo `uname -p`-${UNAME_MACHINE}-nto-qnx
2550 + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
2551 exit 0 ;;
2552 *:QNX:*:4*)
2553 echo i386-pc-qnx
2554 exit 0 ;;
2555 - NSR-[KW]:NONSTOP_KERNEL:*:*)
2556 + NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
2557 echo nsr-tandem-nsk${UNAME_RELEASE}
2558 exit 0 ;;
2559 *:NonStop-UX:*:*)
2560 @@ -1149,11 +1174,6 @@
2561 fi
2562 echo ${UNAME_MACHINE}-unknown-plan9
2563 exit 0 ;;
2564 - i*86:OS/2:*:*)
2565 - # If we were able to find `uname', then EMX Unix compatibility
2566 - # is probably installed.
2567 - echo ${UNAME_MACHINE}-pc-os2-emx
2568 - exit 0 ;;
2569 *:TOPS-10:*:*)
2570 echo pdp10-unknown-tops10
2571 exit 0 ;;
2572 @@ -1177,6 +1197,7 @@
2573 #echo '(No uname command or uname output not recognized.)' 1>&2
2574 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
2575
2576 +eval $set_cc_for_build
2577 cat >$dummy.c <<EOF
2578 #ifdef _SEQUENT_
2579 # include <sys/types.h>
2580 @@ -1291,8 +1312,7 @@
2581 }
2582 EOF
2583
2584 -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
2585 -rm -f $dummy.c $dummy
2586 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
2587
2588 # Apollos put the system type in the environment.
2589
2590 --- linux-atm-2.4.1.orig/config.h.in
2591 +++ linux-atm-2.4.1/config.h.in
2592 @@ -1,4 +1,4 @@
2593 -/* config.h.in. Generated automatically from configure.in by autoheader. */
2594 +/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
2595 #ifndef _ATM_CONFIG_H
2596 #define _ATM_CONFIG_H
2597
2598 --- linux-atm-2.4.1.orig/config.sub
2599 +++ linux-atm-2.4.1/config.sub
2600 @@ -1,9 +1,9 @@
2601 #! /bin/sh
2602 # Configuration validation subroutine script.
2603 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
2604 -# Free Software Foundation, Inc.
2605 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2606 +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
2607
2608 -timestamp='2001-04-20'
2609 +timestamp='2003-05-09'
2610
2611 # This file is (in principle) common to ALL GNU software.
2612 # The presence of a machine in this file suggests that SOME GNU software
2613 @@ -29,7 +29,8 @@
2614 # configuration script generated by Autoconf, you may include it under
2615 # the same distribution terms that you use for the rest of that program.
2616
2617 -# Please send patches to <config-patches@gnu.org>.
2618 +# Please send patches to <config-patches@gnu.org>. Submit a context
2619 +# diff and a properly formatted ChangeLog entry.
2620 #
2621 # Configuration subroutine to validate and canonicalize a configuration type.
2622 # Supply the specified configuration type as an argument.
2623 @@ -117,7 +118,7 @@
2624 # Here we must recognize all the valid KERNEL-OS combinations.
2625 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
2626 case $maybe_os in
2627 - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
2628 + nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
2629 os=-$maybe_os
2630 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
2631 ;;
2632 @@ -157,6 +158,14 @@
2633 os=-vxworks
2634 basic_machine=$1
2635 ;;
2636 + -chorusos*)
2637 + os=-chorusos
2638 + basic_machine=$1
2639 + ;;
2640 + -chorusrdb)
2641 + os=-chorusrdb
2642 + basic_machine=$1
2643 + ;;
2644 -hiux*)
2645 os=-hiuxwe2
2646 ;;
2647 @@ -215,26 +224,48 @@
2648 case $basic_machine in
2649 # Recognize the basic CPU types without company name.
2650 # Some are omitted here because they have special meanings below.
2651 - tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
2652 - | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
2653 - | pyramid | mn10200 | mn10300 | tron | a29k \
2654 - | 580 | i960 | h8300 \
2655 - | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
2656 - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
2657 - | hppa64 \
2658 - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
2659 - | alphaev6[78] \
2660 - | we32k | ns16k | clipper | i370 | sh | sh[34] \
2661 - | powerpc | powerpcle \
2662 - | 1750a | dsp16xx | pdp10 | pdp11 \
2663 - | mips16 | mips64 | mipsel | mips64el \
2664 - | mips64orion | mips64orionel | mipstx39 | mipstx39el \
2665 - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
2666 - | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
2667 - | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
2668 - | v850 | c4x \
2669 - | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
2670 - | pj | pjl | h8500)
2671 + 1750a | 580 \
2672 + | a29k \
2673 + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
2674 + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
2675 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
2676 + | clipper \
2677 + | d10v | d30v | dlx | dsp16xx \
2678 + | fr30 | frv \
2679 + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
2680 + | i370 | i860 | i960 | ia64 \
2681 + | ip2k \
2682 + | m32r | m68000 | m68k | m88k | mcore \
2683 + | mips | mipsbe | mipseb | mipsel | mipsle \
2684 + | mips16 \
2685 + | mips64 | mips64el \
2686 + | mips64vr | mips64vrel \
2687 + | mips64orion | mips64orionel \
2688 + | mips64vr4100 | mips64vr4100el \
2689 + | mips64vr4300 | mips64vr4300el \
2690 + | mips64vr5000 | mips64vr5000el \
2691 + | mipsisa32 | mipsisa32el \
2692 + | mipsisa32r2 | mipsisa32r2el \
2693 + | mipsisa64 | mipsisa64el \
2694 + | mipsisa64sb1 | mipsisa64sb1el \
2695 + | mipsisa64sr71k | mipsisa64sr71kel \
2696 + | mipstx39 | mipstx39el \
2697 + | mn10200 | mn10300 \
2698 + | msp430 \
2699 + | ns16k | ns32k \
2700 + | openrisc | or32 \
2701 + | pdp10 | pdp11 | pj | pjl \
2702 + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
2703 + | pyramid \
2704 + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
2705 + | sh64 | sh64le \
2706 + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
2707 + | strongarm \
2708 + | tahoe | thumb | tic80 | tron \
2709 + | v850 | v850e \
2710 + | we32k \
2711 + | x86 | xscale | xstormy16 | xtensa \
2712 + | z8k)
2713 basic_machine=$basic_machine-unknown
2714 ;;
2715 m6811 | m68hc11 | m6812 | m68hc12)
2716 @@ -242,7 +273,7 @@
2717 basic_machine=$basic_machine-unknown
2718 os=-none
2719 ;;
2720 - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
2721 + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
2722 ;;
2723
2724 # We use `pc' rather than `unknown'
2725 @@ -257,31 +288,60 @@
2726 exit 1
2727 ;;
2728 # Recognize the basic CPU types with company name.
2729 - # FIXME: clean up the formatting here.
2730 - vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
2731 - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
2732 - | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
2733 - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
2734 - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
2735 - | xmp-* | ymp-* \
2736 - | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
2737 - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
2738 - | hppa2.0n-* | hppa64-* \
2739 - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
2740 - | alphaev6[78]-* \
2741 - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
2742 - | clipper-* | orion-* \
2743 - | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
2744 - | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
2745 - | mips16-* | mips64-* | mipsel-* \
2746 - | mips64el-* | mips64orion-* | mips64orionel-* \
2747 - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
2748 - | mipstx39-* | mipstx39el-* | mcore-* \
2749 - | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
2750 - | [cjt]90-* \
2751 - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
2752 - | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
2753 - | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
2754 + 580-* \
2755 + | a29k-* \
2756 + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
2757 + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
2758 + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
2759 + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
2760 + | avr-* \
2761 + | bs2000-* \
2762 + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
2763 + | clipper-* | cydra-* \
2764 + | d10v-* | d30v-* | dlx-* \
2765 + | elxsi-* \
2766 + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
2767 + | h8300-* | h8500-* \
2768 + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
2769 + | i*86-* | i860-* | i960-* | ia64-* \
2770 + | ip2k-* \
2771 + | m32r-* \
2772 + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
2773 + | m88110-* | m88k-* | mcore-* \
2774 + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
2775 + | mips16-* \
2776 + | mips64-* | mips64el-* \
2777 + | mips64vr-* | mips64vrel-* \
2778 + | mips64orion-* | mips64orionel-* \
2779 + | mips64vr4100-* | mips64vr4100el-* \
2780 + | mips64vr4300-* | mips64vr4300el-* \
2781 + | mips64vr5000-* | mips64vr5000el-* \
2782 + | mipsisa32-* | mipsisa32el-* \
2783 + | mipsisa32r2-* | mipsisa32r2el-* \
2784 + | mipsisa64-* | mipsisa64el-* \
2785 + | mipsisa64sb1-* | mipsisa64sb1el-* \
2786 + | mipsisa64sr71k-* | mipsisa64sr71kel-* \
2787 + | mipstx39-* | mipstx39el-* \
2788 + | msp430-* \
2789 + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
2790 + | orion-* \
2791 + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
2792 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
2793 + | pyramid-* \
2794 + | romp-* | rs6000-* \
2795 + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
2796 + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
2797 + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
2798 + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
2799 + | tahoe-* | thumb-* \
2800 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
2801 + | tron-* \
2802 + | v850-* | v850e-* | vax-* \
2803 + | we32k-* \
2804 + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
2805 + | xtensa-* \
2806 + | ymp-* \
2807 + | z8k-*)
2808 ;;
2809 # Recognize the various machine names and aliases which stand
2810 # for a CPU type and a company and sometimes even an OS.
2811 @@ -313,6 +373,9 @@
2812 basic_machine=a29k-none
2813 os=-bsd
2814 ;;
2815 + amd64)
2816 + basic_machine=x86_64-pc
2817 + ;;
2818 amdahl)
2819 basic_machine=580-amdahl
2820 os=-sysv
2821 @@ -344,6 +407,10 @@
2822 basic_machine=ns32k-sequent
2823 os=-dynix
2824 ;;
2825 + c90)
2826 + basic_machine=c90-cray
2827 + os=-unicos
2828 + ;;
2829 convex-c1)
2830 basic_machine=c1-convex
2831 os=-bsd
2832 @@ -364,16 +431,8 @@
2833 basic_machine=c38-convex
2834 os=-bsd
2835 ;;
2836 - cray | ymp)
2837 - basic_machine=ymp-cray
2838 - os=-unicos
2839 - ;;
2840 - cray2)
2841 - basic_machine=cray2-cray
2842 - os=-unicos
2843 - ;;
2844 - [cjt]90)
2845 - basic_machine=${basic_machine}-cray
2846 + cray | j90)
2847 + basic_machine=j90-cray
2848 os=-unicos
2849 ;;
2850 crds | unos)
2851 @@ -388,6 +447,14 @@
2852 decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
2853 basic_machine=mips-dec
2854 ;;
2855 + decsystem10* | dec10*)
2856 + basic_machine=pdp10-dec
2857 + os=-tops10
2858 + ;;
2859 + decsystem20* | dec20*)
2860 + basic_machine=pdp10-dec
2861 + os=-tops20
2862 + ;;
2863 delta | 3300 | motorola-3300 | motorola-delta \
2864 | 3300-motorola | delta-motorola)
2865 basic_machine=m68k-motorola
2866 @@ -568,14 +635,6 @@
2867 basic_machine=m68k-atari
2868 os=-mint
2869 ;;
2870 - mipsel*-linux*)
2871 - basic_machine=mipsel-unknown
2872 - os=-linux-gnu
2873 - ;;
2874 - mips*-linux*)
2875 - basic_machine=mips-unknown
2876 - os=-linux-gnu
2877 - ;;
2878 mips3*-*)
2879 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
2880 ;;
2881 @@ -590,6 +649,10 @@
2882 basic_machine=m68k-rom68k
2883 os=-coff
2884 ;;
2885 + morphos)
2886 + basic_machine=powerpc-unknown
2887 + os=-morphos
2888 + ;;
2889 msdos)
2890 basic_machine=i386-pc
2891 os=-msdos
2892 @@ -662,6 +725,10 @@
2893 np1)
2894 basic_machine=np1-gould
2895 ;;
2896 + nv1)
2897 + basic_machine=nv1-cray
2898 + os=-unicosmp
2899 + ;;
2900 nsr-tandem)
2901 basic_machine=nsr-tandem
2902 ;;
2903 @@ -669,6 +736,10 @@
2904 basic_machine=hppa1.1-oki
2905 os=-proelf
2906 ;;
2907 + or32 | or32-*)
2908 + basic_machine=or32-unknown
2909 + os=-coff
2910 + ;;
2911 OSE68000 | ose68000)
2912 basic_machine=m68000-ericsson
2913 os=-ose
2914 @@ -691,19 +762,19 @@
2915 pbb)
2916 basic_machine=m68k-tti
2917 ;;
2918 - pc532 | pc532-*)
2919 + pc532 | pc532-*)
2920 basic_machine=ns32k-pc532
2921 ;;
2922 - pentium | p5 | k5 | k6 | nexgen)
2923 + pentium | p5 | k5 | k6 | nexgen | viac3)
2924 basic_machine=i586-pc
2925 ;;
2926 - pentiumpro | p6 | 6x86 | athlon)
2927 + pentiumpro | p6 | 6x86 | athlon | athlon_*)
2928 basic_machine=i686-pc
2929 ;;
2930 pentiumii | pentium2)
2931 basic_machine=i686-pc
2932 ;;
2933 - pentium-* | p5-* | k5-* | k6-* | nexgen-*)
2934 + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
2935 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
2936 ;;
2937 pentiumpro-* | p6-* | 6x86-* | athlon-*)
2938 @@ -718,15 +789,25 @@
2939 power) basic_machine=power-ibm
2940 ;;
2941 ppc) basic_machine=powerpc-unknown
2942 - ;;
2943 + ;;
2944 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
2945 ;;
2946 ppcle | powerpclittle | ppc-le | powerpc-little)
2947 basic_machine=powerpcle-unknown
2948 - ;;
2949 + ;;
2950 ppcle-* | powerpclittle-*)
2951 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
2952 ;;
2953 + ppc64) basic_machine=powerpc64-unknown
2954 + ;;
2955 + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
2956 + ;;
2957 + ppc64le | powerpc64little | ppc64-le | powerpc64-little)
2958 + basic_machine=powerpc64le-unknown
2959 + ;;
2960 + ppc64le-* | powerpc64little-*)
2961 + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
2962 + ;;
2963 ps2)
2964 basic_machine=i386-ibm
2965 ;;
2966 @@ -744,10 +825,22 @@
2967 rtpc | rtpc-*)
2968 basic_machine=romp-ibm
2969 ;;
2970 + s390 | s390-*)
2971 + basic_machine=s390-ibm
2972 + ;;
2973 + s390x | s390x-*)
2974 + basic_machine=s390x-ibm
2975 + ;;
2976 sa29200)
2977 basic_machine=a29k-amd
2978 os=-udi
2979 ;;
2980 + sb1)
2981 + basic_machine=mipsisa64sb1-unknown
2982 + ;;
2983 + sb1el)
2984 + basic_machine=mipsisa64sb1el-unknown
2985 + ;;
2986 sequent)
2987 basic_machine=i386-sequent
2988 ;;
2989 @@ -755,7 +848,7 @@
2990 basic_machine=sh-hitachi
2991 os=-hms
2992 ;;
2993 - sparclite-wrs)
2994 + sparclite-wrs | simso-wrs)
2995 basic_machine=sparclite-wrs
2996 os=-vxworks
2997 ;;
2998 @@ -822,19 +915,39 @@
2999 os=-dynix
3000 ;;
3001 t3e)
3002 - basic_machine=t3e-cray
3003 + basic_machine=alphaev5-cray
3004 os=-unicos
3005 ;;
3006 + t90)
3007 + basic_machine=t90-cray
3008 + os=-unicos
3009 + ;;
3010 + tic4x | c4x*)
3011 + basic_machine=tic4x-unknown
3012 + os=-coff
3013 + ;;
3014 tic54x | c54x*)
3015 basic_machine=tic54x-unknown
3016 os=-coff
3017 ;;
3018 + tic55x | c55x*)
3019 + basic_machine=tic55x-unknown
3020 + os=-coff
3021 + ;;
3022 + tic6x | c6x*)
3023 + basic_machine=tic6x-unknown
3024 + os=-coff
3025 + ;;
3026 tx39)
3027 basic_machine=mipstx39-unknown
3028 ;;
3029 tx39el)
3030 basic_machine=mipstx39el-unknown
3031 ;;
3032 + toad1)
3033 + basic_machine=pdp10-xkl
3034 + os=-tops20
3035 + ;;
3036 tower | tower-32)
3037 basic_machine=m68k-ncr
3038 ;;
3039 @@ -859,8 +972,8 @@
3040 os=-vms
3041 ;;
3042 vpp*|vx|vx-*)
3043 - basic_machine=f301-fujitsu
3044 - ;;
3045 + basic_machine=f301-fujitsu
3046 + ;;
3047 vxworks960)
3048 basic_machine=i960-wrs
3049 os=-vxworks
3050 @@ -881,13 +994,13 @@
3051 basic_machine=hppa1.1-winbond
3052 os=-proelf
3053 ;;
3054 - xmp)
3055 - basic_machine=xmp-cray
3056 - os=-unicos
3057 - ;;
3058 - xps | xps100)
3059 + xps | xps100)
3060 basic_machine=xps100-honeywell
3061 ;;
3062 + ymp)
3063 + basic_machine=ymp-cray
3064 + os=-unicos
3065 + ;;
3066 z8k-*-coff)
3067 basic_machine=z8k-unknown
3068 os=-sim
3069 @@ -908,13 +1021,6 @@
3070 op60c)
3071 basic_machine=hppa1.1-oki
3072 ;;
3073 - mips)
3074 - if [ x$os = x-linux-gnu ]; then
3075 - basic_machine=mips-unknown
3076 - else
3077 - basic_machine=mips-mips
3078 - fi
3079 - ;;
3080 romp)
3081 basic_machine=romp-ibm
3082 ;;
3083 @@ -934,13 +1040,16 @@
3084 we32k)
3085 basic_machine=we32k-att
3086 ;;
3087 - sh3 | sh4)
3088 + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
3089 basic_machine=sh-unknown
3090 ;;
3091 + sh64)
3092 + basic_machine=sh64-unknown
3093 + ;;
3094 sparc | sparcv9 | sparcv9b)
3095 basic_machine=sparc-sun
3096 ;;
3097 - cydra)
3098 + cydra)
3099 basic_machine=cydra-cydrome
3100 ;;
3101 orion)
3102 @@ -955,10 +1064,6 @@
3103 pmac | pmac-mpw)
3104 basic_machine=powerpc-apple
3105 ;;
3106 - c4x*)
3107 - basic_machine=c4x-none
3108 - os=-coff
3109 - ;;
3110 *-unknown)
3111 # Make sure to match an already-canonicalized machine name.
3112 ;;
3113 @@ -1018,11 +1123,15 @@
3114 | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
3115 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
3116 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
3117 + | -chorusos* | -chorusrdb* \
3118 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
3119 | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
3120 - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
3121 + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
3122 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
3123 - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
3124 + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
3125 + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
3126 + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
3127 + | -powermax* | -dnix*)
3128 # Remember, each alternative MUST END IN *, to match a version number.
3129 ;;
3130 -qnx*)
3131 @@ -1034,8 +1143,10 @@
3132 ;;
3133 esac
3134 ;;
3135 + -nto-qnx*)
3136 + ;;
3137 -nto*)
3138 - os=-nto-qnx
3139 + os=`echo $os | sed -e 's|nto|nto-qnx|'`
3140 ;;
3141 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
3142 | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
3143 @@ -1074,14 +1185,20 @@
3144 -acis*)
3145 os=-aos
3146 ;;
3147 + -atheos*)
3148 + os=-atheos
3149 + ;;
3150 -386bsd)
3151 os=-bsd
3152 ;;
3153 -ctix* | -uts*)
3154 os=-sysv
3155 ;;
3156 + -nova*)
3157 + os=-rtmk-nova
3158 + ;;
3159 -ns2 )
3160 - os=-nextstep2
3161 + os=-nextstep2
3162 ;;
3163 -nsk*)
3164 os=-nsk
3165 @@ -1120,8 +1237,14 @@
3166 -xenix)
3167 os=-xenix
3168 ;;
3169 - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3170 - os=-mint
3171 + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3172 + os=-mint
3173 + ;;
3174 + -aros*)
3175 + os=-aros
3176 + ;;
3177 + -kaos*)
3178 + os=-kaos
3179 ;;
3180 -none)
3181 ;;
3182 @@ -1154,10 +1277,11 @@
3183 arm*-semi)
3184 os=-aout
3185 ;;
3186 + # This must come before the *-dec entry.
3187 pdp10-*)
3188 os=-tops20
3189 ;;
3190 - pdp11-*)
3191 + pdp11-*)
3192 os=-none
3193 ;;
3194 *-dec | vax-*)
3195 @@ -1184,6 +1308,9 @@
3196 mips*-*)
3197 os=-elf
3198 ;;
3199 + or32-*)
3200 + os=-coff
3201 + ;;
3202 *-tti) # must be before sparc entry or we get the wrong os.
3203 os=-sysv3
3204 ;;
3205 @@ -1247,19 +1374,19 @@
3206 *-next)
3207 os=-nextstep3
3208 ;;
3209 - *-gould)
3210 + *-gould)
3211 os=-sysv
3212 ;;
3213 - *-highlevel)
3214 + *-highlevel)
3215 os=-bsd
3216 ;;
3217 *-encore)
3218 os=-bsd
3219 ;;
3220 - *-sgi)
3221 + *-sgi)
3222 os=-irix
3223 ;;
3224 - *-siemens)
3225 + *-siemens)
3226 os=-sysv4
3227 ;;
3228 *-masscomp)
3229 @@ -1331,7 +1458,7 @@
3230 -ptx*)
3231 vendor=sequent
3232 ;;
3233 - -vxsim* | -vxworks*)
3234 + -vxsim* | -vxworks* | -windiss*)
3235 vendor=wrs
3236 ;;
3237 -aux*)
3238 @@ -1346,6 +1473,9 @@
3239 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3240 vendor=atari
3241 ;;
3242 + -vos*)
3243 + vendor=stratus
3244 + ;;
3245 esac
3246 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
3247 ;;
3248 --- linux-atm-2.4.1.orig/configure
3249 +++ linux-atm-2.4.1/configure
3250 @@ -1,24 +1,244 @@
3251 #! /bin/sh
3252 -
3253 # Guess values for system-dependent variables and create Makefiles.
3254 -# Generated automatically using autoconf version 2.13
3255 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
3256 +# Generated by GNU Autoconf 2.57.
3257 #
3258 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
3259 +# Free Software Foundation, Inc.
3260 # This configure script is free software; the Free Software Foundation
3261 # gives unlimited permission to copy, distribute and modify it.
3262 +## --------------------- ##
3263 +## M4sh Initialization. ##
3264 +## --------------------- ##
3265 +
3266 +# Be Bourne compatible
3267 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3268 + emulate sh
3269 + NULLCMD=:
3270 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3271 + # is contrary to our usage. Disable this feature.
3272 + alias -g '${1+"$@"}'='"$@"'
3273 +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
3274 + set -o posix
3275 +fi
3276 +
3277 +# Support unset when possible.
3278 +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
3279 + as_unset=unset
3280 +else
3281 + as_unset=false
3282 +fi
3283 +
3284 +
3285 +# Work around bugs in pre-3.0 UWIN ksh.
3286 +$as_unset ENV MAIL MAILPATH
3287 +PS1='$ '
3288 +PS2='> '
3289 +PS4='+ '
3290 +
3291 +# NLS nuisances.
3292 +for as_var in \
3293 + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
3294 + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
3295 + LC_TELEPHONE LC_TIME
3296 +do
3297 + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
3298 + eval $as_var=C; export $as_var
3299 + else
3300 + $as_unset $as_var
3301 + fi
3302 +done
3303 +
3304 +# Required to use basename.
3305 +if expr a : '\(a\)' >/dev/null 2>&1; then
3306 + as_expr=expr
3307 +else
3308 + as_expr=false
3309 +fi
3310 +
3311 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
3312 + as_basename=basename
3313 +else
3314 + as_basename=false
3315 +fi
3316 +
3317 +
3318 +# Name of the executable.
3319 +as_me=`$as_basename "$0" ||
3320 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
3321 + X"$0" : 'X\(//\)$' \| \
3322 + X"$0" : 'X\(/\)$' \| \
3323 + . : '\(.\)' 2>/dev/null ||
3324 +echo X/"$0" |
3325 + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
3326 + /^X\/\(\/\/\)$/{ s//\1/; q; }
3327 + /^X\/\(\/\).*/{ s//\1/; q; }
3328 + s/.*/./; q'`
3329 +
3330 +
3331 +# PATH needs CR, and LINENO needs CR and PATH.
3332 +# Avoid depending upon Character Ranges.
3333 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
3334 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
3335 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
3336 +as_cr_digits='0123456789'
3337 +as_cr_alnum=$as_cr_Letters$as_cr_digits
3338 +
3339 +# The user is always right.
3340 +if test "${PATH_SEPARATOR+set}" != set; then
3341 + echo "#! /bin/sh" >conf$$.sh
3342 + echo "exit 0" >>conf$$.sh
3343 + chmod +x conf$$.sh
3344 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
3345 + PATH_SEPARATOR=';'
3346 + else
3347 + PATH_SEPARATOR=:
3348 + fi
3349 + rm -f conf$$.sh
3350 +fi
3351 +
3352 +
3353 + as_lineno_1=$LINENO
3354 + as_lineno_2=$LINENO
3355 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
3356 + test "x$as_lineno_1" != "x$as_lineno_2" &&
3357 + test "x$as_lineno_3" = "x$as_lineno_2" || {
3358 + # Find who we are. Look in the path if we contain no path at all
3359 + # relative or not.
3360 + case $0 in
3361 + *[\\/]* ) as_myself=$0 ;;
3362 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3363 +for as_dir in $PATH
3364 +do
3365 + IFS=$as_save_IFS
3366 + test -z "$as_dir" && as_dir=.
3367 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
3368 +done
3369 +
3370 + ;;
3371 + esac
3372 + # We did not find ourselves, most probably we were run as `sh COMMAND'
3373 + # in which case we are not to be found in the path.
3374 + if test "x$as_myself" = x; then
3375 + as_myself=$0
3376 + fi
3377 + if test ! -f "$as_myself"; then
3378 + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
3379 + { (exit 1); exit 1; }; }
3380 + fi
3381 + case $CONFIG_SHELL in
3382 + '')
3383 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3384 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
3385 +do
3386 + IFS=$as_save_IFS
3387 + test -z "$as_dir" && as_dir=.
3388 + for as_base in sh bash ksh sh5; do
3389 + case $as_dir in
3390 + /*)
3391 + if ("$as_dir/$as_base" -c '
3392 + as_lineno_1=$LINENO
3393 + as_lineno_2=$LINENO
3394 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
3395 + test "x$as_lineno_1" != "x$as_lineno_2" &&
3396 + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
3397 + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
3398 + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
3399 + CONFIG_SHELL=$as_dir/$as_base
3400 + export CONFIG_SHELL
3401 + exec "$CONFIG_SHELL" "$0" ${1+"$@"}
3402 + fi;;
3403 + esac
3404 + done
3405 +done
3406 +;;
3407 + esac
3408 +
3409 + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
3410 + # uniformly replaced by the line number. The first 'sed' inserts a
3411 + # line-number line before each line; the second 'sed' does the real
3412 + # work. The second script uses 'N' to pair each line-number line
3413 + # with the numbered line, and appends trailing '-' during
3414 + # substitution so that $LINENO is not a special case at line end.
3415 + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
3416 + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
3417 + sed '=' <$as_myself |
3418 + sed '
3419 + N
3420 + s,$,-,
3421 + : loop
3422 + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
3423 + t loop
3424 + s,-$,,
3425 + s,^['$as_cr_digits']*\n,,
3426 + ' >$as_me.lineno &&
3427 + chmod +x $as_me.lineno ||
3428 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3429 + { (exit 1); exit 1; }; }
3430 +
3431 + # Don't try to exec as it changes $[0], causing all sort of problems
3432 + # (the dirname of $[0] is not the place where we might find the
3433 + # original and so on. Autoconf is especially sensible to this).
3434 + . ./$as_me.lineno
3435 + # Exit status is that of the last command.
3436 + exit
3437 +}
3438 +
3439 +
3440 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
3441 + *c*,-n*) ECHO_N= ECHO_C='
3442 +' ECHO_T=' ' ;;
3443 + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
3444 + *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
3445 +esac
3446 +
3447 +if expr a : '\(a\)' >/dev/null 2>&1; then
3448 + as_expr=expr
3449 +else
3450 + as_expr=false
3451 +fi
3452 +
3453 +rm -f conf$$ conf$$.exe conf$$.file
3454 +echo >conf$$.file
3455 +if ln -s conf$$.file conf$$ 2>/dev/null; then
3456 + # We could just check for DJGPP; but this test a) works b) is more generic
3457 + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
3458 + if test -f conf$$.exe; then
3459 + # Don't use ln at all; we don't have any links
3460 + as_ln_s='cp -p'
3461 + else
3462 + as_ln_s='ln -s'
3463 + fi
3464 +elif ln conf$$.file conf$$ 2>/dev/null; then
3465 + as_ln_s=ln
3466 +else
3467 + as_ln_s='cp -p'
3468 +fi
3469 +rm -f conf$$ conf$$.exe conf$$.file
3470 +
3471 +if mkdir -p . 2>/dev/null; then
3472 + as_mkdir_p=:
3473 +else
3474 + as_mkdir_p=false
3475 +fi
3476 +
3477 +as_executable_p="test -f"
3478 +
3479 +# Sed expression to map a string onto a valid CPP name.
3480 +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
3481 +
3482 +# Sed expression to map a string onto a valid variable name.
3483 +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
3484 +
3485 +
3486 +# IFS
3487 +# We need space, tab and new line, in precisely that order.
3488 +as_nl='
3489 +'
3490 +IFS=" $as_nl"
3491 +
3492 +# CDPATH.
3493 +$as_unset CDPATH
3494
3495 -# Defaults:
3496 -ac_help=
3497 -ac_default_prefix=/usr/local
3498 -# Any additions from configure.in:
3499 -ac_help="$ac_help
3500 - --enable-shared[=PKGS] build shared libraries [default=yes]"
3501 -ac_help="$ac_help
3502 - --enable-static[=PKGS] build static libraries [default=yes]"
3503 -ac_help="$ac_help
3504 - --enable-fast-install[=PKGS] optimize for fast installation [default=yes]"
3505 -ac_help="$ac_help
3506 - --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
3507
3508 # Find the correct PATH separator. Usually this is `:', but
3509 # DJGPP uses `;' like DOS.
3510 @@ -28,6 +248,7 @@
3511 *-DOS) lt_cv_sys_path_separator=';' ;;
3512 *) lt_cv_sys_path_separator=':' ;;
3513 esac
3514 + PATH_SEPARATOR=$lt_cv_sys_path_separator
3515 fi
3516
3517
3518 @@ -94,7 +315,7 @@
3519 #
3520 # So, first we look for a working echo in the user's PATH.
3521
3522 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
3523 + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
3524 for dir in $PATH /usr/ucb; do
3525 if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
3526 test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
3527 @@ -177,34 +398,86 @@
3528 fi
3529
3530
3531 -ac_help="$ac_help
3532 - --disable-libtool-lock avoid locking (might break parallel builds)"
3533 -ac_help="$ac_help
3534 - --with-pic try to use only PIC/non-PIC objects [default=use both]"
3535 -ac_help="$ac_help
3536 - --with-uni=VERSION UNI version to use (3.0,3.1,4.0) [default=dynamic]"
3537 -ac_help="$ac_help
3538 - --enable-allow_uni30 Allow UNI 3.0 backwards-compatible extensions (if using UNI 3.1)"
3539 -ac_help="$ac_help
3540 - --enable-q2963_1 Enable peak cell rate modification as specified in Q.2963.1 (if using UNI 4.0)"
3541 -ac_help="$ac_help
3542 - --enable-cisco Enable work around for point-to-multipoint signaling bug in Cisco LS100 or LS7010 switches"
3543 -ac_help="$ac_help
3544 - --enable-thomflex Some versions of the Thomson Thomflex 5000 won't do any signaling before they get a RESTART. Enable sending of a RESTART whenever SAAL comes up."
3545 -ac_help="$ac_help
3546 - --enable-mpoa_1_1 Enable proposed MPOA 1.1 features"
3547 -ac_help="$ac_help
3548 - --enable-mpr Enable memory debugging (if MPR is installed)"
3549 +
3550 +# Name of the host.
3551 +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
3552 +# so uname gets run too.
3553 +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
3554 +
3555 +exec 6>&1
3556 +
3557 +#
3558 +# Initializations.
3559 +#
3560 +ac_default_prefix=/usr/local
3561 +ac_config_libobj_dir=.
3562 +cross_compiling=no
3563 +subdirs=
3564 +MFLAGS=
3565 +MAKEFLAGS=
3566 +SHELL=${CONFIG_SHELL-/bin/sh}
3567 +
3568 +# Maximum number of lines to put in a shell here document.
3569 +# This variable seems obsolete. It should probably be removed, and
3570 +# only ac_max_sed_lines should be used.
3571 +: ${ac_max_here_lines=38}
3572 +
3573 +# Identity of this package.
3574 +PACKAGE_NAME=
3575 +PACKAGE_TARNAME=
3576 +PACKAGE_VERSION=
3577 +PACKAGE_STRING=
3578 +PACKAGE_BUGREPORT=
3579 +
3580 +ac_unique_file="src/include/atm.h"
3581 +# Factoring default headers for most tests.
3582 +ac_includes_default="\
3583 +#include <stdio.h>
3584 +#if HAVE_SYS_TYPES_H
3585 +# include <sys/types.h>
3586 +#endif
3587 +#if HAVE_SYS_STAT_H
3588 +# include <sys/stat.h>
3589 +#endif
3590 +#if STDC_HEADERS
3591 +# include <stdlib.h>
3592 +# include <stddef.h>
3593 +#else
3594 +# if HAVE_STDLIB_H
3595 +# include <stdlib.h>
3596 +# endif
3597 +#endif
3598 +#if HAVE_STRING_H
3599 +# if !STDC_HEADERS && HAVE_MEMORY_H
3600 +# include <memory.h>
3601 +# endif
3602 +# include <string.h>
3603 +#endif
3604 +#if HAVE_STRINGS_H
3605 +# include <strings.h>
3606 +#endif
3607 +#if HAVE_INTTYPES_H
3608 +# include <inttypes.h>
3609 +#else
3610 +# if HAVE_STDINT_H
3611 +# include <stdint.h>
3612 +# endif
3613 +#endif
3614 +#if HAVE_UNISTD_H
3615 +# include <unistd.h>
3616 +#endif"
3617 +
3618 +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE LIBVER_CURRENT LIBVER_REVISION LIBVER_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LEX LEXLIB LEX_OUTPUT_ROOT YACC LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL LIBTOOL_DEPS PERL LIBOBJS LTLIBOBJS'
3619 +ac_subst_files=''
3620
3621 # Initialize some variables set by options.
3622 +ac_init_help=
3623 +ac_init_version=false
3624 # The variables have the same names as the options, with
3625 # dashes changed to underlines.
3626 -build=NONE
3627 -cache_file=./config.cache
3628 +cache_file=/dev/null
3629 exec_prefix=NONE
3630 -host=NONE
3631 no_create=
3632 -nonopt=NONE
3633 no_recursion=
3634 prefix=NONE
3635 program_prefix=NONE
3636 @@ -213,10 +486,15 @@
3637 silent=
3638 site=
3639 srcdir=
3640 -target=NONE
3641 verbose=
3642 x_includes=NONE
3643 x_libraries=NONE
3644 +
3645 +# Installation directory options.
3646 +# These are left unexpanded so users can "make install exec_prefix=/foo"
3647 +# and all the variables that are supposed to be based on exec_prefix
3648 +# by default will actually change.
3649 +# Use braces instead of parens because sh, perl, etc. also accept them.
3650 bindir='${exec_prefix}/bin'
3651 sbindir='${exec_prefix}/sbin'
3652 libexecdir='${exec_prefix}/libexec'
3653 @@ -230,17 +508,9 @@
3654 infodir='${prefix}/info'
3655 mandir='${prefix}/man'
3656
3657 -# Initialize some other variables.
3658 -subdirs=
3659 -MFLAGS= MAKEFLAGS=
3660 -SHELL=${CONFIG_SHELL-/bin/sh}
3661 -# Maximum number of lines to put in a shell here document.
3662 -ac_max_here_lines=12
3663 -
3664 ac_prev=
3665 for ac_option
3666 do
3667 -
3668 # If the previous option needs an argument, assign it.
3669 if test -n "$ac_prev"; then
3670 eval "$ac_prev=\$ac_option"
3671 @@ -248,59 +518,59 @@
3672 continue
3673 fi
3674
3675 - case "$ac_option" in
3676 - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
3677 - *) ac_optarg= ;;
3678 - esac
3679 + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
3680
3681 # Accept the important Cygnus configure options, so we can diagnose typos.
3682
3683 - case "$ac_option" in
3684 + case $ac_option in
3685
3686 -bindir | --bindir | --bindi | --bind | --bin | --bi)
3687 ac_prev=bindir ;;
3688 -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
3689 - bindir="$ac_optarg" ;;
3690 + bindir=$ac_optarg ;;
3691
3692 -build | --build | --buil | --bui | --bu)
3693 - ac_prev=build ;;
3694 + ac_prev=build_alias ;;
3695 -build=* | --build=* | --buil=* | --bui=* | --bu=*)
3696 - build="$ac_optarg" ;;
3697 + build_alias=$ac_optarg ;;
3698
3699 -cache-file | --cache-file | --cache-fil | --cache-fi \
3700 | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
3701 ac_prev=cache_file ;;
3702 -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
3703 | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
3704 - cache_file="$ac_optarg" ;;
3705 + cache_file=$ac_optarg ;;
3706 +
3707 + --config-cache | -C)
3708 + cache_file=config.cache ;;
3709
3710 -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
3711 ac_prev=datadir ;;
3712 -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
3713 | --da=*)
3714 - datadir="$ac_optarg" ;;
3715 + datadir=$ac_optarg ;;
3716
3717 -disable-* | --disable-*)
3718 - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
3719 + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
3720 # Reject names that are not valid shell variable names.
3721 - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
3722 - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
3723 - fi
3724 - ac_feature=`echo $ac_feature| sed 's/-/_/g'`
3725 - eval "enable_${ac_feature}=no" ;;
3726 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
3727 + { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3728 + { (exit 1); exit 1; }; }
3729 + ac_feature=`echo $ac_feature | sed 's/-/_/g'`
3730 + eval "enable_$ac_feature=no" ;;
3731
3732 -enable-* | --enable-*)
3733 - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
3734 + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
3735 # Reject names that are not valid shell variable names.
3736 - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
3737 - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
3738 - fi
3739 - ac_feature=`echo $ac_feature| sed 's/-/_/g'`
3740 - case "$ac_option" in
3741 - *=*) ;;
3742 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
3743 + { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3744 + { (exit 1); exit 1; }; }
3745 + ac_feature=`echo $ac_feature | sed 's/-/_/g'`
3746 + case $ac_option in
3747 + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
3748 *) ac_optarg=yes ;;
3749 esac
3750 - eval "enable_${ac_feature}='$ac_optarg'" ;;
3751 + eval "enable_$ac_feature='$ac_optarg'" ;;
3752
3753 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
3754 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
3755 @@ -309,95 +579,47 @@
3756 -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
3757 | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
3758 | --exec=* | --exe=* | --ex=*)
3759 - exec_prefix="$ac_optarg" ;;
3760 + exec_prefix=$ac_optarg ;;
3761
3762 -gas | --gas | --ga | --g)
3763 # Obsolete; use --with-gas.
3764 with_gas=yes ;;
3765
3766 - -help | --help | --hel | --he)
3767 - # Omit some internal or obsolete options to make the list less imposing.
3768 - # This message is too long to be a string in the A/UX 3.1 sh.
3769 - cat << EOF
3770 -Usage: configure [options] [host]
3771 -Options: [defaults in brackets after descriptions]
3772 -Configuration:
3773 - --cache-file=FILE cache test results in FILE
3774 - --help print this message
3775 - --no-create do not create output files
3776 - --quiet, --silent do not print \`checking...' messages
3777 - --version print the version of autoconf that created configure
3778 -Directory and file names:
3779 - --prefix=PREFIX install architecture-independent files in PREFIX
3780 - [$ac_default_prefix]
3781 - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
3782 - [same as prefix]
3783 - --bindir=DIR user executables in DIR [EPREFIX/bin]
3784 - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
3785 - --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
3786 - --datadir=DIR read-only architecture-independent data in DIR
3787 - [PREFIX/share]
3788 - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
3789 - --sharedstatedir=DIR modifiable architecture-independent data in DIR
3790 - [PREFIX/com]
3791 - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
3792 - --libdir=DIR object code libraries in DIR [EPREFIX/lib]
3793 - --includedir=DIR C header files in DIR [PREFIX/include]
3794 - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
3795 - --infodir=DIR info documentation in DIR [PREFIX/info]
3796 - --mandir=DIR man documentation in DIR [PREFIX/man]
3797 - --srcdir=DIR find the sources in DIR [configure dir or ..]
3798 - --program-prefix=PREFIX prepend PREFIX to installed program names
3799 - --program-suffix=SUFFIX append SUFFIX to installed program names
3800 - --program-transform-name=PROGRAM
3801 - run sed PROGRAM on installed program names
3802 -EOF
3803 - cat << EOF
3804 -Host type:
3805 - --build=BUILD configure for building on BUILD [BUILD=HOST]
3806 - --host=HOST configure for HOST [guessed]
3807 - --target=TARGET configure for TARGET [TARGET=HOST]
3808 -Features and packages:
3809 - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3810 - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3811 - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
3812 - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
3813 - --x-includes=DIR X include files are in DIR
3814 - --x-libraries=DIR X library files are in DIR
3815 -EOF
3816 - if test -n "$ac_help"; then
3817 - echo "--enable and --with options recognized:$ac_help"
3818 - fi
3819 - exit 0 ;;
3820 + -help | --help | --hel | --he | -h)
3821 + ac_init_help=long ;;
3822 + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
3823 + ac_init_help=recursive ;;
3824 + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
3825 + ac_init_help=short ;;
3826
3827 -host | --host | --hos | --ho)
3828 - ac_prev=host ;;
3829 + ac_prev=host_alias ;;
3830 -host=* | --host=* | --hos=* | --ho=*)
3831 - host="$ac_optarg" ;;
3832 + host_alias=$ac_optarg ;;
3833
3834 -includedir | --includedir | --includedi | --included | --include \
3835 | --includ | --inclu | --incl | --inc)
3836 ac_prev=includedir ;;
3837 -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
3838 | --includ=* | --inclu=* | --incl=* | --inc=*)
3839 - includedir="$ac_optarg" ;;
3840 + includedir=$ac_optarg ;;
3841
3842 -infodir | --infodir | --infodi | --infod | --info | --inf)
3843 ac_prev=infodir ;;
3844 -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
3845 - infodir="$ac_optarg" ;;
3846 + infodir=$ac_optarg ;;
3847
3848 -libdir | --libdir | --libdi | --libd)
3849 ac_prev=libdir ;;
3850 -libdir=* | --libdir=* | --libdi=* | --libd=*)
3851 - libdir="$ac_optarg" ;;
3852 + libdir=$ac_optarg ;;
3853
3854 -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
3855 | --libexe | --libex | --libe)
3856 ac_prev=libexecdir ;;
3857 -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
3858 | --libexe=* | --libex=* | --libe=*)
3859 - libexecdir="$ac_optarg" ;;
3860 + libexecdir=$ac_optarg ;;
3861
3862 -localstatedir | --localstatedir | --localstatedi | --localstated \
3863 | --localstate | --localstat | --localsta | --localst \
3864 @@ -406,19 +628,19 @@
3865 -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
3866 | --localstate=* | --localstat=* | --localsta=* | --localst=* \
3867 | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
3868 - localstatedir="$ac_optarg" ;;
3869 + localstatedir=$ac_optarg ;;
3870
3871 -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
3872 ac_prev=mandir ;;
3873 -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
3874 - mandir="$ac_optarg" ;;
3875 + mandir=$ac_optarg ;;
3876
3877 -nfp | --nfp | --nf)
3878 # Obsolete; use --without-fp.
3879 with_fp=no ;;
3880
3881 -no-create | --no-create | --no-creat | --no-crea | --no-cre \
3882 - | --no-cr | --no-c)
3883 + | --no-cr | --no-c | -n)
3884 no_create=yes ;;
3885
3886 -no-recursion | --no-recursion | --no-recursio | --no-recursi \
3887 @@ -432,26 +654,26 @@
3888 -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
3889 | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
3890 | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
3891 - oldincludedir="$ac_optarg" ;;
3892 + oldincludedir=$ac_optarg ;;
3893
3894 -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
3895 ac_prev=prefix ;;
3896 -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
3897 - prefix="$ac_optarg" ;;
3898 + prefix=$ac_optarg ;;
3899
3900 -program-prefix | --program-prefix | --program-prefi | --program-pref \
3901 | --program-pre | --program-pr | --program-p)
3902 ac_prev=program_prefix ;;
3903 -program-prefix=* | --program-prefix=* | --program-prefi=* \
3904 | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
3905 - program_prefix="$ac_optarg" ;;
3906 + program_prefix=$ac_optarg ;;
3907
3908 -program-suffix | --program-suffix | --program-suffi | --program-suff \
3909 | --program-suf | --program-su | --program-s)
3910 ac_prev=program_suffix ;;
3911 -program-suffix=* | --program-suffix=* | --program-suffi=* \
3912 | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
3913 - program_suffix="$ac_optarg" ;;
3914 + program_suffix=$ac_optarg ;;
3915
3916 -program-transform-name | --program-transform-name \
3917 | --program-transform-nam | --program-transform-na \
3918 @@ -468,7 +690,7 @@
3919 | --program-transfo=* | --program-transf=* \
3920 | --program-trans=* | --program-tran=* \
3921 | --progr-tra=* | --program-tr=* | --program-t=*)
3922 - program_transform_name="$ac_optarg" ;;
3923 + program_transform_name=$ac_optarg ;;
3924
3925 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
3926 | -silent | --silent | --silen | --sile | --sil)
3927 @@ -478,7 +700,7 @@
3928 ac_prev=sbindir ;;
3929 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
3930 | --sbi=* | --sb=*)
3931 - sbindir="$ac_optarg" ;;
3932 + sbindir=$ac_optarg ;;
3933
3934 -sharedstatedir | --sharedstatedir | --sharedstatedi \
3935 | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
3936 @@ -489,58 +711,57 @@
3937 | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
3938 | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
3939 | --sha=* | --sh=*)
3940 - sharedstatedir="$ac_optarg" ;;
3941 + sharedstatedir=$ac_optarg ;;
3942
3943 -site | --site | --sit)
3944 ac_prev=site ;;
3945 -site=* | --site=* | --sit=*)
3946 - site="$ac_optarg" ;;
3947 + site=$ac_optarg ;;
3948
3949 -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
3950 ac_prev=srcdir ;;
3951 -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
3952 - srcdir="$ac_optarg" ;;
3953 + srcdir=$ac_optarg ;;
3954
3955 -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
3956 | --syscon | --sysco | --sysc | --sys | --sy)
3957 ac_prev=sysconfdir ;;
3958 -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
3959 | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
3960 - sysconfdir="$ac_optarg" ;;
3961 + sysconfdir=$ac_optarg ;;
3962
3963 -target | --target | --targe | --targ | --tar | --ta | --t)
3964 - ac_prev=target ;;
3965 + ac_prev=target_alias ;;
3966 -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
3967 - target="$ac_optarg" ;;
3968 + target_alias=$ac_optarg ;;
3969
3970 -v | -verbose | --verbose | --verbos | --verbo | --verb)
3971 verbose=yes ;;
3972
3973 - -version | --version | --versio | --versi | --vers)
3974 - echo "configure generated by autoconf version 2.13"
3975 - exit 0 ;;
3976 + -version | --version | --versio | --versi | --vers | -V)
3977 + ac_init_version=: ;;
3978
3979 -with-* | --with-*)
3980 - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
3981 + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
3982 # Reject names that are not valid shell variable names.
3983 - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
3984 - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
3985 - fi
3986 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
3987 + { echo "$as_me: error: invalid package name: $ac_package" >&2
3988 + { (exit 1); exit 1; }; }
3989 ac_package=`echo $ac_package| sed 's/-/_/g'`
3990 - case "$ac_option" in
3991 - *=*) ;;
3992 + case $ac_option in
3993 + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
3994 *) ac_optarg=yes ;;
3995 esac
3996 - eval "with_${ac_package}='$ac_optarg'" ;;
3997 + eval "with_$ac_package='$ac_optarg'" ;;
3998
3999 -without-* | --without-*)
4000 - ac_package=`echo $ac_option|sed -e 's/-*without-//'`
4001 + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
4002 # Reject names that are not valid shell variable names.
4003 - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
4004 - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
4005 - fi
4006 - ac_package=`echo $ac_package| sed 's/-/_/g'`
4007 - eval "with_${ac_package}=no" ;;
4008 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
4009 + { echo "$as_me: error: invalid package name: $ac_package" >&2
4010 + { (exit 1); exit 1; }; }
4011 + ac_package=`echo $ac_package | sed 's/-/_/g'`
4012 + eval "with_$ac_package=no" ;;
4013
4014 --x)
4015 # Obsolete; use --with-x.
4016 @@ -551,99 +772,110 @@
4017 ac_prev=x_includes ;;
4018 -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
4019 | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
4020 - x_includes="$ac_optarg" ;;
4021 + x_includes=$ac_optarg ;;
4022
4023 -x-libraries | --x-libraries | --x-librarie | --x-librari \
4024 | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
4025 ac_prev=x_libraries ;;
4026 -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
4027 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
4028 - x_libraries="$ac_optarg" ;;
4029 + x_libraries=$ac_optarg ;;
4030
4031 - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
4032 + -*) { echo "$as_me: error: unrecognized option: $ac_option
4033 +Try \`$0 --help' for more information." >&2
4034 + { (exit 1); exit 1; }; }
4035 ;;
4036
4037 + *=*)
4038 + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
4039 + # Reject names that are not valid shell variable names.
4040 + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
4041 + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
4042 + { (exit 1); exit 1; }; }
4043 + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
4044 + eval "$ac_envvar='$ac_optarg'"
4045 + export $ac_envvar ;;
4046 +
4047 *)
4048 - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
4049 - echo "configure: warning: $ac_option: invalid host type" 1>&2
4050 - fi
4051 - if test "x$nonopt" != xNONE; then
4052 - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
4053 - fi
4054 - nonopt="$ac_option"
4055 + # FIXME: should be removed in autoconf 3.0.
4056 + echo "$as_me: WARNING: you should use --build, --host, --target" >&2
4057 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
4058 + echo "$as_me: WARNING: invalid host type: $ac_option" >&2
4059 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
4060 ;;
4061
4062 esac
4063 done
4064
4065 if test -n "$ac_prev"; then
4066 - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
4067 -fi
4068 -
4069 -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
4070 -
4071 -# File descriptor usage:
4072 -# 0 standard input
4073 -# 1 file creation
4074 -# 2 errors and warnings
4075 -# 3 some systems may open it to /dev/tty
4076 -# 4 used on the Kubota Titan
4077 -# 6 checking for... messages and results
4078 -# 5 compiler messages saved in config.log
4079 -if test "$silent" = yes; then
4080 - exec 6>/dev/null
4081 -else
4082 - exec 6>&1
4083 + ac_option=--`echo $ac_prev | sed 's/_/-/g'`
4084 + { echo "$as_me: error: missing argument to $ac_option" >&2
4085 + { (exit 1); exit 1; }; }
4086 fi
4087 -exec 5>./config.log
4088
4089 -echo "\
4090 -This file contains any messages produced by compilers while
4091 -running configure, to aid debugging if configure makes a mistake.
4092 -" 1>&5
4093 +# Be sure to have absolute paths.
4094 +for ac_var in exec_prefix prefix
4095 +do
4096 + eval ac_val=$`echo $ac_var`
4097 + case $ac_val in
4098 + [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
4099 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
4100 + { (exit 1); exit 1; }; };;
4101 + esac
4102 +done
4103
4104 -# Strip out --no-create and --no-recursion so they do not pile up.
4105 -# Also quote any args containing shell metacharacters.
4106 -ac_configure_args=
4107 -for ac_arg
4108 +# Be sure to have absolute paths.
4109 +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
4110 + localstatedir libdir includedir oldincludedir infodir mandir
4111 do
4112 - case "$ac_arg" in
4113 - -no-create | --no-create | --no-creat | --no-crea | --no-cre \
4114 - | --no-cr | --no-c) ;;
4115 - -no-recursion | --no-recursion | --no-recursio | --no-recursi \
4116 - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
4117 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
4118 - ac_configure_args="$ac_configure_args '$ac_arg'" ;;
4119 - *) ac_configure_args="$ac_configure_args $ac_arg" ;;
4120 + eval ac_val=$`echo $ac_var`
4121 + case $ac_val in
4122 + [\\/$]* | ?:[\\/]* ) ;;
4123 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
4124 + { (exit 1); exit 1; }; };;
4125 esac
4126 done
4127
4128 -# NLS nuisances.
4129 -# Only set these to C if already set. These must not be set unconditionally
4130 -# because not all systems understand e.g. LANG=C (notably SCO).
4131 -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
4132 -# Non-C LC_CTYPE values break the ctype check.
4133 -if test "${LANG+set}" = set; then LANG=C; export LANG; fi
4134 -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
4135 -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
4136 -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
4137 +# There might be people who depend on the old broken behavior: `$host'
4138 +# used to hold the argument of --host etc.
4139 +# FIXME: To remove some day.
4140 +build=$build_alias
4141 +host=$host_alias
4142 +target=$target_alias
4143 +
4144 +# FIXME: To remove some day.
4145 +if test "x$host_alias" != x; then
4146 + if test "x$build_alias" = x; then
4147 + cross_compiling=maybe
4148 + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
4149 + If a cross compiler is detected then cross compile mode will be used." >&2
4150 + elif test "x$build_alias" != "x$host_alias"; then
4151 + cross_compiling=yes
4152 + fi
4153 +fi
4154
4155 -# confdefs.h avoids OS command line length limits that DEFS can exceed.
4156 -rm -rf conftest* confdefs.h
4157 -# AIX cpp loses on an empty file, so make sure it contains at least a newline.
4158 -echo > confdefs.h
4159 +ac_tool_prefix=
4160 +test -n "$host_alias" && ac_tool_prefix=$host_alias-
4161 +
4162 +test "$silent" = yes && exec 6>/dev/null
4163
4164 -# A filename unique to this package, relative to the directory that
4165 -# configure is in, which we can look for to find out if srcdir is correct.
4166 -ac_unique_file=src/include/atm.h
4167
4168 # Find the source files, if location was not specified.
4169 if test -z "$srcdir"; then
4170 ac_srcdir_defaulted=yes
4171 # Try the directory containing this script, then its parent.
4172 - ac_prog=$0
4173 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
4174 - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
4175 + ac_confdir=`(dirname "$0") 2>/dev/null ||
4176 +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4177 + X"$0" : 'X\(//\)[^/]' \| \
4178 + X"$0" : 'X\(//\)$' \| \
4179 + X"$0" : 'X\(/\)' \| \
4180 + . : '\(.\)' 2>/dev/null ||
4181 +echo X"$0" |
4182 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4183 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4184 + /^X\(\/\/\)$/{ s//\1/; q; }
4185 + /^X\(\/\).*/{ s//\1/; q; }
4186 + s/.*/./; q'`
4187 srcdir=$ac_confdir
4188 if test ! -r $srcdir/$ac_unique_file; then
4189 srcdir=..
4190 @@ -653,13 +885,453 @@
4191 fi
4192 if test ! -r $srcdir/$ac_unique_file; then
4193 if test "$ac_srcdir_defaulted" = yes; then
4194 - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
4195 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
4196 + { (exit 1); exit 1; }; }
4197 else
4198 - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
4199 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
4200 + { (exit 1); exit 1; }; }
4201 fi
4202 fi
4203 -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
4204 +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
4205 + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
4206 + { (exit 1); exit 1; }; }
4207 +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
4208 +ac_env_build_alias_set=${build_alias+set}
4209 +ac_env_build_alias_value=$build_alias
4210 +ac_cv_env_build_alias_set=${build_alias+set}
4211 +ac_cv_env_build_alias_value=$build_alias
4212 +ac_env_host_alias_set=${host_alias+set}
4213 +ac_env_host_alias_value=$host_alias
4214 +ac_cv_env_host_alias_set=${host_alias+set}
4215 +ac_cv_env_host_alias_value=$host_alias
4216 +ac_env_target_alias_set=${target_alias+set}
4217 +ac_env_target_alias_value=$target_alias
4218 +ac_cv_env_target_alias_set=${target_alias+set}
4219 +ac_cv_env_target_alias_value=$target_alias
4220 +ac_env_CC_set=${CC+set}
4221 +ac_env_CC_value=$CC
4222 +ac_cv_env_CC_set=${CC+set}
4223 +ac_cv_env_CC_value=$CC
4224 +ac_env_CFLAGS_set=${CFLAGS+set}
4225 +ac_env_CFLAGS_value=$CFLAGS
4226 +ac_cv_env_CFLAGS_set=${CFLAGS+set}
4227 +ac_cv_env_CFLAGS_value=$CFLAGS
4228 +ac_env_LDFLAGS_set=${LDFLAGS+set}
4229 +ac_env_LDFLAGS_value=$LDFLAGS
4230 +ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
4231 +ac_cv_env_LDFLAGS_value=$LDFLAGS
4232 +ac_env_CPPFLAGS_set=${CPPFLAGS+set}
4233 +ac_env_CPPFLAGS_value=$CPPFLAGS
4234 +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
4235 +ac_cv_env_CPPFLAGS_value=$CPPFLAGS
4236 +ac_env_CPP_set=${CPP+set}
4237 +ac_env_CPP_value=$CPP
4238 +ac_cv_env_CPP_set=${CPP+set}
4239 +ac_cv_env_CPP_value=$CPP
4240 +
4241 +#
4242 +# Report the --help message.
4243 +#
4244 +if test "$ac_init_help" = "long"; then
4245 + # Omit some internal or obsolete options to make the list less imposing.
4246 + # This message is too long to be a string in the A/UX 3.1 sh.
4247 + cat <<_ACEOF
4248 +\`configure' configures this package to adapt to many kinds of systems.
4249 +
4250 +Usage: $0 [OPTION]... [VAR=VALUE]...
4251 +
4252 +To assign environment variables (e.g., CC, CFLAGS...), specify them as
4253 +VAR=VALUE. See below for descriptions of some of the useful variables.
4254 +
4255 +Defaults for the options are specified in brackets.
4256 +
4257 +Configuration:
4258 + -h, --help display this help and exit
4259 + --help=short display options specific to this package
4260 + --help=recursive display the short help of all the included packages
4261 + -V, --version display version information and exit
4262 + -q, --quiet, --silent do not print \`checking...' messages
4263 + --cache-file=FILE cache test results in FILE [disabled]
4264 + -C, --config-cache alias for \`--cache-file=config.cache'
4265 + -n, --no-create do not create output files
4266 + --srcdir=DIR find the sources in DIR [configure dir or \`..']
4267 +
4268 +_ACEOF
4269 +
4270 + cat <<_ACEOF
4271 +Installation directories:
4272 + --prefix=PREFIX install architecture-independent files in PREFIX
4273 + [$ac_default_prefix]
4274 + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
4275 + [PREFIX]
4276 +
4277 +By default, \`make install' will install all the files in
4278 +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
4279 +an installation prefix other than \`$ac_default_prefix' using \`--prefix',
4280 +for instance \`--prefix=\$HOME'.
4281 +
4282 +For better control, use the options below.
4283 +
4284 +Fine tuning of the installation directories:
4285 + --bindir=DIR user executables [EPREFIX/bin]
4286 + --sbindir=DIR system admin executables [EPREFIX/sbin]
4287 + --libexecdir=DIR program executables [EPREFIX/libexec]
4288 + --datadir=DIR read-only architecture-independent data [PREFIX/share]
4289 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
4290 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
4291 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
4292 + --libdir=DIR object code libraries [EPREFIX/lib]
4293 + --includedir=DIR C header files [PREFIX/include]
4294 + --oldincludedir=DIR C header files for non-gcc [/usr/include]
4295 + --infodir=DIR info documentation [PREFIX/info]
4296 + --mandir=DIR man documentation [PREFIX/man]
4297 +_ACEOF
4298 +
4299 + cat <<\_ACEOF
4300 +
4301 +Program names:
4302 + --program-prefix=PREFIX prepend PREFIX to installed program names
4303 + --program-suffix=SUFFIX append SUFFIX to installed program names
4304 + --program-transform-name=PROGRAM run sed PROGRAM on installed program names
4305 +
4306 +System types:
4307 + --build=BUILD configure for building on BUILD [guessed]
4308 + --host=HOST cross-compile to build programs to run on HOST [BUILD]
4309 + --target=TARGET configure for building compilers for TARGET [HOST]
4310 +_ACEOF
4311 +fi
4312 +
4313 +if test -n "$ac_init_help"; then
4314 +
4315 + cat <<\_ACEOF
4316 +
4317 +Optional Features:
4318 + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
4319 + --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
4320 + --enable-shared=PKGS build shared libraries default=yes
4321 + --enable-static=PKGS build static libraries default=yes
4322 + --enable-fast-install=PKGS optimize for fast installation default=yes
4323 + --disable-libtool-lock avoid locking (might break parallel builds)
4324 + --enable-allow_uni30 Allow UNI 3.0 backwards-compatible extensions (if using UNI 3.1)
4325 + --enable-q2963_1 Enable peak cell rate modification as specified in Q.2963.1 (if using UNI 4.0)
4326 + --enable-cisco Enable work around for point-to-multipoint signaling bug in Cisco LS100 or LS7010 switches
4327 + --enable-thomflex Some versions of the Thomson Thomflex 5000 won't do any signaling before they get a RESTART. Enable sending of a RESTART whenever SAAL comes up.
4328 + --enable-mpoa_1_1 Enable proposed MPOA 1.1 features
4329 + --enable-mpr Enable memory debugging (if MPR is installed)
4330 +
4331 +Optional Packages:
4332 + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
4333 + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
4334 + --with-gnu-ld assume the C compiler uses GNU ld default=no
4335 + --with-pic try to use only PIC/non-PIC objects default=use both
4336 + --with-uni=VERSION UNI version to use (3.0,3.1,4.0) default=dynamic
4337 +
4338 +Some influential environment variables:
4339 + CC C compiler command
4340 + CFLAGS C compiler flags
4341 + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
4342 + nonstandard directory <lib dir>
4343 + CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
4344 + headers in a nonstandard directory <include dir>
4345 + CPP C preprocessor
4346 +
4347 +Use these variables to override the choices made by `configure' or to help
4348 +it to find libraries and programs with nonstandard names/locations.
4349 +
4350 +_ACEOF
4351 +fi
4352 +
4353 +if test "$ac_init_help" = "recursive"; then
4354 + # If there are subdirs, report their specific --help.
4355 + ac_popdir=`pwd`
4356 + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
4357 + test -d $ac_dir || continue
4358 + ac_builddir=.
4359 +
4360 +if test "$ac_dir" != .; then
4361 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
4362 + # A "../" for each directory in $ac_dir_suffix.
4363 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
4364 +else
4365 + ac_dir_suffix= ac_top_builddir=
4366 +fi
4367 +
4368 +case $srcdir in
4369 + .) # No --srcdir option. We are building in place.
4370 + ac_srcdir=.
4371 + if test -z "$ac_top_builddir"; then
4372 + ac_top_srcdir=.
4373 + else
4374 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
4375 + fi ;;
4376 + [\\/]* | ?:[\\/]* ) # Absolute path.
4377 + ac_srcdir=$srcdir$ac_dir_suffix;
4378 + ac_top_srcdir=$srcdir ;;
4379 + *) # Relative path.
4380 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
4381 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
4382 +esac
4383 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
4384 +# absolute.
4385 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
4386 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
4387 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
4388 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
4389 +
4390 + cd $ac_dir
4391 + # Check for guested configure; otherwise get Cygnus style configure.
4392 + if test -f $ac_srcdir/configure.gnu; then
4393 + echo
4394 + $SHELL $ac_srcdir/configure.gnu --help=recursive
4395 + elif test -f $ac_srcdir/configure; then
4396 + echo
4397 + $SHELL $ac_srcdir/configure --help=recursive
4398 + elif test -f $ac_srcdir/configure.ac ||
4399 + test -f $ac_srcdir/configure.in; then
4400 + echo
4401 + $ac_configure --help
4402 + else
4403 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
4404 + fi
4405 + cd $ac_popdir
4406 + done
4407 +fi
4408 +
4409 +test -n "$ac_init_help" && exit 0
4410 +if $ac_init_version; then
4411 + cat <<\_ACEOF
4412 +
4413 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
4414 +Free Software Foundation, Inc.
4415 +This configure script is free software; the Free Software Foundation
4416 +gives unlimited permission to copy, distribute and modify it.
4417 +_ACEOF
4418 + exit 0
4419 +fi
4420 +exec 5>config.log
4421 +cat >&5 <<_ACEOF
4422 +This file contains any messages produced by compilers while
4423 +running configure, to aid debugging if configure makes a mistake.
4424 +
4425 +It was created by $as_me, which was
4426 +generated by GNU Autoconf 2.57. Invocation command line was
4427 +
4428 + $ $0 $@
4429 +
4430 +_ACEOF
4431 +{
4432 +cat <<_ASUNAME
4433 +## --------- ##
4434 +## Platform. ##
4435 +## --------- ##
4436 +
4437 +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
4438 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
4439 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
4440 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
4441 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
4442 +
4443 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
4444 +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
4445 +
4446 +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
4447 +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
4448 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
4449 +hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
4450 +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
4451 +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
4452 +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
4453 +
4454 +_ASUNAME
4455 +
4456 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4457 +for as_dir in $PATH
4458 +do
4459 + IFS=$as_save_IFS
4460 + test -z "$as_dir" && as_dir=.
4461 + echo "PATH: $as_dir"
4462 +done
4463 +
4464 +} >&5
4465 +
4466 +cat >&5 <<_ACEOF
4467 +
4468 +
4469 +## ----------- ##
4470 +## Core tests. ##
4471 +## ----------- ##
4472 +
4473 +_ACEOF
4474 +
4475 +
4476 +# Keep a trace of the command line.
4477 +# Strip out --no-create and --no-recursion so they do not pile up.
4478 +# Strip out --silent because we don't want to record it for future runs.
4479 +# Also quote any args containing shell meta-characters.
4480 +# Make two passes to allow for proper duplicate-argument suppression.
4481 +ac_configure_args=
4482 +ac_configure_args0=
4483 +ac_configure_args1=
4484 +ac_sep=
4485 +ac_must_keep_next=false
4486 +for ac_pass in 1 2
4487 +do
4488 + for ac_arg
4489 + do
4490 + case $ac_arg in
4491 + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
4492 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
4493 + | -silent | --silent | --silen | --sile | --sil)
4494 + continue ;;
4495 + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
4496 + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
4497 + esac
4498 + case $ac_pass in
4499 + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
4500 + 2)
4501 + ac_configure_args1="$ac_configure_args1 '$ac_arg'"
4502 + if test $ac_must_keep_next = true; then
4503 + ac_must_keep_next=false # Got value, back to normal.
4504 + else
4505 + case $ac_arg in
4506 + *=* | --config-cache | -C | -disable-* | --disable-* \
4507 + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
4508 + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
4509 + | -with-* | --with-* | -without-* | --without-* | --x)
4510 + case "$ac_configure_args0 " in
4511 + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
4512 + esac
4513 + ;;
4514 + -* ) ac_must_keep_next=true ;;
4515 + esac
4516 + fi
4517 + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
4518 + # Get rid of the leading space.
4519 + ac_sep=" "
4520 + ;;
4521 + esac
4522 + done
4523 +done
4524 +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
4525 +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
4526 +
4527 +# When interrupted or exit'd, cleanup temporary files, and complete
4528 +# config.log. We remove comments because anyway the quotes in there
4529 +# would cause problems or look ugly.
4530 +# WARNING: Be sure not to use single quotes in there, as some shells,
4531 +# such as our DU 5.0 friend, will then `close' the trap.
4532 +trap 'exit_status=$?
4533 + # Save into config.log some information that might help in debugging.
4534 + {
4535 + echo
4536 +
4537 + cat <<\_ASBOX
4538 +## ---------------- ##
4539 +## Cache variables. ##
4540 +## ---------------- ##
4541 +_ASBOX
4542 + echo
4543 + # The following way of writing the cache mishandles newlines in values,
4544 +{
4545 + (set) 2>&1 |
4546 + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
4547 + *ac_space=\ *)
4548 + sed -n \
4549 + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
4550 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
4551 + ;;
4552 + *)
4553 + sed -n \
4554 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
4555 + ;;
4556 + esac;
4557 +}
4558 + echo
4559 +
4560 + cat <<\_ASBOX
4561 +## ----------------- ##
4562 +## Output variables. ##
4563 +## ----------------- ##
4564 +_ASBOX
4565 + echo
4566 + for ac_var in $ac_subst_vars
4567 + do
4568 + eval ac_val=$`echo $ac_var`
4569 + echo "$ac_var='"'"'$ac_val'"'"'"
4570 + done | sort
4571 + echo
4572 +
4573 + if test -n "$ac_subst_files"; then
4574 + cat <<\_ASBOX
4575 +## ------------- ##
4576 +## Output files. ##
4577 +## ------------- ##
4578 +_ASBOX
4579 + echo
4580 + for ac_var in $ac_subst_files
4581 + do
4582 + eval ac_val=$`echo $ac_var`
4583 + echo "$ac_var='"'"'$ac_val'"'"'"
4584 + done | sort
4585 + echo
4586 + fi
4587 +
4588 + if test -s confdefs.h; then
4589 + cat <<\_ASBOX
4590 +## ----------- ##
4591 +## confdefs.h. ##
4592 +## ----------- ##
4593 +_ASBOX
4594 + echo
4595 + sed "/^$/d" confdefs.h | sort
4596 + echo
4597 + fi
4598 + test "$ac_signal" != 0 &&
4599 + echo "$as_me: caught signal $ac_signal"
4600 + echo "$as_me: exit $exit_status"
4601 + } >&5
4602 + rm -f core *.core &&
4603 + rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
4604 + exit $exit_status
4605 + ' 0
4606 +for ac_signal in 1 2 13 15; do
4607 + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
4608 +done
4609 +ac_signal=0
4610 +
4611 +# confdefs.h avoids OS command line length limits that DEFS can exceed.
4612 +rm -rf conftest* confdefs.h
4613 +# AIX cpp loses on an empty file, so make sure it contains at least a newline.
4614 +echo >confdefs.h
4615 +
4616 +# Predefined preprocessor variables.
4617
4618 +cat >>confdefs.h <<_ACEOF
4619 +#define PACKAGE_NAME "$PACKAGE_NAME"
4620 +_ACEOF
4621 +
4622 +
4623 +cat >>confdefs.h <<_ACEOF
4624 +#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
4625 +_ACEOF
4626 +
4627 +
4628 +cat >>confdefs.h <<_ACEOF
4629 +#define PACKAGE_VERSION "$PACKAGE_VERSION"
4630 +_ACEOF
4631 +
4632 +
4633 +cat >>confdefs.h <<_ACEOF
4634 +#define PACKAGE_STRING "$PACKAGE_STRING"
4635 +_ACEOF
4636 +
4637 +
4638 +cat >>confdefs.h <<_ACEOF
4639 +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
4640 +_ACEOF
4641 +
4642 +
4643 +# Let the site file select an alternate cache file if it wants to.
4644 # Prefer explicitly selected file to automatically selected ones.
4645 if test -z "$CONFIG_SITE"; then
4646 if test "x$prefix" != xNONE; then
4647 @@ -670,45 +1342,111 @@
4648 fi
4649 for ac_site_file in $CONFIG_SITE; do
4650 if test -r "$ac_site_file"; then
4651 - echo "loading site script $ac_site_file"
4652 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
4653 +echo "$as_me: loading site script $ac_site_file" >&6;}
4654 + sed 's/^/| /' "$ac_site_file" >&5
4655 . "$ac_site_file"
4656 fi
4657 done
4658
4659 if test -r "$cache_file"; then
4660 - echo "loading cache $cache_file"
4661 - . $cache_file
4662 + # Some versions of bash will fail to source /dev/null (special
4663 + # files actually), so we avoid doing that.
4664 + if test -f "$cache_file"; then
4665 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5
4666 +echo "$as_me: loading cache $cache_file" >&6;}
4667 + case $cache_file in
4668 + [\\/]* | ?:[\\/]* ) . $cache_file;;
4669 + *) . ./$cache_file;;
4670 + esac
4671 + fi
4672 else
4673 - echo "creating cache $cache_file"
4674 - > $cache_file
4675 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5
4676 +echo "$as_me: creating cache $cache_file" >&6;}
4677 + >$cache_file
4678 +fi
4679 +
4680 +# Check that the precious variables saved in the cache have kept the same
4681 +# value.
4682 +ac_cache_corrupted=false
4683 +for ac_var in `(set) 2>&1 |
4684 + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
4685 + eval ac_old_set=\$ac_cv_env_${ac_var}_set
4686 + eval ac_new_set=\$ac_env_${ac_var}_set
4687 + eval ac_old_val="\$ac_cv_env_${ac_var}_value"
4688 + eval ac_new_val="\$ac_env_${ac_var}_value"
4689 + case $ac_old_set,$ac_new_set in
4690 + set,)
4691 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
4692 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
4693 + ac_cache_corrupted=: ;;
4694 + ,set)
4695 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
4696 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
4697 + ac_cache_corrupted=: ;;
4698 + ,);;
4699 + *)
4700 + if test "x$ac_old_val" != "x$ac_new_val"; then
4701 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
4702 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
4703 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
4704 +echo "$as_me: former value: $ac_old_val" >&2;}
4705 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
4706 +echo "$as_me: current value: $ac_new_val" >&2;}
4707 + ac_cache_corrupted=:
4708 + fi;;
4709 + esac
4710 + # Pass precious variables to config.status.
4711 + if test "$ac_new_set" = set; then
4712 + case $ac_new_val in
4713 + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
4714 + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
4715 + *) ac_arg=$ac_var=$ac_new_val ;;
4716 + esac
4717 + case " $ac_configure_args " in
4718 + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
4719 + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
4720 + esac
4721 + fi
4722 +done
4723 +if $ac_cache_corrupted; then
4724 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
4725 +echo "$as_me: error: changes in the environment can compromise the build" >&2;}
4726 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
4727 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
4728 + { (exit 1); exit 1; }; }
4729 fi
4730
4731 ac_ext=c
4732 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
4733 ac_cpp='$CPP $CPPFLAGS'
4734 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
4735 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
4736 -cross_compiling=$ac_cv_prog_cc_cross
4737 -
4738 -ac_exeext=
4739 -ac_objext=o
4740 -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
4741 - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
4742 - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
4743 - ac_n= ac_c='
4744 -' ac_t=' '
4745 - else
4746 - ac_n=-n ac_c= ac_t=
4747 - fi
4748 -else
4749 - ac_n= ac_c='\c' ac_t=
4750 -fi
4751 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4752 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4753 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
4754 +
4755 +
4756 +
4757 +
4758 +
4759 +
4760 +
4761 +
4762 +
4763 +
4764
4765
4766
4767
4768
4769
4770 +
4771 +
4772 +
4773 +
4774 + ac_config_headers="$ac_config_headers config.h"
4775 +
4776 + ac_config_commands="$ac_config_commands default-1"
4777 +
4778 +
4779 ac_aux_dir=
4780 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
4781 if test -f $ac_dir/install-sh; then
4782 @@ -719,105 +1457,105 @@
4783 ac_aux_dir=$ac_dir
4784 ac_install_sh="$ac_aux_dir/install.sh -c"
4785 break
4786 + elif test -f $ac_dir/shtool; then
4787 + ac_aux_dir=$ac_dir
4788 + ac_install_sh="$ac_aux_dir/shtool install -c"
4789 + break
4790 fi
4791 done
4792 if test -z "$ac_aux_dir"; then
4793 - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
4794 -fi
4795 -ac_config_guess=$ac_aux_dir/config.guess
4796 -ac_config_sub=$ac_aux_dir/config.sub
4797 -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
4798 -
4799 -
4800 -# Do some error checking and defaulting for the host and target type.
4801 -# The inputs are:
4802 -# configure --host=HOST --target=TARGET --build=BUILD NONOPT
4803 -#
4804 -# The rules are:
4805 -# 1. You are not allowed to specify --host, --target, and nonopt at the
4806 -# same time.
4807 -# 2. Host defaults to nonopt.
4808 -# 3. If nonopt is not specified, then host defaults to the current host,
4809 -# as determined by config.guess.
4810 -# 4. Target and build default to nonopt.
4811 -# 5. If nonopt is not specified, then target and build default to host.
4812 -
4813 -# The aliases save the names the user supplied, while $host etc.
4814 -# will get canonicalized.
4815 -case $host---$target---$nonopt in
4816 -NONE---*---* | *---NONE---* | *---*---NONE) ;;
4817 -*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
4818 -esac
4819 -
4820 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
4821 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
4822 + { (exit 1); exit 1; }; }
4823 +fi
4824 +ac_config_guess="$SHELL $ac_aux_dir/config.guess"
4825 +ac_config_sub="$SHELL $ac_aux_dir/config.sub"
4826 +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
4827
4828 # Make sure we can run config.sub.
4829 -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
4830 -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
4831 -fi
4832 +$ac_config_sub sun4 >/dev/null 2>&1 ||
4833 + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
4834 +echo "$as_me: error: cannot run $ac_config_sub" >&2;}
4835 + { (exit 1); exit 1; }; }
4836 +
4837 +echo "$as_me:$LINENO: checking build system type" >&5
4838 +echo $ECHO_N "checking build system type... $ECHO_C" >&6
4839 +if test "${ac_cv_build+set}" = set; then
4840 + echo $ECHO_N "(cached) $ECHO_C" >&6
4841 +else
4842 + ac_cv_build_alias=$build_alias
4843 +test -z "$ac_cv_build_alias" &&
4844 + ac_cv_build_alias=`$ac_config_guess`
4845 +test -z "$ac_cv_build_alias" &&
4846 + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
4847 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
4848 + { (exit 1); exit 1; }; }
4849 +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
4850 + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
4851 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
4852 + { (exit 1); exit 1; }; }
4853 +
4854 +fi
4855 +echo "$as_me:$LINENO: result: $ac_cv_build" >&5
4856 +echo "${ECHO_T}$ac_cv_build" >&6
4857 +build=$ac_cv_build
4858 +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4859 +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4860 +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4861 +
4862 +
4863 +echo "$as_me:$LINENO: checking host system type" >&5
4864 +echo $ECHO_N "checking host system type... $ECHO_C" >&6
4865 +if test "${ac_cv_host+set}" = set; then
4866 + echo $ECHO_N "(cached) $ECHO_C" >&6
4867 +else
4868 + ac_cv_host_alias=$host_alias
4869 +test -z "$ac_cv_host_alias" &&
4870 + ac_cv_host_alias=$ac_cv_build_alias
4871 +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
4872 + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
4873 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
4874 + { (exit 1); exit 1; }; }
4875 +
4876 +fi
4877 +echo "$as_me:$LINENO: result: $ac_cv_host" >&5
4878 +echo "${ECHO_T}$ac_cv_host" >&6
4879 +host=$ac_cv_host
4880 +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4881 +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4882 +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4883 +
4884 +
4885 +echo "$as_me:$LINENO: checking target system type" >&5
4886 +echo $ECHO_N "checking target system type... $ECHO_C" >&6
4887 +if test "${ac_cv_target+set}" = set; then
4888 + echo $ECHO_N "(cached) $ECHO_C" >&6
4889 +else
4890 + ac_cv_target_alias=$target_alias
4891 +test "x$ac_cv_target_alias" = "x" &&
4892 + ac_cv_target_alias=$ac_cv_host_alias
4893 +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
4894 + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
4895 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
4896 + { (exit 1); exit 1; }; }
4897 +
4898 +fi
4899 +echo "$as_me:$LINENO: result: $ac_cv_target" >&5
4900 +echo "${ECHO_T}$ac_cv_target" >&6
4901 +target=$ac_cv_target
4902 +target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4903 +target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4904 +target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4905
4906 -echo $ac_n "checking host system type""... $ac_c" 1>&6
4907 -echo "configure:760: checking host system type" >&5
4908
4909 -host_alias=$host
4910 -case "$host_alias" in
4911 -NONE)
4912 - case $nonopt in
4913 - NONE)
4914 - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
4915 - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
4916 - fi ;;
4917 - *) host_alias=$nonopt ;;
4918 - esac ;;
4919 -esac
4920 -
4921 -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
4922 -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4923 -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4924 -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4925 -echo "$ac_t""$host" 1>&6
4926 -
4927 -echo $ac_n "checking target system type""... $ac_c" 1>&6
4928 -echo "configure:781: checking target system type" >&5
4929 -
4930 -target_alias=$target
4931 -case "$target_alias" in
4932 -NONE)
4933 - case $nonopt in
4934 - NONE) target_alias=$host_alias ;;
4935 - *) target_alias=$nonopt ;;
4936 - esac ;;
4937 -esac
4938 -
4939 -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
4940 -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4941 -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4942 -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4943 -echo "$ac_t""$target" 1>&6
4944 -
4945 -echo $ac_n "checking build system type""... $ac_c" 1>&6
4946 -echo "configure:799: checking build system type" >&5
4947 -
4948 -build_alias=$build
4949 -case "$build_alias" in
4950 -NONE)
4951 - case $nonopt in
4952 - NONE) build_alias=$host_alias ;;
4953 - *) build_alias=$nonopt ;;
4954 - esac ;;
4955 -esac
4956 -
4957 -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
4958 -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4959 -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4960 -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4961 -echo "$ac_t""$build" 1>&6
4962 -
4963 -test "$host_alias" != "$target_alias" &&
4964 +# The aliases save the names the user supplied, while $host etc.
4965 +# will get canonicalized.
4966 +test -n "$target_alias" &&
4967 test "$program_prefix$program_suffix$program_transform_name" = \
4968 NONENONEs,x,x, &&
4969 program_prefix=${target_alias}-
4970
4971 -
4972 +am__api_version="1.4"
4973 # Find a good install program. We prefer a C program (faster),
4974 # so one script is as good as another. But avoid the broken or
4975 # incompatible versions:
4976 @@ -825,65 +1563,78 @@
4977 # SunOS /usr/etc/install
4978 # IRIX /sbin/install
4979 # AIX /bin/install
4980 +# AmigaOS /C/install, which installs bootblocks on floppy discs
4981 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
4982 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
4983 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
4984 # ./install, which can be erroneously created by make from ./install.sh.
4985 -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
4986 -echo "configure:834: checking for a BSD compatible install" >&5
4987 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
4988 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
4989 if test -z "$INSTALL"; then
4990 -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
4991 - echo $ac_n "(cached) $ac_c" 1>&6
4992 +if test "${ac_cv_path_install+set}" = set; then
4993 + echo $ECHO_N "(cached) $ECHO_C" >&6
4994 else
4995 - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
4996 - for ac_dir in $PATH; do
4997 - # Account for people who put trailing slashes in PATH elements.
4998 - case "$ac_dir/" in
4999 - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
5000 - *)
5001 - # OSF1 and SCO ODT 3.0 have their own names for install.
5002 - # Don't use installbsd from OSF since it installs stuff as root
5003 - # by default.
5004 - for ac_prog in ginstall scoinst install; do
5005 - if test -f $ac_dir/$ac_prog; then
5006 - if test $ac_prog = install &&
5007 - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
5008 - # AIX install. It has an incompatible calling convention.
5009 - :
5010 - else
5011 - ac_cv_path_install="$ac_dir/$ac_prog -c"
5012 - break 2
5013 - fi
5014 - fi
5015 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5016 +for as_dir in $PATH
5017 +do
5018 + IFS=$as_save_IFS
5019 + test -z "$as_dir" && as_dir=.
5020 + # Account for people who put trailing slashes in PATH elements.
5021 +case $as_dir/ in
5022 + ./ | .// | /cC/* | \
5023 + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
5024 + /usr/ucb/* ) ;;
5025 + *)
5026 + # OSF1 and SCO ODT 3.0 have their own names for install.
5027 + # Don't use installbsd from OSF since it installs stuff as root
5028 + # by default.
5029 + for ac_prog in ginstall scoinst install; do
5030 + for ac_exec_ext in '' $ac_executable_extensions; do
5031 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
5032 + if test $ac_prog = install &&
5033 + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5034 + # AIX install. It has an incompatible calling convention.
5035 + :
5036 + elif test $ac_prog = install &&
5037 + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5038 + # program-specific install script used by HP pwplus--don't use.
5039 + :
5040 + else
5041 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
5042 + break 3
5043 + fi
5044 + fi
5045 done
5046 - ;;
5047 - esac
5048 - done
5049 - IFS="$ac_save_IFS"
5050 + done
5051 + ;;
5052 +esac
5053 +done
5054 +
5055
5056 fi
5057 if test "${ac_cv_path_install+set}" = set; then
5058 - INSTALL="$ac_cv_path_install"
5059 + INSTALL=$ac_cv_path_install
5060 else
5061 # As a last resort, use the slow shell script. We don't cache a
5062 # path for INSTALL within a source directory, because that will
5063 # break other packages using the cache if that directory is
5064 # removed, or if the path is relative.
5065 - INSTALL="$ac_install_sh"
5066 + INSTALL=$ac_install_sh
5067 fi
5068 fi
5069 -echo "$ac_t""$INSTALL" 1>&6
5070 +echo "$as_me:$LINENO: result: $INSTALL" >&5
5071 +echo "${ECHO_T}$INSTALL" >&6
5072
5073 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
5074 # It thinks the first close brace ends the variable substitution.
5075 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
5076
5077 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
5078 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
5079
5080 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
5081
5082 -echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
5083 -echo "configure:887: checking whether build environment is sane" >&5
5084 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5
5085 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
5086 # Just in case
5087 sleep 1
5088 echo timestamp > conftestfile
5089 @@ -905,8 +1656,11 @@
5090 # if, for instance, CONFIG_SHELL is bash and it inherits a
5091 # broken ls alias from the environment. This has actually
5092 # happened. Such a system could not be considered "sane".
5093 - { echo "configure: error: ls -t appears to fail. Make sure there is not a broken
5094 -alias in your environment" 1>&2; exit 1; }
5095 + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
5096 +alias in your environment" >&5
5097 +echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
5098 +alias in your environment" >&2;}
5099 + { (exit 1); exit 1; }; }
5100 fi
5101
5102 test "$2" = conftestfile
5103 @@ -915,54 +1669,54 @@
5104 # Ok.
5105 :
5106 else
5107 - { echo "configure: error: newly created file is older than distributed files!
5108 -Check your system clock" 1>&2; exit 1; }
5109 + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
5110 +Check your system clock" >&5
5111 +echo "$as_me: error: newly created file is older than distributed files!
5112 +Check your system clock" >&2;}
5113 + { (exit 1); exit 1; }; }
5114 fi
5115 rm -f conftest*
5116 -echo "$ac_t""yes" 1>&6
5117 -if test "$program_transform_name" = s,x,x,; then
5118 - program_transform_name=
5119 -else
5120 - # Double any \ or $. echo might interpret backslashes.
5121 - cat <<\EOF_SED > conftestsed
5122 -s,\\,\\\\,g; s,\$,$$,g
5123 -EOF_SED
5124 - program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
5125 - rm -f conftestsed
5126 -fi
5127 +echo "$as_me:$LINENO: result: yes" >&5
5128 +echo "${ECHO_T}yes" >&6
5129 test "$program_prefix" != NONE &&
5130 - program_transform_name="s,^,${program_prefix},; $program_transform_name"
5131 + program_transform_name="s,^,$program_prefix,;$program_transform_name"
5132 # Use a double $ so make ignores it.
5133 test "$program_suffix" != NONE &&
5134 - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
5135 -
5136 -# sed with no file args requires a program.
5137 -test "$program_transform_name" = "" && program_transform_name="s,x,x,"
5138 -
5139 -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
5140 -echo "configure:944: checking whether ${MAKE-make} sets \${MAKE}" >&5
5141 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
5142 -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
5143 - echo $ac_n "(cached) $ac_c" 1>&6
5144 + program_transform_name="s,\$,$program_suffix,;$program_transform_name"
5145 +# Double any \ or $. echo might interpret backslashes.
5146 +# By default was `s,x,x', remove it if useless.
5147 +cat <<\_ACEOF >conftest.sed
5148 +s/[\\$]/&&/g;s/;s,x,x,$//
5149 +_ACEOF
5150 +program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
5151 +rm conftest.sed
5152 +
5153 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
5154 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
5155 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
5156 +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
5157 + echo $ECHO_N "(cached) $ECHO_C" >&6
5158 else
5159 - cat > conftestmake <<\EOF
5160 + cat >conftest.make <<\_ACEOF
5161 all:
5162 - @echo 'ac_maketemp="${MAKE}"'
5163 -EOF
5164 + @echo 'ac_maketemp="$(MAKE)"'
5165 +_ACEOF
5166 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
5167 -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
5168 +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
5169 if test -n "$ac_maketemp"; then
5170 eval ac_cv_prog_make_${ac_make}_set=yes
5171 else
5172 eval ac_cv_prog_make_${ac_make}_set=no
5173 fi
5174 -rm -f conftestmake
5175 +rm -f conftest.make
5176 fi
5177 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
5178 - echo "$ac_t""yes" 1>&6
5179 + echo "$as_me:$LINENO: result: yes" >&5
5180 +echo "${ECHO_T}yes" >&6
5181 SET_MAKE=
5182 else
5183 - echo "$ac_t""no" 1>&6
5184 + echo "$as_me:$LINENO: result: no" >&5
5185 +echo "${ECHO_T}no" >&6
5186 SET_MAKE="MAKE=${MAKE-make}"
5187 fi
5188
5189 @@ -972,82 +1726,96 @@
5190 VERSION=2.4.1
5191
5192 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
5193 - { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
5194 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
5195 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
5196 + { (exit 1); exit 1; }; }
5197 fi
5198 -cat >> confdefs.h <<EOF
5199 +
5200 +cat >>confdefs.h <<_ACEOF
5201 #define PACKAGE "$PACKAGE"
5202 -EOF
5203 +_ACEOF
5204
5205 -cat >> confdefs.h <<EOF
5206 +
5207 +cat >>confdefs.h <<_ACEOF
5208 #define VERSION "$VERSION"
5209 -EOF
5210 +_ACEOF
5211
5212
5213
5214 missing_dir=`cd $ac_aux_dir && pwd`
5215 -echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
5216 -echo "configure:990: checking for working aclocal" >&5
5217 +echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5
5218 +echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6
5219 # Run test in a subshell; some versions of sh will print an error if
5220 # an executable is not found, even if stderr is redirected.
5221 # Redirect stdin to placate older versions of autoconf. Sigh.
5222 -if (aclocal --version) < /dev/null > /dev/null 2>&1; then
5223 - ACLOCAL=aclocal
5224 - echo "$ac_t""found" 1>&6
5225 -else
5226 - ACLOCAL="$missing_dir/missing aclocal"
5227 - echo "$ac_t""missing" 1>&6
5228 +if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
5229 + ACLOCAL=aclocal-${am__api_version}
5230 + echo "$as_me:$LINENO: result: found" >&5
5231 +echo "${ECHO_T}found" >&6
5232 +else
5233 + ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
5234 + echo "$as_me:$LINENO: result: missing" >&5
5235 +echo "${ECHO_T}missing" >&6
5236 fi
5237
5238 -echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
5239 -echo "configure:1003: checking for working autoconf" >&5
5240 +echo "$as_me:$LINENO: checking for working autoconf" >&5
5241 +echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
5242 # Run test in a subshell; some versions of sh will print an error if
5243 # an executable is not found, even if stderr is redirected.
5244 # Redirect stdin to placate older versions of autoconf. Sigh.
5245 if (autoconf --version) < /dev/null > /dev/null 2>&1; then
5246 AUTOCONF=autoconf
5247 - echo "$ac_t""found" 1>&6
5248 + echo "$as_me:$LINENO: result: found" >&5
5249 +echo "${ECHO_T}found" >&6
5250 else
5251 AUTOCONF="$missing_dir/missing autoconf"
5252 - echo "$ac_t""missing" 1>&6
5253 + echo "$as_me:$LINENO: result: missing" >&5
5254 +echo "${ECHO_T}missing" >&6
5255 fi
5256
5257 -echo $ac_n "checking for working automake""... $ac_c" 1>&6
5258 -echo "configure:1016: checking for working automake" >&5
5259 +echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5
5260 +echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6
5261 # Run test in a subshell; some versions of sh will print an error if
5262 # an executable is not found, even if stderr is redirected.
5263 # Redirect stdin to placate older versions of autoconf. Sigh.
5264 -if (automake --version) < /dev/null > /dev/null 2>&1; then
5265 - AUTOMAKE=automake
5266 - echo "$ac_t""found" 1>&6
5267 -else
5268 - AUTOMAKE="$missing_dir/missing automake"
5269 - echo "$ac_t""missing" 1>&6
5270 +if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
5271 + AUTOMAKE=automake-${am__api_version}
5272 + echo "$as_me:$LINENO: result: found" >&5
5273 +echo "${ECHO_T}found" >&6
5274 +else
5275 + AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
5276 + echo "$as_me:$LINENO: result: missing" >&5
5277 +echo "${ECHO_T}missing" >&6
5278 fi
5279
5280 -echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
5281 -echo "configure:1029: checking for working autoheader" >&5
5282 +echo "$as_me:$LINENO: checking for working autoheader" >&5
5283 +echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
5284 # Run test in a subshell; some versions of sh will print an error if
5285 # an executable is not found, even if stderr is redirected.
5286 # Redirect stdin to placate older versions of autoconf. Sigh.
5287 if (autoheader --version) < /dev/null > /dev/null 2>&1; then
5288 AUTOHEADER=autoheader
5289 - echo "$ac_t""found" 1>&6
5290 + echo "$as_me:$LINENO: result: found" >&5
5291 +echo "${ECHO_T}found" >&6
5292 else
5293 AUTOHEADER="$missing_dir/missing autoheader"
5294 - echo "$ac_t""missing" 1>&6
5295 + echo "$as_me:$LINENO: result: missing" >&5
5296 +echo "${ECHO_T}missing" >&6
5297 fi
5298
5299 -echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
5300 -echo "configure:1042: checking for working makeinfo" >&5
5301 +echo "$as_me:$LINENO: checking for working makeinfo" >&5
5302 +echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
5303 # Run test in a subshell; some versions of sh will print an error if
5304 # an executable is not found, even if stderr is redirected.
5305 # Redirect stdin to placate older versions of autoconf. Sigh.
5306 if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
5307 MAKEINFO=makeinfo
5308 - echo "$ac_t""found" 1>&6
5309 + echo "$as_me:$LINENO: result: found" >&5
5310 +echo "${ECHO_T}found" >&6
5311 else
5312 MAKEINFO="$missing_dir/missing makeinfo"
5313 - echo "$ac_t""missing" 1>&6
5314 + echo "$as_me:$LINENO: result: missing" >&5
5315 +echo "${ECHO_T}missing" >&6
5316 fi
5317
5318
5319 @@ -1059,214 +1827,643 @@
5320
5321
5322
5323 -# Extract the first word of "gcc", so it can be a program name with args.
5324 +ac_ext=c
5325 +ac_cpp='$CPP $CPPFLAGS'
5326 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5327 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5328 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
5329 +if test -n "$ac_tool_prefix"; then
5330 + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
5331 +set dummy ${ac_tool_prefix}gcc; ac_word=$2
5332 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5333 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5334 +if test "${ac_cv_prog_CC+set}" = set; then
5335 + echo $ECHO_N "(cached) $ECHO_C" >&6
5336 +else
5337 + if test -n "$CC"; then
5338 + ac_cv_prog_CC="$CC" # Let the user override the test.
5339 +else
5340 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5341 +for as_dir in $PATH
5342 +do
5343 + IFS=$as_save_IFS
5344 + test -z "$as_dir" && as_dir=.
5345 + for ac_exec_ext in '' $ac_executable_extensions; do
5346 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5347 + ac_cv_prog_CC="${ac_tool_prefix}gcc"
5348 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5349 + break 2
5350 + fi
5351 +done
5352 +done
5353 +
5354 +fi
5355 +fi
5356 +CC=$ac_cv_prog_CC
5357 +if test -n "$CC"; then
5358 + echo "$as_me:$LINENO: result: $CC" >&5
5359 +echo "${ECHO_T}$CC" >&6
5360 +else
5361 + echo "$as_me:$LINENO: result: no" >&5
5362 +echo "${ECHO_T}no" >&6
5363 +fi
5364 +
5365 +fi
5366 +if test -z "$ac_cv_prog_CC"; then
5367 + ac_ct_CC=$CC
5368 + # Extract the first word of "gcc", so it can be a program name with args.
5369 set dummy gcc; ac_word=$2
5370 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5371 -echo "configure:1066: checking for $ac_word" >&5
5372 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
5373 - echo $ac_n "(cached) $ac_c" 1>&6
5374 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5375 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5376 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
5377 + echo $ECHO_N "(cached) $ECHO_C" >&6
5378 +else
5379 + if test -n "$ac_ct_CC"; then
5380 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
5381 +else
5382 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5383 +for as_dir in $PATH
5384 +do
5385 + IFS=$as_save_IFS
5386 + test -z "$as_dir" && as_dir=.
5387 + for ac_exec_ext in '' $ac_executable_extensions; do
5388 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5389 + ac_cv_prog_ac_ct_CC="gcc"
5390 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5391 + break 2
5392 + fi
5393 +done
5394 +done
5395 +
5396 +fi
5397 +fi
5398 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
5399 +if test -n "$ac_ct_CC"; then
5400 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
5401 +echo "${ECHO_T}$ac_ct_CC" >&6
5402 +else
5403 + echo "$as_me:$LINENO: result: no" >&5
5404 +echo "${ECHO_T}no" >&6
5405 +fi
5406 +
5407 + CC=$ac_ct_CC
5408 +else
5409 + CC="$ac_cv_prog_CC"
5410 +fi
5411 +
5412 +if test -z "$CC"; then
5413 + if test -n "$ac_tool_prefix"; then
5414 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
5415 +set dummy ${ac_tool_prefix}cc; ac_word=$2
5416 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5417 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5418 +if test "${ac_cv_prog_CC+set}" = set; then
5419 + echo $ECHO_N "(cached) $ECHO_C" >&6
5420 else
5421 if test -n "$CC"; then
5422 ac_cv_prog_CC="$CC" # Let the user override the test.
5423 else
5424 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
5425 - ac_dummy="$PATH"
5426 - for ac_dir in $ac_dummy; do
5427 - test -z "$ac_dir" && ac_dir=.
5428 - if test -f $ac_dir/$ac_word; then
5429 - ac_cv_prog_CC="gcc"
5430 - break
5431 - fi
5432 - done
5433 - IFS="$ac_save_ifs"
5434 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5435 +for as_dir in $PATH
5436 +do
5437 + IFS=$as_save_IFS
5438 + test -z "$as_dir" && as_dir=.
5439 + for ac_exec_ext in '' $ac_executable_extensions; do
5440 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5441 + ac_cv_prog_CC="${ac_tool_prefix}cc"
5442 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5443 + break 2
5444 + fi
5445 +done
5446 +done
5447 +
5448 fi
5449 fi
5450 -CC="$ac_cv_prog_CC"
5451 +CC=$ac_cv_prog_CC
5452 if test -n "$CC"; then
5453 - echo "$ac_t""$CC" 1>&6
5454 + echo "$as_me:$LINENO: result: $CC" >&5
5455 +echo "${ECHO_T}$CC" >&6
5456 +else
5457 + echo "$as_me:$LINENO: result: no" >&5
5458 +echo "${ECHO_T}no" >&6
5459 +fi
5460 +
5461 +fi
5462 +if test -z "$ac_cv_prog_CC"; then
5463 + ac_ct_CC=$CC
5464 + # Extract the first word of "cc", so it can be a program name with args.
5465 +set dummy cc; ac_word=$2
5466 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5467 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5468 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
5469 + echo $ECHO_N "(cached) $ECHO_C" >&6
5470 +else
5471 + if test -n "$ac_ct_CC"; then
5472 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
5473 +else
5474 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5475 +for as_dir in $PATH
5476 +do
5477 + IFS=$as_save_IFS
5478 + test -z "$as_dir" && as_dir=.
5479 + for ac_exec_ext in '' $ac_executable_extensions; do
5480 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5481 + ac_cv_prog_ac_ct_CC="cc"
5482 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5483 + break 2
5484 + fi
5485 +done
5486 +done
5487 +
5488 +fi
5489 +fi
5490 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
5491 +if test -n "$ac_ct_CC"; then
5492 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
5493 +echo "${ECHO_T}$ac_ct_CC" >&6
5494 else
5495 - echo "$ac_t""no" 1>&6
5496 + echo "$as_me:$LINENO: result: no" >&5
5497 +echo "${ECHO_T}no" >&6
5498 fi
5499
5500 + CC=$ac_ct_CC
5501 +else
5502 + CC="$ac_cv_prog_CC"
5503 +fi
5504 +
5505 +fi
5506 if test -z "$CC"; then
5507 # Extract the first word of "cc", so it can be a program name with args.
5508 set dummy cc; ac_word=$2
5509 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5510 -echo "configure:1096: checking for $ac_word" >&5
5511 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
5512 - echo $ac_n "(cached) $ac_c" 1>&6
5513 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5514 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5515 +if test "${ac_cv_prog_CC+set}" = set; then
5516 + echo $ECHO_N "(cached) $ECHO_C" >&6
5517 else
5518 if test -n "$CC"; then
5519 ac_cv_prog_CC="$CC" # Let the user override the test.
5520 else
5521 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
5522 ac_prog_rejected=no
5523 - ac_dummy="$PATH"
5524 - for ac_dir in $ac_dummy; do
5525 - test -z "$ac_dir" && ac_dir=.
5526 - if test -f $ac_dir/$ac_word; then
5527 - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
5528 - ac_prog_rejected=yes
5529 - continue
5530 - fi
5531 - ac_cv_prog_CC="cc"
5532 - break
5533 - fi
5534 - done
5535 - IFS="$ac_save_ifs"
5536 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5537 +for as_dir in $PATH
5538 +do
5539 + IFS=$as_save_IFS
5540 + test -z "$as_dir" && as_dir=.
5541 + for ac_exec_ext in '' $ac_executable_extensions; do
5542 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5543 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
5544 + ac_prog_rejected=yes
5545 + continue
5546 + fi
5547 + ac_cv_prog_CC="cc"
5548 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5549 + break 2
5550 + fi
5551 +done
5552 +done
5553 +
5554 if test $ac_prog_rejected = yes; then
5555 # We found a bogon in the path, so make sure we never use it.
5556 set dummy $ac_cv_prog_CC
5557 shift
5558 - if test $# -gt 0; then
5559 + if test $# != 0; then
5560 # We chose a different compiler from the bogus one.
5561 # However, it has the same basename, so the bogon will be chosen
5562 # first if we set CC to just the basename; use the full file name.
5563 shift
5564 - set dummy "$ac_dir/$ac_word" "$@"
5565 - shift
5566 - ac_cv_prog_CC="$@"
5567 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
5568 fi
5569 fi
5570 fi
5571 fi
5572 -CC="$ac_cv_prog_CC"
5573 +CC=$ac_cv_prog_CC
5574 if test -n "$CC"; then
5575 - echo "$ac_t""$CC" 1>&6
5576 + echo "$as_me:$LINENO: result: $CC" >&5
5577 +echo "${ECHO_T}$CC" >&6
5578 else
5579 - echo "$ac_t""no" 1>&6
5580 + echo "$as_me:$LINENO: result: no" >&5
5581 +echo "${ECHO_T}no" >&6
5582 fi
5583
5584 - if test -z "$CC"; then
5585 - case "`uname -s`" in
5586 - *win32* | *WIN32*)
5587 - # Extract the first word of "cl", so it can be a program name with args.
5588 -set dummy cl; ac_word=$2
5589 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5590 -echo "configure:1147: checking for $ac_word" >&5
5591 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
5592 - echo $ac_n "(cached) $ac_c" 1>&6
5593 +fi
5594 +if test -z "$CC"; then
5595 + if test -n "$ac_tool_prefix"; then
5596 + for ac_prog in cl
5597 + do
5598 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
5599 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
5600 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5601 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5602 +if test "${ac_cv_prog_CC+set}" = set; then
5603 + echo $ECHO_N "(cached) $ECHO_C" >&6
5604 else
5605 if test -n "$CC"; then
5606 ac_cv_prog_CC="$CC" # Let the user override the test.
5607 else
5608 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
5609 - ac_dummy="$PATH"
5610 - for ac_dir in $ac_dummy; do
5611 - test -z "$ac_dir" && ac_dir=.
5612 - if test -f $ac_dir/$ac_word; then
5613 - ac_cv_prog_CC="cl"
5614 - break
5615 - fi
5616 - done
5617 - IFS="$ac_save_ifs"
5618 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5619 +for as_dir in $PATH
5620 +do
5621 + IFS=$as_save_IFS
5622 + test -z "$as_dir" && as_dir=.
5623 + for ac_exec_ext in '' $ac_executable_extensions; do
5624 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5625 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
5626 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5627 + break 2
5628 + fi
5629 +done
5630 +done
5631 +
5632 fi
5633 fi
5634 -CC="$ac_cv_prog_CC"
5635 +CC=$ac_cv_prog_CC
5636 if test -n "$CC"; then
5637 - echo "$ac_t""$CC" 1>&6
5638 + echo "$as_me:$LINENO: result: $CC" >&5
5639 +echo "${ECHO_T}$CC" >&6
5640 else
5641 - echo "$ac_t""no" 1>&6
5642 + echo "$as_me:$LINENO: result: no" >&5
5643 +echo "${ECHO_T}no" >&6
5644 fi
5645 - ;;
5646 - esac
5647 +
5648 + test -n "$CC" && break
5649 + done
5650 +fi
5651 +if test -z "$CC"; then
5652 + ac_ct_CC=$CC
5653 + for ac_prog in cl
5654 +do
5655 + # Extract the first word of "$ac_prog", so it can be a program name with args.
5656 +set dummy $ac_prog; ac_word=$2
5657 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5658 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5659 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
5660 + echo $ECHO_N "(cached) $ECHO_C" >&6
5661 +else
5662 + if test -n "$ac_ct_CC"; then
5663 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
5664 +else
5665 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5666 +for as_dir in $PATH
5667 +do
5668 + IFS=$as_save_IFS
5669 + test -z "$as_dir" && as_dir=.
5670 + for ac_exec_ext in '' $ac_executable_extensions; do
5671 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5672 + ac_cv_prog_ac_ct_CC="$ac_prog"
5673 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5674 + break 2
5675 fi
5676 - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
5677 +done
5678 +done
5679 +
5680 fi
5681 +fi
5682 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
5683 +if test -n "$ac_ct_CC"; then
5684 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
5685 +echo "${ECHO_T}$ac_ct_CC" >&6
5686 +else
5687 + echo "$as_me:$LINENO: result: no" >&5
5688 +echo "${ECHO_T}no" >&6
5689 +fi
5690 +
5691 + test -n "$ac_ct_CC" && break
5692 +done
5693
5694 -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
5695 -echo "configure:1179: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
5696 + CC=$ac_ct_CC
5697 +fi
5698
5699 -ac_ext=c
5700 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
5701 -ac_cpp='$CPP $CPPFLAGS'
5702 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
5703 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
5704 -cross_compiling=$ac_cv_prog_cc_cross
5705 +fi
5706
5707 -cat > conftest.$ac_ext << EOF
5708
5709 -#line 1190 "configure"
5710 -#include "confdefs.h"
5711 +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
5712 +See \`config.log' for more details." >&5
5713 +echo "$as_me: error: no acceptable C compiler found in \$PATH
5714 +See \`config.log' for more details." >&2;}
5715 + { (exit 1); exit 1; }; }
5716 +
5717 +# Provide some information about the compiler.
5718 +echo "$as_me:$LINENO:" \
5719 + "checking for C compiler version" >&5
5720 +ac_compiler=`set X $ac_compile; echo $2`
5721 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
5722 + (eval $ac_compiler --version </dev/null >&5) 2>&5
5723 + ac_status=$?
5724 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5725 + (exit $ac_status); }
5726 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
5727 + (eval $ac_compiler -v </dev/null >&5) 2>&5
5728 + ac_status=$?
5729 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5730 + (exit $ac_status); }
5731 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
5732 + (eval $ac_compiler -V </dev/null >&5) 2>&5
5733 + ac_status=$?
5734 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5735 + (exit $ac_status); }
5736 +
5737 +cat >conftest.$ac_ext <<_ACEOF
5738 +#line $LINENO "configure"
5739 +/* confdefs.h. */
5740 +_ACEOF
5741 +cat confdefs.h >>conftest.$ac_ext
5742 +cat >>conftest.$ac_ext <<_ACEOF
5743 +/* end confdefs.h. */
5744
5745 -main(){return(0);}
5746 -EOF
5747 -if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5748 - ac_cv_prog_cc_works=yes
5749 - # If we can't run a trivial program, we are probably using a cross compiler.
5750 - if (./conftest; exit) 2>/dev/null; then
5751 - ac_cv_prog_cc_cross=no
5752 - else
5753 - ac_cv_prog_cc_cross=yes
5754 - fi
5755 +int
5756 +main ()
5757 +{
5758 +
5759 + ;
5760 + return 0;
5761 +}
5762 +_ACEOF
5763 +ac_clean_files_save=$ac_clean_files
5764 +ac_clean_files="$ac_clean_files a.out a.exe b.out"
5765 +# Try to create an executable without -o first, disregard a.out.
5766 +# It will help us diagnose broken compilers, and finding out an intuition
5767 +# of exeext.
5768 +echo "$as_me:$LINENO: checking for C compiler default output" >&5
5769 +echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
5770 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
5771 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
5772 + (eval $ac_link_default) 2>&5
5773 + ac_status=$?
5774 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5775 + (exit $ac_status); }; then
5776 + # Find the output, starting from the most likely. This scheme is
5777 +# not robust to junk in `.', hence go to wildcards (a.*) only as a last
5778 +# resort.
5779 +
5780 +# Be careful to initialize this variable, since it used to be cached.
5781 +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
5782 +ac_cv_exeext=
5783 +# b.out is created by i960 compilers.
5784 +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
5785 +do
5786 + test -f "$ac_file" || continue
5787 + case $ac_file in
5788 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
5789 + ;;
5790 + conftest.$ac_ext )
5791 + # This is the source file.
5792 + ;;
5793 + [ab].out )
5794 + # We found the default executable, but exeext='' is most
5795 + # certainly right.
5796 + break;;
5797 + *.* )
5798 + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
5799 + # FIXME: I believe we export ac_cv_exeext for Libtool,
5800 + # but it would be cool to find out if it's true. Does anybody
5801 + # maintain Libtool? --akim.
5802 + export ac_cv_exeext
5803 + break;;
5804 + * )
5805 + break;;
5806 + esac
5807 +done
5808 else
5809 - echo "configure: failed program was:" >&5
5810 - cat conftest.$ac_ext >&5
5811 - ac_cv_prog_cc_works=no
5812 + echo "$as_me: failed program was:" >&5
5813 +sed 's/^/| /' conftest.$ac_ext >&5
5814 +
5815 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
5816 +See \`config.log' for more details." >&5
5817 +echo "$as_me: error: C compiler cannot create executables
5818 +See \`config.log' for more details." >&2;}
5819 + { (exit 77); exit 77; }; }
5820 +fi
5821 +
5822 +ac_exeext=$ac_cv_exeext
5823 +echo "$as_me:$LINENO: result: $ac_file" >&5
5824 +echo "${ECHO_T}$ac_file" >&6
5825 +
5826 +# Check the compiler produces executables we can run. If not, either
5827 +# the compiler is broken, or we cross compile.
5828 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5
5829 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
5830 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
5831 +# If not cross compiling, check that we can run a simple program.
5832 +if test "$cross_compiling" != yes; then
5833 + if { ac_try='./$ac_file'
5834 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5835 + (eval $ac_try) 2>&5
5836 + ac_status=$?
5837 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5838 + (exit $ac_status); }; }; then
5839 + cross_compiling=no
5840 + else
5841 + if test "$cross_compiling" = maybe; then
5842 + cross_compiling=yes
5843 + else
5844 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
5845 +If you meant to cross compile, use \`--host'.
5846 +See \`config.log' for more details." >&5
5847 +echo "$as_me: error: cannot run C compiled programs.
5848 +If you meant to cross compile, use \`--host'.
5849 +See \`config.log' for more details." >&2;}
5850 + { (exit 1); exit 1; }; }
5851 + fi
5852 + fi
5853 fi
5854 -rm -fr conftest*
5855 -ac_ext=c
5856 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
5857 -ac_cpp='$CPP $CPPFLAGS'
5858 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
5859 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
5860 -cross_compiling=$ac_cv_prog_cc_cross
5861 -
5862 -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
5863 -if test $ac_cv_prog_cc_works = no; then
5864 - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
5865 -fi
5866 -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
5867 -echo "configure:1221: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
5868 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
5869 -cross_compiling=$ac_cv_prog_cc_cross
5870 -
5871 -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
5872 -echo "configure:1226: checking whether we are using GNU C" >&5
5873 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
5874 - echo $ac_n "(cached) $ac_c" 1>&6
5875 -else
5876 - cat > conftest.c <<EOF
5877 -#ifdef __GNUC__
5878 - yes;
5879 -#endif
5880 -EOF
5881 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
5882 - ac_cv_prog_gcc=yes
5883 +echo "$as_me:$LINENO: result: yes" >&5
5884 +echo "${ECHO_T}yes" >&6
5885 +
5886 +rm -f a.out a.exe conftest$ac_cv_exeext b.out
5887 +ac_clean_files=$ac_clean_files_save
5888 +# Check the compiler produces executables we can run. If not, either
5889 +# the compiler is broken, or we cross compile.
5890 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
5891 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
5892 +echo "$as_me:$LINENO: result: $cross_compiling" >&5
5893 +echo "${ECHO_T}$cross_compiling" >&6
5894 +
5895 +echo "$as_me:$LINENO: checking for suffix of executables" >&5
5896 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
5897 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5898 + (eval $ac_link) 2>&5
5899 + ac_status=$?
5900 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5901 + (exit $ac_status); }; then
5902 + # If both `conftest.exe' and `conftest' are `present' (well, observable)
5903 +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
5904 +# work properly (i.e., refer to `conftest.exe'), while it won't with
5905 +# `rm'.
5906 +for ac_file in conftest.exe conftest conftest.*; do
5907 + test -f "$ac_file" || continue
5908 + case $ac_file in
5909 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
5910 + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
5911 + export ac_cv_exeext
5912 + break;;
5913 + * ) break;;
5914 + esac
5915 +done
5916 else
5917 - ac_cv_prog_gcc=no
5918 -fi
5919 + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
5920 +See \`config.log' for more details." >&5
5921 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
5922 +See \`config.log' for more details." >&2;}
5923 + { (exit 1); exit 1; }; }
5924 fi
5925
5926 -echo "$ac_t""$ac_cv_prog_gcc" 1>&6
5927 +rm -f conftest$ac_cv_exeext
5928 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
5929 +echo "${ECHO_T}$ac_cv_exeext" >&6
5930 +
5931 +rm -f conftest.$ac_ext
5932 +EXEEXT=$ac_cv_exeext
5933 +ac_exeext=$EXEEXT
5934 +echo "$as_me:$LINENO: checking for suffix of object files" >&5
5935 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
5936 +if test "${ac_cv_objext+set}" = set; then
5937 + echo $ECHO_N "(cached) $ECHO_C" >&6
5938 +else
5939 + cat >conftest.$ac_ext <<_ACEOF
5940 +#line $LINENO "configure"
5941 +/* confdefs.h. */
5942 +_ACEOF
5943 +cat confdefs.h >>conftest.$ac_ext
5944 +cat >>conftest.$ac_ext <<_ACEOF
5945 +/* end confdefs.h. */
5946 +
5947 +int
5948 +main ()
5949 +{
5950
5951 -if test $ac_cv_prog_gcc = yes; then
5952 - GCC=yes
5953 + ;
5954 + return 0;
5955 +}
5956 +_ACEOF
5957 +rm -f conftest.o conftest.obj
5958 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5959 + (eval $ac_compile) 2>&5
5960 + ac_status=$?
5961 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5962 + (exit $ac_status); }; then
5963 + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
5964 + case $ac_file in
5965 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
5966 + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
5967 + break;;
5968 + esac
5969 +done
5970 else
5971 - GCC=
5972 + echo "$as_me: failed program was:" >&5
5973 +sed 's/^/| /' conftest.$ac_ext >&5
5974 +
5975 +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
5976 +See \`config.log' for more details." >&5
5977 +echo "$as_me: error: cannot compute suffix of object files: cannot compile
5978 +See \`config.log' for more details." >&2;}
5979 + { (exit 1); exit 1; }; }
5980 fi
5981
5982 -ac_test_CFLAGS="${CFLAGS+set}"
5983 -ac_save_CFLAGS="$CFLAGS"
5984 -CFLAGS=
5985 -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
5986 -echo "configure:1254: checking whether ${CC-cc} accepts -g" >&5
5987 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
5988 - echo $ac_n "(cached) $ac_c" 1>&6
5989 -else
5990 - echo 'void f(){}' > conftest.c
5991 -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
5992 +rm -f conftest.$ac_cv_objext conftest.$ac_ext
5993 +fi
5994 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
5995 +echo "${ECHO_T}$ac_cv_objext" >&6
5996 +OBJEXT=$ac_cv_objext
5997 +ac_objext=$OBJEXT
5998 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
5999 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
6000 +if test "${ac_cv_c_compiler_gnu+set}" = set; then
6001 + echo $ECHO_N "(cached) $ECHO_C" >&6
6002 +else
6003 + cat >conftest.$ac_ext <<_ACEOF
6004 +#line $LINENO "configure"
6005 +/* confdefs.h. */
6006 +_ACEOF
6007 +cat confdefs.h >>conftest.$ac_ext
6008 +cat >>conftest.$ac_ext <<_ACEOF
6009 +/* end confdefs.h. */
6010 +
6011 +int
6012 +main ()
6013 +{
6014 +#ifndef __GNUC__
6015 + choke me
6016 +#endif
6017 +
6018 + ;
6019 + return 0;
6020 +}
6021 +_ACEOF
6022 +rm -f conftest.$ac_objext
6023 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6024 + (eval $ac_compile) 2>&5
6025 + ac_status=$?
6026 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6027 + (exit $ac_status); } &&
6028 + { ac_try='test -s conftest.$ac_objext'
6029 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6030 + (eval $ac_try) 2>&5
6031 + ac_status=$?
6032 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6033 + (exit $ac_status); }; }; then
6034 + ac_compiler_gnu=yes
6035 +else
6036 + echo "$as_me: failed program was:" >&5
6037 +sed 's/^/| /' conftest.$ac_ext >&5
6038 +
6039 +ac_compiler_gnu=no
6040 +fi
6041 +rm -f conftest.$ac_objext conftest.$ac_ext
6042 +ac_cv_c_compiler_gnu=$ac_compiler_gnu
6043 +
6044 +fi
6045 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
6046 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
6047 +GCC=`test $ac_compiler_gnu = yes && echo yes`
6048 +ac_test_CFLAGS=${CFLAGS+set}
6049 +ac_save_CFLAGS=$CFLAGS
6050 +CFLAGS="-g"
6051 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
6052 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
6053 +if test "${ac_cv_prog_cc_g+set}" = set; then
6054 + echo $ECHO_N "(cached) $ECHO_C" >&6
6055 +else
6056 + cat >conftest.$ac_ext <<_ACEOF
6057 +#line $LINENO "configure"
6058 +/* confdefs.h. */
6059 +_ACEOF
6060 +cat confdefs.h >>conftest.$ac_ext
6061 +cat >>conftest.$ac_ext <<_ACEOF
6062 +/* end confdefs.h. */
6063 +
6064 +int
6065 +main ()
6066 +{
6067 +
6068 + ;
6069 + return 0;
6070 +}
6071 +_ACEOF
6072 +rm -f conftest.$ac_objext
6073 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6074 + (eval $ac_compile) 2>&5
6075 + ac_status=$?
6076 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6077 + (exit $ac_status); } &&
6078 + { ac_try='test -s conftest.$ac_objext'
6079 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6080 + (eval $ac_try) 2>&5
6081 + ac_status=$?
6082 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6083 + (exit $ac_status); }; }; then
6084 ac_cv_prog_cc_g=yes
6085 else
6086 - ac_cv_prog_cc_g=no
6087 -fi
6088 -rm -f conftest*
6089 + echo "$as_me: failed program was:" >&5
6090 +sed 's/^/| /' conftest.$ac_ext >&5
6091
6092 +ac_cv_prog_cc_g=no
6093 fi
6094 -
6095 -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
6096 +rm -f conftest.$ac_objext conftest.$ac_ext
6097 +fi
6098 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
6099 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
6100 if test "$ac_test_CFLAGS" = set; then
6101 - CFLAGS="$ac_save_CFLAGS"
6102 + CFLAGS=$ac_save_CFLAGS
6103 elif test $ac_cv_prog_cc_g = yes; then
6104 if test "$GCC" = yes; then
6105 CFLAGS="-g -O2"
6106 @@ -1280,295 +2477,548 @@
6107 CFLAGS=
6108 fi
6109 fi
6110 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
6111 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
6112 +if test "${ac_cv_prog_cc_stdc+set}" = set; then
6113 + echo $ECHO_N "(cached) $ECHO_C" >&6
6114 +else
6115 + ac_cv_prog_cc_stdc=no
6116 +ac_save_CC=$CC
6117 +cat >conftest.$ac_ext <<_ACEOF
6118 +#line $LINENO "configure"
6119 +/* confdefs.h. */
6120 +_ACEOF
6121 +cat confdefs.h >>conftest.$ac_ext
6122 +cat >>conftest.$ac_ext <<_ACEOF
6123 +/* end confdefs.h. */
6124 +#include <stdarg.h>
6125 +#include <stdio.h>
6126 +#include <sys/types.h>
6127 +#include <sys/stat.h>
6128 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
6129 +struct buf { int x; };
6130 +FILE * (*rcsopen) (struct buf *, struct stat *, int);
6131 +static char *e (p, i)
6132 + char **p;
6133 + int i;
6134 +{
6135 + return p[i];
6136 +}
6137 +static char *f (char * (*g) (char **, int), char **p, ...)
6138 +{
6139 + char *s;
6140 + va_list v;
6141 + va_start (v,p);
6142 + s = g (p, va_arg (v,int));
6143 + va_end (v);
6144 + return s;
6145 +}
6146 +int test (int i, double x);
6147 +struct s1 {int (*f) (int a);};
6148 +struct s2 {int (*f) (double a);};
6149 +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
6150 +int argc;
6151 +char **argv;
6152 +int
6153 +main ()
6154 +{
6155 +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
6156 + ;
6157 + return 0;
6158 +}
6159 +_ACEOF
6160 +# Don't try gcc -ansi; that turns off useful extensions and
6161 +# breaks some systems' header files.
6162 +# AIX -qlanglvl=ansi
6163 +# Ultrix and OSF/1 -std1
6164 +# HP-UX 10.20 and later -Ae
6165 +# HP-UX older versions -Aa -D_HPUX_SOURCE
6166 +# SVR4 -Xc -D__EXTENSIONS__
6167 +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
6168 +do
6169 + CC="$ac_save_CC $ac_arg"
6170 + rm -f conftest.$ac_objext
6171 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6172 + (eval $ac_compile) 2>&5
6173 + ac_status=$?
6174 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6175 + (exit $ac_status); } &&
6176 + { ac_try='test -s conftest.$ac_objext'
6177 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6178 + (eval $ac_try) 2>&5
6179 + ac_status=$?
6180 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6181 + (exit $ac_status); }; }; then
6182 + ac_cv_prog_cc_stdc=$ac_arg
6183 +break
6184 +else
6185 + echo "$as_me: failed program was:" >&5
6186 +sed 's/^/| /' conftest.$ac_ext >&5
6187 +
6188 +fi
6189 +rm -f conftest.$ac_objext
6190 +done
6191 +rm -f conftest.$ac_ext conftest.$ac_objext
6192 +CC=$ac_save_CC
6193
6194 -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
6195 -echo "configure:1286: checking how to run the C preprocessor" >&5
6196 -# On Suns, sometimes $CPP names a directory.
6197 -if test -n "$CPP" && test -d "$CPP"; then
6198 - CPP=
6199 fi
6200 -if test -z "$CPP"; then
6201 -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
6202 - echo $ac_n "(cached) $ac_c" 1>&6
6203 -else
6204 - # This must be in double quotes, not single quotes, because CPP may get
6205 - # substituted into the Makefile and "${CC-cc}" will confuse make.
6206 - CPP="${CC-cc} -E"
6207 - # On the NeXT, cc -E runs the code through the compiler's parser,
6208 - # not just through cpp.
6209 - cat > conftest.$ac_ext <<EOF
6210 -#line 1301 "configure"
6211 -#include "confdefs.h"
6212 -#include <assert.h>
6213 -Syntax Error
6214 -EOF
6215 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6216 -{ (eval echo configure:1307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6217 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
6218 -if test -z "$ac_err"; then
6219 - :
6220 -else
6221 - echo "$ac_err" >&5
6222 - echo "configure: failed program was:" >&5
6223 - cat conftest.$ac_ext >&5
6224 - rm -rf conftest*
6225 - CPP="${CC-cc} -E -traditional-cpp"
6226 - cat > conftest.$ac_ext <<EOF
6227 -#line 1318 "configure"
6228 -#include "confdefs.h"
6229 -#include <assert.h>
6230 -Syntax Error
6231 -EOF
6232 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6233 -{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6234 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
6235 -if test -z "$ac_err"; then
6236 - :
6237 -else
6238 - echo "$ac_err" >&5
6239 - echo "configure: failed program was:" >&5
6240 - cat conftest.$ac_ext >&5
6241 - rm -rf conftest*
6242 - CPP="${CC-cc} -nologo -E"
6243 - cat > conftest.$ac_ext <<EOF
6244 -#line 1335 "configure"
6245 -#include "confdefs.h"
6246 -#include <assert.h>
6247 -Syntax Error
6248 -EOF
6249 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6250 -{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6251 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
6252 -if test -z "$ac_err"; then
6253 +
6254 +case "x$ac_cv_prog_cc_stdc" in
6255 + x|xno)
6256 + echo "$as_me:$LINENO: result: none needed" >&5
6257 +echo "${ECHO_T}none needed" >&6 ;;
6258 + *)
6259 + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
6260 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
6261 + CC="$CC $ac_cv_prog_cc_stdc" ;;
6262 +esac
6263 +
6264 +# Some people use a C++ compiler to compile C. Since we use `exit',
6265 +# in C++ we need to declare it. In case someone uses the same compiler
6266 +# for both compiling C and C++ we need to have the C++ compiler decide
6267 +# the declaration of exit, since it's the most demanding environment.
6268 +cat >conftest.$ac_ext <<_ACEOF
6269 +#ifndef __cplusplus
6270 + choke me
6271 +#endif
6272 +_ACEOF
6273 +rm -f conftest.$ac_objext
6274 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6275 + (eval $ac_compile) 2>&5
6276 + ac_status=$?
6277 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6278 + (exit $ac_status); } &&
6279 + { ac_try='test -s conftest.$ac_objext'
6280 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6281 + (eval $ac_try) 2>&5
6282 + ac_status=$?
6283 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6284 + (exit $ac_status); }; }; then
6285 + for ac_declaration in \
6286 + '' \
6287 + 'extern "C" void std::exit (int) throw (); using std::exit;' \
6288 + 'extern "C" void std::exit (int); using std::exit;' \
6289 + 'extern "C" void exit (int) throw ();' \
6290 + 'extern "C" void exit (int);' \
6291 + 'void exit (int);'
6292 +do
6293 + cat >conftest.$ac_ext <<_ACEOF
6294 +#line $LINENO "configure"
6295 +/* confdefs.h. */
6296 +_ACEOF
6297 +cat confdefs.h >>conftest.$ac_ext
6298 +cat >>conftest.$ac_ext <<_ACEOF
6299 +/* end confdefs.h. */
6300 +$ac_declaration
6301 +#include <stdlib.h>
6302 +int
6303 +main ()
6304 +{
6305 +exit (42);
6306 + ;
6307 + return 0;
6308 +}
6309 +_ACEOF
6310 +rm -f conftest.$ac_objext
6311 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6312 + (eval $ac_compile) 2>&5
6313 + ac_status=$?
6314 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6315 + (exit $ac_status); } &&
6316 + { ac_try='test -s conftest.$ac_objext'
6317 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6318 + (eval $ac_try) 2>&5
6319 + ac_status=$?
6320 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6321 + (exit $ac_status); }; }; then
6322 :
6323 else
6324 - echo "$ac_err" >&5
6325 - echo "configure: failed program was:" >&5
6326 - cat conftest.$ac_ext >&5
6327 - rm -rf conftest*
6328 - CPP=/lib/cpp
6329 -fi
6330 -rm -f conftest*
6331 + echo "$as_me: failed program was:" >&5
6332 +sed 's/^/| /' conftest.$ac_ext >&5
6333 +
6334 +continue
6335 fi
6336 -rm -f conftest*
6337 +rm -f conftest.$ac_objext conftest.$ac_ext
6338 + cat >conftest.$ac_ext <<_ACEOF
6339 +#line $LINENO "configure"
6340 +/* confdefs.h. */
6341 +_ACEOF
6342 +cat confdefs.h >>conftest.$ac_ext
6343 +cat >>conftest.$ac_ext <<_ACEOF
6344 +/* end confdefs.h. */
6345 +$ac_declaration
6346 +int
6347 +main ()
6348 +{
6349 +exit (42);
6350 + ;
6351 + return 0;
6352 +}
6353 +_ACEOF
6354 +rm -f conftest.$ac_objext
6355 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6356 + (eval $ac_compile) 2>&5
6357 + ac_status=$?
6358 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6359 + (exit $ac_status); } &&
6360 + { ac_try='test -s conftest.$ac_objext'
6361 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6362 + (eval $ac_try) 2>&5
6363 + ac_status=$?
6364 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6365 + (exit $ac_status); }; }; then
6366 + break
6367 +else
6368 + echo "$as_me: failed program was:" >&5
6369 +sed 's/^/| /' conftest.$ac_ext >&5
6370 +
6371 fi
6372 +rm -f conftest.$ac_objext conftest.$ac_ext
6373 +done
6374 rm -f conftest*
6375 - ac_cv_prog_CPP="$CPP"
6376 +if test -n "$ac_declaration"; then
6377 + echo '#ifdef __cplusplus' >>confdefs.h
6378 + echo $ac_declaration >>confdefs.h
6379 + echo '#endif' >>confdefs.h
6380 fi
6381 - CPP="$ac_cv_prog_CPP"
6382 +
6383 else
6384 - ac_cv_prog_CPP="$CPP"
6385 + echo "$as_me: failed program was:" >&5
6386 +sed 's/^/| /' conftest.$ac_ext >&5
6387 +
6388 fi
6389 -echo "$ac_t""$CPP" 1>&6
6390 +rm -f conftest.$ac_objext conftest.$ac_ext
6391 +ac_ext=c
6392 +ac_cpp='$CPP $CPPFLAGS'
6393 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6394 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6395 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
6396 +
6397
6398 missing_dir=`cd $ac_aux_dir && pwd`
6399 for ac_prog in flex lex
6400 do
6401 -# Extract the first word of "$ac_prog", so it can be a program name with args.
6402 + # Extract the first word of "$ac_prog", so it can be a program name with args.
6403 set dummy $ac_prog; ac_word=$2
6404 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
6405 -echo "configure:1371: checking for $ac_word" >&5
6406 -if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
6407 - echo $ac_n "(cached) $ac_c" 1>&6
6408 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6409 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6410 +if test "${ac_cv_prog_LEX+set}" = set; then
6411 + echo $ECHO_N "(cached) $ECHO_C" >&6
6412 else
6413 if test -n "$LEX"; then
6414 ac_cv_prog_LEX="$LEX" # Let the user override the test.
6415 else
6416 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
6417 - ac_dummy="$PATH"
6418 - for ac_dir in $ac_dummy; do
6419 - test -z "$ac_dir" && ac_dir=.
6420 - if test -f $ac_dir/$ac_word; then
6421 - ac_cv_prog_LEX="$ac_prog"
6422 - break
6423 - fi
6424 - done
6425 - IFS="$ac_save_ifs"
6426 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6427 +for as_dir in $PATH
6428 +do
6429 + IFS=$as_save_IFS
6430 + test -z "$as_dir" && as_dir=.
6431 + for ac_exec_ext in '' $ac_executable_extensions; do
6432 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6433 + ac_cv_prog_LEX="$ac_prog"
6434 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6435 + break 2
6436 + fi
6437 +done
6438 +done
6439 +
6440 fi
6441 fi
6442 -LEX="$ac_cv_prog_LEX"
6443 +LEX=$ac_cv_prog_LEX
6444 if test -n "$LEX"; then
6445 - echo "$ac_t""$LEX" 1>&6
6446 + echo "$as_me:$LINENO: result: $LEX" >&5
6447 +echo "${ECHO_T}$LEX" >&6
6448 else
6449 - echo "$ac_t""no" 1>&6
6450 + echo "$as_me:$LINENO: result: no" >&5
6451 +echo "${ECHO_T}no" >&6
6452 fi
6453
6454 -test -n "$LEX" && break
6455 + test -n "$LEX" && break
6456 done
6457 -test -n "$LEX" || LEX=""$missing_dir/missing flex""
6458 +test -n "$LEX" || LEX="$missing_dir/missing flex"
6459
6460 -# Extract the first word of "flex", so it can be a program name with args.
6461 -set dummy flex; ac_word=$2
6462 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
6463 -echo "configure:1404: checking for $ac_word" >&5
6464 -if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
6465 - echo $ac_n "(cached) $ac_c" 1>&6
6466 +for ac_prog in flex lex
6467 +do
6468 + # Extract the first word of "$ac_prog", so it can be a program name with args.
6469 +set dummy $ac_prog; ac_word=$2
6470 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6471 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6472 +if test "${ac_cv_prog_LEX+set}" = set; then
6473 + echo $ECHO_N "(cached) $ECHO_C" >&6
6474 else
6475 if test -n "$LEX"; then
6476 ac_cv_prog_LEX="$LEX" # Let the user override the test.
6477 else
6478 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
6479 - ac_dummy="$PATH"
6480 - for ac_dir in $ac_dummy; do
6481 - test -z "$ac_dir" && ac_dir=.
6482 - if test -f $ac_dir/$ac_word; then
6483 - ac_cv_prog_LEX="flex"
6484 - break
6485 - fi
6486 - done
6487 - IFS="$ac_save_ifs"
6488 - test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
6489 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6490 +for as_dir in $PATH
6491 +do
6492 + IFS=$as_save_IFS
6493 + test -z "$as_dir" && as_dir=.
6494 + for ac_exec_ext in '' $ac_executable_extensions; do
6495 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6496 + ac_cv_prog_LEX="$ac_prog"
6497 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6498 + break 2
6499 + fi
6500 +done
6501 +done
6502 +
6503 fi
6504 fi
6505 -LEX="$ac_cv_prog_LEX"
6506 +LEX=$ac_cv_prog_LEX
6507 if test -n "$LEX"; then
6508 - echo "$ac_t""$LEX" 1>&6
6509 + echo "$as_me:$LINENO: result: $LEX" >&5
6510 +echo "${ECHO_T}$LEX" >&6
6511 else
6512 - echo "$ac_t""no" 1>&6
6513 + echo "$as_me:$LINENO: result: no" >&5
6514 +echo "${ECHO_T}no" >&6
6515 fi
6516
6517 + test -n "$LEX" && break
6518 +done
6519 +test -n "$LEX" || LEX=":"
6520 +
6521 if test -z "$LEXLIB"
6522 then
6523 - case "$LEX" in
6524 - flex*) ac_lib=fl ;;
6525 - *) ac_lib=l ;;
6526 - esac
6527 - echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
6528 -echo "configure:1438: checking for yywrap in -l$ac_lib" >&5
6529 -ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
6530 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6531 - echo $ac_n "(cached) $ac_c" 1>&6
6532 -else
6533 - ac_save_LIBS="$LIBS"
6534 -LIBS="-l$ac_lib $LIBS"
6535 -cat > conftest.$ac_ext <<EOF
6536 -#line 1446 "configure"
6537 -#include "confdefs.h"
6538 + echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
6539 +echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
6540 +if test "${ac_cv_lib_fl_yywrap+set}" = set; then
6541 + echo $ECHO_N "(cached) $ECHO_C" >&6
6542 +else
6543 + ac_check_lib_save_LIBS=$LIBS
6544 +LIBS="-lfl $LIBS"
6545 +cat >conftest.$ac_ext <<_ACEOF
6546 +#line $LINENO "configure"
6547 +/* confdefs.h. */
6548 +_ACEOF
6549 +cat confdefs.h >>conftest.$ac_ext
6550 +cat >>conftest.$ac_ext <<_ACEOF
6551 +/* end confdefs.h. */
6552 +
6553 /* Override any gcc2 internal prototype to avoid an error. */
6554 +#ifdef __cplusplus
6555 +extern "C"
6556 +#endif
6557 /* We use char because int might match the return type of a gcc2
6558 - builtin and then its argument prototype would still apply. */
6559 -char yywrap();
6560 + builtin and then its argument prototype would still apply. */
6561 +char yywrap ();
6562 +int
6563 +main ()
6564 +{
6565 +yywrap ();
6566 + ;
6567 + return 0;
6568 +}
6569 +_ACEOF
6570 +rm -f conftest.$ac_objext conftest$ac_exeext
6571 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6572 + (eval $ac_link) 2>&5
6573 + ac_status=$?
6574 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6575 + (exit $ac_status); } &&
6576 + { ac_try='test -s conftest$ac_exeext'
6577 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6578 + (eval $ac_try) 2>&5
6579 + ac_status=$?
6580 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6581 + (exit $ac_status); }; }; then
6582 + ac_cv_lib_fl_yywrap=yes
6583 +else
6584 + echo "$as_me: failed program was:" >&5
6585 +sed 's/^/| /' conftest.$ac_ext >&5
6586 +
6587 +ac_cv_lib_fl_yywrap=no
6588 +fi
6589 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6590 +LIBS=$ac_check_lib_save_LIBS
6591 +fi
6592 +echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
6593 +echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
6594 +if test $ac_cv_lib_fl_yywrap = yes; then
6595 + LEXLIB="-lfl"
6596 +else
6597 + echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
6598 +echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
6599 +if test "${ac_cv_lib_l_yywrap+set}" = set; then
6600 + echo $ECHO_N "(cached) $ECHO_C" >&6
6601 +else
6602 + ac_check_lib_save_LIBS=$LIBS
6603 +LIBS="-ll $LIBS"
6604 +cat >conftest.$ac_ext <<_ACEOF
6605 +#line $LINENO "configure"
6606 +/* confdefs.h. */
6607 +_ACEOF
6608 +cat confdefs.h >>conftest.$ac_ext
6609 +cat >>conftest.$ac_ext <<_ACEOF
6610 +/* end confdefs.h. */
6611
6612 -int main() {
6613 -yywrap()
6614 -; return 0; }
6615 -EOF
6616 -if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6617 - rm -rf conftest*
6618 - eval "ac_cv_lib_$ac_lib_var=yes"
6619 +/* Override any gcc2 internal prototype to avoid an error. */
6620 +#ifdef __cplusplus
6621 +extern "C"
6622 +#endif
6623 +/* We use char because int might match the return type of a gcc2
6624 + builtin and then its argument prototype would still apply. */
6625 +char yywrap ();
6626 +int
6627 +main ()
6628 +{
6629 +yywrap ();
6630 + ;
6631 + return 0;
6632 +}
6633 +_ACEOF
6634 +rm -f conftest.$ac_objext conftest$ac_exeext
6635 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6636 + (eval $ac_link) 2>&5
6637 + ac_status=$?
6638 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6639 + (exit $ac_status); } &&
6640 + { ac_try='test -s conftest$ac_exeext'
6641 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6642 + (eval $ac_try) 2>&5
6643 + ac_status=$?
6644 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6645 + (exit $ac_status); }; }; then
6646 + ac_cv_lib_l_yywrap=yes
6647 else
6648 - echo "configure: failed program was:" >&5
6649 - cat conftest.$ac_ext >&5
6650 - rm -rf conftest*
6651 - eval "ac_cv_lib_$ac_lib_var=no"
6652 -fi
6653 -rm -f conftest*
6654 -LIBS="$ac_save_LIBS"
6655 + echo "$as_me: failed program was:" >&5
6656 +sed 's/^/| /' conftest.$ac_ext >&5
6657
6658 +ac_cv_lib_l_yywrap=no
6659 fi
6660 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
6661 - echo "$ac_t""yes" 1>&6
6662 - LEXLIB="-l$ac_lib"
6663 -else
6664 - echo "$ac_t""no" 1>&6
6665 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6666 +LIBS=$ac_check_lib_save_LIBS
6667 +fi
6668 +echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
6669 +echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
6670 +if test $ac_cv_lib_l_yywrap = yes; then
6671 + LEXLIB="-ll"
6672 +fi
6673 +
6674 fi
6675
6676 fi
6677
6678 -echo $ac_n "checking lex output file root""... $ac_c" 1>&6
6679 -echo "configure:1480: checking lex output file root" >&5
6680 -if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
6681 - echo $ac_n "(cached) $ac_c" 1>&6
6682 +if test "x$LEX" != "x:"; then
6683 + echo "$as_me:$LINENO: checking lex output file root" >&5
6684 +echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
6685 +if test "${ac_cv_prog_lex_root+set}" = set; then
6686 + echo $ECHO_N "(cached) $ECHO_C" >&6
6687 else
6688 # The minimal lex program is just a single line: %%. But some broken lexes
6689 # (Solaris, I think it was) want two %% lines, so accommodate them.
6690 -echo '%%
6691 -%%' | $LEX
6692 +cat >conftest.l <<_ACEOF
6693 +%%
6694 +%%
6695 +_ACEOF
6696 +{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
6697 + (eval $LEX conftest.l) 2>&5
6698 + ac_status=$?
6699 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6700 + (exit $ac_status); }
6701 if test -f lex.yy.c; then
6702 ac_cv_prog_lex_root=lex.yy
6703 elif test -f lexyy.c; then
6704 ac_cv_prog_lex_root=lexyy
6705 else
6706 - { echo "configure: error: cannot find output from $LEX; giving up" 1>&2; exit 1; }
6707 + { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
6708 +echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
6709 + { (exit 1); exit 1; }; }
6710 fi
6711 fi
6712 -
6713 -echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
6714 +echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
6715 +echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
6716 +rm -f conftest.l
6717 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
6718
6719 -echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
6720 -echo "configure:1501: checking whether yytext is a pointer" >&5
6721 -if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
6722 - echo $ac_n "(cached) $ac_c" 1>&6
6723 +echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
6724 +echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
6725 +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
6726 + echo $ECHO_N "(cached) $ECHO_C" >&6
6727 else
6728 # POSIX says lex can declare yytext either as a pointer or an array; the
6729 # default is implementation-dependent. Figure out which it is, since
6730 # not all implementations provide the %pointer and %array declarations.
6731 ac_cv_prog_lex_yytext_pointer=no
6732 echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
6733 -ac_save_LIBS="$LIBS"
6734 +ac_save_LIBS=$LIBS
6735 LIBS="$LIBS $LEXLIB"
6736 -cat > conftest.$ac_ext <<EOF
6737 -#line 1513 "configure"
6738 -#include "confdefs.h"
6739 +cat >conftest.$ac_ext <<_ACEOF
6740 `cat $LEX_OUTPUT_ROOT.c`
6741 -int main() {
6742 -
6743 -; return 0; }
6744 -EOF
6745 -if { (eval echo configure:1520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6746 - rm -rf conftest*
6747 +_ACEOF
6748 +rm -f conftest.$ac_objext conftest$ac_exeext
6749 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6750 + (eval $ac_link) 2>&5
6751 + ac_status=$?
6752 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6753 + (exit $ac_status); } &&
6754 + { ac_try='test -s conftest$ac_exeext'
6755 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6756 + (eval $ac_try) 2>&5
6757 + ac_status=$?
6758 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6759 + (exit $ac_status); }; }; then
6760 ac_cv_prog_lex_yytext_pointer=yes
6761 else
6762 - echo "configure: failed program was:" >&5
6763 - cat conftest.$ac_ext >&5
6764 + echo "$as_me: failed program was:" >&5
6765 +sed 's/^/| /' conftest.$ac_ext >&5
6766 +
6767 fi
6768 -rm -f conftest*
6769 -LIBS="$ac_save_LIBS"
6770 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6771 +LIBS=$ac_save_LIBS
6772 rm -f "${LEX_OUTPUT_ROOT}.c"
6773
6774 fi
6775 -
6776 -echo "$ac_t""$ac_cv_prog_lex_yytext_pointer" 1>&6
6777 +echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
6778 +echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
6779 if test $ac_cv_prog_lex_yytext_pointer = yes; then
6780 - cat >> confdefs.h <<\EOF
6781 +
6782 +cat >>confdefs.h <<\_ACEOF
6783 #define YYTEXT_POINTER 1
6784 -EOF
6785 +_ACEOF
6786 +
6787 +fi
6788
6789 fi
6790
6791 for ac_prog in 'bison -y' byacc
6792 do
6793 -# Extract the first word of "$ac_prog", so it can be a program name with args.
6794 + # Extract the first word of "$ac_prog", so it can be a program name with args.
6795 set dummy $ac_prog; ac_word=$2
6796 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
6797 -echo "configure:1546: checking for $ac_word" >&5
6798 -if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
6799 - echo $ac_n "(cached) $ac_c" 1>&6
6800 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6801 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6802 +if test "${ac_cv_prog_YACC+set}" = set; then
6803 + echo $ECHO_N "(cached) $ECHO_C" >&6
6804 else
6805 if test -n "$YACC"; then
6806 ac_cv_prog_YACC="$YACC" # Let the user override the test.
6807 else
6808 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
6809 - ac_dummy="$PATH"
6810 - for ac_dir in $ac_dummy; do
6811 - test -z "$ac_dir" && ac_dir=.
6812 - if test -f $ac_dir/$ac_word; then
6813 - ac_cv_prog_YACC="$ac_prog"
6814 - break
6815 - fi
6816 - done
6817 - IFS="$ac_save_ifs"
6818 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6819 +for as_dir in $PATH
6820 +do
6821 + IFS=$as_save_IFS
6822 + test -z "$as_dir" && as_dir=.
6823 + for ac_exec_ext in '' $ac_executable_extensions; do
6824 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6825 + ac_cv_prog_YACC="$ac_prog"
6826 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6827 + break 2
6828 + fi
6829 +done
6830 +done
6831 +
6832 fi
6833 fi
6834 -YACC="$ac_cv_prog_YACC"
6835 +YACC=$ac_cv_prog_YACC
6836 if test -n "$YACC"; then
6837 - echo "$ac_t""$YACC" 1>&6
6838 + echo "$as_me:$LINENO: result: $YACC" >&5
6839 +echo "${ECHO_T}$YACC" >&6
6840 else
6841 - echo "$ac_t""no" 1>&6
6842 + echo "$as_me:$LINENO: result: no" >&5
6843 +echo "${ECHO_T}no" >&6
6844 fi
6845
6846 -test -n "$YACC" && break
6847 + test -n "$YACC" && break
6848 done
6849 test -n "$YACC" || YACC="yacc"
6850
6851 @@ -1579,126 +3029,77 @@
6852 # SunOS /usr/etc/install
6853 # IRIX /sbin/install
6854 # AIX /bin/install
6855 +# AmigaOS /C/install, which installs bootblocks on floppy discs
6856 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
6857 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
6858 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
6859 # ./install, which can be erroneously created by make from ./install.sh.
6860 -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
6861 -echo "configure:1588: checking for a BSD compatible install" >&5
6862 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
6863 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
6864 if test -z "$INSTALL"; then
6865 -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
6866 - echo $ac_n "(cached) $ac_c" 1>&6
6867 +if test "${ac_cv_path_install+set}" = set; then
6868 + echo $ECHO_N "(cached) $ECHO_C" >&6
6869 else
6870 - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
6871 - for ac_dir in $PATH; do
6872 - # Account for people who put trailing slashes in PATH elements.
6873 - case "$ac_dir/" in
6874 - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
6875 - *)
6876 - # OSF1 and SCO ODT 3.0 have their own names for install.
6877 - # Don't use installbsd from OSF since it installs stuff as root
6878 - # by default.
6879 - for ac_prog in ginstall scoinst install; do
6880 - if test -f $ac_dir/$ac_prog; then
6881 - if test $ac_prog = install &&
6882 - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
6883 - # AIX install. It has an incompatible calling convention.
6884 - :
6885 - else
6886 - ac_cv_path_install="$ac_dir/$ac_prog -c"
6887 - break 2
6888 - fi
6889 - fi
6890 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6891 +for as_dir in $PATH
6892 +do
6893 + IFS=$as_save_IFS
6894 + test -z "$as_dir" && as_dir=.
6895 + # Account for people who put trailing slashes in PATH elements.
6896 +case $as_dir/ in
6897 + ./ | .// | /cC/* | \
6898 + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
6899 + /usr/ucb/* ) ;;
6900 + *)
6901 + # OSF1 and SCO ODT 3.0 have their own names for install.
6902 + # Don't use installbsd from OSF since it installs stuff as root
6903 + # by default.
6904 + for ac_prog in ginstall scoinst install; do
6905 + for ac_exec_ext in '' $ac_executable_extensions; do
6906 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
6907 + if test $ac_prog = install &&
6908 + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
6909 + # AIX install. It has an incompatible calling convention.
6910 + :
6911 + elif test $ac_prog = install &&
6912 + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
6913 + # program-specific install script used by HP pwplus--don't use.
6914 + :
6915 + else
6916 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
6917 + break 3
6918 + fi
6919 + fi
6920 done
6921 - ;;
6922 - esac
6923 - done
6924 - IFS="$ac_save_IFS"
6925 + done
6926 + ;;
6927 +esac
6928 +done
6929 +
6930
6931 fi
6932 if test "${ac_cv_path_install+set}" = set; then
6933 - INSTALL="$ac_cv_path_install"
6934 + INSTALL=$ac_cv_path_install
6935 else
6936 # As a last resort, use the slow shell script. We don't cache a
6937 # path for INSTALL within a source directory, because that will
6938 # break other packages using the cache if that directory is
6939 # removed, or if the path is relative.
6940 - INSTALL="$ac_install_sh"
6941 + INSTALL=$ac_install_sh
6942 fi
6943 fi
6944 -echo "$ac_t""$INSTALL" 1>&6
6945 +echo "$as_me:$LINENO: result: $INSTALL" >&5
6946 +echo "${ECHO_T}$INSTALL" >&6
6947
6948 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
6949 # It thinks the first close brace ends the variable substitution.
6950 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
6951
6952 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
6953 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
6954
6955 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
6956
6957
6958 -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
6959 -echo "configure:1642: checking for Cygwin environment" >&5
6960 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
6961 - echo $ac_n "(cached) $ac_c" 1>&6
6962 -else
6963 - cat > conftest.$ac_ext <<EOF
6964 -#line 1647 "configure"
6965 -#include "confdefs.h"
6966 -
6967 -int main() {
6968 -
6969 -#ifndef __CYGWIN__
6970 -#define __CYGWIN__ __CYGWIN32__
6971 -#endif
6972 -return __CYGWIN__;
6973 -; return 0; }
6974 -EOF
6975 -if { (eval echo configure:1658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6976 - rm -rf conftest*
6977 - ac_cv_cygwin=yes
6978 -else
6979 - echo "configure: failed program was:" >&5
6980 - cat conftest.$ac_ext >&5
6981 - rm -rf conftest*
6982 - ac_cv_cygwin=no
6983 -fi
6984 -rm -f conftest*
6985 -rm -f conftest*
6986 -fi
6987 -
6988 -echo "$ac_t""$ac_cv_cygwin" 1>&6
6989 -CYGWIN=
6990 -test "$ac_cv_cygwin" = yes && CYGWIN=yes
6991 -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
6992 -echo "configure:1675: checking for mingw32 environment" >&5
6993 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
6994 - echo $ac_n "(cached) $ac_c" 1>&6
6995 -else
6996 - cat > conftest.$ac_ext <<EOF
6997 -#line 1680 "configure"
6998 -#include "confdefs.h"
6999 -
7000 -int main() {
7001 -return __MINGW32__;
7002 -; return 0; }
7003 -EOF
7004 -if { (eval echo configure:1687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7005 - rm -rf conftest*
7006 - ac_cv_mingw32=yes
7007 -else
7008 - echo "configure: failed program was:" >&5
7009 - cat conftest.$ac_ext >&5
7010 - rm -rf conftest*
7011 - ac_cv_mingw32=no
7012 -fi
7013 -rm -f conftest*
7014 -rm -f conftest*
7015 -fi
7016 -
7017 -echo "$ac_t""$ac_cv_mingw32" 1>&6
7018 -MINGW32=
7019 -test "$ac_cv_mingw32" = yes && MINGW32=yes
7020 # Check whether --enable-shared or --disable-shared was given.
7021 if test "${enable_shared+set}" = set; then
7022 enableval="$enable_shared"
7023 @@ -1720,8 +3121,7 @@
7024 esac
7025 else
7026 enable_shared=yes
7027 -fi
7028 -
7029 +fi;
7030 # Check whether --enable-static or --disable-static was given.
7031 if test "${enable_static+set}" = set; then
7032 enableval="$enable_static"
7033 @@ -1743,8 +3143,7 @@
7034 esac
7035 else
7036 enable_static=yes
7037 -fi
7038 -
7039 +fi;
7040 # Check whether --enable-fast-install or --disable-fast-install was given.
7041 if test "${enable_fast_install+set}" = set; then
7042 enableval="$enable_fast_install"
7043 @@ -1766,21 +3165,31 @@
7044 esac
7045 else
7046 enable_fast_install=yes
7047 +fi;
7048 +# Find the correct PATH separator. Usually this is `:', but
7049 +# DJGPP uses `;' like DOS.
7050 +if test "X${PATH_SEPARATOR+set}" != Xset; then
7051 + UNAME=${UNAME-`uname 2>/dev/null`}
7052 + case X$UNAME in
7053 + *-DOS) lt_cv_sys_path_separator=';' ;;
7054 + *) lt_cv_sys_path_separator=':' ;;
7055 + esac
7056 + PATH_SEPARATOR=$lt_cv_sys_path_separator
7057 fi
7058
7059 +
7060 # Check whether --with-gnu-ld or --without-gnu-ld was given.
7061 if test "${with_gnu_ld+set}" = set; then
7062 withval="$with_gnu_ld"
7063 test "$withval" = no || with_gnu_ld=yes
7064 else
7065 with_gnu_ld=no
7066 -fi
7067 -
7068 +fi;
7069 ac_prog=ld
7070 if test "$GCC" = yes; then
7071 # Check if gcc -print-prog-name=ld gives a path.
7072 - echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
7073 -echo "configure:1784: checking for ld used by GCC" >&5
7074 + echo "$as_me:$LINENO: checking for ld used by GCC" >&5
7075 +echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
7076 case $host in
7077 *-*-mingw*)
7078 # gcc leaves a trailing carriage return which upsets mingw
7079 @@ -1809,17 +3218,17 @@
7080 ;;
7081 esac
7082 elif test "$with_gnu_ld" = yes; then
7083 - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
7084 -echo "configure:1814: checking for GNU ld" >&5
7085 + echo "$as_me:$LINENO: checking for GNU ld" >&5
7086 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
7087 else
7088 - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
7089 -echo "configure:1817: checking for non-GNU ld" >&5
7090 + echo "$as_me:$LINENO: checking for non-GNU ld" >&5
7091 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
7092 fi
7093 -if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
7094 - echo $ac_n "(cached) $ac_c" 1>&6
7095 +if test "${lt_cv_path_LD+set}" = set; then
7096 + echo $ECHO_N "(cached) $ECHO_C" >&6
7097 else
7098 if test -z "$LD"; then
7099 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
7100 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
7101 for ac_dir in $PATH; do
7102 test -z "$ac_dir" && ac_dir=.
7103 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
7104 @@ -1842,15 +3251,19 @@
7105
7106 LD="$lt_cv_path_LD"
7107 if test -n "$LD"; then
7108 - echo "$ac_t""$LD" 1>&6
7109 + echo "$as_me:$LINENO: result: $LD" >&5
7110 +echo "${ECHO_T}$LD" >&6
7111 else
7112 - echo "$ac_t""no" 1>&6
7113 + echo "$as_me:$LINENO: result: no" >&5
7114 +echo "${ECHO_T}no" >&6
7115 fi
7116 -test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
7117 -echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
7118 -echo "configure:1852: checking if the linker ($LD) is GNU ld" >&5
7119 -if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
7120 - echo $ac_n "(cached) $ac_c" 1>&6
7121 +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
7122 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
7123 + { (exit 1); exit 1; }; }
7124 +echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
7125 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
7126 +if test "${lt_cv_prog_gnu_ld+set}" = set; then
7127 + echo $ECHO_N "(cached) $ECHO_C" >&6
7128 else
7129 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
7130 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
7131 @@ -1859,33 +3272,33 @@
7132 lt_cv_prog_gnu_ld=no
7133 fi
7134 fi
7135 -
7136 -echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
7137 +echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
7138 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
7139 with_gnu_ld=$lt_cv_prog_gnu_ld
7140
7141
7142 -echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
7143 -echo "configure:1869: checking for $LD option to reload object files" >&5
7144 -if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
7145 - echo $ac_n "(cached) $ac_c" 1>&6
7146 +echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
7147 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
7148 +if test "${lt_cv_ld_reload_flag+set}" = set; then
7149 + echo $ECHO_N "(cached) $ECHO_C" >&6
7150 else
7151 lt_cv_ld_reload_flag='-r'
7152 fi
7153 -
7154 -echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
7155 +echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
7156 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
7157 reload_flag=$lt_cv_ld_reload_flag
7158 test -n "$reload_flag" && reload_flag=" $reload_flag"
7159
7160 -echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
7161 -echo "configure:1881: checking for BSD-compatible nm" >&5
7162 -if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
7163 - echo $ac_n "(cached) $ac_c" 1>&6
7164 +echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
7165 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
7166 +if test "${lt_cv_path_NM+set}" = set; then
7167 + echo $ECHO_N "(cached) $ECHO_C" >&6
7168 else
7169 if test -n "$NM"; then
7170 # Let the user override the test.
7171 lt_cv_path_NM="$NM"
7172 else
7173 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
7174 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
7175 for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
7176 test -z "$ac_dir" && ac_dir=.
7177 tmp_nm=$ac_dir/${ac_tool_prefix}nm
7178 @@ -1912,33 +3325,109 @@
7179 fi
7180
7181 NM="$lt_cv_path_NM"
7182 -echo "$ac_t""$NM" 1>&6
7183 +echo "$as_me:$LINENO: result: $NM" >&5
7184 +echo "${ECHO_T}$NM" >&6
7185 +
7186 +echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
7187 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
7188 +if test "${lt_cv_path_SED+set}" = set; then
7189 + echo $ECHO_N "(cached) $ECHO_C" >&6
7190 +else
7191 + # Loop through the user's path and test for sed and gsed.
7192 +# Then use that list of sed's as ones to test for truncation.
7193 +as_executable_p="test -f"
7194 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7195 +for as_dir in $PATH
7196 +do
7197 + IFS=$as_save_IFS
7198 + test -z "$as_dir" && as_dir=.
7199 + for ac_prog in sed gsed; do
7200 + for ac_exec_ext in '' $ac_executable_extensions; do
7201 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
7202 + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
7203 + fi
7204 + done
7205 + done
7206 +done
7207 +
7208 + # Create a temporary directory, and hook for its removal unless debugging.
7209 +$debug ||
7210 +{
7211 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
7212 + trap '{ (exit 1); exit 1; }' 1 2 13 15
7213 +}
7214 +
7215 +# Create a (secure) tmp directory for tmp files.
7216 +: ${TMPDIR=/tmp}
7217 +{
7218 + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
7219 + test -n "$tmp" && test -d "$tmp"
7220 +} ||
7221 +{
7222 + tmp=$TMPDIR/sed$$-$RANDOM
7223 + (umask 077 && mkdir $tmp)
7224 +} ||
7225 +{
7226 + echo "$me: cannot create a temporary directory in $TMPDIR" >&2
7227 + { (exit 1); exit 1; }
7228 +}
7229 + _max=0
7230 + _count=0
7231 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris
7232 + # along with /bin/sed that truncates output.
7233 + for _sed in $_sed_list /usr/xpg4/bin/sed; do
7234 + test ! -f ${_sed} && break
7235 + cat /dev/null > "$tmp/sed.in"
7236 + _count=0
7237 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
7238 + # Check for GNU sed and select it if it is found.
7239 + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
7240 + lt_cv_path_SED=${_sed}
7241 + break
7242 + fi
7243 + while true; do
7244 + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
7245 + mv "$tmp/sed.tmp" "$tmp/sed.in"
7246 + cp "$tmp/sed.in" "$tmp/sed.nl"
7247 + echo >>"$tmp/sed.nl"
7248 + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
7249 + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
7250 + # 40000 chars as input seems more than enough
7251 + test $_count -gt 10 && break
7252 + _count=`expr $_count + 1`
7253 + if test $_count -gt $_max; then
7254 + _max=$_count
7255 + lt_cv_path_SED=$_sed
7256 + fi
7257 + done
7258 + done
7259 + rm -rf "$tmp"
7260
7261 -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
7262 -echo "configure:1919: checking whether ln -s works" >&5
7263 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
7264 - echo $ac_n "(cached) $ac_c" 1>&6
7265 -else
7266 - rm -f conftestdata
7267 -if ln -s X conftestdata 2>/dev/null
7268 -then
7269 - rm -f conftestdata
7270 - ac_cv_prog_LN_S="ln -s"
7271 -else
7272 - ac_cv_prog_LN_S=ln
7273 fi
7274 +
7275 +if test "X$SED" != "X"; then
7276 + lt_cv_path_SED=$SED
7277 +else
7278 + SED=$lt_cv_path_SED
7279 fi
7280 -LN_S="$ac_cv_prog_LN_S"
7281 -if test "$ac_cv_prog_LN_S" = "ln -s"; then
7282 - echo "$ac_t""yes" 1>&6
7283 +echo "$as_me:$LINENO: result: $SED" >&5
7284 +echo "${ECHO_T}$SED" >&6
7285 +
7286 +echo "$as_me:$LINENO: checking whether ln -s works" >&5
7287 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
7288 +LN_S=$as_ln_s
7289 +if test "$LN_S" = "ln -s"; then
7290 + echo "$as_me:$LINENO: result: yes" >&5
7291 +echo "${ECHO_T}yes" >&6
7292 else
7293 - echo "$ac_t""no" 1>&6
7294 + echo "$as_me:$LINENO: result: no, using $LN_S" >&5
7295 +echo "${ECHO_T}no, using $LN_S" >&6
7296 fi
7297
7298 -echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
7299 -echo "configure:1940: checking how to recognise dependant libraries" >&5
7300 -if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
7301 - echo $ac_n "(cached) $ac_c" 1>&6
7302 +echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
7303 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
7304 +if test "${lt_cv_deplibs_check_method+set}" = set; then
7305 + echo $ECHO_N "(cached) $ECHO_C" >&6
7306 else
7307 lt_cv_file_magic_cmd='$MAGIC_CMD'
7308 lt_cv_file_magic_test_file=
7309 @@ -1949,7 +3438,7 @@
7310 # `unknown' -- same as none, but documents that we really don't know.
7311 # 'pass_all' -- all dependencies passed with no checks.
7312 # 'test_compile' -- check by making test program.
7313 -# ['file_magic [regex]'] -- check by looking for files in library path
7314 +# 'file_magic [[regex]]' -- check by looking for files in library path
7315 # which responds to the $file_magic_cmd with a given egrep regex.
7316 # If you have `file' or equivalent on your system and you're not sure
7317 # whether `pass_all' will *always* work, you probably want this one.
7318 @@ -1978,7 +3467,7 @@
7319 lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
7320 lt_cv_file_magic_cmd='/usr/bin/file -L'
7321 case "$host_os" in
7322 - rhapsody* | darwin1.012)
7323 + rhapsody* | darwin1.[012])
7324 lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
7325 ;;
7326 *) # Darwin 1.3 on
7327 @@ -2013,9 +3502,9 @@
7328 lt_cv_file_magic_test_file=/usr/lib/libc.sl
7329 ;;
7330
7331 -irix5* | irix6*)
7332 +irix5* | irix6* | nonstopux*)
7333 case $host_os in
7334 - irix5*)
7335 + irix5* | nonstopux*)
7336 # this will be overridden with pass_all, but let us keep it just in case
7337 lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
7338 ;;
7339 @@ -2037,7 +3526,7 @@
7340 # This must be Linux ELF.
7341 linux-gnu*)
7342 case $host_cpu in
7343 - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
7344 + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k)
7345 lt_cv_deplibs_check_method=pass_all ;;
7346 *)
7347 # glibc up to 2.1.1 does not perform some relocations on ARM
7348 @@ -2060,6 +3549,16 @@
7349 lt_cv_file_magic_test_file=/usr/lib/libnls.so
7350 ;;
7351
7352 +openbsd*)
7353 + lt_cv_file_magic_cmd=/usr/bin/file
7354 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
7355 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
7356 + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
7357 + else
7358 + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
7359 + fi
7360 + ;;
7361 +
7362 osf3* | osf4* | osf5*)
7363 # this will be overridden with pass_all, but let us keep it just in case
7364 lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
7365 @@ -2098,89 +3597,32 @@
7366 lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
7367 lt_cv_file_magic_test_file=/lib/libc.so
7368 ;;
7369 + siemens)
7370 + lt_cv_deplibs_check_method=pass_all
7371 + ;;
7372 esac
7373 ;;
7374 esac
7375
7376 fi
7377 -
7378 -echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
7379 +echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
7380 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
7381 file_magic_cmd=$lt_cv_file_magic_cmd
7382 deplibs_check_method=$lt_cv_deplibs_check_method
7383
7384 -echo $ac_n "checking for object suffix""... $ac_c" 1>&6
7385 -echo "configure:2113: checking for object suffix" >&5
7386 -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
7387 - echo $ac_n "(cached) $ac_c" 1>&6
7388 -else
7389 - rm -f conftest*
7390 -echo 'int i = 1;' > conftest.$ac_ext
7391 -if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7392 - for ac_file in conftest.*; do
7393 - case $ac_file in
7394 - *.c) ;;
7395 - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
7396 - esac
7397 - done
7398 -else
7399 - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
7400 -fi
7401 -rm -f conftest*
7402 -fi
7403 -
7404 -echo "$ac_t""$ac_cv_objext" 1>&6
7405 -OBJEXT=$ac_cv_objext
7406 -ac_objext=$ac_cv_objext
7407 -
7408 -
7409 -
7410 -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
7411 -echo "configure:2139: checking for executable suffix" >&5
7412 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
7413 - echo $ac_n "(cached) $ac_c" 1>&6
7414 -else
7415 - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
7416 - ac_cv_exeext=.exe
7417 -else
7418 - rm -f conftest*
7419 - echo 'int main () { return 0; }' > conftest.$ac_ext
7420 - ac_cv_exeext=
7421 - if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
7422 - for file in conftest.*; do
7423 - case $file in
7424 - *.c | *.o | *.obj) ;;
7425 - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
7426 - esac
7427 - done
7428 - else
7429 - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
7430 - fi
7431 - rm -f conftest*
7432 - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
7433 -fi
7434 -fi
7435
7436 -EXEEXT=""
7437 -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
7438 -echo "$ac_t""${ac_cv_exeext}" 1>&6
7439 -ac_exeext=$EXEEXT
7440
7441 -if test $host != $build; then
7442 - ac_tool_prefix=${host_alias}-
7443 -else
7444 - ac_tool_prefix=
7445 -fi
7446
7447
7448
7449
7450 # Check for command to grab the raw symbol name followed by C symbol from nm.
7451 -echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
7452 -echo "configure:2180: checking command to parse $NM output" >&5
7453 -if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
7454 - echo $ac_n "(cached) $ac_c" 1>&6
7455 +echo "$as_me:$LINENO: checking command to parse $NM output" >&5
7456 +echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
7457 +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
7458 + echo $ECHO_N "(cached) $ECHO_C" >&6
7459 else
7460 -
7461 +
7462 # These are sane defaults that work on at least a few old systems.
7463 # [They come from Ultrix. What could be older than Ultrix?!! ;)]
7464
7465 @@ -2196,6 +3638,9 @@
7466 # Transform an extracted symbol line into a proper C declaration
7467 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
7468
7469 +# Transform an extracted symbol line into symbol name and symbol address
7470 +lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
7471 +
7472 # Define system-specific variables.
7473 case $host_os in
7474 aix*)
7475 @@ -2206,10 +3651,14 @@
7476 ;;
7477 hpux*) # Its linker distinguishes data from code symbols
7478 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
7479 + lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
7480 ;;
7481 -irix*)
7482 +irix* | nonstopux*)
7483 symcode='[BCDEGRST]'
7484 ;;
7485 +osf*)
7486 + symcode='[BCDEGQRST]'
7487 + ;;
7488 solaris* | sysv5*)
7489 symcode='[BDT]'
7490 ;;
7491 @@ -2252,10 +3701,18 @@
7492 int main(){nm_test_var='a';nm_test_func();return(0);}
7493 EOF
7494
7495 - if { (eval echo configure:2256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7496 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7497 + (eval $ac_compile) 2>&5
7498 + ac_status=$?
7499 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7500 + (exit $ac_status); }; then
7501 # Now try to grab the symbols.
7502 nlist=conftest.nm
7503 - if { (eval echo configure:2259: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
7504 + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
7505 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
7506 + ac_status=$?
7507 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7508 + (exit $ac_status); } && test -s "$nlist"; then
7509 # Try sorting and uniquifying the output.
7510 if sort "$nlist" | uniq > "$nlist"T; then
7511 mv -f "$nlist"T "$nlist"
7512 @@ -2277,23 +3734,23 @@
7513
7514 cat <<EOF >> conftest.$ac_ext
7515 #if defined (__STDC__) && __STDC__
7516 -# define lt_ptr_t void *
7517 +# define lt_ptr void *
7518 #else
7519 -# define lt_ptr_t char *
7520 +# define lt_ptr char *
7521 # define const
7522 #endif
7523
7524 /* The mapping between symbol names and symbols. */
7525 const struct {
7526 const char *name;
7527 - lt_ptr_t address;
7528 + lt_ptr address;
7529 }
7530 lt_preloaded_symbols[] =
7531 {
7532 EOF
7533 - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
7534 + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
7535 cat <<\EOF >> conftest.$ac_ext
7536 - {0, (lt_ptr_t) 0}
7537 + {0, (lt_ptr) 0}
7538 };
7539
7540 #ifdef __cplusplus
7541 @@ -2306,7 +3763,11 @@
7542 save_CFLAGS="$CFLAGS"
7543 LIBS="conftstm.$ac_objext"
7544 CFLAGS="$CFLAGS$no_builtin_flag"
7545 - if { (eval echo configure:2310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
7546 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7547 + (eval $ac_link) 2>&5
7548 + ac_status=$?
7549 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7550 + (exit $ac_status); } && test -s conftest$ac_exeext; then
7551 pipe_works=yes
7552 fi
7553 LIBS="$save_LIBS"
7554 @@ -2339,84 +3800,665 @@
7555 global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
7556 if test -z "$lt_cv_sys_global_symbol_pipe"; then
7557 global_symbol_to_cdecl=
7558 + global_symbol_to_c_name_address=
7559 else
7560 global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
7561 + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
7562 fi
7563 -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
7564 - echo "$ac_t""failed" 1>&6
7565 +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
7566 +then
7567 + echo "$as_me:$LINENO: result: failed" >&5
7568 +echo "${ECHO_T}failed" >&6
7569 else
7570 - echo "$ac_t""ok" 1>&6
7571 + echo "$as_me:$LINENO: result: ok" >&5
7572 +echo "${ECHO_T}ok" >&6
7573 fi
7574
7575 -for ac_hdr in dlfcn.h
7576 +ac_ext=c
7577 +ac_cpp='$CPP $CPPFLAGS'
7578 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7579 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7580 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
7581 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
7582 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
7583 +# On Suns, sometimes $CPP names a directory.
7584 +if test -n "$CPP" && test -d "$CPP"; then
7585 + CPP=
7586 +fi
7587 +if test -z "$CPP"; then
7588 + if test "${ac_cv_prog_CPP+set}" = set; then
7589 + echo $ECHO_N "(cached) $ECHO_C" >&6
7590 +else
7591 + # Double quotes because CPP needs to be expanded
7592 + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
7593 + do
7594 + ac_preproc_ok=false
7595 +for ac_c_preproc_warn_flag in '' yes
7596 do
7597 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
7598 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
7599 -echo "configure:2356: checking for $ac_hdr" >&5
7600 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
7601 - echo $ac_n "(cached) $ac_c" 1>&6
7602 + # Use a header file that comes with gcc, so configuring glibc
7603 + # with a fresh cross-compiler works.
7604 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7605 + # <limits.h> exists even on freestanding compilers.
7606 + # On the NeXT, cc -E runs the code through the compiler's parser,
7607 + # not just through cpp. "Syntax error" is here to catch this case.
7608 + cat >conftest.$ac_ext <<_ACEOF
7609 +#line $LINENO "configure"
7610 +/* confdefs.h. */
7611 +_ACEOF
7612 +cat confdefs.h >>conftest.$ac_ext
7613 +cat >>conftest.$ac_ext <<_ACEOF
7614 +/* end confdefs.h. */
7615 +#ifdef __STDC__
7616 +# include <limits.h>
7617 +#else
7618 +# include <assert.h>
7619 +#endif
7620 + Syntax error
7621 +_ACEOF
7622 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7623 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7624 + ac_status=$?
7625 + grep -v '^ *+' conftest.er1 >conftest.err
7626 + rm -f conftest.er1
7627 + cat conftest.err >&5
7628 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7629 + (exit $ac_status); } >/dev/null; then
7630 + if test -s conftest.err; then
7631 + ac_cpp_err=$ac_c_preproc_warn_flag
7632 + else
7633 + ac_cpp_err=
7634 + fi
7635 else
7636 - cat > conftest.$ac_ext <<EOF
7637 -#line 2361 "configure"
7638 -#include "confdefs.h"
7639 -#include <$ac_hdr>
7640 -EOF
7641 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7642 -{ (eval echo configure:2366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7643 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7644 -if test -z "$ac_err"; then
7645 - rm -rf conftest*
7646 - eval "ac_cv_header_$ac_safe=yes"
7647 + ac_cpp_err=yes
7648 +fi
7649 +if test -z "$ac_cpp_err"; then
7650 + :
7651 else
7652 - echo "$ac_err" >&5
7653 - echo "configure: failed program was:" >&5
7654 - cat conftest.$ac_ext >&5
7655 - rm -rf conftest*
7656 - eval "ac_cv_header_$ac_safe=no"
7657 + echo "$as_me: failed program was:" >&5
7658 +sed 's/^/| /' conftest.$ac_ext >&5
7659 +
7660 + # Broken: fails on valid input.
7661 +continue
7662 fi
7663 -rm -f conftest*
7664 +rm -f conftest.err conftest.$ac_ext
7665 +
7666 + # OK, works on sane cases. Now check whether non-existent headers
7667 + # can be detected and how.
7668 + cat >conftest.$ac_ext <<_ACEOF
7669 +#line $LINENO "configure"
7670 +/* confdefs.h. */
7671 +_ACEOF
7672 +cat confdefs.h >>conftest.$ac_ext
7673 +cat >>conftest.$ac_ext <<_ACEOF
7674 +/* end confdefs.h. */
7675 +#include <ac_nonexistent.h>
7676 +_ACEOF
7677 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7678 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7679 + ac_status=$?
7680 + grep -v '^ *+' conftest.er1 >conftest.err
7681 + rm -f conftest.er1
7682 + cat conftest.err >&5
7683 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7684 + (exit $ac_status); } >/dev/null; then
7685 + if test -s conftest.err; then
7686 + ac_cpp_err=$ac_c_preproc_warn_flag
7687 + else
7688 + ac_cpp_err=
7689 + fi
7690 +else
7691 + ac_cpp_err=yes
7692 fi
7693 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
7694 - echo "$ac_t""yes" 1>&6
7695 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
7696 - cat >> confdefs.h <<EOF
7697 -#define $ac_tr_hdr 1
7698 -EOF
7699 -
7700 +if test -z "$ac_cpp_err"; then
7701 + # Broken: success on invalid input.
7702 +continue
7703 else
7704 - echo "$ac_t""no" 1>&6
7705 + echo "$as_me: failed program was:" >&5
7706 +sed 's/^/| /' conftest.$ac_ext >&5
7707 +
7708 + # Passes both tests.
7709 +ac_preproc_ok=:
7710 +break
7711 fi
7712 +rm -f conftest.err conftest.$ac_ext
7713 +
7714 done
7715 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7716 +rm -f conftest.err conftest.$ac_ext
7717 +if $ac_preproc_ok; then
7718 + break
7719 +fi
7720
7721 + done
7722 + ac_cv_prog_CPP=$CPP
7723 +
7724 +fi
7725 + CPP=$ac_cv_prog_CPP
7726 +else
7727 + ac_cv_prog_CPP=$CPP
7728 +fi
7729 +echo "$as_me:$LINENO: result: $CPP" >&5
7730 +echo "${ECHO_T}$CPP" >&6
7731 +ac_preproc_ok=false
7732 +for ac_c_preproc_warn_flag in '' yes
7733 +do
7734 + # Use a header file that comes with gcc, so configuring glibc
7735 + # with a fresh cross-compiler works.
7736 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7737 + # <limits.h> exists even on freestanding compilers.
7738 + # On the NeXT, cc -E runs the code through the compiler's parser,
7739 + # not just through cpp. "Syntax error" is here to catch this case.
7740 + cat >conftest.$ac_ext <<_ACEOF
7741 +#line $LINENO "configure"
7742 +/* confdefs.h. */
7743 +_ACEOF
7744 +cat confdefs.h >>conftest.$ac_ext
7745 +cat >>conftest.$ac_ext <<_ACEOF
7746 +/* end confdefs.h. */
7747 +#ifdef __STDC__
7748 +# include <limits.h>
7749 +#else
7750 +# include <assert.h>
7751 +#endif
7752 + Syntax error
7753 +_ACEOF
7754 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7755 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7756 + ac_status=$?
7757 + grep -v '^ *+' conftest.er1 >conftest.err
7758 + rm -f conftest.er1
7759 + cat conftest.err >&5
7760 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7761 + (exit $ac_status); } >/dev/null; then
7762 + if test -s conftest.err; then
7763 + ac_cpp_err=$ac_c_preproc_warn_flag
7764 + else
7765 + ac_cpp_err=
7766 + fi
7767 +else
7768 + ac_cpp_err=yes
7769 +fi
7770 +if test -z "$ac_cpp_err"; then
7771 + :
7772 +else
7773 + echo "$as_me: failed program was:" >&5
7774 +sed 's/^/| /' conftest.$ac_ext >&5
7775
7776 + # Broken: fails on valid input.
7777 +continue
7778 +fi
7779 +rm -f conftest.err conftest.$ac_ext
7780
7781 + # OK, works on sane cases. Now check whether non-existent headers
7782 + # can be detected and how.
7783 + cat >conftest.$ac_ext <<_ACEOF
7784 +#line $LINENO "configure"
7785 +/* confdefs.h. */
7786 +_ACEOF
7787 +cat confdefs.h >>conftest.$ac_ext
7788 +cat >>conftest.$ac_ext <<_ACEOF
7789 +/* end confdefs.h. */
7790 +#include <ac_nonexistent.h>
7791 +_ACEOF
7792 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7793 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7794 + ac_status=$?
7795 + grep -v '^ *+' conftest.er1 >conftest.err
7796 + rm -f conftest.er1
7797 + cat conftest.err >&5
7798 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7799 + (exit $ac_status); } >/dev/null; then
7800 + if test -s conftest.err; then
7801 + ac_cpp_err=$ac_c_preproc_warn_flag
7802 + else
7803 + ac_cpp_err=
7804 + fi
7805 +else
7806 + ac_cpp_err=yes
7807 +fi
7808 +if test -z "$ac_cpp_err"; then
7809 + # Broken: success on invalid input.
7810 +continue
7811 +else
7812 + echo "$as_me: failed program was:" >&5
7813 +sed 's/^/| /' conftest.$ac_ext >&5
7814
7815 + # Passes both tests.
7816 +ac_preproc_ok=:
7817 +break
7818 +fi
7819 +rm -f conftest.err conftest.$ac_ext
7820
7821 -# Only perform the check for file, if the check method requires it
7822 -case $deplibs_check_method in
7823 -file_magic*)
7824 - if test "$file_magic_cmd" = '$MAGIC_CMD'; then
7825 - echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
7826 -echo "configure:2401: checking for ${ac_tool_prefix}file" >&5
7827 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
7828 - echo $ac_n "(cached) $ac_c" 1>&6
7829 +done
7830 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7831 +rm -f conftest.err conftest.$ac_ext
7832 +if $ac_preproc_ok; then
7833 + :
7834 else
7835 - case $MAGIC_CMD in
7836 - /*)
7837 - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
7838 - ;;
7839 - ?:/*)
7840 - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
7841 - ;;
7842 - *)
7843 - ac_save_MAGIC_CMD="$MAGIC_CMD"
7844 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
7845 - ac_dummy="/usr/bin:$PATH"
7846 - for ac_dir in $ac_dummy; do
7847 - test -z "$ac_dir" && ac_dir=.
7848 - if test -f $ac_dir/${ac_tool_prefix}file; then
7849 - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
7850 - if test -n "$file_magic_test_file"; then
7851 + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
7852 +See \`config.log' for more details." >&5
7853 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
7854 +See \`config.log' for more details." >&2;}
7855 + { (exit 1); exit 1; }; }
7856 +fi
7857 +
7858 +ac_ext=c
7859 +ac_cpp='$CPP $CPPFLAGS'
7860 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7861 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7862 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
7863 +
7864 +
7865 +echo "$as_me:$LINENO: checking for egrep" >&5
7866 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6
7867 +if test "${ac_cv_prog_egrep+set}" = set; then
7868 + echo $ECHO_N "(cached) $ECHO_C" >&6
7869 +else
7870 + if echo a | (grep -E '(a|b)') >/dev/null 2>&1
7871 + then ac_cv_prog_egrep='grep -E'
7872 + else ac_cv_prog_egrep='egrep'
7873 + fi
7874 +fi
7875 +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
7876 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6
7877 + EGREP=$ac_cv_prog_egrep
7878 +
7879 +
7880 +echo "$as_me:$LINENO: checking for ANSI C header files" >&5
7881 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
7882 +if test "${ac_cv_header_stdc+set}" = set; then
7883 + echo $ECHO_N "(cached) $ECHO_C" >&6
7884 +else
7885 + cat >conftest.$ac_ext <<_ACEOF
7886 +#line $LINENO "configure"
7887 +/* confdefs.h. */
7888 +_ACEOF
7889 +cat confdefs.h >>conftest.$ac_ext
7890 +cat >>conftest.$ac_ext <<_ACEOF
7891 +/* end confdefs.h. */
7892 +#include <stdlib.h>
7893 +#include <stdarg.h>
7894 +#include <string.h>
7895 +#include <float.h>
7896 +
7897 +int
7898 +main ()
7899 +{
7900 +
7901 + ;
7902 + return 0;
7903 +}
7904 +_ACEOF
7905 +rm -f conftest.$ac_objext
7906 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7907 + (eval $ac_compile) 2>&5
7908 + ac_status=$?
7909 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7910 + (exit $ac_status); } &&
7911 + { ac_try='test -s conftest.$ac_objext'
7912 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7913 + (eval $ac_try) 2>&5
7914 + ac_status=$?
7915 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7916 + (exit $ac_status); }; }; then
7917 + ac_cv_header_stdc=yes
7918 +else
7919 + echo "$as_me: failed program was:" >&5
7920 +sed 's/^/| /' conftest.$ac_ext >&5
7921 +
7922 +ac_cv_header_stdc=no
7923 +fi
7924 +rm -f conftest.$ac_objext conftest.$ac_ext
7925 +
7926 +if test $ac_cv_header_stdc = yes; then
7927 + # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
7928 + cat >conftest.$ac_ext <<_ACEOF
7929 +#line $LINENO "configure"
7930 +/* confdefs.h. */
7931 +_ACEOF
7932 +cat confdefs.h >>conftest.$ac_ext
7933 +cat >>conftest.$ac_ext <<_ACEOF
7934 +/* end confdefs.h. */
7935 +#include <string.h>
7936 +
7937 +_ACEOF
7938 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
7939 + $EGREP "memchr" >/dev/null 2>&1; then
7940 + :
7941 +else
7942 + ac_cv_header_stdc=no
7943 +fi
7944 +rm -f conftest*
7945 +
7946 +fi
7947 +
7948 +if test $ac_cv_header_stdc = yes; then
7949 + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
7950 + cat >conftest.$ac_ext <<_ACEOF
7951 +#line $LINENO "configure"
7952 +/* confdefs.h. */
7953 +_ACEOF
7954 +cat confdefs.h >>conftest.$ac_ext
7955 +cat >>conftest.$ac_ext <<_ACEOF
7956 +/* end confdefs.h. */
7957 +#include <stdlib.h>
7958 +
7959 +_ACEOF
7960 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
7961 + $EGREP "free" >/dev/null 2>&1; then
7962 + :
7963 +else
7964 + ac_cv_header_stdc=no
7965 +fi
7966 +rm -f conftest*
7967 +
7968 +fi
7969 +
7970 +if test $ac_cv_header_stdc = yes; then
7971 + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
7972 + if test "$cross_compiling" = yes; then
7973 + :
7974 +else
7975 + cat >conftest.$ac_ext <<_ACEOF
7976 +#line $LINENO "configure"
7977 +/* confdefs.h. */
7978 +_ACEOF
7979 +cat confdefs.h >>conftest.$ac_ext
7980 +cat >>conftest.$ac_ext <<_ACEOF
7981 +/* end confdefs.h. */
7982 +#include <ctype.h>
7983 +#if ((' ' & 0x0FF) == 0x020)
7984 +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
7985 +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
7986 +#else
7987 +# define ISLOWER(c) \
7988 + (('a' <= (c) && (c) <= 'i') \
7989 + || ('j' <= (c) && (c) <= 'r') \
7990 + || ('s' <= (c) && (c) <= 'z'))
7991 +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
7992 +#endif
7993 +
7994 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
7995 +int
7996 +main ()
7997 +{
7998 + int i;
7999 + for (i = 0; i < 256; i++)
8000 + if (XOR (islower (i), ISLOWER (i))
8001 + || toupper (i) != TOUPPER (i))
8002 + exit(2);
8003 + exit (0);
8004 +}
8005 +_ACEOF
8006 +rm -f conftest$ac_exeext
8007 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8008 + (eval $ac_link) 2>&5
8009 + ac_status=$?
8010 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8011 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8012 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8013 + (eval $ac_try) 2>&5
8014 + ac_status=$?
8015 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8016 + (exit $ac_status); }; }; then
8017 + :
8018 +else
8019 + echo "$as_me: program exited with status $ac_status" >&5
8020 +echo "$as_me: failed program was:" >&5
8021 +sed 's/^/| /' conftest.$ac_ext >&5
8022 +
8023 +( exit $ac_status )
8024 +ac_cv_header_stdc=no
8025 +fi
8026 +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8027 +fi
8028 +fi
8029 +fi
8030 +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
8031 +echo "${ECHO_T}$ac_cv_header_stdc" >&6
8032 +if test $ac_cv_header_stdc = yes; then
8033 +
8034 +cat >>confdefs.h <<\_ACEOF
8035 +#define STDC_HEADERS 1
8036 +_ACEOF
8037 +
8038 +fi
8039 +
8040 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
8041 +
8042 +
8043 +
8044 +
8045 +
8046 +
8047 +
8048 +
8049 +
8050 +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
8051 + inttypes.h stdint.h unistd.h
8052 +do
8053 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8054 +echo "$as_me:$LINENO: checking for $ac_header" >&5
8055 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8056 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8057 + echo $ECHO_N "(cached) $ECHO_C" >&6
8058 +else
8059 + cat >conftest.$ac_ext <<_ACEOF
8060 +#line $LINENO "configure"
8061 +/* confdefs.h. */
8062 +_ACEOF
8063 +cat confdefs.h >>conftest.$ac_ext
8064 +cat >>conftest.$ac_ext <<_ACEOF
8065 +/* end confdefs.h. */
8066 +$ac_includes_default
8067 +
8068 +#include <$ac_header>
8069 +_ACEOF
8070 +rm -f conftest.$ac_objext
8071 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8072 + (eval $ac_compile) 2>&5
8073 + ac_status=$?
8074 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8075 + (exit $ac_status); } &&
8076 + { ac_try='test -s conftest.$ac_objext'
8077 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8078 + (eval $ac_try) 2>&5
8079 + ac_status=$?
8080 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8081 + (exit $ac_status); }; }; then
8082 + eval "$as_ac_Header=yes"
8083 +else
8084 + echo "$as_me: failed program was:" >&5
8085 +sed 's/^/| /' conftest.$ac_ext >&5
8086 +
8087 +eval "$as_ac_Header=no"
8088 +fi
8089 +rm -f conftest.$ac_objext conftest.$ac_ext
8090 +fi
8091 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8092 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8093 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
8094 + cat >>confdefs.h <<_ACEOF
8095 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
8096 +_ACEOF
8097 +
8098 +fi
8099 +
8100 +done
8101 +
8102 +
8103 +
8104 +for ac_header in dlfcn.h
8105 +do
8106 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8107 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8108 + echo "$as_me:$LINENO: checking for $ac_header" >&5
8109 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8110 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8111 + echo $ECHO_N "(cached) $ECHO_C" >&6
8112 +fi
8113 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8114 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8115 +else
8116 + # Is the header compilable?
8117 +echo "$as_me:$LINENO: checking $ac_header usability" >&5
8118 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
8119 +cat >conftest.$ac_ext <<_ACEOF
8120 +#line $LINENO "configure"
8121 +/* confdefs.h. */
8122 +_ACEOF
8123 +cat confdefs.h >>conftest.$ac_ext
8124 +cat >>conftest.$ac_ext <<_ACEOF
8125 +/* end confdefs.h. */
8126 +$ac_includes_default
8127 +#include <$ac_header>
8128 +_ACEOF
8129 +rm -f conftest.$ac_objext
8130 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8131 + (eval $ac_compile) 2>&5
8132 + ac_status=$?
8133 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8134 + (exit $ac_status); } &&
8135 + { ac_try='test -s conftest.$ac_objext'
8136 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8137 + (eval $ac_try) 2>&5
8138 + ac_status=$?
8139 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8140 + (exit $ac_status); }; }; then
8141 + ac_header_compiler=yes
8142 +else
8143 + echo "$as_me: failed program was:" >&5
8144 +sed 's/^/| /' conftest.$ac_ext >&5
8145 +
8146 +ac_header_compiler=no
8147 +fi
8148 +rm -f conftest.$ac_objext conftest.$ac_ext
8149 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
8150 +echo "${ECHO_T}$ac_header_compiler" >&6
8151 +
8152 +# Is the header present?
8153 +echo "$as_me:$LINENO: checking $ac_header presence" >&5
8154 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
8155 +cat >conftest.$ac_ext <<_ACEOF
8156 +#line $LINENO "configure"
8157 +/* confdefs.h. */
8158 +_ACEOF
8159 +cat confdefs.h >>conftest.$ac_ext
8160 +cat >>conftest.$ac_ext <<_ACEOF
8161 +/* end confdefs.h. */
8162 +#include <$ac_header>
8163 +_ACEOF
8164 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8165 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8166 + ac_status=$?
8167 + grep -v '^ *+' conftest.er1 >conftest.err
8168 + rm -f conftest.er1
8169 + cat conftest.err >&5
8170 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8171 + (exit $ac_status); } >/dev/null; then
8172 + if test -s conftest.err; then
8173 + ac_cpp_err=$ac_c_preproc_warn_flag
8174 + else
8175 + ac_cpp_err=
8176 + fi
8177 +else
8178 + ac_cpp_err=yes
8179 +fi
8180 +if test -z "$ac_cpp_err"; then
8181 + ac_header_preproc=yes
8182 +else
8183 + echo "$as_me: failed program was:" >&5
8184 +sed 's/^/| /' conftest.$ac_ext >&5
8185 +
8186 + ac_header_preproc=no
8187 +fi
8188 +rm -f conftest.err conftest.$ac_ext
8189 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
8190 +echo "${ECHO_T}$ac_header_preproc" >&6
8191 +
8192 +# So? What about this header?
8193 +case $ac_header_compiler:$ac_header_preproc in
8194 + yes:no )
8195 + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
8196 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
8197 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
8198 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
8199 + (
8200 + cat <<\_ASBOX
8201 +## ------------------------------------ ##
8202 +## Report this to bug-autoconf@gnu.org. ##
8203 +## ------------------------------------ ##
8204 +_ASBOX
8205 + ) |
8206 + sed "s/^/$as_me: WARNING: /" >&2
8207 + ;;
8208 + no:yes )
8209 + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
8210 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
8211 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
8212 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
8213 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
8214 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
8215 + (
8216 + cat <<\_ASBOX
8217 +## ------------------------------------ ##
8218 +## Report this to bug-autoconf@gnu.org. ##
8219 +## ------------------------------------ ##
8220 +_ASBOX
8221 + ) |
8222 + sed "s/^/$as_me: WARNING: /" >&2
8223 + ;;
8224 +esac
8225 +echo "$as_me:$LINENO: checking for $ac_header" >&5
8226 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8227 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8228 + echo $ECHO_N "(cached) $ECHO_C" >&6
8229 +else
8230 + eval "$as_ac_Header=$ac_header_preproc"
8231 +fi
8232 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8233 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8234 +
8235 +fi
8236 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
8237 + cat >>confdefs.h <<_ACEOF
8238 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
8239 +_ACEOF
8240 +
8241 +fi
8242 +
8243 +done
8244 +
8245 +
8246 +
8247 +
8248 +
8249 +
8250 +# Only perform the check for file, if the check method requires it
8251 +case $deplibs_check_method in
8252 +file_magic*)
8253 + if test "$file_magic_cmd" = '$MAGIC_CMD'; then
8254 + echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
8255 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
8256 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
8257 + echo $ECHO_N "(cached) $ECHO_C" >&6
8258 +else
8259 + case $MAGIC_CMD in
8260 + /*)
8261 + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
8262 + ;;
8263 + ?:/*)
8264 + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
8265 + ;;
8266 + *)
8267 + ac_save_MAGIC_CMD="$MAGIC_CMD"
8268 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8269 + ac_dummy="/usr/bin:$PATH"
8270 + for ac_dir in $ac_dummy; do
8271 + test -z "$ac_dir" && ac_dir=.
8272 + if test -f $ac_dir/${ac_tool_prefix}file; then
8273 + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
8274 + if test -n "$file_magic_test_file"; then
8275 case $deplibs_check_method in
8276 "file_magic "*)
8277 file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
8278 @@ -2451,17 +4493,19 @@
8279
8280 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
8281 if test -n "$MAGIC_CMD"; then
8282 - echo "$ac_t""$MAGIC_CMD" 1>&6
8283 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
8284 +echo "${ECHO_T}$MAGIC_CMD" >&6
8285 else
8286 - echo "$ac_t""no" 1>&6
8287 + echo "$as_me:$LINENO: result: no" >&5
8288 +echo "${ECHO_T}no" >&6
8289 fi
8290
8291 if test -z "$lt_cv_path_MAGIC_CMD"; then
8292 if test -n "$ac_tool_prefix"; then
8293 - echo $ac_n "checking for file""... $ac_c" 1>&6
8294 -echo "configure:2463: checking for file" >&5
8295 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
8296 - echo $ac_n "(cached) $ac_c" 1>&6
8297 + echo "$as_me:$LINENO: checking for file" >&5
8298 +echo $ECHO_N "checking for file... $ECHO_C" >&6
8299 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
8300 + echo $ECHO_N "(cached) $ECHO_C" >&6
8301 else
8302 case $MAGIC_CMD in
8303 /*)
8304 @@ -2513,9 +4557,11 @@
8305
8306 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
8307 if test -n "$MAGIC_CMD"; then
8308 - echo "$ac_t""$MAGIC_CMD" 1>&6
8309 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
8310 +echo "${ECHO_T}$MAGIC_CMD" >&6
8311 else
8312 - echo "$ac_t""no" 1>&6
8313 + echo "$as_me:$LINENO: result: no" >&5
8314 +echo "${ECHO_T}no" >&6
8315 fi
8316
8317 else
8318 @@ -2527,138 +4573,164 @@
8319 ;;
8320 esac
8321
8322 -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
8323 +if test -n "$ac_tool_prefix"; then
8324 + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
8325 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
8326 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
8327 -echo "configure:2534: checking for $ac_word" >&5
8328 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
8329 - echo $ac_n "(cached) $ac_c" 1>&6
8330 +echo "$as_me:$LINENO: checking for $ac_word" >&5
8331 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8332 +if test "${ac_cv_prog_RANLIB+set}" = set; then
8333 + echo $ECHO_N "(cached) $ECHO_C" >&6
8334 else
8335 if test -n "$RANLIB"; then
8336 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
8337 else
8338 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8339 - ac_dummy="$PATH"
8340 - for ac_dir in $ac_dummy; do
8341 - test -z "$ac_dir" && ac_dir=.
8342 - if test -f $ac_dir/$ac_word; then
8343 - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
8344 - break
8345 - fi
8346 - done
8347 - IFS="$ac_save_ifs"
8348 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8349 +for as_dir in $PATH
8350 +do
8351 + IFS=$as_save_IFS
8352 + test -z "$as_dir" && as_dir=.
8353 + for ac_exec_ext in '' $ac_executable_extensions; do
8354 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8355 + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
8356 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8357 + break 2
8358 + fi
8359 +done
8360 +done
8361 +
8362 fi
8363 fi
8364 -RANLIB="$ac_cv_prog_RANLIB"
8365 +RANLIB=$ac_cv_prog_RANLIB
8366 if test -n "$RANLIB"; then
8367 - echo "$ac_t""$RANLIB" 1>&6
8368 + echo "$as_me:$LINENO: result: $RANLIB" >&5
8369 +echo "${ECHO_T}$RANLIB" >&6
8370 else
8371 - echo "$ac_t""no" 1>&6
8372 + echo "$as_me:$LINENO: result: no" >&5
8373 +echo "${ECHO_T}no" >&6
8374 fi
8375
8376 -
8377 +fi
8378 if test -z "$ac_cv_prog_RANLIB"; then
8379 -if test -n "$ac_tool_prefix"; then
8380 + ac_ct_RANLIB=$RANLIB
8381 # Extract the first word of "ranlib", so it can be a program name with args.
8382 set dummy ranlib; ac_word=$2
8383 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
8384 -echo "configure:2566: checking for $ac_word" >&5
8385 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
8386 - echo $ac_n "(cached) $ac_c" 1>&6
8387 +echo "$as_me:$LINENO: checking for $ac_word" >&5
8388 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8389 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
8390 + echo $ECHO_N "(cached) $ECHO_C" >&6
8391 else
8392 - if test -n "$RANLIB"; then
8393 - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
8394 + if test -n "$ac_ct_RANLIB"; then
8395 + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
8396 else
8397 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8398 - ac_dummy="$PATH"
8399 - for ac_dir in $ac_dummy; do
8400 - test -z "$ac_dir" && ac_dir=.
8401 - if test -f $ac_dir/$ac_word; then
8402 - ac_cv_prog_RANLIB="ranlib"
8403 - break
8404 - fi
8405 - done
8406 - IFS="$ac_save_ifs"
8407 - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
8408 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8409 +for as_dir in $PATH
8410 +do
8411 + IFS=$as_save_IFS
8412 + test -z "$as_dir" && as_dir=.
8413 + for ac_exec_ext in '' $ac_executable_extensions; do
8414 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8415 + ac_cv_prog_ac_ct_RANLIB="ranlib"
8416 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8417 + break 2
8418 + fi
8419 +done
8420 +done
8421 +
8422 + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
8423 fi
8424 fi
8425 -RANLIB="$ac_cv_prog_RANLIB"
8426 -if test -n "$RANLIB"; then
8427 - echo "$ac_t""$RANLIB" 1>&6
8428 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
8429 +if test -n "$ac_ct_RANLIB"; then
8430 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
8431 +echo "${ECHO_T}$ac_ct_RANLIB" >&6
8432 else
8433 - echo "$ac_t""no" 1>&6
8434 + echo "$as_me:$LINENO: result: no" >&5
8435 +echo "${ECHO_T}no" >&6
8436 fi
8437
8438 + RANLIB=$ac_ct_RANLIB
8439 else
8440 - RANLIB=":"
8441 -fi
8442 + RANLIB="$ac_cv_prog_RANLIB"
8443 fi
8444
8445 -# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8446 +if test -n "$ac_tool_prefix"; then
8447 + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8448 set dummy ${ac_tool_prefix}strip; ac_word=$2
8449 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
8450 -echo "configure:2601: checking for $ac_word" >&5
8451 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
8452 - echo $ac_n "(cached) $ac_c" 1>&6
8453 +echo "$as_me:$LINENO: checking for $ac_word" >&5
8454 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8455 +if test "${ac_cv_prog_STRIP+set}" = set; then
8456 + echo $ECHO_N "(cached) $ECHO_C" >&6
8457 else
8458 if test -n "$STRIP"; then
8459 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
8460 else
8461 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8462 - ac_dummy="$PATH"
8463 - for ac_dir in $ac_dummy; do
8464 - test -z "$ac_dir" && ac_dir=.
8465 - if test -f $ac_dir/$ac_word; then
8466 - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
8467 - break
8468 - fi
8469 - done
8470 - IFS="$ac_save_ifs"
8471 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8472 +for as_dir in $PATH
8473 +do
8474 + IFS=$as_save_IFS
8475 + test -z "$as_dir" && as_dir=.
8476 + for ac_exec_ext in '' $ac_executable_extensions; do
8477 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8478 + ac_cv_prog_STRIP="${ac_tool_prefix}strip"
8479 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8480 + break 2
8481 + fi
8482 +done
8483 +done
8484 +
8485 fi
8486 fi
8487 -STRIP="$ac_cv_prog_STRIP"
8488 +STRIP=$ac_cv_prog_STRIP
8489 if test -n "$STRIP"; then
8490 - echo "$ac_t""$STRIP" 1>&6
8491 + echo "$as_me:$LINENO: result: $STRIP" >&5
8492 +echo "${ECHO_T}$STRIP" >&6
8493 else
8494 - echo "$ac_t""no" 1>&6
8495 + echo "$as_me:$LINENO: result: no" >&5
8496 +echo "${ECHO_T}no" >&6
8497 fi
8498
8499 -
8500 +fi
8501 if test -z "$ac_cv_prog_STRIP"; then
8502 -if test -n "$ac_tool_prefix"; then
8503 + ac_ct_STRIP=$STRIP
8504 # Extract the first word of "strip", so it can be a program name with args.
8505 set dummy strip; ac_word=$2
8506 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
8507 -echo "configure:2633: checking for $ac_word" >&5
8508 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
8509 - echo $ac_n "(cached) $ac_c" 1>&6
8510 +echo "$as_me:$LINENO: checking for $ac_word" >&5
8511 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8512 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
8513 + echo $ECHO_N "(cached) $ECHO_C" >&6
8514 else
8515 - if test -n "$STRIP"; then
8516 - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
8517 + if test -n "$ac_ct_STRIP"; then
8518 + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
8519 else
8520 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8521 - ac_dummy="$PATH"
8522 - for ac_dir in $ac_dummy; do
8523 - test -z "$ac_dir" && ac_dir=.
8524 - if test -f $ac_dir/$ac_word; then
8525 - ac_cv_prog_STRIP="strip"
8526 - break
8527 - fi
8528 - done
8529 - IFS="$ac_save_ifs"
8530 - test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
8531 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8532 +for as_dir in $PATH
8533 +do
8534 + IFS=$as_save_IFS
8535 + test -z "$as_dir" && as_dir=.
8536 + for ac_exec_ext in '' $ac_executable_extensions; do
8537 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8538 + ac_cv_prog_ac_ct_STRIP="strip"
8539 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8540 + break 2
8541 + fi
8542 +done
8543 +done
8544 +
8545 + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
8546 fi
8547 fi
8548 -STRIP="$ac_cv_prog_STRIP"
8549 -if test -n "$STRIP"; then
8550 - echo "$ac_t""$STRIP" 1>&6
8551 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
8552 +if test -n "$ac_ct_STRIP"; then
8553 + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
8554 +echo "${ECHO_T}$ac_ct_STRIP" >&6
8555 else
8556 - echo "$ac_t""no" 1>&6
8557 + echo "$as_me:$LINENO: result: no" >&5
8558 +echo "${ECHO_T}no" >&6
8559 fi
8560
8561 + STRIP=$ac_ct_STRIP
8562 else
8563 - STRIP=":"
8564 -fi
8565 + STRIP="$ac_cv_prog_STRIP"
8566 fi
8567
8568
8569 @@ -2668,9 +4740,8 @@
8570 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
8571 if test "${enable_libtool_lock+set}" = set; then
8572 enableval="$enable_libtool_lock"
8573 - :
8574 -fi
8575
8576 +fi;
8577 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
8578
8579 # Some flags need to be propagated to the compiler or linker for good
8580 @@ -2678,8 +4749,12 @@
8581 case $host in
8582 *-*-irix6*)
8583 # Find out which ABI we are using.
8584 - echo '#line 2682 "configure"' > conftest.$ac_ext
8585 - if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8586 + echo '#line 4752 "configure"' > conftest.$ac_ext
8587 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8588 + (eval $ac_compile) 2>&5
8589 + ac_status=$?
8590 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8591 + (exit $ac_status); }; then
8592 case `/usr/bin/file conftest.$ac_objext` in
8593 *32-bit*)
8594 LD="${LD-ld} -32"
8595 @@ -2699,47 +4774,64 @@
8596 # On SCO OpenServer 5, we need -belf to get full-featured binaries.
8597 SAVE_CFLAGS="$CFLAGS"
8598 CFLAGS="$CFLAGS -belf"
8599 - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
8600 -echo "configure:2704: checking whether the C compiler needs -belf" >&5
8601 -if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
8602 - echo $ac_n "(cached) $ac_c" 1>&6
8603 + echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
8604 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
8605 +if test "${lt_cv_cc_needs_belf+set}" = set; then
8606 + echo $ECHO_N "(cached) $ECHO_C" >&6
8607 else
8608 -
8609 +
8610 +
8611 ac_ext=c
8612 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
8613 ac_cpp='$CPP $CPPFLAGS'
8614 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
8615 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
8616 -cross_compiling=$ac_cv_prog_cc_cross
8617 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8618 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8619 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
8620 +
8621 + cat >conftest.$ac_ext <<_ACEOF
8622 +#line $LINENO "configure"
8623 +/* confdefs.h. */
8624 +_ACEOF
8625 +cat confdefs.h >>conftest.$ac_ext
8626 +cat >>conftest.$ac_ext <<_ACEOF
8627 +/* end confdefs.h. */
8628
8629 - cat > conftest.$ac_ext <<EOF
8630 -#line 2717 "configure"
8631 -#include "confdefs.h"
8632 -
8633 -int main() {
8634 +int
8635 +main ()
8636 +{
8637
8638 -; return 0; }
8639 -EOF
8640 -if { (eval echo configure:2724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8641 - rm -rf conftest*
8642 + ;
8643 + return 0;
8644 +}
8645 +_ACEOF
8646 +rm -f conftest.$ac_objext conftest$ac_exeext
8647 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8648 + (eval $ac_link) 2>&5
8649 + ac_status=$?
8650 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8651 + (exit $ac_status); } &&
8652 + { ac_try='test -s conftest$ac_exeext'
8653 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8654 + (eval $ac_try) 2>&5
8655 + ac_status=$?
8656 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8657 + (exit $ac_status); }; }; then
8658 lt_cv_cc_needs_belf=yes
8659 else
8660 - echo "configure: failed program was:" >&5
8661 - cat conftest.$ac_ext >&5
8662 - rm -rf conftest*
8663 - lt_cv_cc_needs_belf=no
8664 + echo "$as_me: failed program was:" >&5
8665 +sed 's/^/| /' conftest.$ac_ext >&5
8666 +
8667 +lt_cv_cc_needs_belf=no
8668 fi
8669 -rm -f conftest*
8670 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8671 ac_ext=c
8672 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
8673 ac_cpp='$CPP $CPPFLAGS'
8674 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
8675 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
8676 -cross_compiling=$ac_cv_prog_cc_cross
8677 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8678 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8679 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
8680
8681 fi
8682 -
8683 -echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
8684 +echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
8685 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
8686 if test x"$lt_cv_cc_needs_belf" != x"yes"; then
8687 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
8688 CFLAGS="$SAVE_CFLAGS"
8689 @@ -2824,16 +4916,23 @@
8690 old_postuninstall_cmds=
8691
8692 if test -n "$RANLIB"; then
8693 + case $host_os in
8694 + openbsd*)
8695 + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
8696 + ;;
8697 + *)
8698 + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
8699 + ;;
8700 + esac
8701 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
8702 - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
8703 fi
8704
8705 # Allow CC to be a program name with arguments.
8706 set dummy $CC
8707 compiler="$2"
8708
8709 -echo $ac_n "checking for objdir""... $ac_c" 1>&6
8710 -echo "configure:2837: checking for objdir" >&5
8711 +echo "$as_me:$LINENO: checking for objdir" >&5
8712 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6
8713 rm -f .libs 2>/dev/null
8714 mkdir .libs 2>/dev/null
8715 if test -d .libs; then
8716 @@ -2843,7 +4942,9 @@
8717 objdir=_libs
8718 fi
8719 rmdir .libs 2>/dev/null
8720 -echo "$ac_t""$objdir" 1>&6
8721 +echo "$as_me:$LINENO: result: $objdir" >&5
8722 +echo "${ECHO_T}$objdir" >&6
8723 +
8724
8725
8726 # Check whether --with-pic or --without-pic was given.
8727 @@ -2852,17 +4953,16 @@
8728 pic_mode="$withval"
8729 else
8730 pic_mode=default
8731 -fi
8732 -
8733 +fi;
8734 test -z "$pic_mode" && pic_mode=default
8735
8736 # We assume here that the value for lt_cv_prog_cc_pic will not be cached
8737 # in isolation, and that seeing it set (from the cache) indicates that
8738 # the associated values are set (in the cache) correctly too.
8739 -echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
8740 -echo "configure:2864: checking for $compiler option to produce PIC" >&5
8741 -if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
8742 - echo $ac_n "(cached) $ac_c" 1>&6
8743 +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
8744 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
8745 +if test "${lt_cv_prog_cc_pic+set}" = set; then
8746 + echo $ECHO_N "(cached) $ECHO_C" >&6
8747 else
8748 lt_cv_prog_cc_pic=
8749 lt_cv_prog_cc_shlib=
8750 @@ -2882,7 +4982,7 @@
8751 # libC (AIX C++ library), which obviously doesn't included in libraries
8752 # list by gcc. This cause undefined symbols with -static flags.
8753 # This hack allows C programs to be linked with "-static -ldl", but
8754 - # we not sure about C++ programs.
8755 + # not sure about C++ programs.
8756 lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
8757 ;;
8758 amigaos*)
8759 @@ -2891,7 +4991,7 @@
8760 # like `-m68040'.
8761 lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
8762 ;;
8763 - beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
8764 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
8765 # PIC is the default for these OSes.
8766 ;;
8767 darwin* | rhapsody*)
8768 @@ -2917,13 +5017,13 @@
8769 # PORTME Check for PIC flags for the system compiler.
8770 case $host_os in
8771 aix3* | aix4* | aix5*)
8772 + lt_cv_prog_cc_wl='-Wl,'
8773 # All AIX code is PIC.
8774 if test "$host_cpu" = ia64; then
8775 - # AIX 5 now supports IA64 processor
8776 - lt_cv_prog_cc_static='-Bstatic'
8777 - lt_cv_prog_cc_wl='-Wl,'
8778 + # AIX 5 now supports IA64 processor
8779 + lt_cv_prog_cc_static='-Bstatic'
8780 else
8781 - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
8782 + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
8783 fi
8784 ;;
8785
8786 @@ -2934,7 +5034,7 @@
8787 lt_cv_prog_cc_pic='+Z'
8788 ;;
8789
8790 - irix5* | irix6*)
8791 + irix5* | irix6* | nonstopux*)
8792 lt_cv_prog_cc_wl='-Wl,'
8793 lt_cv_prog_cc_static='-non_shared'
8794 # PIC (with -KPIC) is the default.
8795 @@ -2978,11 +5078,7 @@
8796 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
8797 lt_cv_prog_cc_pic='-KPIC'
8798 lt_cv_prog_cc_static='-Bstatic'
8799 - if test "x$host_vendor" = xsni; then
8800 - lt_cv_prog_cc_wl='-LD'
8801 - else
8802 - lt_cv_prog_cc_wl='-Wl,'
8803 - fi
8804 + lt_cv_prog_cc_wl='-Wl,'
8805 ;;
8806
8807 uts4*)
8808 @@ -3006,28 +5102,48 @@
8809 fi
8810
8811 if test -z "$lt_cv_prog_cc_pic"; then
8812 - echo "$ac_t""none" 1>&6
8813 + echo "$as_me:$LINENO: result: none" >&5
8814 +echo "${ECHO_T}none" >&6
8815 else
8816 - echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
8817 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5
8818 +echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
8819
8820 # Check to make sure the pic_flag actually works.
8821 - echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
8822 -echo "configure:3016: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
8823 - if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
8824 - echo $ac_n "(cached) $ac_c" 1>&6
8825 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
8826 +echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
8827 + if test "${lt_cv_prog_cc_pic_works+set}" = set; then
8828 + echo $ECHO_N "(cached) $ECHO_C" >&6
8829 else
8830 save_CFLAGS="$CFLAGS"
8831 CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
8832 - cat > conftest.$ac_ext <<EOF
8833 -#line 3023 "configure"
8834 -#include "confdefs.h"
8835 + cat >conftest.$ac_ext <<_ACEOF
8836 +#line $LINENO "configure"
8837 +/* confdefs.h. */
8838 +_ACEOF
8839 +cat confdefs.h >>conftest.$ac_ext
8840 +cat >>conftest.$ac_ext <<_ACEOF
8841 +/* end confdefs.h. */
8842
8843 -int main() {
8844 +int
8845 +main ()
8846 +{
8847
8848 -; return 0; }
8849 -EOF
8850 -if { (eval echo configure:3030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8851 - rm -rf conftest*
8852 + ;
8853 + return 0;
8854 +}
8855 +_ACEOF
8856 +rm -f conftest.$ac_objext
8857 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8858 + (eval $ac_compile) 2>&5
8859 + ac_status=$?
8860 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8861 + (exit $ac_status); } &&
8862 + { ac_try='test -s conftest.$ac_objext'
8863 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8864 + (eval $ac_try) 2>&5
8865 + ac_status=$?
8866 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8867 + (exit $ac_status); }; }; then
8868 case $host_os in
8869 hpux9* | hpux10* | hpux11*)
8870 # On HP-UX, both CC and GCC only warn that PIC is supported... then
8871 @@ -3043,17 +5159,17 @@
8872 lt_cv_prog_cc_pic_works=yes
8873 ;;
8874 esac
8875 -
8876 +
8877 else
8878 - echo "configure: failed program was:" >&5
8879 - cat conftest.$ac_ext >&5
8880 - rm -rf conftest*
8881 - lt_cv_prog_cc_pic_works=no
8882 -
8883 + echo "$as_me: failed program was:" >&5
8884 +sed 's/^/| /' conftest.$ac_ext >&5
8885 +
8886 + lt_cv_prog_cc_pic_works=no
8887 +
8888 fi
8889 -rm -f conftest*
8890 +rm -f conftest.$ac_objext conftest.$ac_ext
8891 CFLAGS="$save_CFLAGS"
8892 -
8893 +
8894 fi
8895
8896
8897 @@ -3064,43 +5180,65 @@
8898 lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
8899 fi
8900
8901 - echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
8902 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5
8903 +echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
8904 fi
8905
8906 # Check for any special shared library compilation flags.
8907 if test -n "$lt_cv_prog_cc_shlib"; then
8908 - echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
8909 + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
8910 +echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
8911 if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then :
8912 else
8913 - echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
8914 + { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
8915 +echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
8916 lt_cv_prog_cc_can_build_shared=no
8917 fi
8918 fi
8919
8920 -echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
8921 -echo "configure:3082: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
8922 -if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
8923 - echo $ac_n "(cached) $ac_c" 1>&6
8924 +echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
8925 +echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
8926 +if test "${lt_cv_prog_cc_static_works+set}" = set; then
8927 + echo $ECHO_N "(cached) $ECHO_C" >&6
8928 else
8929 lt_cv_prog_cc_static_works=no
8930 save_LDFLAGS="$LDFLAGS"
8931 LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
8932 - cat > conftest.$ac_ext <<EOF
8933 -#line 3090 "configure"
8934 -#include "confdefs.h"
8935 + cat >conftest.$ac_ext <<_ACEOF
8936 +#line $LINENO "configure"
8937 +/* confdefs.h. */
8938 +_ACEOF
8939 +cat confdefs.h >>conftest.$ac_ext
8940 +cat >>conftest.$ac_ext <<_ACEOF
8941 +/* end confdefs.h. */
8942
8943 -int main() {
8944 +int
8945 +main ()
8946 +{
8947
8948 -; return 0; }
8949 -EOF
8950 -if { (eval echo configure:3097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8951 - rm -rf conftest*
8952 + ;
8953 + return 0;
8954 +}
8955 +_ACEOF
8956 +rm -f conftest.$ac_objext conftest$ac_exeext
8957 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8958 + (eval $ac_link) 2>&5
8959 + ac_status=$?
8960 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8961 + (exit $ac_status); } &&
8962 + { ac_try='test -s conftest$ac_exeext'
8963 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8964 + (eval $ac_try) 2>&5
8965 + ac_status=$?
8966 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8967 + (exit $ac_status); }; }; then
8968 lt_cv_prog_cc_static_works=yes
8969 else
8970 - echo "configure: failed program was:" >&5
8971 - cat conftest.$ac_ext >&5
8972 + echo "$as_me: failed program was:" >&5
8973 +sed 's/^/| /' conftest.$ac_ext >&5
8974 +
8975 fi
8976 -rm -f conftest*
8977 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8978 LDFLAGS="$save_LDFLAGS"
8979
8980 fi
8981 @@ -3108,7 +5246,8 @@
8982
8983 # Belt *and* braces to stop my trousers falling down:
8984 test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
8985 -echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
8986 +echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5
8987 +echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
8988
8989 pic_flag="$lt_cv_prog_cc_pic"
8990 special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
8991 @@ -3119,12 +5258,12 @@
8992
8993
8994 # Check to see if options -o and -c are simultaneously supported by compiler
8995 -echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
8996 -echo "configure:3124: checking if $compiler supports -c -o file.$ac_objext" >&5
8997 -if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
8998 - echo $ac_n "(cached) $ac_c" 1>&6
8999 +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
9000 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
9001 +if test "${lt_cv_compiler_c_o+set}" = set; then
9002 + echo $ECHO_N "(cached) $ECHO_C" >&6
9003 else
9004 -
9005 +
9006 $rm -r conftest 2>/dev/null
9007 mkdir conftest
9008 cd conftest
9009 @@ -3139,7 +5278,7 @@
9010 save_CFLAGS="$CFLAGS"
9011 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
9012 compiler_c_o=no
9013 -if { (eval echo configure:3143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
9014 +if { (eval echo configure:5281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
9015 # The compiler can only warn and ignore the option if not recognized
9016 # So say no if there are warnings
9017 if test -s out/conftest.err; then
9018 @@ -3163,29 +5302,50 @@
9019 fi
9020
9021 compiler_c_o=$lt_cv_compiler_c_o
9022 -echo "$ac_t""$compiler_c_o" 1>&6
9023 +echo "$as_me:$LINENO: result: $compiler_c_o" >&5
9024 +echo "${ECHO_T}$compiler_c_o" >&6
9025
9026 if test x"$compiler_c_o" = x"yes"; then
9027 # Check to see if we can write to a .lo
9028 - echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
9029 -echo "configure:3172: checking if $compiler supports -c -o file.lo" >&5
9030 - if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
9031 - echo $ac_n "(cached) $ac_c" 1>&6
9032 + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5
9033 +echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
9034 + if test "${lt_cv_compiler_o_lo+set}" = set; then
9035 + echo $ECHO_N "(cached) $ECHO_C" >&6
9036 else
9037 -
9038 +
9039 lt_cv_compiler_o_lo=no
9040 save_CFLAGS="$CFLAGS"
9041 CFLAGS="$CFLAGS -c -o conftest.lo"
9042 - cat > conftest.$ac_ext <<EOF
9043 -#line 3181 "configure"
9044 -#include "confdefs.h"
9045 + save_objext="$ac_objext"
9046 + ac_objext=lo
9047 + cat >conftest.$ac_ext <<_ACEOF
9048 +#line $LINENO "configure"
9049 +/* confdefs.h. */
9050 +_ACEOF
9051 +cat confdefs.h >>conftest.$ac_ext
9052 +cat >>conftest.$ac_ext <<_ACEOF
9053 +/* end confdefs.h. */
9054
9055 -int main() {
9056 +int
9057 +main ()
9058 +{
9059 int some_variable = 0;
9060 -; return 0; }
9061 -EOF
9062 -if { (eval echo configure:3188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9063 - rm -rf conftest*
9064 + ;
9065 + return 0;
9066 +}
9067 +_ACEOF
9068 +rm -f conftest.$ac_objext
9069 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9070 + (eval $ac_compile) 2>&5
9071 + ac_status=$?
9072 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9073 + (exit $ac_status); } &&
9074 + { ac_try='test -s conftest.$ac_objext'
9075 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9076 + (eval $ac_try) 2>&5
9077 + ac_status=$?
9078 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9079 + (exit $ac_status); }; }; then
9080 # The compiler can only warn and ignore the option if not recognized
9081 # So say no if there are warnings
9082 if test -s conftest.err; then
9083 @@ -3193,18 +5353,21 @@
9084 else
9085 lt_cv_compiler_o_lo=yes
9086 fi
9087 -
9088 +
9089 else
9090 - echo "configure: failed program was:" >&5
9091 - cat conftest.$ac_ext >&5
9092 + echo "$as_me: failed program was:" >&5
9093 +sed 's/^/| /' conftest.$ac_ext >&5
9094 +
9095 fi
9096 -rm -f conftest*
9097 +rm -f conftest.$ac_objext conftest.$ac_ext
9098 + ac_objext="$save_objext"
9099 CFLAGS="$save_CFLAGS"
9100 -
9101 +
9102 fi
9103
9104 compiler_o_lo=$lt_cv_compiler_o_lo
9105 - echo "$ac_t""$compiler_o_lo" 1>&6
9106 + echo "$as_me:$LINENO: result: $compiler_o_lo" >&5
9107 +echo "${ECHO_T}$compiler_o_lo" >&6
9108 else
9109 compiler_o_lo=no
9110 fi
9111 @@ -3213,17 +5376,19 @@
9112 hard_links="nottested"
9113 if test "$compiler_c_o" = no && test "$need_locks" != no; then
9114 # do not overwrite the value of need_locks provided by the user
9115 - echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
9116 -echo "configure:3218: checking if we can lock with hard links" >&5
9117 + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
9118 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
9119 hard_links=yes
9120 $rm conftest*
9121 ln conftest.a conftest.b 2>/dev/null && hard_links=no
9122 touch conftest.a
9123 ln conftest.a conftest.b 2>&5 || hard_links=no
9124 ln conftest.a conftest.b 2>/dev/null && hard_links=no
9125 - echo "$ac_t""$hard_links" 1>&6
9126 + echo "$as_me:$LINENO: result: $hard_links" >&5
9127 +echo "${ECHO_T}$hard_links" >&6
9128 if test "$hard_links" = no; then
9129 - echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
9130 + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
9131 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
9132 need_locks=warn
9133 fi
9134 else
9135 @@ -3232,22 +5397,40 @@
9136
9137 if test "$GCC" = yes; then
9138 # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
9139 - echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
9140 -echo "configure:3237: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
9141 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
9142 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
9143 echo "int some_variable = 0;" > conftest.$ac_ext
9144 save_CFLAGS="$CFLAGS"
9145 CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
9146 compiler_rtti_exceptions=no
9147 - cat > conftest.$ac_ext <<EOF
9148 -#line 3243 "configure"
9149 -#include "confdefs.h"
9150 + cat >conftest.$ac_ext <<_ACEOF
9151 +#line $LINENO "configure"
9152 +/* confdefs.h. */
9153 +_ACEOF
9154 +cat confdefs.h >>conftest.$ac_ext
9155 +cat >>conftest.$ac_ext <<_ACEOF
9156 +/* end confdefs.h. */
9157
9158 -int main() {
9159 +int
9160 +main ()
9161 +{
9162 int some_variable = 0;
9163 -; return 0; }
9164 -EOF
9165 -if { (eval echo configure:3250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9166 - rm -rf conftest*
9167 + ;
9168 + return 0;
9169 +}
9170 +_ACEOF
9171 +rm -f conftest.$ac_objext
9172 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9173 + (eval $ac_compile) 2>&5
9174 + ac_status=$?
9175 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9176 + (exit $ac_status); } &&
9177 + { ac_try='test -s conftest.$ac_objext'
9178 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9179 + (eval $ac_try) 2>&5
9180 + ac_status=$?
9181 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9182 + (exit $ac_status); }; }; then
9183 # The compiler can only warn and ignore the option if not recognized
9184 # So say no if there are warnings
9185 if test -s conftest.err; then
9186 @@ -3255,14 +5438,16 @@
9187 else
9188 compiler_rtti_exceptions=yes
9189 fi
9190 -
9191 +
9192 else
9193 - echo "configure: failed program was:" >&5
9194 - cat conftest.$ac_ext >&5
9195 + echo "$as_me: failed program was:" >&5
9196 +sed 's/^/| /' conftest.$ac_ext >&5
9197 +
9198 fi
9199 -rm -f conftest*
9200 +rm -f conftest.$ac_objext conftest.$ac_ext
9201 CFLAGS="$save_CFLAGS"
9202 - echo "$ac_t""$compiler_rtti_exceptions" 1>&6
9203 + echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5
9204 +echo "${ECHO_T}$compiler_rtti_exceptions" >&6
9205
9206 if test "$compiler_rtti_exceptions" = "yes"; then
9207 no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
9208 @@ -3272,8 +5457,8 @@
9209 fi
9210
9211 # See if the linker supports building shared libraries.
9212 -echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
9213 -echo "configure:3277: checking whether the linker ($LD) supports shared libraries" >&5
9214 +echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5
9215 +echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
9216
9217 allow_undefined_flag=
9218 no_undefined_flag=
9219 @@ -3314,7 +5499,7 @@
9220 extract_expsyms_cmds=
9221
9222 case $host_os in
9223 -cygwin* | mingw* | pw32* )
9224 +cygwin* | mingw* | pw32*)
9225 # FIXME: the MSVC++ port hasn't been tested in a loooong time
9226 # When not using gcc, we currently assume that we are using
9227 # Microsoft Visual C++.
9228 @@ -3322,7 +5507,9 @@
9229 with_gnu_ld=no
9230 fi
9231 ;;
9232 -
9233 +openbsd*)
9234 + with_gnu_ld=no
9235 + ;;
9236 esac
9237
9238 ld_shlibs=yes
9239 @@ -3409,7 +5596,7 @@
9240 # can override, but on older systems we have to supply one (in ltdll.c)
9241 if test "x$lt_cv_need_dllmain" = "xyes"; then
9242 ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
9243 - ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < [$]0 > $output_objdir/$soname-ltdll.c~
9244 + ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
9245 test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
9246 else
9247 ltdll_obj=
9248 @@ -3427,19 +5614,20 @@
9249 # If the export-symbols file already is a .def file (1st line
9250 # is EXPORTS), use it as is.
9251 # If DATA tags from a recent dlltool are present, honour them!
9252 - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
9253 - cp $export_symbols $output_objdir/$soname-def;
9254 + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
9255 + cp $export_symbols $output_objdir/$soname-def;
9256 else
9257 - echo EXPORTS > $output_objdir/$soname-def;
9258 - _lt_hint=1;
9259 - cat $export_symbols | while read symbol; do
9260 - set dummy \$symbol;
9261 - case \$# in
9262 - 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
9263 - *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
9264 - esac;
9265 - _lt_hint=`expr 1 + \$_lt_hint`;
9266 - done;
9267 + echo EXPORTS > $output_objdir/$soname-def;
9268 + _lt_hint=1;
9269 + cat $export_symbols | while read symbol; do
9270 + set dummy \$symbol;
9271 + case \$# in
9272 + 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
9273 + 4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
9274 + *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
9275 + esac;
9276 + _lt_hint=`expr 1 + \$_lt_hint`;
9277 + done;
9278 fi~
9279 '"$ltdll_cmds"'
9280 $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
9281 @@ -3534,80 +5722,98 @@
9282 ;;
9283
9284 aix4* | aix5*)
9285 + if test "$host_cpu" = ia64; then
9286 + # On IA64, the linker does run time linking by default, so we don't
9287 + # have to do anything special.
9288 + aix_use_runtimelinking=no
9289 + exp_sym_flag='-Bexport'
9290 + no_entry_flag=""
9291 + else
9292 + aix_use_runtimelinking=no
9293 +
9294 + # Test if we are trying to use run time linking or normal
9295 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
9296 + # need to do runtime linking.
9297 + case $host_os in aix4.[23]|aix4.[23].*|aix5*)
9298 + for ld_flag in $LDFLAGS; do
9299 + case $ld_flag in
9300 + *-brtl*)
9301 + aix_use_runtimelinking=yes
9302 + break
9303 + ;;
9304 + esac
9305 + done
9306 + esac
9307 +
9308 + exp_sym_flag='-bexport'
9309 + no_entry_flag='-bnoentry'
9310 + fi
9311 +
9312 # When large executables or shared objects are built, AIX ld can
9313 # have problems creating the table of contents. If linking a library
9314 # or program results in "error TOC overflow" add -mminimal-toc to
9315 # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
9316 # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
9317
9318 + hardcode_direct=yes
9319 archive_cmds=''
9320 hardcode_libdir_separator=':'
9321 if test "$GCC" = yes; then
9322 - collect2name=`${CC} -print-prog-name=collect2`
9323 - if test -f "$collect2name" && \
9324 - strings "$collect2name" | grep resolve_lib_name >/dev/null
9325 - then
9326 - # We have reworked collect2
9327 - hardcode_direct=yes
9328 - else
9329 - # We have old collect2
9330 - hardcode_direct=unsupported
9331 - # It fails to find uninstalled libraries when the uninstalled
9332 - # path is not listed in the libpath. Setting hardcode_minus_L
9333 - # to unsupported forces relinking
9334 - hardcode_minus_L=yes
9335 - hardcode_libdir_flag_spec='-L$libdir'
9336 - hardcode_libdir_separator=
9337 - fi
9338 - shared_flag='-shared'
9339 - else
9340 + case $host_os in aix4.[012]|aix4.[012].*)
9341 + collect2name=`${CC} -print-prog-name=collect2`
9342 + if test -f "$collect2name" && \
9343 + strings "$collect2name" | grep resolve_lib_name >/dev/null
9344 + then
9345 + # We have reworked collect2
9346 + hardcode_direct=yes
9347 + else
9348 + # We have old collect2
9349 + hardcode_direct=unsupported
9350 + # It fails to find uninstalled libraries when the uninstalled
9351 + # path is not listed in the libpath. Setting hardcode_minus_L
9352 + # to unsupported forces relinking
9353 + hardcode_minus_L=yes
9354 + hardcode_libdir_flag_spec='-L$libdir'
9355 + hardcode_libdir_separator=
9356 + fi
9357 + esac
9358 +
9359 + shared_flag='-shared'
9360 + else
9361 + # not using gcc
9362 if test "$host_cpu" = ia64; then
9363 - shared_flag='-G'
9364 + shared_flag='${wl}-G'
9365 else
9366 - shared_flag='${wl}-bM:SRE'
9367 + if test "$aix_use_runtimelinking" = yes; then
9368 + shared_flag='${wl}-G'
9369 + else
9370 + shared_flag='${wl}-bM:SRE'
9371 + fi
9372 fi
9373 - hardcode_direct=yes
9374 fi
9375
9376 - if test "$host_cpu" = ia64; then
9377 - # On IA64, the linker does run time linking by default, so we don't
9378 - # have to do anything special.
9379 - aix_use_runtimelinking=no
9380 - exp_sym_flag='-Bexport'
9381 - no_entry_flag=""
9382 - else
9383 - # Test if we are trying to use run time linking, or normal AIX style linking.
9384 - # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
9385 - aix_use_runtimelinking=no
9386 - for ld_flag in $LDFLAGS; do
9387 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
9388 - aix_use_runtimelinking=yes
9389 - break
9390 - fi
9391 - done
9392 - exp_sym_flag='-bexport'
9393 - no_entry_flag='-bnoentry'
9394 - fi
9395 # It seems that -bexpall can do strange things, so it is better to
9396 # generate a list of symbols to export.
9397 always_export_symbols=yes
9398 if test "$aix_use_runtimelinking" = yes; then
9399 + # Warning - without using the other runtime loading flags (-brtl),
9400 + # -berok will link without error, but may produce a broken library.
9401 + allow_undefined_flag='-berok'
9402 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
9403 - allow_undefined_flag=' -Wl,-G'
9404 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
9405 + archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
9406 else
9407 if test "$host_cpu" = ia64; then
9408 - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
9409 - allow_undefined_flag="-znodefs"
9410 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
9411 + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
9412 + allow_undefined_flag="-z nodefs"
9413 + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
9414 else
9415 - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
9416 - # Warning - without using the other run time loading flags, -berok will
9417 - # link without error, but may produce a broken library.
9418 - allow_undefined_flag='${wl}-berok'
9419 - # This is a bit strange, but is similar to how AIX traditionally builds
9420 - # it's shared libraries.
9421 - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
9422 + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
9423 + # Warning - without using the other run time loading flags,
9424 + # -berok will link without error, but may produce a broken library.
9425 + allow_undefined_flag='${wl}-berok'
9426 + # This is a bit strange, but is similar to how AIX traditionally builds
9427 + # it's shared libraries.
9428 + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $output_objdir/$libname$release.a $output_objdir/$soname'
9429 fi
9430 fi
9431 ;;
9432 @@ -3639,11 +5845,19 @@
9433 ;;
9434
9435 darwin* | rhapsody*)
9436 - allow_undefined_flag='-undefined suppress'
9437 + case "$host_os" in
9438 + rhapsody* | darwin1.[012])
9439 + allow_undefined_flag='-undefined suppress'
9440 + ;;
9441 + *) # Darwin 1.3 on
9442 + allow_undefined_flag='-flat_namespace -undefined suppress'
9443 + ;;
9444 + esac
9445 # FIXME: Relying on posixy $() will cause problems for
9446 # cross-compilation, but unfortunately the echo tests do not
9447 - # yet detect zsh echo's removal of \ escapes.
9448 - archive_cmds='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
9449 + # yet detect zsh echo's removal of \ escapes. Also zsh mangles
9450 + # `"' quotes if we put them in here... so don't!
9451 + archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
9452 # We need to add '_' to the symbols in $export_symbols first
9453 #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
9454 hardcode_direct=yes
9455 @@ -3695,13 +5909,14 @@
9456 export_dynamic_flag_spec='${wl}-E'
9457 ;;
9458
9459 - irix5* | irix6*)
9460 + irix5* | irix6* | nonstopux*)
9461 if test "$GCC" = yes; then
9462 archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
9463 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9464 else
9465 archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
9466 + hardcode_libdir_flag_spec='-rpath $libdir'
9467 fi
9468 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9469 hardcode_libdir_separator=:
9470 link_all_deplibs=yes
9471 ;;
9472 @@ -3718,7 +5933,7 @@
9473 ;;
9474
9475 newsos6)
9476 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
9477 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
9478 hardcode_direct=yes
9479 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9480 hardcode_libdir_separator=:
9481 @@ -3726,10 +5941,24 @@
9482 ;;
9483
9484 openbsd*)
9485 - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
9486 - hardcode_libdir_flag_spec='-R$libdir'
9487 hardcode_direct=yes
9488 hardcode_shlibpath_var=no
9489 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
9490 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
9491 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
9492 + export_dynamic_flag_spec='${wl}-E'
9493 + else
9494 + case "$host_os" in
9495 + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
9496 + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
9497 + hardcode_libdir_flag_spec='-R$libdir'
9498 + ;;
9499 + *)
9500 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
9501 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
9502 + ;;
9503 + esac
9504 + fi
9505 ;;
9506
9507 os2*)
9508 @@ -3774,10 +6003,39 @@
9509 hardcode_shlibpath_var=no
9510 runpath_var=LD_RUN_PATH
9511 hardcode_runpath_var=yes
9512 + export_dynamic_flag_spec='${wl}-Bexport'
9513 ;;
9514
9515 solaris*)
9516 + # gcc --version < 3.0 without binutils cannot create self contained
9517 + # shared libraries reliably, requiring libgcc.a to resolve some of
9518 + # the object symbols generated in some cases. Libraries that use
9519 + # assert need libgcc.a to resolve __eprintf, for example. Linking
9520 + # a copy of libgcc.a into every shared library to guarantee resolving
9521 + # such symbols causes other problems: According to Tim Van Holder
9522 + # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
9523 + # (to the application) exception stack for one thing.
9524 no_undefined_flag=' -z defs'
9525 + if test "$GCC" = yes; then
9526 + case `$CC --version 2>/dev/null` in
9527 + [12].*)
9528 + cat <<EOF 1>&2
9529 +
9530 +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
9531 +*** create self contained shared libraries on Solaris systems, without
9532 +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
9533 +*** -no-undefined support, which will at least allow you to build shared
9534 +*** libraries. However, you may find that when you link such libraries
9535 +*** into an application without using GCC, you have to manually add
9536 +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
9537 +*** upgrade to a newer version of GCC. Another option is to rebuild your
9538 +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
9539 +
9540 +EOF
9541 + no_undefined_flag=
9542 + ;;
9543 + esac
9544 + fi
9545 # $CC -shared without GNU ld will not create a library from C++
9546 # object files and a static libstdc++, better avoid it by now
9547 archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
9548 @@ -3808,13 +6066,23 @@
9549 ;;
9550
9551 sysv4)
9552 - if test "x$host_vendor" = xsno; then
9553 - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
9554 - hardcode_direct=yes # is this really true???
9555 - else
9556 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
9557 - hardcode_direct=no #Motorola manual says yes, but my tests say they lie
9558 - fi
9559 + case $host_vendor in
9560 + sni)
9561 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
9562 + hardcode_direct=yes # is this really true???
9563 + ;;
9564 + siemens)
9565 + ## LD is ld it makes a PLAMLIB
9566 + ## CC just makes a GrossModule.
9567 + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
9568 + reload_cmds='$CC -r -o $output$reload_objs'
9569 + hardcode_direct=no
9570 + ;;
9571 + motorola)
9572 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
9573 + hardcode_direct=no #Motorola manual says yes, but my tests say they lie
9574 + ;;
9575 + esac
9576 runpath_var='LD_RUN_PATH'
9577 hardcode_shlibpath_var=no
9578 ;;
9579 @@ -3884,12 +6152,13 @@
9580 ;;
9581 esac
9582 fi
9583 -echo "$ac_t""$ld_shlibs" 1>&6
9584 +echo "$as_me:$LINENO: result: $ld_shlibs" >&5
9585 +echo "${ECHO_T}$ld_shlibs" >&6
9586 test "$ld_shlibs" = no && can_build_shared=no
9587
9588 # Check hardcoding attributes.
9589 -echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
9590 -echo "configure:3893: checking how to hardcode library paths into programs" >&5
9591 +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
9592 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
9593 hardcode_action=
9594 if test -n "$hardcode_libdir_flag_spec" || \
9595 test -n "$runpath_var"; then
9596 @@ -3912,26 +6181,29 @@
9597 # directories.
9598 hardcode_action=unsupported
9599 fi
9600 -echo "$ac_t""$hardcode_action" 1>&6
9601 +echo "$as_me:$LINENO: result: $hardcode_action" >&5
9602 +echo "${ECHO_T}$hardcode_action" >&6
9603
9604 striplib=
9605 old_striplib=
9606 -echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
9607 -echo "configure:3921: checking whether stripping libraries is possible" >&5
9608 +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
9609 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
9610 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
9611 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
9612 test -z "$striplib" && striplib="$STRIP --strip-unneeded"
9613 - echo "$ac_t""yes" 1>&6
9614 + echo "$as_me:$LINENO: result: yes" >&5
9615 +echo "${ECHO_T}yes" >&6
9616 else
9617 - echo "$ac_t""no" 1>&6
9618 + echo "$as_me:$LINENO: result: no" >&5
9619 +echo "${ECHO_T}no" >&6
9620 fi
9621
9622 reload_cmds='$LD$reload_flag -o $output$reload_objs'
9623 test -z "$deplibs_check_method" && deplibs_check_method=unknown
9624
9625 # PORTME Fill in your ld.so characteristics
9626 -echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
9627 -echo "configure:3935: checking dynamic linker characteristics" >&5
9628 +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
9629 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
9630 library_names_spec=
9631 libname_spec='lib$name'
9632 soname_spec=
9633 @@ -3958,6 +6230,9 @@
9634
9635 aix4* | aix5*)
9636 version_type=linux
9637 + need_lib_prefix=no
9638 + need_version=no
9639 + hardcode_into_libs=yes
9640 if test "$host_cpu" = ia64; then
9641 # AIX 5 supports IA64
9642 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
9643 @@ -3969,22 +6244,24 @@
9644 # depend on `.', always an invalid library. This was fixed in
9645 # development snapshots of GCC prior to 3.0.
9646 case $host_os in
9647 - aix4 | aix4.[01] | aix4.[01].*)
9648 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
9649 - echo ' yes '
9650 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
9651 - :
9652 - else
9653 - can_build_shared=no
9654 - fi
9655 - ;;
9656 + aix4 | aix4.[01] | aix4.[01].*)
9657 + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
9658 + echo ' yes '
9659 + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
9660 + :
9661 + else
9662 + can_build_shared=no
9663 + fi
9664 + ;;
9665 esac
9666 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
9667 - # soname into executable. Probably we can add versioning support to
9668 - # collect2, so additional links can be useful in future.
9669 + # AIX (on Power*) has no versioning support, so currently we can
9670 + # not hardcode correct soname into executable. Probably we can
9671 + # add versioning support to collect2, so additional links can
9672 + # be useful in future.
9673 if test "$aix_use_runtimelinking" = yes; then
9674 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
9675 - # lib<name>.a to let people know that these are not typical AIX shared libraries.
9676 + # If using run time linking (on AIX 4.2 or later) use lib<name>.so
9677 + # instead of lib<name>.a to let people know that these are not
9678 + # typical AIX shared libraries.
9679 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
9680 else
9681 # We preserve .a as extension for shared libraries through AIX4.2
9682 @@ -3993,8 +6270,8 @@
9683 soname_spec='${libname}${release}.so$major'
9684 fi
9685 shlibpath_var=LIBPATH
9686 - deplibs_check_method=pass_all
9687 fi
9688 + hardcode_into_libs=yes
9689 ;;
9690
9691 amigaos*)
9692 @@ -4042,7 +6319,7 @@
9693 ;;
9694 yes,mingw*)
9695 library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
9696 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
9697 + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
9698 ;;
9699 yes,pw32*)
9700 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
9701 @@ -4074,6 +6351,18 @@
9702 dynamic_linker=no
9703 ;;
9704
9705 +freebsd*-gnu*)
9706 + version_type=linux
9707 + need_lib_prefix=no
9708 + need_version=no
9709 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
9710 + soname_spec='${libname}${release}.so$major'
9711 + shlibpath_var=LD_LIBRARY_PATH
9712 + shlibpath_overrides_runpath=no
9713 + hardcode_into_libs=yes
9714 + dynamic_linker='GNU/FreeBSD ld.so'
9715 + ;;
9716 +
9717 freebsd*)
9718 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
9719 version_type=freebsd-$objformat
9720 @@ -4125,14 +6414,17 @@
9721 postinstall_cmds='chmod 555 $lib'
9722 ;;
9723
9724 -irix5* | irix6*)
9725 - version_type=irix
9726 +irix5* | irix6* | nonstopux*)
9727 + case $host_os in
9728 + nonstopux*) version_type=nonstopux ;;
9729 + *) version_type=irix ;;
9730 + esac
9731 need_lib_prefix=no
9732 need_version=no
9733 soname_spec='${libname}${release}.so$major'
9734 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
9735 case $host_os in
9736 - irix5*)
9737 + irix5* | nonstopux*)
9738 libsuff= shlibsuff=
9739 ;;
9740 *)
9741 @@ -4206,9 +6498,19 @@
9742
9743 openbsd*)
9744 version_type=sunos
9745 - if test "$with_gnu_ld" = yes; then
9746 - need_lib_prefix=no
9747 - need_version=no
9748 + need_lib_prefix=no
9749 + need_version=no
9750 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
9751 + case "$host_os" in
9752 + openbsd2.[89] | openbsd2.[89].*)
9753 + shlibpath_overrides_runpath=no
9754 + ;;
9755 + *)
9756 + shlibpath_overrides_runpath=yes
9757 + ;;
9758 + esac
9759 + else
9760 + shlibpath_overrides_runpath=yes
9761 fi
9762 library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
9763 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
9764 @@ -4226,11 +6528,13 @@
9765 osf3* | osf4* | osf5*)
9766 version_type=osf
9767 need_version=no
9768 - soname_spec='${libname}${release}.so'
9769 - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
9770 + need_lib_prefix=no
9771 + soname_spec='${libname}${release}.so$major'
9772 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
9773 shlibpath_var=LD_LIBRARY_PATH
9774 sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
9775 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
9776 + hardcode_into_libs=yes
9777 ;;
9778
9779 sco3.2v5*)
9780 @@ -4273,6 +6577,12 @@
9781 case $host_vendor in
9782 sni)
9783 shlibpath_overrides_runpath=no
9784 + need_lib_prefix=no
9785 + export_dynamic_flag_spec='${wl}-Blargedynsym'
9786 + runpath_var=LD_RUN_PATH
9787 + ;;
9788 + siemens)
9789 + need_lib_prefix=no
9790 ;;
9791 motorola)
9792 need_lib_prefix=no
9793 @@ -4312,13 +6622,46 @@
9794 dynamic_linker=no
9795 ;;
9796 esac
9797 -echo "$ac_t""$dynamic_linker" 1>&6
9798 +echo "$as_me:$LINENO: result: $dynamic_linker" >&5
9799 +echo "${ECHO_T}$dynamic_linker" >&6
9800 test "$dynamic_linker" = no && can_build_shared=no
9801
9802 # Report the final consequences.
9803 -echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
9804 -echo "configure:4321: checking if libtool supports shared libraries" >&5
9805 -echo "$ac_t""$can_build_shared" 1>&6
9806 +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
9807 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
9808 +echo "$as_me:$LINENO: result: $can_build_shared" >&5
9809 +echo "${ECHO_T}$can_build_shared" >&6
9810 +
9811 +echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
9812 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
9813 +test "$can_build_shared" = "no" && enable_shared=no
9814 +
9815 +# On AIX, shared libraries and static libraries use the same namespace, and
9816 +# are all built from PIC.
9817 +case "$host_os" in
9818 +aix3*)
9819 + test "$enable_shared" = yes && enable_static=no
9820 + if test -n "$RANLIB"; then
9821 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
9822 + postinstall_cmds='$RANLIB $lib'
9823 + fi
9824 + ;;
9825 +
9826 +aix4*)
9827 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
9828 + test "$enable_shared" = yes && enable_static=no
9829 + fi
9830 + ;;
9831 +esac
9832 +echo "$as_me:$LINENO: result: $enable_shared" >&5
9833 +echo "${ECHO_T}$enable_shared" >&6
9834 +
9835 +echo "$as_me:$LINENO: checking whether to build static libraries" >&5
9836 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
9837 +# Make sure either enable_shared or enable_static is yes.
9838 +test "$enable_shared" = yes || enable_static=yes
9839 +echo "$as_me:$LINENO: result: $enable_static" >&5
9840 +echo "${ECHO_T}$enable_static" >&6
9841
9842 if test "$hardcode_action" = relink; then
9843 # Fast installation is not supported
9844 @@ -4355,224 +6698,398 @@
9845 ;;
9846
9847 *)
9848 - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
9849 -echo "configure:4360: checking for dlopen in -ldl" >&5
9850 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
9851 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9852 - echo $ac_n "(cached) $ac_c" 1>&6
9853 -else
9854 - ac_save_LIBS="$LIBS"
9855 -LIBS="-ldl $LIBS"
9856 -cat > conftest.$ac_ext <<EOF
9857 -#line 4368 "configure"
9858 -#include "confdefs.h"
9859 -/* Override any gcc2 internal prototype to avoid an error. */
9860 -/* We use char because int might match the return type of a gcc2
9861 - builtin and then its argument prototype would still apply. */
9862 -char dlopen();
9863 -
9864 -int main() {
9865 -dlopen()
9866 -; return 0; }
9867 -EOF
9868 -if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9869 - rm -rf conftest*
9870 - eval "ac_cv_lib_$ac_lib_var=yes"
9871 -else
9872 - echo "configure: failed program was:" >&5
9873 - cat conftest.$ac_ext >&5
9874 - rm -rf conftest*
9875 - eval "ac_cv_lib_$ac_lib_var=no"
9876 -fi
9877 -rm -f conftest*
9878 -LIBS="$ac_save_LIBS"
9879 -
9880 -fi
9881 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
9882 - echo "$ac_t""yes" 1>&6
9883 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
9884 -else
9885 - echo "$ac_t""no" 1>&6
9886 -echo $ac_n "checking for dlopen""... $ac_c" 1>&6
9887 -echo "configure:4398: checking for dlopen" >&5
9888 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
9889 - echo $ac_n "(cached) $ac_c" 1>&6
9890 -else
9891 - cat > conftest.$ac_ext <<EOF
9892 -#line 4403 "configure"
9893 -#include "confdefs.h"
9894 + echo "$as_me:$LINENO: checking for shl_load" >&5
9895 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
9896 +if test "${ac_cv_func_shl_load+set}" = set; then
9897 + echo $ECHO_N "(cached) $ECHO_C" >&6
9898 +else
9899 + cat >conftest.$ac_ext <<_ACEOF
9900 +#line $LINENO "configure"
9901 +/* confdefs.h. */
9902 +_ACEOF
9903 +cat confdefs.h >>conftest.$ac_ext
9904 +cat >>conftest.$ac_ext <<_ACEOF
9905 +/* end confdefs.h. */
9906 /* System header to define __stub macros and hopefully few prototypes,
9907 - which can conflict with char dlopen(); below. */
9908 -#include <assert.h>
9909 + which can conflict with char shl_load (); below.
9910 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9911 + <limits.h> exists even on freestanding compilers. */
9912 +#ifdef __STDC__
9913 +# include <limits.h>
9914 +#else
9915 +# include <assert.h>
9916 +#endif
9917 /* Override any gcc2 internal prototype to avoid an error. */
9918 +#ifdef __cplusplus
9919 +extern "C"
9920 +{
9921 +#endif
9922 /* We use char because int might match the return type of a gcc2
9923 - builtin and then its argument prototype would still apply. */
9924 -char dlopen();
9925 -
9926 -int main() {
9927 -
9928 + builtin and then its argument prototype would still apply. */
9929 +char shl_load ();
9930 /* The GNU C library defines this for functions which it implements
9931 to always fail with ENOSYS. Some functions are actually named
9932 something starting with __ and the normal name is an alias. */
9933 -#if defined (__stub_dlopen) || defined (__stub___dlopen)
9934 +#if defined (__stub_shl_load) || defined (__stub___shl_load)
9935 choke me
9936 #else
9937 -dlopen();
9938 +char (*f) () = shl_load;
9939 +#endif
9940 +#ifdef __cplusplus
9941 +}
9942 #endif
9943
9944 -; return 0; }
9945 -EOF
9946 -if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9947 - rm -rf conftest*
9948 - eval "ac_cv_func_dlopen=yes"
9949 -else
9950 - echo "configure: failed program was:" >&5
9951 - cat conftest.$ac_ext >&5
9952 - rm -rf conftest*
9953 - eval "ac_cv_func_dlopen=no"
9954 -fi
9955 -rm -f conftest*
9956 -fi
9957 -
9958 -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
9959 - echo "$ac_t""yes" 1>&6
9960 - lt_cv_dlopen="dlopen"
9961 +int
9962 +main ()
9963 +{
9964 +return f != shl_load;
9965 + ;
9966 + return 0;
9967 +}
9968 +_ACEOF
9969 +rm -f conftest.$ac_objext conftest$ac_exeext
9970 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9971 + (eval $ac_link) 2>&5
9972 + ac_status=$?
9973 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9974 + (exit $ac_status); } &&
9975 + { ac_try='test -s conftest$ac_exeext'
9976 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9977 + (eval $ac_try) 2>&5
9978 + ac_status=$?
9979 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9980 + (exit $ac_status); }; }; then
9981 + ac_cv_func_shl_load=yes
9982 +else
9983 + echo "$as_me: failed program was:" >&5
9984 +sed 's/^/| /' conftest.$ac_ext >&5
9985 +
9986 +ac_cv_func_shl_load=no
9987 +fi
9988 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
9989 +fi
9990 +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
9991 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6
9992 +if test $ac_cv_func_shl_load = yes; then
9993 + lt_cv_dlopen="shl_load"
9994 else
9995 - echo "$ac_t""no" 1>&6
9996 -echo $ac_n "checking for shl_load""... $ac_c" 1>&6
9997 -echo "configure:4444: checking for shl_load" >&5
9998 -if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
9999 - echo $ac_n "(cached) $ac_c" 1>&6
10000 + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
10001 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
10002 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then
10003 + echo $ECHO_N "(cached) $ECHO_C" >&6
10004 else
10005 - cat > conftest.$ac_ext <<EOF
10006 -#line 4449 "configure"
10007 -#include "confdefs.h"
10008 + ac_check_lib_save_LIBS=$LIBS
10009 +LIBS="-ldld $LIBS"
10010 +cat >conftest.$ac_ext <<_ACEOF
10011 +#line $LINENO "configure"
10012 +/* confdefs.h. */
10013 +_ACEOF
10014 +cat confdefs.h >>conftest.$ac_ext
10015 +cat >>conftest.$ac_ext <<_ACEOF
10016 +/* end confdefs.h. */
10017 +
10018 +/* Override any gcc2 internal prototype to avoid an error. */
10019 +#ifdef __cplusplus
10020 +extern "C"
10021 +#endif
10022 +/* We use char because int might match the return type of a gcc2
10023 + builtin and then its argument prototype would still apply. */
10024 +char shl_load ();
10025 +int
10026 +main ()
10027 +{
10028 +shl_load ();
10029 + ;
10030 + return 0;
10031 +}
10032 +_ACEOF
10033 +rm -f conftest.$ac_objext conftest$ac_exeext
10034 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10035 + (eval $ac_link) 2>&5
10036 + ac_status=$?
10037 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10038 + (exit $ac_status); } &&
10039 + { ac_try='test -s conftest$ac_exeext'
10040 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10041 + (eval $ac_try) 2>&5
10042 + ac_status=$?
10043 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10044 + (exit $ac_status); }; }; then
10045 + ac_cv_lib_dld_shl_load=yes
10046 +else
10047 + echo "$as_me: failed program was:" >&5
10048 +sed 's/^/| /' conftest.$ac_ext >&5
10049 +
10050 +ac_cv_lib_dld_shl_load=no
10051 +fi
10052 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10053 +LIBS=$ac_check_lib_save_LIBS
10054 +fi
10055 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
10056 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
10057 +if test $ac_cv_lib_dld_shl_load = yes; then
10058 + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
10059 +else
10060 + echo "$as_me:$LINENO: checking for dlopen" >&5
10061 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
10062 +if test "${ac_cv_func_dlopen+set}" = set; then
10063 + echo $ECHO_N "(cached) $ECHO_C" >&6
10064 +else
10065 + cat >conftest.$ac_ext <<_ACEOF
10066 +#line $LINENO "configure"
10067 +/* confdefs.h. */
10068 +_ACEOF
10069 +cat confdefs.h >>conftest.$ac_ext
10070 +cat >>conftest.$ac_ext <<_ACEOF
10071 +/* end confdefs.h. */
10072 /* System header to define __stub macros and hopefully few prototypes,
10073 - which can conflict with char shl_load(); below. */
10074 -#include <assert.h>
10075 + which can conflict with char dlopen (); below.
10076 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
10077 + <limits.h> exists even on freestanding compilers. */
10078 +#ifdef __STDC__
10079 +# include <limits.h>
10080 +#else
10081 +# include <assert.h>
10082 +#endif
10083 /* Override any gcc2 internal prototype to avoid an error. */
10084 +#ifdef __cplusplus
10085 +extern "C"
10086 +{
10087 +#endif
10088 /* We use char because int might match the return type of a gcc2
10089 - builtin and then its argument prototype would still apply. */
10090 -char shl_load();
10091 -
10092 -int main() {
10093 -
10094 + builtin and then its argument prototype would still apply. */
10095 +char dlopen ();
10096 /* The GNU C library defines this for functions which it implements
10097 to always fail with ENOSYS. Some functions are actually named
10098 something starting with __ and the normal name is an alias. */
10099 -#if defined (__stub_shl_load) || defined (__stub___shl_load)
10100 +#if defined (__stub_dlopen) || defined (__stub___dlopen)
10101 choke me
10102 #else
10103 -shl_load();
10104 +char (*f) () = dlopen;
10105 +#endif
10106 +#ifdef __cplusplus
10107 +}
10108 #endif
10109
10110 -; return 0; }
10111 -EOF
10112 -if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10113 - rm -rf conftest*
10114 - eval "ac_cv_func_shl_load=yes"
10115 +int
10116 +main ()
10117 +{
10118 +return f != dlopen;
10119 + ;
10120 + return 0;
10121 +}
10122 +_ACEOF
10123 +rm -f conftest.$ac_objext conftest$ac_exeext
10124 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10125 + (eval $ac_link) 2>&5
10126 + ac_status=$?
10127 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10128 + (exit $ac_status); } &&
10129 + { ac_try='test -s conftest$ac_exeext'
10130 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10131 + (eval $ac_try) 2>&5
10132 + ac_status=$?
10133 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10134 + (exit $ac_status); }; }; then
10135 + ac_cv_func_dlopen=yes
10136 +else
10137 + echo "$as_me: failed program was:" >&5
10138 +sed 's/^/| /' conftest.$ac_ext >&5
10139 +
10140 +ac_cv_func_dlopen=no
10141 +fi
10142 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10143 +fi
10144 +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
10145 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6
10146 +if test $ac_cv_func_dlopen = yes; then
10147 + lt_cv_dlopen="dlopen"
10148 else
10149 - echo "configure: failed program was:" >&5
10150 - cat conftest.$ac_ext >&5
10151 - rm -rf conftest*
10152 - eval "ac_cv_func_shl_load=no"
10153 -fi
10154 -rm -f conftest*
10155 -fi
10156 + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
10157 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
10158 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then
10159 + echo $ECHO_N "(cached) $ECHO_C" >&6
10160 +else
10161 + ac_check_lib_save_LIBS=$LIBS
10162 +LIBS="-ldl $LIBS"
10163 +cat >conftest.$ac_ext <<_ACEOF
10164 +#line $LINENO "configure"
10165 +/* confdefs.h. */
10166 +_ACEOF
10167 +cat confdefs.h >>conftest.$ac_ext
10168 +cat >>conftest.$ac_ext <<_ACEOF
10169 +/* end confdefs.h. */
10170
10171 -if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
10172 - echo "$ac_t""yes" 1>&6
10173 - lt_cv_dlopen="shl_load"
10174 +/* Override any gcc2 internal prototype to avoid an error. */
10175 +#ifdef __cplusplus
10176 +extern "C"
10177 +#endif
10178 +/* We use char because int might match the return type of a gcc2
10179 + builtin and then its argument prototype would still apply. */
10180 +char dlopen ();
10181 +int
10182 +main ()
10183 +{
10184 +dlopen ();
10185 + ;
10186 + return 0;
10187 +}
10188 +_ACEOF
10189 +rm -f conftest.$ac_objext conftest$ac_exeext
10190 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10191 + (eval $ac_link) 2>&5
10192 + ac_status=$?
10193 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10194 + (exit $ac_status); } &&
10195 + { ac_try='test -s conftest$ac_exeext'
10196 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10197 + (eval $ac_try) 2>&5
10198 + ac_status=$?
10199 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10200 + (exit $ac_status); }; }; then
10201 + ac_cv_lib_dl_dlopen=yes
10202 +else
10203 + echo "$as_me: failed program was:" >&5
10204 +sed 's/^/| /' conftest.$ac_ext >&5
10205 +
10206 +ac_cv_lib_dl_dlopen=no
10207 +fi
10208 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10209 +LIBS=$ac_check_lib_save_LIBS
10210 +fi
10211 +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
10212 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
10213 +if test $ac_cv_lib_dl_dlopen = yes; then
10214 + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
10215 else
10216 - echo "$ac_t""no" 1>&6
10217 -echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
10218 -echo "configure:4490: checking for dlopen in -lsvld" >&5
10219 -ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
10220 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10221 - echo $ac_n "(cached) $ac_c" 1>&6
10222 + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
10223 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
10224 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then
10225 + echo $ECHO_N "(cached) $ECHO_C" >&6
10226 else
10227 - ac_save_LIBS="$LIBS"
10228 + ac_check_lib_save_LIBS=$LIBS
10229 LIBS="-lsvld $LIBS"
10230 -cat > conftest.$ac_ext <<EOF
10231 -#line 4498 "configure"
10232 -#include "confdefs.h"
10233 +cat >conftest.$ac_ext <<_ACEOF
10234 +#line $LINENO "configure"
10235 +/* confdefs.h. */
10236 +_ACEOF
10237 +cat confdefs.h >>conftest.$ac_ext
10238 +cat >>conftest.$ac_ext <<_ACEOF
10239 +/* end confdefs.h. */
10240 +
10241 /* Override any gcc2 internal prototype to avoid an error. */
10242 +#ifdef __cplusplus
10243 +extern "C"
10244 +#endif
10245 /* We use char because int might match the return type of a gcc2
10246 - builtin and then its argument prototype would still apply. */
10247 -char dlopen();
10248 -
10249 -int main() {
10250 -dlopen()
10251 -; return 0; }
10252 -EOF
10253 -if { (eval echo configure:4509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10254 - rm -rf conftest*
10255 - eval "ac_cv_lib_$ac_lib_var=yes"
10256 -else
10257 - echo "configure: failed program was:" >&5
10258 - cat conftest.$ac_ext >&5
10259 - rm -rf conftest*
10260 - eval "ac_cv_lib_$ac_lib_var=no"
10261 -fi
10262 -rm -f conftest*
10263 -LIBS="$ac_save_LIBS"
10264 -
10265 -fi
10266 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
10267 - echo "$ac_t""yes" 1>&6
10268 + builtin and then its argument prototype would still apply. */
10269 +char dlopen ();
10270 +int
10271 +main ()
10272 +{
10273 +dlopen ();
10274 + ;
10275 + return 0;
10276 +}
10277 +_ACEOF
10278 +rm -f conftest.$ac_objext conftest$ac_exeext
10279 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10280 + (eval $ac_link) 2>&5
10281 + ac_status=$?
10282 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10283 + (exit $ac_status); } &&
10284 + { ac_try='test -s conftest$ac_exeext'
10285 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10286 + (eval $ac_try) 2>&5
10287 + ac_status=$?
10288 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10289 + (exit $ac_status); }; }; then
10290 + ac_cv_lib_svld_dlopen=yes
10291 +else
10292 + echo "$as_me: failed program was:" >&5
10293 +sed 's/^/| /' conftest.$ac_ext >&5
10294 +
10295 +ac_cv_lib_svld_dlopen=no
10296 +fi
10297 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10298 +LIBS=$ac_check_lib_save_LIBS
10299 +fi
10300 +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
10301 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
10302 +if test $ac_cv_lib_svld_dlopen = yes; then
10303 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
10304 else
10305 - echo "$ac_t""no" 1>&6
10306 -echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
10307 -echo "configure:4528: checking for shl_load in -ldld" >&5
10308 -ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
10309 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10310 - echo $ac_n "(cached) $ac_c" 1>&6
10311 + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
10312 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
10313 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then
10314 + echo $ECHO_N "(cached) $ECHO_C" >&6
10315 else
10316 - ac_save_LIBS="$LIBS"
10317 + ac_check_lib_save_LIBS=$LIBS
10318 LIBS="-ldld $LIBS"
10319 -cat > conftest.$ac_ext <<EOF
10320 -#line 4536 "configure"
10321 -#include "confdefs.h"
10322 +cat >conftest.$ac_ext <<_ACEOF
10323 +#line $LINENO "configure"
10324 +/* confdefs.h. */
10325 +_ACEOF
10326 +cat confdefs.h >>conftest.$ac_ext
10327 +cat >>conftest.$ac_ext <<_ACEOF
10328 +/* end confdefs.h. */
10329 +
10330 /* Override any gcc2 internal prototype to avoid an error. */
10331 +#ifdef __cplusplus
10332 +extern "C"
10333 +#endif
10334 /* We use char because int might match the return type of a gcc2
10335 - builtin and then its argument prototype would still apply. */
10336 -char shl_load();
10337 -
10338 -int main() {
10339 -shl_load()
10340 -; return 0; }
10341 -EOF
10342 -if { (eval echo configure:4547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10343 - rm -rf conftest*
10344 - eval "ac_cv_lib_$ac_lib_var=yes"
10345 -else
10346 - echo "configure: failed program was:" >&5
10347 - cat conftest.$ac_ext >&5
10348 - rm -rf conftest*
10349 - eval "ac_cv_lib_$ac_lib_var=no"
10350 + builtin and then its argument prototype would still apply. */
10351 +char dld_link ();
10352 +int
10353 +main ()
10354 +{
10355 +dld_link ();
10356 + ;
10357 + return 0;
10358 +}
10359 +_ACEOF
10360 +rm -f conftest.$ac_objext conftest$ac_exeext
10361 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10362 + (eval $ac_link) 2>&5
10363 + ac_status=$?
10364 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10365 + (exit $ac_status); } &&
10366 + { ac_try='test -s conftest$ac_exeext'
10367 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10368 + (eval $ac_try) 2>&5
10369 + ac_status=$?
10370 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10371 + (exit $ac_status); }; }; then
10372 + ac_cv_lib_dld_dld_link=yes
10373 +else
10374 + echo "$as_me: failed program was:" >&5
10375 +sed 's/^/| /' conftest.$ac_ext >&5
10376 +
10377 +ac_cv_lib_dld_dld_link=no
10378 +fi
10379 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10380 +LIBS=$ac_check_lib_save_LIBS
10381 +fi
10382 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
10383 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
10384 +if test $ac_cv_lib_dld_dld_link = yes; then
10385 + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
10386 fi
10387 -rm -f conftest*
10388 -LIBS="$ac_save_LIBS"
10389
10390 -fi
10391 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
10392 - echo "$ac_t""yes" 1>&6
10393 - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
10394 -else
10395 - echo "$ac_t""no" 1>&6
10396 +
10397 fi
10398
10399 -
10400 +
10401 fi
10402
10403 -
10404 +
10405 fi
10406
10407 -
10408 +
10409 fi
10410
10411 -
10412 +
10413 fi
10414
10415 ;;
10416 @@ -4595,10 +7112,10 @@
10417 save_LIBS="$LIBS"
10418 LIBS="$lt_cv_dlopen_libs $LIBS"
10419
10420 - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
10421 -echo "configure:4600: checking whether a program can dlopen itself" >&5
10422 -if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
10423 - echo $ac_n "(cached) $ac_c" 1>&6
10424 + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
10425 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
10426 +if test "${lt_cv_dlopen_self+set}" = set; then
10427 + echo $ECHO_N "(cached) $ECHO_C" >&6
10428 else
10429 if test "$cross_compiling" = yes; then :
10430 lt_cv_dlopen_self=cross
10431 @@ -4606,7 +7123,7 @@
10432 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10433 lt_status=$lt_dlunknown
10434 cat > conftest.$ac_ext <<EOF
10435 -#line 4610 "configure"
10436 +#line 7126 "configure"
10437 #include "confdefs.h"
10438
10439 #if HAVE_DLFCN_H
10440 @@ -4667,7 +7184,11 @@
10441 exit (status);
10442 }
10443 EOF
10444 - if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
10445 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10446 + (eval $ac_link) 2>&5
10447 + ac_status=$?
10448 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10449 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
10450 (./conftest; exit; ) 2>/dev/null
10451 lt_status=$?
10452 case x$lt_status in
10453 @@ -4682,17 +7203,17 @@
10454 fi
10455 rm -fr conftest*
10456
10457 -
10458 -fi
10459
10460 -echo "$ac_t""$lt_cv_dlopen_self" 1>&6
10461 +fi
10462 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
10463 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6
10464
10465 if test "x$lt_cv_dlopen_self" = xyes; then
10466 LDFLAGS="$LDFLAGS $link_static_flag"
10467 - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
10468 -echo "configure:4694: checking whether a statically linked program can dlopen itself" >&5
10469 -if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
10470 - echo $ac_n "(cached) $ac_c" 1>&6
10471 + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
10472 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
10473 +if test "${lt_cv_dlopen_self_static+set}" = set; then
10474 + echo $ECHO_N "(cached) $ECHO_C" >&6
10475 else
10476 if test "$cross_compiling" = yes; then :
10477 lt_cv_dlopen_self_static=cross
10478 @@ -4700,7 +7221,7 @@
10479 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10480 lt_status=$lt_dlunknown
10481 cat > conftest.$ac_ext <<EOF
10482 -#line 4704 "configure"
10483 +#line 7224 "configure"
10484 #include "confdefs.h"
10485
10486 #if HAVE_DLFCN_H
10487 @@ -4761,7 +7282,11 @@
10488 exit (status);
10489 }
10490 EOF
10491 - if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
10492 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10493 + (eval $ac_link) 2>&5
10494 + ac_status=$?
10495 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10496 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
10497 (./conftest; exit; ) 2>/dev/null
10498 lt_status=$?
10499 case x$lt_status in
10500 @@ -4776,10 +7301,10 @@
10501 fi
10502 rm -fr conftest*
10503
10504 -
10505 -fi
10506
10507 -echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
10508 +fi
10509 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
10510 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
10511 fi
10512
10513 CPPFLAGS="$save_CPPFLAGS"
10514 @@ -4809,15 +7334,19 @@
10515 # Test whether the compiler implicitly links with -lc since on some
10516 # systems, -lgcc has to come before -lc. If gcc already passes -lc
10517 # to ld, don't add -lc before -lgcc.
10518 - echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
10519 -echo "configure:4814: checking whether -lc should be explicitly linked in" >&5
10520 - if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
10521 - echo $ac_n "(cached) $ac_c" 1>&6
10522 + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
10523 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
10524 + if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
10525 + echo $ECHO_N "(cached) $ECHO_C" >&6
10526 else
10527 $rm conftest*
10528 echo 'static int dummy;' > conftest.$ac_ext
10529
10530 - if { (eval echo configure:4821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
10531 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10532 + (eval $ac_compile) 2>&5
10533 + ac_status=$?
10534 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10535 + (exit $ac_status); }; then
10536 soname=conftest
10537 lib=conftest
10538 libobjs=conftest.$ac_objext
10539 @@ -4830,7 +7359,11 @@
10540 libname=conftest
10541 save_allow_undefined_flag=$allow_undefined_flag
10542 allow_undefined_flag=
10543 - if { (eval echo configure:4834: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
10544 + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
10545 + (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
10546 + ac_status=$?
10547 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10548 + (exit $ac_status); }
10549 then
10550 lt_cv_archive_cmds_need_lc=no
10551 else
10552 @@ -4842,7 +7375,8 @@
10553 fi
10554 fi
10555
10556 - echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
10557 + echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
10558 +echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
10559 ;;
10560 esac
10561 fi
10562 @@ -4870,7 +7404,7 @@
10563 # Now quote all the things that may contain metacharacters while being
10564 # careful not to overquote the AC_SUBSTed values. We take copies of the
10565 # variables and quote the copies for generation of the libtool script.
10566 - for var in echo old_CC old_CFLAGS \
10567 + for var in echo old_CC old_CFLAGS SED \
10568 AR AR_FLAGS CC LD LN_S NM SHELL \
10569 reload_flag reload_cmds wl \
10570 pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
10571 @@ -4882,6 +7416,7 @@
10572 old_striplib striplib file_magic_cmd export_symbols_cmds \
10573 deplibs_check_method allow_undefined_flag no_undefined_flag \
10574 finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
10575 + global_symbol_to_c_name_address \
10576 hardcode_libdir_flag_spec hardcode_libdir_separator \
10577 sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
10578 compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
10579 @@ -4931,8 +7466,11 @@
10580 # configuration script generated by Autoconf, you may include it under
10581 # the same distribution terms that you use for the rest of that program.
10582
10583 +# A sed that does not truncate output.
10584 +SED=$lt_SED
10585 +
10586 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
10587 -Xsed="sed -e s/^X//"
10588 +Xsed="${SED} -e s/^X//"
10589
10590 # The HP-UX ksh and POSIX shell print the target directory to stdout
10591 # if CDPATH is set.
10592 @@ -4948,12 +7486,12 @@
10593 # Whether or not to build shared libraries.
10594 build_libtool_libs=$enable_shared
10595
10596 -# Whether or not to add -lc for building shared libraries.
10597 -build_libtool_need_lc=$need_lc
10598 -
10599 # Whether or not to build static libraries.
10600 build_old_libs=$enable_static
10601
10602 +# Whether or not to add -lc for building shared libraries.
10603 +build_libtool_need_lc=$need_lc
10604 +
10605 # Whether or not to optimize for fast installation.
10606 fast_install=$enable_fast_install
10607
10608 @@ -5119,6 +7657,9 @@
10609 # Transform the output of nm in a proper C declaration
10610 global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
10611
10612 +# Transform the output of nm in a C name address pair
10613 +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
10614 +
10615 # This is the shared library runtime path variable.
10616 runpath_var=$runpath_var
10617
10618 @@ -5241,9 +7782,9 @@
10619 # return TRUE;
10620 # }
10621 # /* ltdll.c ends here */
10622 - # This is a source program that is used to create import libraries
10623 - # on Windows for dlls which lack them. Don't remove nor modify the
10624 - # starting and closing comments
10625 + # This is a source program that is used to create import libraries
10626 + # on Windows for dlls which lack them. Don't remove nor modify the
10627 + # starting and closing comments
10628 # /* impgen.c starts here */
10629 # /* Copyright (C) 1999-2000 Free Software Foundation, Inc.
10630 #
10631 @@ -5411,156 +7952,386 @@
10632
10633 # Extract the first word of "perl", so it can be a program name with args.
10634 set dummy perl; ac_word=$2
10635 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
10636 -echo "configure:5416: checking for $ac_word" >&5
10637 -if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
10638 - echo $ac_n "(cached) $ac_c" 1>&6
10639 +echo "$as_me:$LINENO: checking for $ac_word" >&5
10640 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10641 +if test "${ac_cv_path_PERL+set}" = set; then
10642 + echo $ECHO_N "(cached) $ECHO_C" >&6
10643 else
10644 - case "$PERL" in
10645 - /*)
10646 + case $PERL in
10647 + [\\/]* | ?:[\\/]*)
10648 ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
10649 ;;
10650 - ?:/*)
10651 - ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
10652 - ;;
10653 *)
10654 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
10655 - ac_dummy="$PATH"
10656 - for ac_dir in $ac_dummy; do
10657 - test -z "$ac_dir" && ac_dir=.
10658 - if test -f $ac_dir/$ac_word; then
10659 - ac_cv_path_PERL="$ac_dir/$ac_word"
10660 - break
10661 - fi
10662 - done
10663 - IFS="$ac_save_ifs"
10664 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10665 +for as_dir in $PATH
10666 +do
10667 + IFS=$as_save_IFS
10668 + test -z "$as_dir" && as_dir=.
10669 + for ac_exec_ext in '' $ac_executable_extensions; do
10670 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10671 + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
10672 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10673 + break 2
10674 + fi
10675 +done
10676 +done
10677 +
10678 ;;
10679 esac
10680 fi
10681 -PERL="$ac_cv_path_PERL"
10682 +PERL=$ac_cv_path_PERL
10683 +
10684 if test -n "$PERL"; then
10685 - echo "$ac_t""$PERL" 1>&6
10686 + echo "$as_me:$LINENO: result: $PERL" >&5
10687 +echo "${ECHO_T}$PERL" >&6
10688 else
10689 - echo "$ac_t""no" 1>&6
10690 + echo "$as_me:$LINENO: result: no" >&5
10691 +echo "${ECHO_T}no" >&6
10692 fi
10693
10694
10695
10696
10697 -ac_safe=`echo "asm/errno.h" | sed 'y%./+-%__p_%'`
10698 -echo $ac_n "checking for asm/errno.h""... $ac_c" 1>&6
10699 -echo "configure:5453: checking for asm/errno.h" >&5
10700 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
10701 - echo $ac_n "(cached) $ac_c" 1>&6
10702 +if test "${ac_cv_header_asm_errno_h+set}" = set; then
10703 + echo "$as_me:$LINENO: checking for asm/errno.h" >&5
10704 +echo $ECHO_N "checking for asm/errno.h... $ECHO_C" >&6
10705 +if test "${ac_cv_header_asm_errno_h+set}" = set; then
10706 + echo $ECHO_N "(cached) $ECHO_C" >&6
10707 +fi
10708 +echo "$as_me:$LINENO: result: $ac_cv_header_asm_errno_h" >&5
10709 +echo "${ECHO_T}$ac_cv_header_asm_errno_h" >&6
10710 else
10711 - cat > conftest.$ac_ext <<EOF
10712 -#line 5458 "configure"
10713 -#include "confdefs.h"
10714 + # Is the header compilable?
10715 +echo "$as_me:$LINENO: checking asm/errno.h usability" >&5
10716 +echo $ECHO_N "checking asm/errno.h usability... $ECHO_C" >&6
10717 +cat >conftest.$ac_ext <<_ACEOF
10718 +#line $LINENO "configure"
10719 +/* confdefs.h. */
10720 +_ACEOF
10721 +cat confdefs.h >>conftest.$ac_ext
10722 +cat >>conftest.$ac_ext <<_ACEOF
10723 +/* end confdefs.h. */
10724 +$ac_includes_default
10725 #include <asm/errno.h>
10726 -EOF
10727 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
10728 -{ (eval echo configure:5463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10729 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
10730 -if test -z "$ac_err"; then
10731 - rm -rf conftest*
10732 - eval "ac_cv_header_$ac_safe=yes"
10733 +_ACEOF
10734 +rm -f conftest.$ac_objext
10735 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10736 + (eval $ac_compile) 2>&5
10737 + ac_status=$?
10738 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10739 + (exit $ac_status); } &&
10740 + { ac_try='test -s conftest.$ac_objext'
10741 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10742 + (eval $ac_try) 2>&5
10743 + ac_status=$?
10744 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10745 + (exit $ac_status); }; }; then
10746 + ac_header_compiler=yes
10747 +else
10748 + echo "$as_me: failed program was:" >&5
10749 +sed 's/^/| /' conftest.$ac_ext >&5
10750 +
10751 +ac_header_compiler=no
10752 +fi
10753 +rm -f conftest.$ac_objext conftest.$ac_ext
10754 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
10755 +echo "${ECHO_T}$ac_header_compiler" >&6
10756 +
10757 +# Is the header present?
10758 +echo "$as_me:$LINENO: checking asm/errno.h presence" >&5
10759 +echo $ECHO_N "checking asm/errno.h presence... $ECHO_C" >&6
10760 +cat >conftest.$ac_ext <<_ACEOF
10761 +#line $LINENO "configure"
10762 +/* confdefs.h. */
10763 +_ACEOF
10764 +cat confdefs.h >>conftest.$ac_ext
10765 +cat >>conftest.$ac_ext <<_ACEOF
10766 +/* end confdefs.h. */
10767 +#include <asm/errno.h>
10768 +_ACEOF
10769 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
10770 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10771 + ac_status=$?
10772 + grep -v '^ *+' conftest.er1 >conftest.err
10773 + rm -f conftest.er1
10774 + cat conftest.err >&5
10775 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10776 + (exit $ac_status); } >/dev/null; then
10777 + if test -s conftest.err; then
10778 + ac_cpp_err=$ac_c_preproc_warn_flag
10779 + else
10780 + ac_cpp_err=
10781 + fi
10782 else
10783 - echo "$ac_err" >&5
10784 - echo "configure: failed program was:" >&5
10785 - cat conftest.$ac_ext >&5
10786 - rm -rf conftest*
10787 - eval "ac_cv_header_$ac_safe=no"
10788 + ac_cpp_err=yes
10789 fi
10790 -rm -f conftest*
10791 +if test -z "$ac_cpp_err"; then
10792 + ac_header_preproc=yes
10793 +else
10794 + echo "$as_me: failed program was:" >&5
10795 +sed 's/^/| /' conftest.$ac_ext >&5
10796 +
10797 + ac_header_preproc=no
10798 +fi
10799 +rm -f conftest.err conftest.$ac_ext
10800 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
10801 +echo "${ECHO_T}$ac_header_preproc" >&6
10802 +
10803 +# So? What about this header?
10804 +case $ac_header_compiler:$ac_header_preproc in
10805 + yes:no )
10806 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: accepted by the compiler, rejected by the preprocessor!" >&5
10807 +echo "$as_me: WARNING: asm/errno.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
10808 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: proceeding with the preprocessor's result" >&5
10809 +echo "$as_me: WARNING: asm/errno.h: proceeding with the preprocessor's result" >&2;}
10810 + (
10811 + cat <<\_ASBOX
10812 +## ------------------------------------ ##
10813 +## Report this to bug-autoconf@gnu.org. ##
10814 +## ------------------------------------ ##
10815 +_ASBOX
10816 + ) |
10817 + sed "s/^/$as_me: WARNING: /" >&2
10818 + ;;
10819 + no:yes )
10820 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: present but cannot be compiled" >&5
10821 +echo "$as_me: WARNING: asm/errno.h: present but cannot be compiled" >&2;}
10822 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: check for missing prerequisite headers?" >&5
10823 +echo "$as_me: WARNING: asm/errno.h: check for missing prerequisite headers?" >&2;}
10824 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: proceeding with the preprocessor's result" >&5
10825 +echo "$as_me: WARNING: asm/errno.h: proceeding with the preprocessor's result" >&2;}
10826 + (
10827 + cat <<\_ASBOX
10828 +## ------------------------------------ ##
10829 +## Report this to bug-autoconf@gnu.org. ##
10830 +## ------------------------------------ ##
10831 +_ASBOX
10832 + ) |
10833 + sed "s/^/$as_me: WARNING: /" >&2
10834 + ;;
10835 +esac
10836 +echo "$as_me:$LINENO: checking for asm/errno.h" >&5
10837 +echo $ECHO_N "checking for asm/errno.h... $ECHO_C" >&6
10838 +if test "${ac_cv_header_asm_errno_h+set}" = set; then
10839 + echo $ECHO_N "(cached) $ECHO_C" >&6
10840 +else
10841 + ac_cv_header_asm_errno_h=$ac_header_preproc
10842 +fi
10843 +echo "$as_me:$LINENO: result: $ac_cv_header_asm_errno_h" >&5
10844 +echo "${ECHO_T}$ac_cv_header_asm_errno_h" >&6
10845 +
10846 fi
10847 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
10848 - echo "$ac_t""yes" 1>&6
10849 +if test $ac_cv_header_asm_errno_h = yes; then
10850 :
10851 else
10852 - echo "$ac_t""no" 1>&6
10853 -{ echo "configure: error: *** Unable to find asm/errno.h!!!" 1>&2; exit 1; }
10854 + { { echo "$as_me:$LINENO: error: *** Unable to find asm/errno.h!!!" >&5
10855 +echo "$as_me: error: *** Unable to find asm/errno.h!!!" >&2;}
10856 + { (exit 1); exit 1; }; }
10857
10858 fi
10859
10860
10861 -ac_safe=`echo "linux/atmsap.h" | sed 'y%./+-%__p_%'`
10862 -echo $ac_n "checking for linux/atmsap.h""... $ac_c" 1>&6
10863 -echo "configure:5489: checking for linux/atmsap.h" >&5
10864 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
10865 - echo $ac_n "(cached) $ac_c" 1>&6
10866 -else
10867 - cat > conftest.$ac_ext <<EOF
10868 -#line 5494 "configure"
10869 -#include "confdefs.h"
10870 +
10871 +if test "${ac_cv_header_linux_atmsap_h+set}" = set; then
10872 + echo "$as_me:$LINENO: checking for linux/atmsap.h" >&5
10873 +echo $ECHO_N "checking for linux/atmsap.h... $ECHO_C" >&6
10874 +if test "${ac_cv_header_linux_atmsap_h+set}" = set; then
10875 + echo $ECHO_N "(cached) $ECHO_C" >&6
10876 +fi
10877 +echo "$as_me:$LINENO: result: $ac_cv_header_linux_atmsap_h" >&5
10878 +echo "${ECHO_T}$ac_cv_header_linux_atmsap_h" >&6
10879 +else
10880 + # Is the header compilable?
10881 +echo "$as_me:$LINENO: checking linux/atmsap.h usability" >&5
10882 +echo $ECHO_N "checking linux/atmsap.h usability... $ECHO_C" >&6
10883 +cat >conftest.$ac_ext <<_ACEOF
10884 +#line $LINENO "configure"
10885 +/* confdefs.h. */
10886 +_ACEOF
10887 +cat confdefs.h >>conftest.$ac_ext
10888 +cat >>conftest.$ac_ext <<_ACEOF
10889 +/* end confdefs.h. */
10890 +$ac_includes_default
10891 #include <linux/atmsap.h>
10892 -EOF
10893 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
10894 -{ (eval echo configure:5499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10895 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
10896 -if test -z "$ac_err"; then
10897 - rm -rf conftest*
10898 - eval "ac_cv_header_$ac_safe=yes"
10899 +_ACEOF
10900 +rm -f conftest.$ac_objext
10901 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10902 + (eval $ac_compile) 2>&5
10903 + ac_status=$?
10904 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10905 + (exit $ac_status); } &&
10906 + { ac_try='test -s conftest.$ac_objext'
10907 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10908 + (eval $ac_try) 2>&5
10909 + ac_status=$?
10910 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10911 + (exit $ac_status); }; }; then
10912 + ac_header_compiler=yes
10913 +else
10914 + echo "$as_me: failed program was:" >&5
10915 +sed 's/^/| /' conftest.$ac_ext >&5
10916 +
10917 +ac_header_compiler=no
10918 +fi
10919 +rm -f conftest.$ac_objext conftest.$ac_ext
10920 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
10921 +echo "${ECHO_T}$ac_header_compiler" >&6
10922 +
10923 +# Is the header present?
10924 +echo "$as_me:$LINENO: checking linux/atmsap.h presence" >&5
10925 +echo $ECHO_N "checking linux/atmsap.h presence... $ECHO_C" >&6
10926 +cat >conftest.$ac_ext <<_ACEOF
10927 +#line $LINENO "configure"
10928 +/* confdefs.h. */
10929 +_ACEOF
10930 +cat confdefs.h >>conftest.$ac_ext
10931 +cat >>conftest.$ac_ext <<_ACEOF
10932 +/* end confdefs.h. */
10933 +#include <linux/atmsap.h>
10934 +_ACEOF
10935 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
10936 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10937 + ac_status=$?
10938 + grep -v '^ *+' conftest.er1 >conftest.err
10939 + rm -f conftest.er1
10940 + cat conftest.err >&5
10941 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10942 + (exit $ac_status); } >/dev/null; then
10943 + if test -s conftest.err; then
10944 + ac_cpp_err=$ac_c_preproc_warn_flag
10945 + else
10946 + ac_cpp_err=
10947 + fi
10948 else
10949 - echo "$ac_err" >&5
10950 - echo "configure: failed program was:" >&5
10951 - cat conftest.$ac_ext >&5
10952 - rm -rf conftest*
10953 - eval "ac_cv_header_$ac_safe=no"
10954 + ac_cpp_err=yes
10955 fi
10956 -rm -f conftest*
10957 +if test -z "$ac_cpp_err"; then
10958 + ac_header_preproc=yes
10959 +else
10960 + echo "$as_me: failed program was:" >&5
10961 +sed 's/^/| /' conftest.$ac_ext >&5
10962 +
10963 + ac_header_preproc=no
10964 +fi
10965 +rm -f conftest.err conftest.$ac_ext
10966 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
10967 +echo "${ECHO_T}$ac_header_preproc" >&6
10968 +
10969 +# So? What about this header?
10970 +case $ac_header_compiler:$ac_header_preproc in
10971 + yes:no )
10972 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: accepted by the compiler, rejected by the preprocessor!" >&5
10973 +echo "$as_me: WARNING: linux/atmsap.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
10974 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: proceeding with the preprocessor's result" >&5
10975 +echo "$as_me: WARNING: linux/atmsap.h: proceeding with the preprocessor's result" >&2;}
10976 + (
10977 + cat <<\_ASBOX
10978 +## ------------------------------------ ##
10979 +## Report this to bug-autoconf@gnu.org. ##
10980 +## ------------------------------------ ##
10981 +_ASBOX
10982 + ) |
10983 + sed "s/^/$as_me: WARNING: /" >&2
10984 + ;;
10985 + no:yes )
10986 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: present but cannot be compiled" >&5
10987 +echo "$as_me: WARNING: linux/atmsap.h: present but cannot be compiled" >&2;}
10988 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: check for missing prerequisite headers?" >&5
10989 +echo "$as_me: WARNING: linux/atmsap.h: check for missing prerequisite headers?" >&2;}
10990 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: proceeding with the preprocessor's result" >&5
10991 +echo "$as_me: WARNING: linux/atmsap.h: proceeding with the preprocessor's result" >&2;}
10992 + (
10993 + cat <<\_ASBOX
10994 +## ------------------------------------ ##
10995 +## Report this to bug-autoconf@gnu.org. ##
10996 +## ------------------------------------ ##
10997 +_ASBOX
10998 + ) |
10999 + sed "s/^/$as_me: WARNING: /" >&2
11000 + ;;
11001 +esac
11002 +echo "$as_me:$LINENO: checking for linux/atmsap.h" >&5
11003 +echo $ECHO_N "checking for linux/atmsap.h... $ECHO_C" >&6
11004 +if test "${ac_cv_header_linux_atmsap_h+set}" = set; then
11005 + echo $ECHO_N "(cached) $ECHO_C" >&6
11006 +else
11007 + ac_cv_header_linux_atmsap_h=$ac_header_preproc
11008 fi
11009 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
11010 - echo "$ac_t""yes" 1>&6
11011 +echo "$as_me:$LINENO: result: $ac_cv_header_linux_atmsap_h" >&5
11012 +echo "${ECHO_T}$ac_cv_header_linux_atmsap_h" >&6
11013 +
11014 +fi
11015 +if test $ac_cv_header_linux_atmsap_h = yes; then
11016 :
11017 else
11018 - echo "$ac_t""no" 1>&6
11019 -{ echo "configure: error: *** Unable to find linux/atmsap.h!!!" 1>&2; exit 1; }
11020 + { { echo "$as_me:$LINENO: error: *** Unable to find linux/atmsap.h!!!" >&5
11021 +echo "$as_me: error: *** Unable to find linux/atmsap.h!!!" >&2;}
11022 + { (exit 1); exit 1; }; }
11023
11024 fi
11025
11026
11027 -echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
11028 -echo "configure:5524: checking for main in -lresolv" >&5
11029 -ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'`
11030 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11031 - echo $ac_n "(cached) $ac_c" 1>&6
11032 +
11033 +
11034 +echo "$as_me:$LINENO: checking for main in -lresolv" >&5
11035 +echo $ECHO_N "checking for main in -lresolv... $ECHO_C" >&6
11036 +if test "${ac_cv_lib_resolv_main+set}" = set; then
11037 + echo $ECHO_N "(cached) $ECHO_C" >&6
11038 else
11039 - ac_save_LIBS="$LIBS"
11040 + ac_check_lib_save_LIBS=$LIBS
11041 LIBS="-lresolv $LIBS"
11042 -cat > conftest.$ac_ext <<EOF
11043 -#line 5532 "configure"
11044 -#include "confdefs.h"
11045 +cat >conftest.$ac_ext <<_ACEOF
11046 +#line $LINENO "configure"
11047 +/* confdefs.h. */
11048 +_ACEOF
11049 +cat confdefs.h >>conftest.$ac_ext
11050 +cat >>conftest.$ac_ext <<_ACEOF
11051 +/* end confdefs.h. */
11052
11053 -int main() {
11054 -main()
11055 -; return 0; }
11056 -EOF
11057 -if { (eval echo configure:5539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11058 - rm -rf conftest*
11059 - eval "ac_cv_lib_$ac_lib_var=yes"
11060 -else
11061 - echo "configure: failed program was:" >&5
11062 - cat conftest.$ac_ext >&5
11063 - rm -rf conftest*
11064 - eval "ac_cv_lib_$ac_lib_var=no"
11065 -fi
11066 -rm -f conftest*
11067 -LIBS="$ac_save_LIBS"
11068
11069 -fi
11070 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
11071 - echo "$ac_t""yes" 1>&6
11072 - ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
11073 - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
11074 - cat >> confdefs.h <<EOF
11075 -#define $ac_tr_lib 1
11076 -EOF
11077 +int
11078 +main ()
11079 +{
11080 +main ();
11081 + ;
11082 + return 0;
11083 +}
11084 +_ACEOF
11085 +rm -f conftest.$ac_objext conftest$ac_exeext
11086 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11087 + (eval $ac_link) 2>&5
11088 + ac_status=$?
11089 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
11090 + (exit $ac_status); } &&
11091 + { ac_try='test -s conftest$ac_exeext'
11092 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11093 + (eval $ac_try) 2>&5
11094 + ac_status=$?
11095 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
11096 + (exit $ac_status); }; }; then
11097 + ac_cv_lib_resolv_main=yes
11098 +else
11099 + echo "$as_me: failed program was:" >&5
11100 +sed 's/^/| /' conftest.$ac_ext >&5
11101 +
11102 +ac_cv_lib_resolv_main=no
11103 +fi
11104 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11105 +LIBS=$ac_check_lib_save_LIBS
11106 +fi
11107 +echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_main" >&5
11108 +echo "${ECHO_T}$ac_cv_lib_resolv_main" >&6
11109 +if test $ac_cv_lib_resolv_main = yes; then
11110 + cat >>confdefs.h <<_ACEOF
11111 +#define HAVE_LIBRESOLV 1
11112 +_ACEOF
11113
11114 LIBS="-lresolv $LIBS"
11115
11116 else
11117 - echo "$ac_t""no" 1>&6
11118 -{ echo "configure: error: *** Unable to find libresolv!!!" 1>&2; exit 1; }
11119 + { { echo "$as_me:$LINENO: error: *** Unable to find libresolv!!!" >&5
11120 +echo "$as_me: error: *** Unable to find libresolv!!!" >&2;}
11121 + { (exit 1); exit 1; }; }
11122
11123 fi
11124
11125 @@ -5571,639 +8342,1417 @@
11126 CFLAGS="$INCLUDES $CFLAGS -Wall -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes"
11127 YACC="$YACC -d"
11128
11129 -cat >> confdefs.h <<\EOF
11130 +cat >>confdefs.h <<\_ACEOF
11131 #define YY_USE_CONST 1
11132 -EOF
11133 +_ACEOF
11134
11135
11136 atmsigd_conf_dir=` test "x$exec_prefix" = xNONE && exec_prefix=$ac_default_prefix
11137 test "x$prefix" = xNONE && prefix=${exec_prefix}
11138 eval echo "$sysconfdir"`
11139 -cat >> confdefs.h <<EOF
11140 +cat >>confdefs.h <<_ACEOF
11141 #define ATMSIGD_CONF "$atmsigd_conf_dir/atmsigd.conf"
11142 -EOF
11143 +_ACEOF
11144 +
11145
11146
11147 # Check whether --with-uni or --without-uni was given.
11148 if test "${with_uni+set}" = set; then
11149 withval="$with_uni"
11150 -
11151 +
11152 case "$with_uni" in
11153 - "3.0" ) cat >> confdefs.h <<\EOF
11154 + "3.0" ) cat >>confdefs.h <<\_ACEOF
11155 #define UNI30 1
11156 -EOF
11157 +_ACEOF
11158
11159 ;;
11160 - "3.1" ) cat >> confdefs.h <<\EOF
11161 + "3.1" ) cat >>confdefs.h <<\_ACEOF
11162 #define UNI31 1
11163 -EOF
11164 +_ACEOF
11165
11166 ;;
11167 - "4.0" ) cat >> confdefs.h <<\EOF
11168 + "4.0" ) cat >>confdefs.h <<\_ACEOF
11169 #define UNI40 1
11170 -EOF
11171 +_ACEOF
11172
11173 ;;
11174 *)
11175 - cat >> confdefs.h <<\EOF
11176 + cat >>confdefs.h <<\_ACEOF
11177 #define DYNAMIC_UNI 1
11178 -EOF
11179 +_ACEOF
11180
11181 - echo "configure: warning: *** UNI version not specified correctly. Defaulting to dynamic UNI." 1>&2
11182 + { echo "$as_me:$LINENO: WARNING: *** UNI version not specified correctly. Defaulting to dynamic UNI." >&5
11183 +echo "$as_me: WARNING: *** UNI version not specified correctly. Defaulting to dynamic UNI." >&2;}
11184 esac
11185 -
11186 +
11187 else
11188 - cat >> confdefs.h <<\EOF
11189 + cat >>confdefs.h <<\_ACEOF
11190 #define DYNAMIC_UNI 1
11191 -EOF
11192 +_ACEOF
11193
11194
11195 -fi
11196 -
11197 +fi;
11198
11199 # Check whether --enable-allow_uni30 or --disable-allow_uni30 was given.
11200 if test "${enable_allow_uni30+set}" = set; then
11201 enableval="$enable_allow_uni30"
11202 -
11203 +
11204 if test "$with_uni" = "3.1" ; then
11205 - cat >> confdefs.h <<\EOF
11206 + cat >>confdefs.h <<\_ACEOF
11207 #define ALLOW_UNI30 1
11208 -EOF
11209 +_ACEOF
11210
11211 else
11212 - echo "configure: warning: *** Allow UNI 3.0 was not enabled. It is only valid when UNI 3.1 is specified as the default via --with-uni." 1>&2
11213 + { echo "$as_me:$LINENO: WARNING: *** Allow UNI 3.0 was not enabled. It is only valid when UNI 3.1 is specified as the default via --with-uni." >&5
11214 +echo "$as_me: WARNING: *** Allow UNI 3.0 was not enabled. It is only valid when UNI 3.1 is specified as the default via --with-uni." >&2;}
11215 fi
11216 -
11217
11218 -fi
11219
11220 +fi;
11221
11222 # Check whether --enable-q2963_1 or --disable-q2963_1 was given.
11223 if test "${enable_q2963_1+set}" = set; then
11224 enableval="$enable_q2963_1"
11225 -
11226 +
11227 if test "$with_uni" = "4.0" ; then
11228 - cat >> confdefs.h <<\EOF
11229 + cat >>confdefs.h <<\_ACEOF
11230 #define Q2963_1 1
11231 -EOF
11232 +_ACEOF
11233
11234 else
11235 - echo "configure: warning: *** Q.2963.1 was not enabled. It is only valid when UNI 4.0 is specified as the default via --with-uni." 1>&2
11236 + { echo "$as_me:$LINENO: WARNING: *** Q.2963.1 was not enabled. It is only valid when UNI 4.0 is specified as the default via --with-uni." >&5
11237 +echo "$as_me: WARNING: *** Q.2963.1 was not enabled. It is only valid when UNI 4.0 is specified as the default via --with-uni." >&2;}
11238 fi
11239 -
11240
11241 -fi
11242
11243 +fi;
11244
11245 # Check whether --enable-cisco or --disable-cisco was given.
11246 if test "${enable_cisco+set}" = set; then
11247 enableval="$enable_cisco"
11248 - cat >> confdefs.h <<\EOF
11249 + cat >>confdefs.h <<\_ACEOF
11250 #define CISCO 1
11251 -EOF
11252 +_ACEOF
11253
11254
11255 -fi
11256 -
11257 +fi;
11258
11259 # Check whether --enable-thomflex or --disable-thomflex was given.
11260 if test "${enable_thomflex+set}" = set; then
11261 enableval="$enable_thomflex"
11262 - cat >> confdefs.h <<\EOF
11263 + cat >>confdefs.h <<\_ACEOF
11264 #define THOMFLEX 1
11265 -EOF
11266 -
11267 +_ACEOF
11268
11269 -fi
11270
11271 +fi;
11272
11273 -cat >> confdefs.h <<\EOF
11274 +cat >>confdefs.h <<\_ACEOF
11275 #define BROKEN_POLL 1
11276 -EOF
11277 +_ACEOF
11278
11279
11280 # Check whether --enable-mpoa_1_1 or --disable-mpoa_1_1 was given.
11281 if test "${enable_mpoa_1_1+set}" = set; then
11282 enableval="$enable_mpoa_1_1"
11283 - cat >> confdefs.h <<\EOF
11284 + cat >>confdefs.h <<\_ACEOF
11285 #define MPOA_1_1 1
11286 -EOF
11287 -
11288 +_ACEOF
11289
11290 -fi
11291
11292 +fi;
11293
11294 # Check whether --enable-mpr or --disable-mpr was given.
11295 if test "${enable_mpr+set}" = set; then
11296 enableval="$enable_mpr"
11297 -
11298 +
11299 case "$enable_mpr" in
11300 "" | y | ye | yes | Y | YE | YES )
11301 - echo $ac_n "checking for main in -lmpr""... $ac_c" 1>&6
11302 -echo "configure:5704: checking for main in -lmpr" >&5
11303 -ac_lib_var=`echo mpr'_'main | sed 'y%./+-%__p_%'`
11304 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11305 - echo $ac_n "(cached) $ac_c" 1>&6
11306 +
11307 +echo "$as_me:$LINENO: checking for main in -lmpr" >&5
11308 +echo $ECHO_N "checking for main in -lmpr... $ECHO_C" >&6
11309 +if test "${ac_cv_lib_mpr_main+set}" = set; then
11310 + echo $ECHO_N "(cached) $ECHO_C" >&6
11311 else
11312 - ac_save_LIBS="$LIBS"
11313 + ac_check_lib_save_LIBS=$LIBS
11314 LIBS="-lmpr $LIBS"
11315 -cat > conftest.$ac_ext <<EOF
11316 -#line 5712 "configure"
11317 -#include "confdefs.h"
11318 +cat >conftest.$ac_ext <<_ACEOF
11319 +#line $LINENO "configure"
11320 +/* confdefs.h. */
11321 +_ACEOF
11322 +cat confdefs.h >>conftest.$ac_ext
11323 +cat >>conftest.$ac_ext <<_ACEOF
11324 +/* end confdefs.h. */
11325
11326 -int main() {
11327 -main()
11328 -; return 0; }
11329 -EOF
11330 -if { (eval echo configure:5719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11331 - rm -rf conftest*
11332 - eval "ac_cv_lib_$ac_lib_var=yes"
11333 -else
11334 - echo "configure: failed program was:" >&5
11335 - cat conftest.$ac_ext >&5
11336 - rm -rf conftest*
11337 - eval "ac_cv_lib_$ac_lib_var=no"
11338 -fi
11339 -rm -f conftest*
11340 -LIBS="$ac_save_LIBS"
11341
11342 -fi
11343 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
11344 - echo "$ac_t""yes" 1>&6
11345 - ac_tr_lib=HAVE_LIB`echo mpr | sed -e 's/[^a-zA-Z0-9_]/_/g' \
11346 - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
11347 - cat >> confdefs.h <<EOF
11348 -#define $ac_tr_lib 1
11349 -EOF
11350 +int
11351 +main ()
11352 +{
11353 +main ();
11354 + ;
11355 + return 0;
11356 +}
11357 +_ACEOF
11358 +rm -f conftest.$ac_objext conftest$ac_exeext
11359 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11360 + (eval $ac_link) 2>&5
11361 + ac_status=$?
11362 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
11363 + (exit $ac_status); } &&
11364 + { ac_try='test -s conftest$ac_exeext'
11365 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11366 + (eval $ac_try) 2>&5
11367 + ac_status=$?
11368 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
11369 + (exit $ac_status); }; }; then
11370 + ac_cv_lib_mpr_main=yes
11371 +else
11372 + echo "$as_me: failed program was:" >&5
11373 +sed 's/^/| /' conftest.$ac_ext >&5
11374 +
11375 +ac_cv_lib_mpr_main=no
11376 +fi
11377 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11378 +LIBS=$ac_check_lib_save_LIBS
11379 +fi
11380 +echo "$as_me:$LINENO: result: $ac_cv_lib_mpr_main" >&5
11381 +echo "${ECHO_T}$ac_cv_lib_mpr_main" >&6
11382 +if test $ac_cv_lib_mpr_main = yes; then
11383 + cat >>confdefs.h <<_ACEOF
11384 +#define HAVE_LIBMPR 1
11385 +_ACEOF
11386
11387 LIBS="-lmpr $LIBS"
11388
11389 else
11390 - echo "$ac_t""no" 1>&6
11391
11392 - echo "configure: warning: *** Could not find libmpr! Is MPR installed?" 1>&2
11393 -
11394 -
11395 + { echo "$as_me:$LINENO: WARNING: *** Could not find libmpr! Is MPR installed?" >&5
11396 +echo "$as_me: WARNING: *** Could not find libmpr! Is MPR installed?" >&2;}
11397 +
11398 +
11399 fi
11400
11401 ;;
11402 esac
11403 -
11404
11405 -fi
11406
11407 +fi;
11408
11409
11410 -trap '' 1 2 15
11411 -cat > confcache <<\EOF
11412 + ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile src/Makefile src/include/Makefile src/lib/Makefile src/test/Makefile src/debug/Makefile src/qgen/Makefile src/saal/Makefile src/sigd/Makefile src/maint/Makefile src/arpd/Makefile src/ilmid/Makefile src/ilmid/asn1/Makefile src/man/Makefile src/led/Makefile src/lane/Makefile src/mpoad/Makefile src/switch/Makefile src/switch/debug/Makefile src/switch/tcp/Makefile src/config/Makefile src/config/init-redhat/Makefile src/extra/Makefile src/extra/linux-atm.spec src/extra/ANS/Makefile"
11413 +cat >confcache <<\_ACEOF
11414 # This file is a shell script that caches the results of configure
11415 # tests run on this system so they can be shared between configure
11416 -# scripts and configure runs. It is not useful on other systems.
11417 -# If it contains results you don't want to keep, you may remove or edit it.
11418 +# scripts and configure runs, see configure's option --config-cache.
11419 +# It is not useful on other systems. If it contains results you don't
11420 +# want to keep, you may remove or edit it.
11421 #
11422 -# By default, configure uses ./config.cache as the cache file,
11423 -# creating it if it does not exist already. You can give configure
11424 -# the --cache-file=FILE option to use a different cache file; that is
11425 -# what configure does when it calls configure scripts in
11426 -# subdirectories, so they share the cache.
11427 -# Giving --cache-file=/dev/null disables caching, for debugging configure.
11428 -# config.status only pays attention to the cache file if you give it the
11429 -# --recheck option to rerun configure.
11430 +# config.status only pays attention to the cache file if you give it
11431 +# the --recheck option to rerun configure.
11432 #
11433 -EOF
11434 +# `ac_cv_env_foo' variables (set or unset) will be overridden when
11435 +# loading this file, other *unset* `ac_cv_foo' will be assigned the
11436 +# following values.
11437 +
11438 +_ACEOF
11439 +
11440 # The following way of writing the cache mishandles newlines in values,
11441 # but we know of no workaround that is simple, portable, and efficient.
11442 # So, don't put newlines in cache variables' values.
11443 # Ultrix sh set writes to stderr and can't be redirected directly,
11444 # and sets the high bit in the cache file unless we assign to the vars.
11445 -(set) 2>&1 |
11446 - case `(ac_space=' '; set | grep ac_space) 2>&1` in
11447 - *ac_space=\ *)
11448 - # `set' does not quote correctly, so add quotes (double-quote substitution
11449 - # turns \\\\ into \\, and sed turns \\ into \).
11450 - sed -n \
11451 - -e "s/'/'\\\\''/g" \
11452 - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
11453 - ;;
11454 - *)
11455 - # `set' quotes correctly as required by POSIX, so do not add quotes.
11456 - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
11457 - ;;
11458 - esac >> confcache
11459 -if cmp -s $cache_file confcache; then
11460 - :
11461 -else
11462 +{
11463 + (set) 2>&1 |
11464 + case `(ac_space=' '; set | grep ac_space) 2>&1` in
11465 + *ac_space=\ *)
11466 + # `set' does not quote correctly, so add quotes (double-quote
11467 + # substitution turns \\\\ into \\, and sed turns \\ into \).
11468 + sed -n \
11469 + "s/'/'\\\\''/g;
11470 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
11471 + ;;
11472 + *)
11473 + # `set' quotes correctly as required by POSIX, so do not add quotes.
11474 + sed -n \
11475 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
11476 + ;;
11477 + esac;
11478 +} |
11479 + sed '
11480 + t clear
11481 + : clear
11482 + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
11483 + t end
11484 + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
11485 + : end' >>confcache
11486 +if diff $cache_file confcache >/dev/null 2>&1; then :; else
11487 if test -w $cache_file; then
11488 - echo "updating cache $cache_file"
11489 - cat confcache > $cache_file
11490 + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
11491 + cat confcache >$cache_file
11492 else
11493 echo "not updating unwritable cache $cache_file"
11494 fi
11495 fi
11496 rm -f confcache
11497
11498 -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
11499 -
11500 test "x$prefix" = xNONE && prefix=$ac_default_prefix
11501 # Let make expand exec_prefix.
11502 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
11503
11504 -# Any assignment to VPATH causes Sun make to only execute
11505 -# the first set of double-colon rules, so remove it if not needed.
11506 -# If there is a colon in the path, we need to keep it.
11507 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
11508 +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
11509 +# trailing colons and then remove the whole line if VPATH becomes empty
11510 +# (actually we leave an empty line to preserve line numbers).
11511 if test "x$srcdir" = x.; then
11512 - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
11513 + ac_vpsub='/^[ ]*VPATH[ ]*=/{
11514 +s/:*\$(srcdir):*/:/;
11515 +s/:*\${srcdir}:*/:/;
11516 +s/:*@srcdir@:*/:/;
11517 +s/^\([^=]*=[ ]*\):*/\1/;
11518 +s/:*$//;
11519 +s/^[^=]*=[ ]*$//;
11520 +}'
11521 fi
11522
11523 -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
11524 -
11525 DEFS=-DHAVE_CONFIG_H
11526
11527 -# Without the "./", some shells look in PATH for config.status.
11528 -: ${CONFIG_STATUS=./config.status}
11529 +ac_libobjs=
11530 +ac_ltlibobjs=
11531 +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
11532 + # 1. Remove the extension, and $U if already installed.
11533 + ac_i=`echo "$ac_i" |
11534 + sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
11535 + # 2. Add them.
11536 + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
11537 + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
11538 +done
11539 +LIBOBJS=$ac_libobjs
11540
11541 -echo creating $CONFIG_STATUS
11542 -rm -f $CONFIG_STATUS
11543 -cat > $CONFIG_STATUS <<EOF
11544 -#! /bin/sh
11545 -# Generated automatically by configure.
11546 +LTLIBOBJS=$ac_ltlibobjs
11547 +
11548 +
11549 +
11550 +: ${CONFIG_STATUS=./config.status}
11551 +ac_clean_files_save=$ac_clean_files
11552 +ac_clean_files="$ac_clean_files $CONFIG_STATUS"
11553 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
11554 +echo "$as_me: creating $CONFIG_STATUS" >&6;}
11555 +cat >$CONFIG_STATUS <<_ACEOF
11556 +#! $SHELL
11557 +# Generated by $as_me.
11558 # Run this file to recreate the current configuration.
11559 -# This directory was configured as follows,
11560 -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
11561 -#
11562 -# $0 $ac_configure_args
11563 -#
11564 # Compiler output produced by configure, useful for debugging
11565 -# configure, is in ./config.log if it exists.
11566 +# configure, is in config.log if it exists.
11567
11568 -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
11569 -for ac_option
11570 +debug=false
11571 +ac_cs_recheck=false
11572 +ac_cs_silent=false
11573 +SHELL=\${CONFIG_SHELL-$SHELL}
11574 +_ACEOF
11575 +
11576 +cat >>$CONFIG_STATUS <<\_ACEOF
11577 +## --------------------- ##
11578 +## M4sh Initialization. ##
11579 +## --------------------- ##
11580 +
11581 +# Be Bourne compatible
11582 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
11583 + emulate sh
11584 + NULLCMD=:
11585 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
11586 + # is contrary to our usage. Disable this feature.
11587 + alias -g '${1+"$@"}'='"$@"'
11588 +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
11589 + set -o posix
11590 +fi
11591 +
11592 +# Support unset when possible.
11593 +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
11594 + as_unset=unset
11595 +else
11596 + as_unset=false
11597 +fi
11598 +
11599 +
11600 +# Work around bugs in pre-3.0 UWIN ksh.
11601 +$as_unset ENV MAIL MAILPATH
11602 +PS1='$ '
11603 +PS2='> '
11604 +PS4='+ '
11605 +
11606 +# NLS nuisances.
11607 +for as_var in \
11608 + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
11609 + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
11610 + LC_TELEPHONE LC_TIME
11611 do
11612 - case "\$ac_option" in
11613 - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
11614 - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
11615 - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
11616 - -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
11617 - echo "$CONFIG_STATUS generated by autoconf version 2.13"
11618 - exit 0 ;;
11619 - -help | --help | --hel | --he | --h)
11620 - echo "\$ac_cs_usage"; exit 0 ;;
11621 - *) echo "\$ac_cs_usage"; exit 1 ;;
11622 + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
11623 + eval $as_var=C; export $as_var
11624 + else
11625 + $as_unset $as_var
11626 + fi
11627 +done
11628 +
11629 +# Required to use basename.
11630 +if expr a : '\(a\)' >/dev/null 2>&1; then
11631 + as_expr=expr
11632 +else
11633 + as_expr=false
11634 +fi
11635 +
11636 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
11637 + as_basename=basename
11638 +else
11639 + as_basename=false
11640 +fi
11641 +
11642 +
11643 +# Name of the executable.
11644 +as_me=`$as_basename "$0" ||
11645 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
11646 + X"$0" : 'X\(//\)$' \| \
11647 + X"$0" : 'X\(/\)$' \| \
11648 + . : '\(.\)' 2>/dev/null ||
11649 +echo X/"$0" |
11650 + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
11651 + /^X\/\(\/\/\)$/{ s//\1/; q; }
11652 + /^X\/\(\/\).*/{ s//\1/; q; }
11653 + s/.*/./; q'`
11654 +
11655 +
11656 +# PATH needs CR, and LINENO needs CR and PATH.
11657 +# Avoid depending upon Character Ranges.
11658 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
11659 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
11660 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
11661 +as_cr_digits='0123456789'
11662 +as_cr_alnum=$as_cr_Letters$as_cr_digits
11663 +
11664 +# The user is always right.
11665 +if test "${PATH_SEPARATOR+set}" != set; then
11666 + echo "#! /bin/sh" >conf$$.sh
11667 + echo "exit 0" >>conf$$.sh
11668 + chmod +x conf$$.sh
11669 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
11670 + PATH_SEPARATOR=';'
11671 + else
11672 + PATH_SEPARATOR=:
11673 + fi
11674 + rm -f conf$$.sh
11675 +fi
11676 +
11677 +
11678 + as_lineno_1=$LINENO
11679 + as_lineno_2=$LINENO
11680 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
11681 + test "x$as_lineno_1" != "x$as_lineno_2" &&
11682 + test "x$as_lineno_3" = "x$as_lineno_2" || {
11683 + # Find who we are. Look in the path if we contain no path at all
11684 + # relative or not.
11685 + case $0 in
11686 + *[\\/]* ) as_myself=$0 ;;
11687 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11688 +for as_dir in $PATH
11689 +do
11690 + IFS=$as_save_IFS
11691 + test -z "$as_dir" && as_dir=.
11692 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
11693 +done
11694 +
11695 + ;;
11696 esac
11697 + # We did not find ourselves, most probably we were run as `sh COMMAND'
11698 + # in which case we are not to be found in the path.
11699 + if test "x$as_myself" = x; then
11700 + as_myself=$0
11701 + fi
11702 + if test ! -f "$as_myself"; then
11703 + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
11704 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
11705 + { (exit 1); exit 1; }; }
11706 + fi
11707 + case $CONFIG_SHELL in
11708 + '')
11709 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11710 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
11711 +do
11712 + IFS=$as_save_IFS
11713 + test -z "$as_dir" && as_dir=.
11714 + for as_base in sh bash ksh sh5; do
11715 + case $as_dir in
11716 + /*)
11717 + if ("$as_dir/$as_base" -c '
11718 + as_lineno_1=$LINENO
11719 + as_lineno_2=$LINENO
11720 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
11721 + test "x$as_lineno_1" != "x$as_lineno_2" &&
11722 + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
11723 + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
11724 + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
11725 + CONFIG_SHELL=$as_dir/$as_base
11726 + export CONFIG_SHELL
11727 + exec "$CONFIG_SHELL" "$0" ${1+"$@"}
11728 + fi;;
11729 + esac
11730 + done
11731 done
11732 +;;
11733 + esac
11734
11735 -ac_given_srcdir=$srcdir
11736 -ac_given_INSTALL="$INSTALL"
11737 -
11738 -trap 'rm -fr `echo "Makefile \
11739 - doc/Makefile \
11740 - m4/Makefile \
11741 - src/Makefile \
11742 - src/include/Makefile \
11743 - src/lib/Makefile \
11744 - src/test/Makefile \
11745 - src/debug/Makefile \
11746 - src/qgen/Makefile \
11747 - src/saal/Makefile \
11748 - src/sigd/Makefile \
11749 - src/maint/Makefile \
11750 - src/arpd/Makefile \
11751 - src/ilmid/Makefile \
11752 - src/ilmid/asn1/Makefile \
11753 - src/man/Makefile \
11754 - src/led/Makefile \
11755 - src/lane/Makefile \
11756 - src/mpoad/Makefile \
11757 - src/switch/Makefile \
11758 - src/switch/debug/Makefile \
11759 - src/switch/tcp/Makefile \
11760 - src/config/Makefile \
11761 - src/config/init-redhat/Makefile \
11762 - src/extra/Makefile \
11763 - src/extra/linux-atm.spec \
11764 - src/extra/ANS/Makefile
11765 - config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
11766 -EOF
11767 -cat >> $CONFIG_STATUS <<EOF
11768 + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
11769 + # uniformly replaced by the line number. The first 'sed' inserts a
11770 + # line-number line before each line; the second 'sed' does the real
11771 + # work. The second script uses 'N' to pair each line-number line
11772 + # with the numbered line, and appends trailing '-' during
11773 + # substitution so that $LINENO is not a special case at line end.
11774 + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
11775 + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
11776 + sed '=' <$as_myself |
11777 + sed '
11778 + N
11779 + s,$,-,
11780 + : loop
11781 + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
11782 + t loop
11783 + s,-$,,
11784 + s,^['$as_cr_digits']*\n,,
11785 + ' >$as_me.lineno &&
11786 + chmod +x $as_me.lineno ||
11787 + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
11788 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
11789 + { (exit 1); exit 1; }; }
11790 +
11791 + # Don't try to exec as it changes $[0], causing all sort of problems
11792 + # (the dirname of $[0] is not the place where we might find the
11793 + # original and so on. Autoconf is especially sensible to this).
11794 + . ./$as_me.lineno
11795 + # Exit status is that of the last command.
11796 + exit
11797 +}
11798
11799 -# Protect against being on the right side of a sed subst in config.status.
11800 -sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
11801 - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
11802 -$ac_vpsub
11803 -$extrasub
11804 -s%@SHELL@%$SHELL%g
11805 -s%@CFLAGS@%$CFLAGS%g
11806 -s%@CPPFLAGS@%$CPPFLAGS%g
11807 -s%@CXXFLAGS@%$CXXFLAGS%g
11808 -s%@FFLAGS@%$FFLAGS%g
11809 -s%@DEFS@%$DEFS%g
11810 -s%@LDFLAGS@%$LDFLAGS%g
11811 -s%@LIBS@%$LIBS%g
11812 -s%@exec_prefix@%$exec_prefix%g
11813 -s%@prefix@%$prefix%g
11814 -s%@program_transform_name@%$program_transform_name%g
11815 -s%@bindir@%$bindir%g
11816 -s%@sbindir@%$sbindir%g
11817 -s%@libexecdir@%$libexecdir%g
11818 -s%@datadir@%$datadir%g
11819 -s%@sysconfdir@%$sysconfdir%g
11820 -s%@sharedstatedir@%$sharedstatedir%g
11821 -s%@localstatedir@%$localstatedir%g
11822 -s%@libdir@%$libdir%g
11823 -s%@includedir@%$includedir%g
11824 -s%@oldincludedir@%$oldincludedir%g
11825 -s%@infodir@%$infodir%g
11826 -s%@mandir@%$mandir%g
11827 -s%@host@%$host%g
11828 -s%@host_alias@%$host_alias%g
11829 -s%@host_cpu@%$host_cpu%g
11830 -s%@host_vendor@%$host_vendor%g
11831 -s%@host_os@%$host_os%g
11832 -s%@target@%$target%g
11833 -s%@target_alias@%$target_alias%g
11834 -s%@target_cpu@%$target_cpu%g
11835 -s%@target_vendor@%$target_vendor%g
11836 -s%@target_os@%$target_os%g
11837 -s%@build@%$build%g
11838 -s%@build_alias@%$build_alias%g
11839 -s%@build_cpu@%$build_cpu%g
11840 -s%@build_vendor@%$build_vendor%g
11841 -s%@build_os@%$build_os%g
11842 -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
11843 -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
11844 -s%@INSTALL_DATA@%$INSTALL_DATA%g
11845 -s%@PACKAGE@%$PACKAGE%g
11846 -s%@VERSION@%$VERSION%g
11847 -s%@ACLOCAL@%$ACLOCAL%g
11848 -s%@AUTOCONF@%$AUTOCONF%g
11849 -s%@AUTOMAKE@%$AUTOMAKE%g
11850 -s%@AUTOHEADER@%$AUTOHEADER%g
11851 -s%@MAKEINFO@%$MAKEINFO%g
11852 -s%@SET_MAKE@%$SET_MAKE%g
11853 -s%@LIBVER_CURRENT@%$LIBVER_CURRENT%g
11854 -s%@LIBVER_REVISION@%$LIBVER_REVISION%g
11855 -s%@LIBVER_AGE@%$LIBVER_AGE%g
11856 -s%@CC@%$CC%g
11857 -s%@LEX@%$LEX%g
11858 -s%@LEXLIB@%$LEXLIB%g
11859 -s%@CPP@%$CPP%g
11860 -s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g
11861 -s%@YACC@%$YACC%g
11862 -s%@LN_S@%$LN_S%g
11863 -s%@OBJEXT@%$OBJEXT%g
11864 -s%@EXEEXT@%$EXEEXT%g
11865 -s%@ECHO@%$ECHO%g
11866 -s%@RANLIB@%$RANLIB%g
11867 -s%@STRIP@%$STRIP%g
11868 -s%@LIBTOOL@%$LIBTOOL%g
11869 -s%@LIBTOOL_DEPS@%$LIBTOOL_DEPS%g
11870 -s%@PERL@%$PERL%g
11871
11872 -CEOF
11873 -EOF
11874 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
11875 + *c*,-n*) ECHO_N= ECHO_C='
11876 +' ECHO_T=' ' ;;
11877 + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
11878 + *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
11879 +esac
11880
11881 -cat >> $CONFIG_STATUS <<\EOF
11882 +if expr a : '\(a\)' >/dev/null 2>&1; then
11883 + as_expr=expr
11884 +else
11885 + as_expr=false
11886 +fi
11887
11888 -# Split the substitutions into bite-sized pieces for seds with
11889 -# small command number limits, like on Digital OSF/1 and HP-UX.
11890 -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
11891 -ac_file=1 # Number of current file.
11892 -ac_beg=1 # First line for current file.
11893 -ac_end=$ac_max_sed_cmds # Line after last line for current file.
11894 -ac_more_lines=:
11895 -ac_sed_cmds=""
11896 -while $ac_more_lines; do
11897 - if test $ac_beg -gt 1; then
11898 - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
11899 - else
11900 - sed "${ac_end}q" conftest.subs > conftest.s$ac_file
11901 - fi
11902 - if test ! -s conftest.s$ac_file; then
11903 - ac_more_lines=false
11904 - rm -f conftest.s$ac_file
11905 +rm -f conf$$ conf$$.exe conf$$.file
11906 +echo >conf$$.file
11907 +if ln -s conf$$.file conf$$ 2>/dev/null; then
11908 + # We could just check for DJGPP; but this test a) works b) is more generic
11909 + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
11910 + if test -f conf$$.exe; then
11911 + # Don't use ln at all; we don't have any links
11912 + as_ln_s='cp -p'
11913 else
11914 - if test -z "$ac_sed_cmds"; then
11915 - ac_sed_cmds="sed -f conftest.s$ac_file"
11916 - else
11917 - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
11918 - fi
11919 - ac_file=`expr $ac_file + 1`
11920 - ac_beg=$ac_end
11921 - ac_end=`expr $ac_end + $ac_max_sed_cmds`
11922 + as_ln_s='ln -s'
11923 fi
11924 +elif ln conf$$.file conf$$ 2>/dev/null; then
11925 + as_ln_s=ln
11926 +else
11927 + as_ln_s='cp -p'
11928 +fi
11929 +rm -f conf$$ conf$$.exe conf$$.file
11930 +
11931 +if mkdir -p . 2>/dev/null; then
11932 + as_mkdir_p=:
11933 +else
11934 + as_mkdir_p=false
11935 +fi
11936 +
11937 +as_executable_p="test -f"
11938 +
11939 +# Sed expression to map a string onto a valid CPP name.
11940 +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
11941 +
11942 +# Sed expression to map a string onto a valid variable name.
11943 +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
11944 +
11945 +
11946 +# IFS
11947 +# We need space, tab and new line, in precisely that order.
11948 +as_nl='
11949 +'
11950 +IFS=" $as_nl"
11951 +
11952 +# CDPATH.
11953 +$as_unset CDPATH
11954 +
11955 +exec 6>&1
11956 +
11957 +# Open the log real soon, to keep \$[0] and so on meaningful, and to
11958 +# report actual input values of CONFIG_FILES etc. instead of their
11959 +# values after options handling. Logging --version etc. is OK.
11960 +exec 5>>config.log
11961 +{
11962 + echo
11963 + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
11964 +## Running $as_me. ##
11965 +_ASBOX
11966 +} >&5
11967 +cat >&5 <<_CSEOF
11968 +
11969 +This file was extended by $as_me, which was
11970 +generated by GNU Autoconf 2.57. Invocation command line was
11971 +
11972 + CONFIG_FILES = $CONFIG_FILES
11973 + CONFIG_HEADERS = $CONFIG_HEADERS
11974 + CONFIG_LINKS = $CONFIG_LINKS
11975 + CONFIG_COMMANDS = $CONFIG_COMMANDS
11976 + $ $0 $@
11977 +
11978 +_CSEOF
11979 +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
11980 +echo >&5
11981 +_ACEOF
11982 +
11983 +# Files that config.status was made for.
11984 +if test -n "$ac_config_files"; then
11985 + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
11986 +fi
11987 +
11988 +if test -n "$ac_config_headers"; then
11989 + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
11990 +fi
11991 +
11992 +if test -n "$ac_config_links"; then
11993 + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
11994 +fi
11995 +
11996 +if test -n "$ac_config_commands"; then
11997 + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
11998 +fi
11999 +
12000 +cat >>$CONFIG_STATUS <<\_ACEOF
12001 +
12002 +ac_cs_usage="\
12003 +\`$as_me' instantiates files from templates according to the
12004 +current configuration.
12005 +
12006 +Usage: $0 [OPTIONS] [FILE]...
12007 +
12008 + -h, --help print this help, then exit
12009 + -V, --version print version number, then exit
12010 + -q, --quiet do not print progress messages
12011 + -d, --debug don't remove temporary files
12012 + --recheck update $as_me by reconfiguring in the same conditions
12013 + --file=FILE[:TEMPLATE]
12014 + instantiate the configuration file FILE
12015 + --header=FILE[:TEMPLATE]
12016 + instantiate the configuration header FILE
12017 +
12018 +Configuration files:
12019 +$config_files
12020 +
12021 +Configuration headers:
12022 +$config_headers
12023 +
12024 +Configuration commands:
12025 +$config_commands
12026 +
12027 +Report bugs to <bug-autoconf@gnu.org>."
12028 +_ACEOF
12029 +
12030 +cat >>$CONFIG_STATUS <<_ACEOF
12031 +ac_cs_version="\\
12032 +config.status
12033 +configured by $0, generated by GNU Autoconf 2.57,
12034 + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
12035 +
12036 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
12037 +Free Software Foundation, Inc.
12038 +This config.status script is free software; the Free Software Foundation
12039 +gives unlimited permission to copy, distribute and modify it."
12040 +srcdir=$srcdir
12041 +INSTALL="$INSTALL"
12042 +_ACEOF
12043 +
12044 +cat >>$CONFIG_STATUS <<\_ACEOF
12045 +# If no file are specified by the user, then we need to provide default
12046 +# value. By we need to know if files were specified by the user.
12047 +ac_need_defaults=:
12048 +while test $# != 0
12049 +do
12050 + case $1 in
12051 + --*=*)
12052 + ac_option=`expr "x$1" : 'x\([^=]*\)='`
12053 + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
12054 + ac_shift=:
12055 + ;;
12056 + -*)
12057 + ac_option=$1
12058 + ac_optarg=$2
12059 + ac_shift=shift
12060 + ;;
12061 + *) # This is not an option, so the user has probably given explicit
12062 + # arguments.
12063 + ac_option=$1
12064 + ac_need_defaults=false;;
12065 + esac
12066 +
12067 + case $ac_option in
12068 + # Handling of the options.
12069 +_ACEOF
12070 +cat >>$CONFIG_STATUS <<\_ACEOF
12071 + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
12072 + ac_cs_recheck=: ;;
12073 + --version | --vers* | -V )
12074 + echo "$ac_cs_version"; exit 0 ;;
12075 + --he | --h)
12076 + # Conflict between --help and --header
12077 + { { echo "$as_me:$LINENO: error: ambiguous option: $1
12078 +Try \`$0 --help' for more information." >&5
12079 +echo "$as_me: error: ambiguous option: $1
12080 +Try \`$0 --help' for more information." >&2;}
12081 + { (exit 1); exit 1; }; };;
12082 + --help | --hel | -h )
12083 + echo "$ac_cs_usage"; exit 0 ;;
12084 + --debug | --d* | -d )
12085 + debug=: ;;
12086 + --file | --fil | --fi | --f )
12087 + $ac_shift
12088 + CONFIG_FILES="$CONFIG_FILES $ac_optarg"
12089 + ac_need_defaults=false;;
12090 + --header | --heade | --head | --hea )
12091 + $ac_shift
12092 + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
12093 + ac_need_defaults=false;;
12094 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
12095 + | -silent | --silent | --silen | --sile | --sil | --si | --s)
12096 + ac_cs_silent=: ;;
12097 +
12098 + # This is an error.
12099 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
12100 +Try \`$0 --help' for more information." >&5
12101 +echo "$as_me: error: unrecognized option: $1
12102 +Try \`$0 --help' for more information." >&2;}
12103 + { (exit 1); exit 1; }; } ;;
12104 +
12105 + *) ac_config_targets="$ac_config_targets $1" ;;
12106 +
12107 + esac
12108 + shift
12109 +done
12110 +
12111 +ac_configure_extra_args=
12112 +
12113 +if $ac_cs_silent; then
12114 + exec 6>/dev/null
12115 + ac_configure_extra_args="$ac_configure_extra_args --silent"
12116 +fi
12117 +
12118 +_ACEOF
12119 +cat >>$CONFIG_STATUS <<_ACEOF
12120 +if \$ac_cs_recheck; then
12121 + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
12122 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
12123 +fi
12124 +
12125 +_ACEOF
12126 +
12127 +cat >>$CONFIG_STATUS <<_ACEOF
12128 +#
12129 +# INIT-COMMANDS section.
12130 +#
12131 +
12132 +
12133 +
12134 +_ACEOF
12135 +
12136 +
12137 +
12138 +cat >>$CONFIG_STATUS <<\_ACEOF
12139 +for ac_config_target in $ac_config_targets
12140 +do
12141 + case "$ac_config_target" in
12142 + # Handling of arguments.
12143 + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
12144 + "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
12145 + "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
12146 + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
12147 + "src/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
12148 + "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
12149 + "src/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;;
12150 + "src/debug/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/debug/Makefile" ;;
12151 + "src/qgen/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/qgen/Makefile" ;;
12152 + "src/saal/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/saal/Makefile" ;;
12153 + "src/sigd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/sigd/Makefile" ;;
12154 + "src/maint/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/maint/Makefile" ;;
12155 + "src/arpd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/arpd/Makefile" ;;
12156 + "src/ilmid/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/ilmid/Makefile" ;;
12157 + "src/ilmid/asn1/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/ilmid/asn1/Makefile" ;;
12158 + "src/man/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/man/Makefile" ;;
12159 + "src/led/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/led/Makefile" ;;
12160 + "src/lane/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lane/Makefile" ;;
12161 + "src/mpoad/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mpoad/Makefile" ;;
12162 + "src/switch/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/switch/Makefile" ;;
12163 + "src/switch/debug/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/switch/debug/Makefile" ;;
12164 + "src/switch/tcp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/switch/tcp/Makefile" ;;
12165 + "src/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/config/Makefile" ;;
12166 + "src/config/init-redhat/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/config/init-redhat/Makefile" ;;
12167 + "src/extra/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/extra/Makefile" ;;
12168 + "src/extra/linux-atm.spec" ) CONFIG_FILES="$CONFIG_FILES src/extra/linux-atm.spec" ;;
12169 + "src/extra/ANS/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/extra/ANS/Makefile" ;;
12170 + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
12171 + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
12172 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
12173 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
12174 + { (exit 1); exit 1; }; };;
12175 + esac
12176 done
12177 -if test -z "$ac_sed_cmds"; then
12178 - ac_sed_cmds=cat
12179 +
12180 +# If the user did not use the arguments to specify the items to instantiate,
12181 +# then the envvar interface is used. Set only those that are not.
12182 +# We use the long form for the default assignment because of an extremely
12183 +# bizarre bug on SunOS 4.1.3.
12184 +if $ac_need_defaults; then
12185 + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
12186 + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
12187 + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
12188 fi
12189 -EOF
12190
12191 -cat >> $CONFIG_STATUS <<EOF
12192 +# Have a temporary directory for convenience. Make it in the build tree
12193 +# simply because there is no reason to put it here, and in addition,
12194 +# creating and moving files from /tmp can sometimes cause problems.
12195 +# Create a temporary directory, and hook for its removal unless debugging.
12196 +$debug ||
12197 +{
12198 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
12199 + trap '{ (exit 1); exit 1; }' 1 2 13 15
12200 +}
12201
12202 -CONFIG_FILES=\${CONFIG_FILES-"Makefile \
12203 - doc/Makefile \
12204 - m4/Makefile \
12205 - src/Makefile \
12206 - src/include/Makefile \
12207 - src/lib/Makefile \
12208 - src/test/Makefile \
12209 - src/debug/Makefile \
12210 - src/qgen/Makefile \
12211 - src/saal/Makefile \
12212 - src/sigd/Makefile \
12213 - src/maint/Makefile \
12214 - src/arpd/Makefile \
12215 - src/ilmid/Makefile \
12216 - src/ilmid/asn1/Makefile \
12217 - src/man/Makefile \
12218 - src/led/Makefile \
12219 - src/lane/Makefile \
12220 - src/mpoad/Makefile \
12221 - src/switch/Makefile \
12222 - src/switch/debug/Makefile \
12223 - src/switch/tcp/Makefile \
12224 - src/config/Makefile \
12225 - src/config/init-redhat/Makefile \
12226 - src/extra/Makefile \
12227 - src/extra/linux-atm.spec \
12228 - src/extra/ANS/Makefile
12229 - "}
12230 -EOF
12231 -cat >> $CONFIG_STATUS <<\EOF
12232 -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
12233 +# Create a (secure) tmp directory for tmp files.
12234 +
12235 +{
12236 + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
12237 + test -n "$tmp" && test -d "$tmp"
12238 +} ||
12239 +{
12240 + tmp=./confstat$$-$RANDOM
12241 + (umask 077 && mkdir $tmp)
12242 +} ||
12243 +{
12244 + echo "$me: cannot create a temporary directory in ." >&2
12245 + { (exit 1); exit 1; }
12246 +}
12247 +
12248 +_ACEOF
12249 +
12250 +cat >>$CONFIG_STATUS <<_ACEOF
12251 +
12252 +#
12253 +# CONFIG_FILES section.
12254 +#
12255 +
12256 +# No need to generate the scripts if there are no CONFIG_FILES.
12257 +# This happens for instance when ./config.status config.h
12258 +if test -n "\$CONFIG_FILES"; then
12259 + # Protect against being on the right side of a sed subst in config.status.
12260 + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
12261 + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
12262 +s,@SHELL@,$SHELL,;t t
12263 +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
12264 +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
12265 +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
12266 +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
12267 +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
12268 +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
12269 +s,@exec_prefix@,$exec_prefix,;t t
12270 +s,@prefix@,$prefix,;t t
12271 +s,@program_transform_name@,$program_transform_name,;t t
12272 +s,@bindir@,$bindir,;t t
12273 +s,@sbindir@,$sbindir,;t t
12274 +s,@libexecdir@,$libexecdir,;t t
12275 +s,@datadir@,$datadir,;t t
12276 +s,@sysconfdir@,$sysconfdir,;t t
12277 +s,@sharedstatedir@,$sharedstatedir,;t t
12278 +s,@localstatedir@,$localstatedir,;t t
12279 +s,@libdir@,$libdir,;t t
12280 +s,@includedir@,$includedir,;t t
12281 +s,@oldincludedir@,$oldincludedir,;t t
12282 +s,@infodir@,$infodir,;t t
12283 +s,@mandir@,$mandir,;t t
12284 +s,@build_alias@,$build_alias,;t t
12285 +s,@host_alias@,$host_alias,;t t
12286 +s,@target_alias@,$target_alias,;t t
12287 +s,@DEFS@,$DEFS,;t t
12288 +s,@ECHO_C@,$ECHO_C,;t t
12289 +s,@ECHO_N@,$ECHO_N,;t t
12290 +s,@ECHO_T@,$ECHO_T,;t t
12291 +s,@LIBS@,$LIBS,;t t
12292 +s,@build@,$build,;t t
12293 +s,@build_cpu@,$build_cpu,;t t
12294 +s,@build_vendor@,$build_vendor,;t t
12295 +s,@build_os@,$build_os,;t t
12296 +s,@host@,$host,;t t
12297 +s,@host_cpu@,$host_cpu,;t t
12298 +s,@host_vendor@,$host_vendor,;t t
12299 +s,@host_os@,$host_os,;t t
12300 +s,@target@,$target,;t t
12301 +s,@target_cpu@,$target_cpu,;t t
12302 +s,@target_vendor@,$target_vendor,;t t
12303 +s,@target_os@,$target_os,;t t
12304 +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
12305 +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
12306 +s,@INSTALL_DATA@,$INSTALL_DATA,;t t
12307 +s,@PACKAGE@,$PACKAGE,;t t
12308 +s,@VERSION@,$VERSION,;t t
12309 +s,@ACLOCAL@,$ACLOCAL,;t t
12310 +s,@AUTOCONF@,$AUTOCONF,;t t
12311 +s,@AUTOMAKE@,$AUTOMAKE,;t t
12312 +s,@AUTOHEADER@,$AUTOHEADER,;t t
12313 +s,@MAKEINFO@,$MAKEINFO,;t t
12314 +s,@SET_MAKE@,$SET_MAKE,;t t
12315 +s,@LIBVER_CURRENT@,$LIBVER_CURRENT,;t t
12316 +s,@LIBVER_REVISION@,$LIBVER_REVISION,;t t
12317 +s,@LIBVER_AGE@,$LIBVER_AGE,;t t
12318 +s,@CC@,$CC,;t t
12319 +s,@CFLAGS@,$CFLAGS,;t t
12320 +s,@LDFLAGS@,$LDFLAGS,;t t
12321 +s,@CPPFLAGS@,$CPPFLAGS,;t t
12322 +s,@ac_ct_CC@,$ac_ct_CC,;t t
12323 +s,@EXEEXT@,$EXEEXT,;t t
12324 +s,@OBJEXT@,$OBJEXT,;t t
12325 +s,@LEX@,$LEX,;t t
12326 +s,@LEXLIB@,$LEXLIB,;t t
12327 +s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
12328 +s,@YACC@,$YACC,;t t
12329 +s,@LN_S@,$LN_S,;t t
12330 +s,@ECHO@,$ECHO,;t t
12331 +s,@RANLIB@,$RANLIB,;t t
12332 +s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
12333 +s,@STRIP@,$STRIP,;t t
12334 +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
12335 +s,@CPP@,$CPP,;t t
12336 +s,@EGREP@,$EGREP,;t t
12337 +s,@LIBTOOL@,$LIBTOOL,;t t
12338 +s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
12339 +s,@PERL@,$PERL,;t t
12340 +s,@LIBOBJS@,$LIBOBJS,;t t
12341 +s,@LTLIBOBJS@,$LTLIBOBJS,;t t
12342 +CEOF
12343 +
12344 +_ACEOF
12345 +
12346 + cat >>$CONFIG_STATUS <<\_ACEOF
12347 + # Split the substitutions into bite-sized pieces for seds with
12348 + # small command number limits, like on Digital OSF/1 and HP-UX.
12349 + ac_max_sed_lines=48
12350 + ac_sed_frag=1 # Number of current file.
12351 + ac_beg=1 # First line for current file.
12352 + ac_end=$ac_max_sed_lines # Line after last line for current file.
12353 + ac_more_lines=:
12354 + ac_sed_cmds=
12355 + while $ac_more_lines; do
12356 + if test $ac_beg -gt 1; then
12357 + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
12358 + else
12359 + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
12360 + fi
12361 + if test ! -s $tmp/subs.frag; then
12362 + ac_more_lines=false
12363 + else
12364 + # The purpose of the label and of the branching condition is to
12365 + # speed up the sed processing (if there are no `@' at all, there
12366 + # is no need to browse any of the substitutions).
12367 + # These are the two extra sed commands mentioned above.
12368 + (echo ':t
12369 + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
12370 + if test -z "$ac_sed_cmds"; then
12371 + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
12372 + else
12373 + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
12374 + fi
12375 + ac_sed_frag=`expr $ac_sed_frag + 1`
12376 + ac_beg=$ac_end
12377 + ac_end=`expr $ac_end + $ac_max_sed_lines`
12378 + fi
12379 + done
12380 + if test -z "$ac_sed_cmds"; then
12381 + ac_sed_cmds=cat
12382 + fi
12383 +fi # test -n "$CONFIG_FILES"
12384 +
12385 +_ACEOF
12386 +cat >>$CONFIG_STATUS <<\_ACEOF
12387 +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
12388 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
12389 - case "$ac_file" in
12390 - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
12391 - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
12392 - *) ac_file_in="${ac_file}.in" ;;
12393 - esac
12394 -
12395 - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
12396 -
12397 - # Remove last slash and all that follows it. Not all systems have dirname.
12398 - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
12399 - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
12400 - # The file is in a subdirectory.
12401 - test ! -d "$ac_dir" && mkdir "$ac_dir"
12402 - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
12403 - # A "../" for each directory in $ac_dir_suffix.
12404 - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
12405 - else
12406 - ac_dir_suffix= ac_dots=
12407 - fi
12408 -
12409 - case "$ac_given_srcdir" in
12410 - .) srcdir=.
12411 - if test -z "$ac_dots"; then top_srcdir=.
12412 - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
12413 - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
12414 + case $ac_file in
12415 + - | *:- | *:-:* ) # input from stdin
12416 + cat >$tmp/stdin
12417 + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
12418 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
12419 + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
12420 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
12421 + * ) ac_file_in=$ac_file.in ;;
12422 + esac
12423 +
12424 + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
12425 + ac_dir=`(dirname "$ac_file") 2>/dev/null ||
12426 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12427 + X"$ac_file" : 'X\(//\)[^/]' \| \
12428 + X"$ac_file" : 'X\(//\)$' \| \
12429 + X"$ac_file" : 'X\(/\)' \| \
12430 + . : '\(.\)' 2>/dev/null ||
12431 +echo X"$ac_file" |
12432 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12433 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12434 + /^X\(\/\/\)$/{ s//\1/; q; }
12435 + /^X\(\/\).*/{ s//\1/; q; }
12436 + s/.*/./; q'`
12437 + { if $as_mkdir_p; then
12438 + mkdir -p "$ac_dir"
12439 + else
12440 + as_dir="$ac_dir"
12441 + as_dirs=
12442 + while test ! -d "$as_dir"; do
12443 + as_dirs="$as_dir $as_dirs"
12444 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
12445 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12446 + X"$as_dir" : 'X\(//\)[^/]' \| \
12447 + X"$as_dir" : 'X\(//\)$' \| \
12448 + X"$as_dir" : 'X\(/\)' \| \
12449 + . : '\(.\)' 2>/dev/null ||
12450 +echo X"$as_dir" |
12451 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12452 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12453 + /^X\(\/\/\)$/{ s//\1/; q; }
12454 + /^X\(\/\).*/{ s//\1/; q; }
12455 + s/.*/./; q'`
12456 + done
12457 + test ! -n "$as_dirs" || mkdir $as_dirs
12458 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
12459 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
12460 + { (exit 1); exit 1; }; }; }
12461 +
12462 + ac_builddir=.
12463 +
12464 +if test "$ac_dir" != .; then
12465 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
12466 + # A "../" for each directory in $ac_dir_suffix.
12467 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
12468 +else
12469 + ac_dir_suffix= ac_top_builddir=
12470 +fi
12471 +
12472 +case $srcdir in
12473 + .) # No --srcdir option. We are building in place.
12474 + ac_srcdir=.
12475 + if test -z "$ac_top_builddir"; then
12476 + ac_top_srcdir=.
12477 + else
12478 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
12479 + fi ;;
12480 + [\\/]* | ?:[\\/]* ) # Absolute path.
12481 + ac_srcdir=$srcdir$ac_dir_suffix;
12482 + ac_top_srcdir=$srcdir ;;
12483 *) # Relative path.
12484 - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
12485 - top_srcdir="$ac_dots$ac_given_srcdir" ;;
12486 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
12487 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
12488 +esac
12489 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
12490 +# absolute.
12491 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
12492 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
12493 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
12494 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
12495 +
12496 +
12497 + case $INSTALL in
12498 + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
12499 + *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
12500 esac
12501
12502 - case "$ac_given_INSTALL" in
12503 - [/$]*) INSTALL="$ac_given_INSTALL" ;;
12504 - *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
12505 - esac
12506 -
12507 - echo creating "$ac_file"
12508 - rm -f "$ac_file"
12509 - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
12510 - case "$ac_file" in
12511 - *Makefile*) ac_comsub="1i\\
12512 -# $configure_input" ;;
12513 - *) ac_comsub= ;;
12514 - esac
12515 -
12516 - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
12517 - sed -e "$ac_comsub
12518 -s%@configure_input@%$configure_input%g
12519 -s%@srcdir@%$srcdir%g
12520 -s%@top_srcdir@%$top_srcdir%g
12521 -s%@INSTALL@%$INSTALL%g
12522 -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
12523 -fi; done
12524 -rm -f conftest.s*
12525 + if test x"$ac_file" != x-; then
12526 + { echo "$as_me:$LINENO: creating $ac_file" >&5
12527 +echo "$as_me: creating $ac_file" >&6;}
12528 + rm -f "$ac_file"
12529 + fi
12530 + # Let's still pretend it is `configure' which instantiates (i.e., don't
12531 + # use $as_me), people would be surprised to read:
12532 + # /* config.h. Generated by config.status. */
12533 + if test x"$ac_file" = x-; then
12534 + configure_input=
12535 + else
12536 + configure_input="$ac_file. "
12537 + fi
12538 + configure_input=$configure_input"Generated from `echo $ac_file_in |
12539 + sed 's,.*/,,'` by configure."
12540 +
12541 + # First look for the input files in the build tree, otherwise in the
12542 + # src tree.
12543 + ac_file_inputs=`IFS=:
12544 + for f in $ac_file_in; do
12545 + case $f in
12546 + -) echo $tmp/stdin ;;
12547 + [\\/$]*)
12548 + # Absolute (can't be DOS-style, as IFS=:)
12549 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
12550 +echo "$as_me: error: cannot find input file: $f" >&2;}
12551 + { (exit 1); exit 1; }; }
12552 + echo $f;;
12553 + *) # Relative
12554 + if test -f "$f"; then
12555 + # Build tree
12556 + echo $f
12557 + elif test -f "$srcdir/$f"; then
12558 + # Source tree
12559 + echo $srcdir/$f
12560 + else
12561 + # /dev/null tree
12562 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
12563 +echo "$as_me: error: cannot find input file: $f" >&2;}
12564 + { (exit 1); exit 1; }; }
12565 + fi;;
12566 + esac
12567 + done` || { (exit 1); exit 1; }
12568 +_ACEOF
12569 +cat >>$CONFIG_STATUS <<_ACEOF
12570 + sed "$ac_vpsub
12571 +$extrasub
12572 +_ACEOF
12573 +cat >>$CONFIG_STATUS <<\_ACEOF
12574 +:t
12575 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
12576 +s,@configure_input@,$configure_input,;t t
12577 +s,@srcdir@,$ac_srcdir,;t t
12578 +s,@abs_srcdir@,$ac_abs_srcdir,;t t
12579 +s,@top_srcdir@,$ac_top_srcdir,;t t
12580 +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
12581 +s,@builddir@,$ac_builddir,;t t
12582 +s,@abs_builddir@,$ac_abs_builddir,;t t
12583 +s,@top_builddir@,$ac_top_builddir,;t t
12584 +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
12585 +s,@INSTALL@,$ac_INSTALL,;t t
12586 +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
12587 + rm -f $tmp/stdin
12588 + if test x"$ac_file" != x-; then
12589 + mv $tmp/out $ac_file
12590 + else
12591 + cat $tmp/out
12592 + rm -f $tmp/out
12593 + fi
12594 +
12595 +done
12596 +_ACEOF
12597 +cat >>$CONFIG_STATUS <<\_ACEOF
12598 +
12599 +#
12600 +# CONFIG_HEADER section.
12601 +#
12602
12603 # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
12604 # NAME is the cpp macro being defined and VALUE is the value it is being given.
12605 #
12606 # ac_d sets the value in "#define NAME VALUE" lines.
12607 -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
12608 -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
12609 -ac_dC='\3'
12610 -ac_dD='%g'
12611 -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
12612 -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
12613 -ac_uB='\([ ]\)%\1#\2define\3'
12614 +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
12615 +ac_dB='[ ].*$,\1#\2'
12616 +ac_dC=' '
12617 +ac_dD=',;t'
12618 +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
12619 +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
12620 +ac_uB='$,\1#\2define\3'
12621 ac_uC=' '
12622 -ac_uD='\4%g'
12623 -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
12624 -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
12625 -ac_eB='$%\1#\2define\3'
12626 -ac_eC=' '
12627 -ac_eD='%g'
12628 +ac_uD=',;t'
12629
12630 -if test "${CONFIG_HEADERS+set}" != set; then
12631 -EOF
12632 -cat >> $CONFIG_STATUS <<EOF
12633 - CONFIG_HEADERS="config.h"
12634 -EOF
12635 -cat >> $CONFIG_STATUS <<\EOF
12636 -fi
12637 -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
12638 +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
12639 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
12640 - case "$ac_file" in
12641 - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
12642 - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
12643 - *) ac_file_in="${ac_file}.in" ;;
12644 + case $ac_file in
12645 + - | *:- | *:-:* ) # input from stdin
12646 + cat >$tmp/stdin
12647 + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
12648 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
12649 + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
12650 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
12651 + * ) ac_file_in=$ac_file.in ;;
12652 esac
12653
12654 - echo creating $ac_file
12655 -
12656 - rm -f conftest.frag conftest.in conftest.out
12657 - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
12658 - cat $ac_file_inputs > conftest.in
12659 -
12660 -EOF
12661 + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
12662 +echo "$as_me: creating $ac_file" >&6;}
12663
12664 -# Transform confdefs.h into a sed script conftest.vals that substitutes
12665 -# the proper values into config.h.in to produce config.h. And first:
12666 -# Protect against being on the right side of a sed subst in config.status.
12667 -# Protect against being in an unquoted here document in config.status.
12668 -rm -f conftest.vals
12669 -cat > conftest.hdr <<\EOF
12670 -s/[\\&%]/\\&/g
12671 -s%[\\$`]%\\&%g
12672 -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
12673 -s%ac_d%ac_u%gp
12674 -s%ac_u%ac_e%gp
12675 -EOF
12676 -sed -n -f conftest.hdr confdefs.h > conftest.vals
12677 -rm -f conftest.hdr
12678 + # First look for the input files in the build tree, otherwise in the
12679 + # src tree.
12680 + ac_file_inputs=`IFS=:
12681 + for f in $ac_file_in; do
12682 + case $f in
12683 + -) echo $tmp/stdin ;;
12684 + [\\/$]*)
12685 + # Absolute (can't be DOS-style, as IFS=:)
12686 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
12687 +echo "$as_me: error: cannot find input file: $f" >&2;}
12688 + { (exit 1); exit 1; }; }
12689 + echo $f;;
12690 + *) # Relative
12691 + if test -f "$f"; then
12692 + # Build tree
12693 + echo $f
12694 + elif test -f "$srcdir/$f"; then
12695 + # Source tree
12696 + echo $srcdir/$f
12697 + else
12698 + # /dev/null tree
12699 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
12700 +echo "$as_me: error: cannot find input file: $f" >&2;}
12701 + { (exit 1); exit 1; }; }
12702 + fi;;
12703 + esac
12704 + done` || { (exit 1); exit 1; }
12705 + # Remove the trailing spaces.
12706 + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
12707 +
12708 +_ACEOF
12709 +
12710 +# Transform confdefs.h into two sed scripts, `conftest.defines' and
12711 +# `conftest.undefs', that substitutes the proper values into
12712 +# config.h.in to produce config.h. The first handles `#define'
12713 +# templates, and the second `#undef' templates.
12714 +# And first: Protect against being on the right side of a sed subst in
12715 +# config.status. Protect against being in an unquoted here document
12716 +# in config.status.
12717 +rm -f conftest.defines conftest.undefs
12718 +# Using a here document instead of a string reduces the quoting nightmare.
12719 +# Putting comments in sed scripts is not portable.
12720 +#
12721 +# `end' is used to avoid that the second main sed command (meant for
12722 +# 0-ary CPP macros) applies to n-ary macro definitions.
12723 +# See the Autoconf documentation for `clear'.
12724 +cat >confdef2sed.sed <<\_ACEOF
12725 +s/[\\&,]/\\&/g
12726 +s,[\\$`],\\&,g
12727 +t clear
12728 +: clear
12729 +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
12730 +t end
12731 +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
12732 +: end
12733 +_ACEOF
12734 +# If some macros were called several times there might be several times
12735 +# the same #defines, which is useless. Nevertheless, we may not want to
12736 +# sort them, since we want the *last* AC-DEFINE to be honored.
12737 +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
12738 +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
12739 +rm -f confdef2sed.sed
12740
12741 # This sed command replaces #undef with comments. This is necessary, for
12742 # example, in the case of _POSIX_SOURCE, which is predefined and required
12743 # on some systems where configure will not decide to define it.
12744 -cat >> conftest.vals <<\EOF
12745 -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
12746 -EOF
12747 -
12748 -# Break up conftest.vals because some shells have a limit on
12749 -# the size of here documents, and old seds have small limits too.
12750 -
12751 +cat >>conftest.undefs <<\_ACEOF
12752 +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
12753 +_ACEOF
12754 +
12755 +# Break up conftest.defines because some shells have a limit on the size
12756 +# of here documents, and old seds have small limits too (100 cmds).
12757 +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
12758 +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
12759 +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
12760 +echo ' :' >>$CONFIG_STATUS
12761 +rm -f conftest.tail
12762 +while grep . conftest.defines >/dev/null
12763 +do
12764 + # Write a limited-size here document to $tmp/defines.sed.
12765 + echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
12766 + # Speed up: don't consider the non `#define' lines.
12767 + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
12768 + # Work around the forget-to-reset-the-flag bug.
12769 + echo 't clr' >>$CONFIG_STATUS
12770 + echo ': clr' >>$CONFIG_STATUS
12771 + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
12772 + echo 'CEOF
12773 + sed -f $tmp/defines.sed $tmp/in >$tmp/out
12774 + rm -f $tmp/in
12775 + mv $tmp/out $tmp/in
12776 +' >>$CONFIG_STATUS
12777 + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
12778 + rm -f conftest.defines
12779 + mv conftest.tail conftest.defines
12780 +done
12781 +rm -f conftest.defines
12782 +echo ' fi # grep' >>$CONFIG_STATUS
12783 +echo >>$CONFIG_STATUS
12784 +
12785 +# Break up conftest.undefs because some shells have a limit on the size
12786 +# of here documents, and old seds have small limits too (100 cmds).
12787 +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
12788 rm -f conftest.tail
12789 -while :
12790 +while grep . conftest.undefs >/dev/null
12791 do
12792 - ac_lines=`grep -c . conftest.vals`
12793 - # grep -c gives empty output for an empty file on some AIX systems.
12794 - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
12795 - # Write a limited-size here document to conftest.frag.
12796 - echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
12797 - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
12798 + # Write a limited-size here document to $tmp/undefs.sed.
12799 + echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
12800 + # Speed up: don't consider the non `#undef'
12801 + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
12802 + # Work around the forget-to-reset-the-flag bug.
12803 + echo 't clr' >>$CONFIG_STATUS
12804 + echo ': clr' >>$CONFIG_STATUS
12805 + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
12806 echo 'CEOF
12807 - sed -f conftest.frag conftest.in > conftest.out
12808 - rm -f conftest.in
12809 - mv conftest.out conftest.in
12810 -' >> $CONFIG_STATUS
12811 - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
12812 - rm -f conftest.vals
12813 - mv conftest.tail conftest.vals
12814 -done
12815 -rm -f conftest.vals
12816 -
12817 -cat >> $CONFIG_STATUS <<\EOF
12818 - rm -f conftest.frag conftest.h
12819 - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
12820 - cat conftest.in >> conftest.h
12821 - rm -f conftest.in
12822 - if cmp -s $ac_file conftest.h 2>/dev/null; then
12823 - echo "$ac_file is unchanged"
12824 - rm -f conftest.h
12825 - else
12826 - # Remove last slash and all that follows it. Not all systems have dirname.
12827 - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
12828 - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
12829 - # The file is in a subdirectory.
12830 - test ! -d "$ac_dir" && mkdir "$ac_dir"
12831 + sed -f $tmp/undefs.sed $tmp/in >$tmp/out
12832 + rm -f $tmp/in
12833 + mv $tmp/out $tmp/in
12834 +' >>$CONFIG_STATUS
12835 + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
12836 + rm -f conftest.undefs
12837 + mv conftest.tail conftest.undefs
12838 +done
12839 +rm -f conftest.undefs
12840 +
12841 +cat >>$CONFIG_STATUS <<\_ACEOF
12842 + # Let's still pretend it is `configure' which instantiates (i.e., don't
12843 + # use $as_me), people would be surprised to read:
12844 + # /* config.h. Generated by config.status. */
12845 + if test x"$ac_file" = x-; then
12846 + echo "/* Generated by configure. */" >$tmp/config.h
12847 + else
12848 + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
12849 + fi
12850 + cat $tmp/in >>$tmp/config.h
12851 + rm -f $tmp/in
12852 + if test x"$ac_file" != x-; then
12853 + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
12854 + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
12855 +echo "$as_me: $ac_file is unchanged" >&6;}
12856 + else
12857 + ac_dir=`(dirname "$ac_file") 2>/dev/null ||
12858 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12859 + X"$ac_file" : 'X\(//\)[^/]' \| \
12860 + X"$ac_file" : 'X\(//\)$' \| \
12861 + X"$ac_file" : 'X\(/\)' \| \
12862 + . : '\(.\)' 2>/dev/null ||
12863 +echo X"$ac_file" |
12864 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12865 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12866 + /^X\(\/\/\)$/{ s//\1/; q; }
12867 + /^X\(\/\).*/{ s//\1/; q; }
12868 + s/.*/./; q'`
12869 + { if $as_mkdir_p; then
12870 + mkdir -p "$ac_dir"
12871 + else
12872 + as_dir="$ac_dir"
12873 + as_dirs=
12874 + while test ! -d "$as_dir"; do
12875 + as_dirs="$as_dir $as_dirs"
12876 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
12877 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12878 + X"$as_dir" : 'X\(//\)[^/]' \| \
12879 + X"$as_dir" : 'X\(//\)$' \| \
12880 + X"$as_dir" : 'X\(/\)' \| \
12881 + . : '\(.\)' 2>/dev/null ||
12882 +echo X"$as_dir" |
12883 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12884 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12885 + /^X\(\/\/\)$/{ s//\1/; q; }
12886 + /^X\(\/\).*/{ s//\1/; q; }
12887 + s/.*/./; q'`
12888 + done
12889 + test ! -n "$as_dirs" || mkdir $as_dirs
12890 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
12891 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
12892 + { (exit 1); exit 1; }; }; }
12893 +
12894 + rm -f $ac_file
12895 + mv $tmp/config.h $ac_file
12896 fi
12897 - rm -f $ac_file
12898 - mv conftest.h $ac_file
12899 + else
12900 + cat $tmp/config.h
12901 + rm -f $tmp/config.h
12902 fi
12903 -fi; done
12904 +done
12905 +_ACEOF
12906 +cat >>$CONFIG_STATUS <<\_ACEOF
12907
12908 -EOF
12909 -cat >> $CONFIG_STATUS <<EOF
12910 +#
12911 +# CONFIG_COMMANDS section.
12912 +#
12913 +for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
12914 + ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
12915 + ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
12916 + ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
12917 +$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12918 + X"$ac_dest" : 'X\(//\)[^/]' \| \
12919 + X"$ac_dest" : 'X\(//\)$' \| \
12920 + X"$ac_dest" : 'X\(/\)' \| \
12921 + . : '\(.\)' 2>/dev/null ||
12922 +echo X"$ac_dest" |
12923 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12924 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12925 + /^X\(\/\/\)$/{ s//\1/; q; }
12926 + /^X\(\/\).*/{ s//\1/; q; }
12927 + s/.*/./; q'`
12928 + ac_builddir=.
12929 +
12930 +if test "$ac_dir" != .; then
12931 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
12932 + # A "../" for each directory in $ac_dir_suffix.
12933 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
12934 +else
12935 + ac_dir_suffix= ac_top_builddir=
12936 +fi
12937 +
12938 +case $srcdir in
12939 + .) # No --srcdir option. We are building in place.
12940 + ac_srcdir=.
12941 + if test -z "$ac_top_builddir"; then
12942 + ac_top_srcdir=.
12943 + else
12944 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
12945 + fi ;;
12946 + [\\/]* | ?:[\\/]* ) # Absolute path.
12947 + ac_srcdir=$srcdir$ac_dir_suffix;
12948 + ac_top_srcdir=$srcdir ;;
12949 + *) # Relative path.
12950 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
12951 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
12952 +esac
12953 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
12954 +# absolute.
12955 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
12956 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
12957 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
12958 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
12959
12960
12961 -EOF
12962 -cat >> $CONFIG_STATUS <<\EOF
12963 -test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
12964 + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
12965 +echo "$as_me: executing $ac_dest commands" >&6;}
12966 + case $ac_dest in
12967 + default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
12968 + esac
12969 +done
12970 +_ACEOF
12971
12972 -exit 0
12973 -EOF
12974 +cat >>$CONFIG_STATUS <<\_ACEOF
12975 +
12976 +{ (exit 0); exit 0; }
12977 +_ACEOF
12978 chmod +x $CONFIG_STATUS
12979 -rm -fr confdefs* $ac_clean_files
12980 -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
12981 +ac_clean_files=$ac_clean_files_save
12982 +
12983 +
12984 +# configure is writing to config.log, and then calls config.status.
12985 +# config.status does its own redirection, appending to config.log.
12986 +# Unfortunately, on DOS this fails, as config.log is still kept open
12987 +# by configure, so config.status won't be able to write to it; its
12988 +# output is simply discarded. So we exec the FD to /dev/null,
12989 +# effectively closing config.log, so it can be properly (re)opened and
12990 +# appended to by config.status. When coming back to configure, we
12991 +# need to make the FD available again.
12992 +if test "$no_create" != yes; then
12993 + ac_cs_success=:
12994 + ac_config_status_args=
12995 + test "$silent" = yes &&
12996 + ac_config_status_args="$ac_config_status_args --quiet"
12997 + exec 5>/dev/null
12998 + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
12999 + exec 5>>config.log
13000 + # Use ||, not &&, to avoid exiting from the if with $? = 1, which
13001 + # would make configure fail if this is the last instruction.
13002 + $ac_cs_success || { (exit 1); exit 1; }
13003 +fi
13004
13005
13006 --- linux-atm-2.4.1.orig/ltmain.sh
13007 +++ linux-atm-2.4.1/ltmain.sh
13008 @@ -49,14 +49,14 @@
13009 fi
13010
13011 # The name of this program.
13012 -progname=`$echo "$0" | sed 's%^.*/%%'`
13013 +progname=`$echo "$0" | ${SED} 's%^.*/%%'`
13014 modename="$progname"
13015
13016 # Constants.
13017 PROGRAM=ltmain.sh
13018 PACKAGE=libtool
13019 -VERSION=1.4
13020 -TIMESTAMP=" (1.920 2001/04/24 23:26:18)"
13021 +VERSION=1.4.3
13022 +TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)"
13023
13024 default_mode=
13025 help="Try \`$progname --help' for more information."
13026 @@ -67,10 +67,19 @@
13027
13028 # Sed substitution that helps us do robust quoting. It backslashifies
13029 # metacharacters that are still active within double-quoted strings.
13030 -Xsed='sed -e 1s/^X//'
13031 +Xsed="${SED}"' -e 1s/^X//'
13032 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
13033 -SP2NL='tr \040 \012'
13034 -NL2SP='tr \015\012 \040\040'
13035 +# test EBCDIC or ASCII
13036 +case `echo A|od -x` in
13037 + *[Cc]1*) # EBCDIC based system
13038 + SP2NL="tr '\100' '\n'"
13039 + NL2SP="tr '\r\n' '\100\100'"
13040 + ;;
13041 + *) # Assume ASCII based system
13042 + SP2NL="tr '\040' '\012'"
13043 + NL2SP="tr '\015\012' '\040\040'"
13044 + ;;
13045 +esac
13046
13047 # NLS nuisances.
13048 # Only set LANG and LC_ALL to C if already set.
13049 @@ -84,6 +93,9 @@
13050 save_LANG="$LANG"; LANG=C; export LANG
13051 fi
13052
13053 +# Make sure IFS has a sensible default
13054 +: ${IFS=" "}
13055 +
13056 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
13057 echo "$modename: not configured to build any kind of library" 1>&2
13058 echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
13059 @@ -141,7 +153,7 @@
13060 ;;
13061
13062 --config)
13063 - sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
13064 + ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
13065 exit 0
13066 ;;
13067
13068 @@ -174,6 +186,8 @@
13069 --mode) prevopt="--mode" prev=mode ;;
13070 --mode=*) mode="$optarg" ;;
13071
13072 + --preserve-dup-deps) duplicate_deps="yes" ;;
13073 +
13074 --quiet | --silent)
13075 show=:
13076 ;;
13077 @@ -202,12 +216,17 @@
13078 exit 1
13079 fi
13080
13081 +# If this variable is set in any of the actions, the command in it
13082 +# will be execed at the end. This prevents here-documents from being
13083 +# left over by shells.
13084 +exec_cmd=
13085 +
13086 if test -z "$show_help"; then
13087
13088 # Infer the operation mode.
13089 if test -z "$mode"; then
13090 case $nonopt in
13091 - *cc | *++ | gcc* | *-gcc*)
13092 + *cc | *++ | gcc* | *-gcc* | g++* | xlc*)
13093 mode=link
13094 for arg
13095 do
13096 @@ -329,7 +348,7 @@
13097 -Wc,*)
13098 args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
13099 lastarg=
13100 - IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
13101 + save_ifs="$IFS"; IFS=','
13102 for arg in $args; do
13103 IFS="$save_ifs"
13104
13105 @@ -615,6 +634,10 @@
13106 # Now arrange that obj and lo_libobj become the same file
13107 $show "(cd $xdir && $LN_S $baseobj $libobj)"
13108 if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
13109 + # Unlock the critical section if it was locked
13110 + if test "$need_locks" != no; then
13111 + $run $rm "$lockfile"
13112 + fi
13113 exit 0
13114 else
13115 error=$?
13116 @@ -745,6 +768,7 @@
13117 linker_flags=
13118 dllsearchpath=
13119 lib_search_path=`pwd`
13120 + inst_prefix_dir=
13121
13122 avoid_version=no
13123 dlfiles=
13124 @@ -875,6 +899,11 @@
13125 prev=
13126 continue
13127 ;;
13128 + inst_prefix)
13129 + inst_prefix_dir="$arg"
13130 + prev=
13131 + continue
13132 + ;;
13133 release)
13134 release="-$arg"
13135 prev=
13136 @@ -976,11 +1005,16 @@
13137 continue
13138 ;;
13139
13140 + -inst-prefix-dir)
13141 + prev=inst_prefix
13142 + continue
13143 + ;;
13144 +
13145 # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
13146 # so, if we see these flags be careful not to treat them like -L
13147 -L[A-Z][A-Z]*:*)
13148 case $with_gcc/$host in
13149 - no/*-*-irix*)
13150 + no/*-*-irix* | no/*-*-nonstopux*)
13151 compile_command="$compile_command $arg"
13152 finalize_command="$finalize_command $arg"
13153 ;;
13154 @@ -1031,6 +1065,17 @@
13155 # These systems don't actually have a C library (as such)
13156 test "X$arg" = "X-lc" && continue
13157 ;;
13158 + *-*-openbsd* | *-*-freebsd*)
13159 + # Do not include libc due to us having libc/libc_r.
13160 + test "X$arg" = "X-lc" && continue
13161 + ;;
13162 + esac
13163 + elif test "X$arg" = "X-lc_r"; then
13164 + case $host in
13165 + *-*-openbsd* | *-*-freebsd*)
13166 + # Do not include libc_r directly, use -pthread flag.
13167 + continue
13168 + ;;
13169 esac
13170 fi
13171 deplibs="$deplibs $arg"
13172 @@ -1122,7 +1167,7 @@
13173 -Wc,*)
13174 args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
13175 arg=
13176 - IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
13177 + save_ifs="$IFS"; IFS=','
13178 for flag in $args; do
13179 IFS="$save_ifs"
13180 case $flag in
13181 @@ -1140,7 +1185,7 @@
13182 -Wl,*)
13183 args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
13184 arg=
13185 - IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
13186 + save_ifs="$IFS"; IFS=','
13187 for flag in $args; do
13188 IFS="$save_ifs"
13189 case $flag in
13190 @@ -1307,9 +1352,11 @@
13191 # Find all interdependent deplibs by searching for libraries
13192 # that are linked more than once (e.g. -la -lb -la)
13193 for deplib in $deplibs; do
13194 - case "$libs " in
13195 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13196 - esac
13197 + if test "X$duplicate_deps" = "Xyes" ; then
13198 + case "$libs " in
13199 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13200 + esac
13201 + fi
13202 libs="$libs $deplib"
13203 done
13204 deplibs=
13205 @@ -1343,7 +1390,7 @@
13206 ;;
13207 esac
13208 for pass in $passes; do
13209 - if test "$linkmode" = prog; then
13210 + if test $linkmode = prog; then
13211 # Determine which files to process
13212 case $pass in
13213 dlopen)
13214 @@ -1360,11 +1407,11 @@
13215 found=no
13216 case $deplib in
13217 -l*)
13218 - if test "$linkmode" = oldlib && test "$linkmode" = obj; then
13219 + if test $linkmode = oldlib && test $linkmode = obj; then
13220 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
13221 continue
13222 fi
13223 - if test "$pass" = conv; then
13224 + if test $pass = conv; then
13225 deplibs="$deplib $deplibs"
13226 continue
13227 fi
13228 @@ -1384,7 +1431,7 @@
13229 finalize_deplibs="$deplib $finalize_deplibs"
13230 else
13231 deplibs="$deplib $deplibs"
13232 - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
13233 + test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
13234 fi
13235 continue
13236 fi
13237 @@ -1393,16 +1440,16 @@
13238 case $linkmode in
13239 lib)
13240 deplibs="$deplib $deplibs"
13241 - test "$pass" = conv && continue
13242 + test $pass = conv && continue
13243 newdependency_libs="$deplib $newdependency_libs"
13244 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
13245 ;;
13246 prog)
13247 - if test "$pass" = conv; then
13248 + if test $pass = conv; then
13249 deplibs="$deplib $deplibs"
13250 continue
13251 fi
13252 - if test "$pass" = scan; then
13253 + if test $pass = scan; then
13254 deplibs="$deplib $deplibs"
13255 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
13256 else
13257 @@ -1417,7 +1464,7 @@
13258 continue
13259 ;; # -L
13260 -R*)
13261 - if test "$pass" = link; then
13262 + if test $pass = link; then
13263 dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
13264 # Make sure the xrpath contains only unique directories.
13265 case "$xrpath " in
13266 @@ -1430,7 +1477,7 @@
13267 ;;
13268 *.la) lib="$deplib" ;;
13269 *.$libext)
13270 - if test "$pass" = conv; then
13271 + if test $pass = conv; then
13272 deplibs="$deplib $deplibs"
13273 continue
13274 fi
13275 @@ -1438,10 +1485,12 @@
13276 lib)
13277 if test "$deplibs_check_method" != pass_all; then
13278 echo
13279 - echo "*** Warning: This library needs some functionality provided by $deplib."
13280 + echo "*** Warning: Trying to link with static lib archive $deplib."
13281 echo "*** I have the capability to make that library automatically link in when"
13282 echo "*** you link to this library. But I can only do this if you have a"
13283 - echo "*** shared version of the library, which you do not appear to have."
13284 + echo "*** shared version of the library, which you do not appear to have"
13285 + echo "*** because the file extensions .$libext of this argument makes me believe"
13286 + echo "*** that it is just a static archive that I should not used here."
13287 else
13288 echo
13289 echo "*** Warning: Linking the shared library $output against the"
13290 @@ -1451,7 +1500,7 @@
13291 continue
13292 ;;
13293 prog)
13294 - if test "$pass" != link; then
13295 + if test $pass != link; then
13296 deplibs="$deplib $deplibs"
13297 else
13298 compile_deplibs="$deplib $compile_deplibs"
13299 @@ -1462,7 +1511,7 @@
13300 esac # linkmode
13301 ;; # *.$libext
13302 *.lo | *.$objext)
13303 - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
13304 + if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
13305 # If there is no dlopen support or we're linking statically,
13306 # we need to preload.
13307 newdlprefiles="$newdlprefiles $deplib"
13308 @@ -1485,7 +1534,7 @@
13309 fi
13310
13311 # Check to see that this really is a libtool archive.
13312 - if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
13313 + if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
13314 else
13315 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
13316 exit 1
13317 @@ -1512,13 +1561,13 @@
13318
13319 if test "$linkmode,$pass" = "lib,link" ||
13320 test "$linkmode,$pass" = "prog,scan" ||
13321 - { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
13322 + { test $linkmode = oldlib && test $linkmode = obj; }; then
13323 # Add dl[pre]opened files of deplib
13324 test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
13325 test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
13326 fi
13327
13328 - if test "$pass" = conv; then
13329 + if test $pass = conv; then
13330 # Only check for convenience libraries
13331 deplibs="$lib $deplibs"
13332 if test -z "$libdir"; then
13333 @@ -1532,12 +1581,14 @@
13334 tmp_libs=
13335 for deplib in $dependency_libs; do
13336 deplibs="$deplib $deplibs"
13337 - case "$tmp_libs " in
13338 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13339 - esac
13340 + if test "X$duplicate_deps" = "Xyes" ; then
13341 + case "$tmp_libs " in
13342 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13343 + esac
13344 + fi
13345 tmp_libs="$tmp_libs $deplib"
13346 done
13347 - elif test "$linkmode" != prog && test "$linkmode" != lib; then
13348 + elif test $linkmode != prog && test $linkmode != lib; then
13349 $echo "$modename: \`$lib' is not a convenience library" 1>&2
13350 exit 1
13351 fi
13352 @@ -1555,7 +1606,7 @@
13353 fi
13354
13355 # This library was specified with -dlopen.
13356 - if test "$pass" = dlopen; then
13357 + if test $pass = dlopen; then
13358 if test -z "$libdir"; then
13359 $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
13360 exit 1
13361 @@ -1604,7 +1655,7 @@
13362 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
13363
13364 # This library was specified with -dlpreopen.
13365 - if test "$pass" = dlpreopen; then
13366 + if test $pass = dlpreopen; then
13367 if test -z "$libdir"; then
13368 $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
13369 exit 1
13370 @@ -1623,7 +1674,7 @@
13371
13372 if test -z "$libdir"; then
13373 # Link the convenience library
13374 - if test "$linkmode" = lib; then
13375 + if test $linkmode = lib; then
13376 deplibs="$dir/$old_library $deplibs"
13377 elif test "$linkmode,$pass" = "prog,link"; then
13378 compile_deplibs="$dir/$old_library $compile_deplibs"
13379 @@ -1634,7 +1685,7 @@
13380 continue
13381 fi
13382
13383 - if test "$linkmode" = prog && test "$pass" != link; then
13384 + if test $linkmode = prog && test $pass != link; then
13385 newlib_search_path="$newlib_search_path $ladir"
13386 deplibs="$lib $deplibs"
13387
13388 @@ -1657,9 +1708,11 @@
13389 # or/and link against static libraries
13390 newdependency_libs="$deplib $newdependency_libs"
13391 fi
13392 - case "$tmp_libs " in
13393 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13394 - esac
13395 + if test "X$duplicate_deps" = "Xyes" ; then
13396 + case "$tmp_libs " in
13397 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13398 + esac
13399 + fi
13400 tmp_libs="$tmp_libs $deplib"
13401 done # for deplib
13402 continue
13403 @@ -1671,7 +1724,7 @@
13404 # Link against this shared library
13405
13406 if test "$linkmode,$pass" = "prog,link" ||
13407 - { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
13408 + { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
13409 # Hardcode the library path.
13410 # Skip directories that are in the system default run-time
13411 # search path.
13412 @@ -1693,7 +1746,7 @@
13413 esac
13414 ;;
13415 esac
13416 - if test "$linkmode" = prog; then
13417 + if test $linkmode = prog; then
13418 # We need to hardcode the library path
13419 if test -n "$shlibpath_var"; then
13420 # Make sure the rpath contains only unique directories.
13421 @@ -1743,14 +1796,14 @@
13422
13423 # Make a new name for the extract_expsyms_cmds to use
13424 soroot="$soname"
13425 - soname=`echo $soroot | sed -e 's/^.*\///'`
13426 - newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
13427 + soname=`echo $soroot | ${SED} -e 's/^.*\///'`
13428 + newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
13429
13430 # If the library has no export list, then create one now
13431 if test -f "$output_objdir/$soname-def"; then :
13432 else
13433 $show "extracting exported symbol list from \`$soname'"
13434 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13435 + save_ifs="$IFS"; IFS='~'
13436 eval cmds=\"$extract_expsyms_cmds\"
13437 for cmd in $cmds; do
13438 IFS="$save_ifs"
13439 @@ -1763,7 +1816,7 @@
13440 # Create $newlib
13441 if test -f "$output_objdir/$newlib"; then :; else
13442 $show "generating import library for \`$soname'"
13443 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13444 + save_ifs="$IFS"; IFS='~'
13445 eval cmds=\"$old_archive_from_expsyms_cmds\"
13446 for cmd in $cmds; do
13447 IFS="$save_ifs"
13448 @@ -1777,7 +1830,7 @@
13449 linklib=$newlib
13450 fi # test -n $old_archive_from_expsyms_cmds
13451
13452 - if test "$linkmode" = prog || test "$mode" != relink; then
13453 + if test $linkmode = prog || test "$mode" != relink; then
13454 add_shlibpath=
13455 add_dir=
13456 add=
13457 @@ -1804,6 +1857,14 @@
13458 add="$dir/$linklib"
13459 elif test "$hardcode_minus_L" = yes; then
13460 add_dir="-L$dir"
13461 + # Try looking first in the location we're being installed to.
13462 + if test -n "$inst_prefix_dir"; then
13463 + case "$libdir" in
13464 + [\/]*)
13465 + add_dir="-L$inst_prefix_dir$libdir $add_dir"
13466 + ;;
13467 + esac
13468 + fi
13469 add="-l$name"
13470 elif test "$hardcode_shlibpath_var" = yes; then
13471 add_shlibpath="$dir"
13472 @@ -1826,7 +1887,7 @@
13473 *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
13474 esac
13475 fi
13476 - if test "$linkmode" = prog; then
13477 + if test $linkmode = prog; then
13478 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
13479 test -n "$add" && compile_deplibs="$add $compile_deplibs"
13480 else
13481 @@ -1843,7 +1904,7 @@
13482 fi
13483 fi
13484
13485 - if test "$linkmode" = prog || test "$mode" = relink; then
13486 + if test $linkmode = prog || test "$mode" = relink; then
13487 add_shlibpath=
13488 add_dir=
13489 add=
13490 @@ -1862,10 +1923,18 @@
13491 else
13492 # We cannot seem to hardcode it, guess we'll fake it.
13493 add_dir="-L$libdir"
13494 + # Try looking first in the location we're being installed to.
13495 + if test -n "$inst_prefix_dir"; then
13496 + case "$libdir" in
13497 + [\/]*)
13498 + add_dir="-L$inst_prefix_dir$libdir $add_dir"
13499 + ;;
13500 + esac
13501 + fi
13502 add="-l$name"
13503 fi
13504
13505 - if test "$linkmode" = prog; then
13506 + if test $linkmode = prog; then
13507 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
13508 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
13509 else
13510 @@ -1873,7 +1942,7 @@
13511 test -n "$add" && deplibs="$add $deplibs"
13512 fi
13513 fi
13514 - elif test "$linkmode" = prog; then
13515 + elif test $linkmode = prog; then
13516 if test "$alldeplibs" = yes &&
13517 { test "$deplibs_check_method" = pass_all ||
13518 { test "$build_libtool_libs" = yes &&
13519 @@ -1903,25 +1972,26 @@
13520 # Just print a warning and add the library to dependency_libs so
13521 # that the program can be linked against the static library.
13522 echo
13523 - echo "*** Warning: This library needs some functionality provided by $lib."
13524 + echo "*** Warning: This system can not link to static lib archive $lib."
13525 echo "*** I have the capability to make that library automatically link in when"
13526 echo "*** you link to this library. But I can only do this if you have a"
13527 echo "*** shared version of the library, which you do not appear to have."
13528 if test "$module" = yes; then
13529 - echo "*** Therefore, libtool will create a static module, that should work "
13530 - echo "*** as long as the dlopening application is linked with the -dlopen flag."
13531 + echo "*** But as you try to build a module library, libtool will still create "
13532 + echo "*** a static module, that should work as long as the dlopening application"
13533 + echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
13534 if test -z "$global_symbol_pipe"; then
13535 - echo
13536 - echo "*** However, this would only work if libtool was able to extract symbol"
13537 - echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
13538 - echo "*** not find such a program. So, this module is probably useless."
13539 - echo "*** \`nm' from GNU binutils and a full rebuild may help."
13540 + echo
13541 + echo "*** However, this would only work if libtool was able to extract symbol"
13542 + echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
13543 + echo "*** not find such a program. So, this module is probably useless."
13544 + echo "*** \`nm' from GNU binutils and a full rebuild may help."
13545 fi
13546 if test "$build_old_libs" = no; then
13547 - build_libtool_libs=module
13548 - build_old_libs=yes
13549 + build_libtool_libs=module
13550 + build_old_libs=yes
13551 else
13552 - build_libtool_libs=no
13553 + build_libtool_libs=no
13554 fi
13555 fi
13556 else
13557 @@ -1932,9 +2002,9 @@
13558 fi
13559 fi # link shared/static library?
13560
13561 - if test "$linkmode" = lib; then
13562 + if test $linkmode = lib; then
13563 if test -n "$dependency_libs" &&
13564 - { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
13565 + { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
13566 test $link_static = yes; }; then
13567 # Extract -R from dependency_libs
13568 temp_deplibs=
13569 @@ -1958,13 +2028,15 @@
13570 tmp_libs=
13571 for deplib in $dependency_libs; do
13572 newdependency_libs="$deplib $newdependency_libs"
13573 - case "$tmp_libs " in
13574 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13575 - esac
13576 + if test "X$duplicate_deps" = "Xyes" ; then
13577 + case "$tmp_libs " in
13578 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13579 + esac
13580 + fi
13581 tmp_libs="$tmp_libs $deplib"
13582 done
13583
13584 - if test "$link_all_deplibs" != no; then
13585 + if test $link_all_deplibs != no; then
13586 # Add the search paths of all dependency libraries
13587 for deplib in $dependency_libs; do
13588 case $deplib in
13589 @@ -1986,7 +2058,7 @@
13590 if grep "^installed=no" $deplib > /dev/null; then
13591 path="-L$absdir/$objdir"
13592 else
13593 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
13594 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
13595 if test -z "$libdir"; then
13596 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
13597 exit 1
13598 @@ -2007,15 +2079,15 @@
13599 fi # link_all_deplibs != no
13600 fi # linkmode = lib
13601 done # for deplib in $libs
13602 - if test "$pass" = dlpreopen; then
13603 + if test $pass = dlpreopen; then
13604 # Link the dlpreopened libraries before other libraries
13605 for deplib in $save_deplibs; do
13606 deplibs="$deplib $deplibs"
13607 done
13608 fi
13609 - if test "$pass" != dlopen; then
13610 - test "$pass" != scan && dependency_libs="$newdependency_libs"
13611 - if test "$pass" != conv; then
13612 + if test $pass != dlopen; then
13613 + test $pass != scan && dependency_libs="$newdependency_libs"
13614 + if test $pass != conv; then
13615 # Make sure lib_search_path contains only unique directories.
13616 lib_search_path=
13617 for dir in $newlib_search_path; do
13618 @@ -2073,7 +2145,7 @@
13619 deplibs=
13620 fi
13621 done # for pass
13622 - if test "$linkmode" = prog; then
13623 + if test $linkmode = prog; then
13624 dlfiles="$newdlfiles"
13625 dlprefiles="$newdlprefiles"
13626 fi
13627 @@ -2175,7 +2247,7 @@
13628 else
13629
13630 # Parse the version information argument.
13631 - IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
13632 + save_ifs="$IFS"; IFS=':'
13633 set dummy $vinfo 0 0 0
13634 IFS="$save_ifs"
13635
13636 @@ -2250,16 +2322,21 @@
13637 versuffix=".$current";
13638 ;;
13639
13640 - irix)
13641 + irix | nonstopux)
13642 major=`expr $current - $age + 1`
13643 - verstring="sgi$major.$revision"
13644 +
13645 + case $version_type in
13646 + nonstopux) verstring_prefix=nonstopux ;;
13647 + *) verstring_prefix=sgi ;;
13648 + esac
13649 + verstring="$verstring_prefix$major.$revision"
13650
13651 # Add in all the interfaces that we are compatible with.
13652 loop=$revision
13653 while test $loop != 0; do
13654 iface=`expr $revision - $loop`
13655 loop=`expr $loop - 1`
13656 - verstring="sgi$major.$iface:$verstring"
13657 + verstring="$verstring_prefix$major.$iface:$verstring"
13658 done
13659
13660 # Before this point, $major must not contain `.'.
13661 @@ -2273,7 +2350,7 @@
13662 ;;
13663
13664 osf)
13665 - major=`expr $current - $age`
13666 + major=.`expr $current - $age`
13667 versuffix=".$current.$age.$revision"
13668 verstring="$current.$age.$revision"
13669
13670 @@ -2312,6 +2389,16 @@
13671 if test -z "$vinfo" && test -n "$release"; then
13672 major=
13673 verstring="0.0"
13674 + case $version_type in
13675 + darwin)
13676 + # we can't check for "0.0" in archive_cmds due to quoting
13677 + # problems, so we reset it completely
13678 + verstring=""
13679 + ;;
13680 + *)
13681 + verstring="0.0"
13682 + ;;
13683 + esac
13684 if test "$need_version" = no; then
13685 versuffix=
13686 else
13687 @@ -2355,9 +2442,9 @@
13688
13689 # Eliminate all temporary directories.
13690 for path in $notinst_path; do
13691 - lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
13692 - deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
13693 - dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
13694 + lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
13695 + deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
13696 + dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
13697 done
13698
13699 if test -n "$xrpath"; then
13700 @@ -2408,9 +2495,12 @@
13701 *-*-netbsd*)
13702 # Don't link with libc until the a.out ld.so is fixed.
13703 ;;
13704 + *-*-openbsd* | *-*-freebsd*)
13705 + # Do not include libc due to us having libc/libc_r.
13706 + ;;
13707 *)
13708 # Add libc to deplibs on all other systems if necessary.
13709 - if test "$build_libtool_need_lc" = "yes"; then
13710 + if test $build_libtool_need_lc = "yes"; then
13711 deplibs="$deplibs -lc"
13712 fi
13713 ;;
13714 @@ -2466,18 +2556,20 @@
13715 else
13716 droppeddeps=yes
13717 echo
13718 - echo "*** Warning: This library needs some functionality provided by $i."
13719 + echo "*** Warning: dynamic linker does not accept needed library $i."
13720 echo "*** I have the capability to make that library automatically link in when"
13721 echo "*** you link to this library. But I can only do this if you have a"
13722 - echo "*** shared version of the library, which you do not appear to have."
13723 + echo "*** shared version of the library, which I believe you do not have"
13724 + echo "*** because a test_compile did reveal that the linker did not use it for"
13725 + echo "*** its dynamic dependency list that programs get resolved with at runtime."
13726 fi
13727 else
13728 newdeplibs="$newdeplibs $i"
13729 fi
13730 done
13731 else
13732 - # Error occured in the first compile. Let's try to salvage the situation:
13733 - # Compile a seperate program for each library.
13734 + # Error occured in the first compile. Let's try to salvage
13735 + # the situation: Compile a separate program for each library.
13736 for i in $deplibs; do
13737 name="`expr $i : '-l\(.*\)'`"
13738 # If $name is empty we are operating on a -L argument.
13739 @@ -2496,10 +2588,12 @@
13740 else
13741 droppeddeps=yes
13742 echo
13743 - echo "*** Warning: This library needs some functionality provided by $i."
13744 + echo "*** Warning: dynamic linker does not accept needed library $i."
13745 echo "*** I have the capability to make that library automatically link in when"
13746 echo "*** you link to this library. But I can only do this if you have a"
13747 - echo "*** shared version of the library, which you do not appear to have."
13748 + echo "*** shared version of the library, which you do not appear to have"
13749 + echo "*** because a test_compile did reveal that the linker did not use this one"
13750 + echo "*** as a dynamic dependency that programs can get resolved with at runtime."
13751 fi
13752 else
13753 droppeddeps=yes
13754 @@ -2538,14 +2632,14 @@
13755 # but so what?
13756 potlib="$potent_lib"
13757 while test -h "$potlib" 2>/dev/null; do
13758 - potliblink=`ls -ld $potlib | sed 's/.* -> //'`
13759 + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
13760 case $potliblink in
13761 [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
13762 *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
13763 esac
13764 done
13765 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
13766 - | sed 10q \
13767 + | ${SED} 10q \
13768 | egrep "$file_magic_regex" > /dev/null; then
13769 newdeplibs="$newdeplibs $a_deplib"
13770 a_deplib=""
13771 @@ -2556,10 +2650,17 @@
13772 if test -n "$a_deplib" ; then
13773 droppeddeps=yes
13774 echo
13775 - echo "*** Warning: This library needs some functionality provided by $a_deplib."
13776 + echo "*** Warning: linker path does not have real file for library $a_deplib."
13777 echo "*** I have the capability to make that library automatically link in when"
13778 echo "*** you link to this library. But I can only do this if you have a"
13779 - echo "*** shared version of the library, which you do not appear to have."
13780 + echo "*** shared version of the library, which you do not appear to have"
13781 + echo "*** because I did check the linker path looking for a file starting"
13782 + if test -z "$potlib" ; then
13783 + echo "*** with $libname but no candidates were found. (...for file magic test)"
13784 + else
13785 + echo "*** with $libname and none of the candidates passed a file format test"
13786 + echo "*** using a file magic. Last file checked: $potlib"
13787 + fi
13788 fi
13789 else
13790 # Add a -L argument.
13791 @@ -2578,8 +2679,9 @@
13792 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
13793 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
13794 for potent_lib in $potential_libs; do
13795 + potlib="$potent_lib" # see symlink-check below in file_magic test
13796 if eval echo \"$potent_lib\" 2>/dev/null \
13797 - | sed 10q \
13798 + | ${SED} 10q \
13799 | egrep "$match_pattern_regex" > /dev/null; then
13800 newdeplibs="$newdeplibs $a_deplib"
13801 a_deplib=""
13802 @@ -2590,10 +2692,17 @@
13803 if test -n "$a_deplib" ; then
13804 droppeddeps=yes
13805 echo
13806 - echo "*** Warning: This library needs some functionality provided by $a_deplib."
13807 + echo "*** Warning: linker path does not have real file for library $a_deplib."
13808 echo "*** I have the capability to make that library automatically link in when"
13809 echo "*** you link to this library. But I can only do this if you have a"
13810 - echo "*** shared version of the library, which you do not appear to have."
13811 + echo "*** shared version of the library, which you do not appear to have"
13812 + echo "*** because I did check the linker path looking for a file starting"
13813 + if test -z "$potlib" ; then
13814 + echo "*** with $libname but no candidates were found. (...for regex pattern test)"
13815 + else
13816 + echo "*** with $libname and none of the candidates passed a file format test"
13817 + echo "*** using a regex pattern. Last file checked: $potlib"
13818 + fi
13819 fi
13820 else
13821 # Add a -L argument.
13822 @@ -2683,7 +2792,7 @@
13823
13824 # Test again, we may have decided not to build it any more
13825 if test "$build_libtool_libs" = yes; then
13826 - if test "$hardcode_into_libs" = yes; then
13827 + if test $hardcode_into_libs = yes; then
13828 # Hardcode the library paths
13829 hardcode_libdirs=
13830 dep_rpath=
13831 @@ -2784,7 +2893,7 @@
13832 export_symbols="$output_objdir/$libname.exp"
13833 $run $rm $export_symbols
13834 eval cmds=\"$export_symbols_cmds\"
13835 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13836 + save_ifs="$IFS"; IFS='~'
13837 for cmd in $cmds; do
13838 IFS="$save_ifs"
13839 $show "$cmd"
13840 @@ -2858,9 +2967,20 @@
13841 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
13842 eval cmds=\"$archive_expsym_cmds\"
13843 else
13844 + save_deplibs="$deplibs"
13845 + for conv in $convenience; do
13846 + tmp_deplibs=
13847 + for test_deplib in $deplibs; do
13848 + if test "$test_deplib" != "$conv"; then
13849 + tmp_deplibs="$tmp_deplibs $test_deplib"
13850 + fi
13851 + done
13852 + deplibs="$tmp_deplibs"
13853 + done
13854 eval cmds=\"$archive_cmds\"
13855 + deplibs="$save_deplibs"
13856 fi
13857 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13858 + save_ifs="$IFS"; IFS='~'
13859 for cmd in $cmds; do
13860 IFS="$save_ifs"
13861 $show "$cmd"
13862 @@ -2988,7 +3108,7 @@
13863
13864 output="$obj"
13865 eval cmds=\"$reload_cmds\"
13866 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13867 + save_ifs="$IFS"; IFS='~'
13868 for cmd in $cmds; do
13869 IFS="$save_ifs"
13870 $show "$cmd"
13871 @@ -3024,7 +3144,7 @@
13872 reload_objs="$libobjs $reload_conv_objs"
13873 output="$libobj"
13874 eval cmds=\"$reload_cmds\"
13875 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13876 + save_ifs="$IFS"; IFS='~'
13877 for cmd in $cmds; do
13878 IFS="$save_ifs"
13879 $show "$cmd"
13880 @@ -3057,7 +3177,7 @@
13881
13882 prog)
13883 case $host in
13884 - *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
13885 + *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
13886 esac
13887 if test -n "$vinfo"; then
13888 $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
13889 @@ -3079,6 +3199,13 @@
13890 # On Rhapsody replace the C library is the System framework
13891 compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
13892 finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
13893 + case $host in
13894 + *darwin*)
13895 + # Don't allow lazy linking, it breaks C++ global constructors
13896 + compile_command="$compile_command ${wl}-bind_at_load"
13897 + finalize_command="$finalize_command ${wl}-bind_at_load"
13898 + ;;
13899 + esac
13900 ;;
13901 esac
13902
13903 @@ -3245,9 +3372,9 @@
13904 if test -z "$export_symbols"; then
13905 export_symbols="$output_objdir/$output.exp"
13906 $run $rm $export_symbols
13907 - $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
13908 + $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
13909 else
13910 - $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
13911 + $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
13912 $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
13913 $run eval 'mv "$nlist"T "$nlist"'
13914 fi
13915 @@ -3255,7 +3382,7 @@
13916
13917 for arg in $dlprefiles; do
13918 $show "extracting global C symbols from \`$arg'"
13919 - name=`echo "$arg" | sed -e 's%^.*/%%'`
13920 + name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
13921 $run eval 'echo ": $name " >> "$nlist"'
13922 $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
13923 done
13924 @@ -3270,7 +3397,13 @@
13925 fi
13926
13927 # Try sorting and uniquifying the output.
13928 - if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
13929 + if grep -v "^: " < "$nlist" |
13930 + if sort -k 3 </dev/null >/dev/null 2>&1; then
13931 + sort -k 3
13932 + else
13933 + sort +2
13934 + fi |
13935 + uniq > "$nlist"S; then
13936 :
13937 else
13938 grep -v "^: " < "$nlist" > "$nlist"S
13939 @@ -3287,27 +3420,25 @@
13940 #undef lt_preloaded_symbols
13941
13942 #if defined (__STDC__) && __STDC__
13943 -# define lt_ptr_t void *
13944 +# define lt_ptr void *
13945 #else
13946 -# define lt_ptr_t char *
13947 +# define lt_ptr char *
13948 # define const
13949 #endif
13950
13951 /* The mapping between symbol names and symbols. */
13952 const struct {
13953 const char *name;
13954 - lt_ptr_t address;
13955 + lt_ptr address;
13956 }
13957 lt_preloaded_symbols[] =
13958 {\
13959 "
13960
13961 - sed -n -e 's/^: \([^ ]*\) $/ {\"\1\", (lt_ptr_t) 0},/p' \
13962 - -e 's/^. \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr_t) \&\2},/p' \
13963 - < "$nlist" >> "$output_objdir/$dlsyms"
13964 + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
13965
13966 $echo >> "$output_objdir/$dlsyms" "\
13967 - {0, (lt_ptr_t) 0}
13968 + {0, (lt_ptr) 0}
13969 };
13970
13971 /* This works around a problem in FreeBSD linker */
13972 @@ -3494,7 +3625,7 @@
13973 relink_command="$var=\"$var_value\"; export $var; $relink_command"
13974 fi
13975 done
13976 - relink_command="cd `pwd`; $relink_command"
13977 + relink_command="(cd `pwd`; $relink_command)"
13978 relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
13979 fi
13980
13981 @@ -3514,7 +3645,7 @@
13982 # win32 will think the script is a binary if it has
13983 # a .exe suffix, so we strip it off here.
13984 case $output in
13985 - *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
13986 + *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
13987 esac
13988 # test for cygwin because mv fails w/o .exe extensions
13989 case $host in
13990 @@ -3538,7 +3669,7 @@
13991
13992 # Sed substitution that helps us do robust quoting. It backslashifies
13993 # metacharacters that are still active within double-quoted strings.
13994 -Xsed='sed -e 1s/^X//'
13995 +Xsed="${SED}"' -e 1s/^X//'
13996 sed_quote_subst='$sed_quote_subst'
13997
13998 # The HP-UX ksh and POSIX shell print the target directory to stdout
13999 @@ -3576,7 +3707,7 @@
14000 test \"x\$thisdir\" = \"x\$file\" && thisdir=.
14001
14002 # Follow symbolic links until we get to the real thisdir.
14003 - file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
14004 + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
14005 while test -n \"\$file\"; do
14006 destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
14007
14008 @@ -3589,7 +3720,7 @@
14009 fi
14010
14011 file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
14012 - file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
14013 + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
14014 done
14015
14016 # Try to get the absolute directory name.
14017 @@ -3603,7 +3734,7 @@
14018 progdir=\"\$thisdir/$objdir\"
14019
14020 if test ! -f \"\$progdir/\$program\" || \\
14021 - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
14022 + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
14023 test \"X\$file\" != \"X\$progdir/\$program\"; }; then
14024
14025 file=\"\$\$-\$program\"
14026 @@ -3618,8 +3749,9 @@
14027
14028 # relink executable if necessary
14029 if test -n \"\$relink_command\"; then
14030 - if (eval \$relink_command); then :
14031 + if relink_command_output=\`eval \$relink_command 2>&1\`; then :
14032 else
14033 + $echo \"\$relink_command_output\" >&2
14034 $rm \"\$progdir/\$file\"
14035 exit 1
14036 fi
14037 @@ -3648,7 +3780,7 @@
14038 $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
14039
14040 # Some systems cannot cope with colon-terminated $shlibpath_var
14041 - # The second colon is a workaround for a bug in BeOS R4 sed
14042 + # The second colon is a workaround for a bug in BeOS R4 ${SED}
14043 $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
14044
14045 export $shlibpath_var
14046 @@ -3790,7 +3922,7 @@
14047
14048 eval cmds=\"$old_archive_cmds\"
14049 fi
14050 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14051 + save_ifs="$IFS"; IFS='~'
14052 for cmd in $cmds; do
14053 IFS="$save_ifs"
14054 $show "$cmd"
14055 @@ -3823,7 +3955,7 @@
14056 fi
14057 done
14058 # Quote the link command for shipping.
14059 - relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
14060 + relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
14061 relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
14062
14063 # Only create the output if not a dry run.
14064 @@ -3840,7 +3972,7 @@
14065 case $deplib in
14066 *.la)
14067 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
14068 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
14069 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
14070 if test -z "$libdir"; then
14071 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
14072 exit 1
14073 @@ -3854,7 +3986,7 @@
14074 newdlfiles=
14075 for lib in $dlfiles; do
14076 name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
14077 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
14078 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
14079 if test -z "$libdir"; then
14080 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
14081 exit 1
14082 @@ -3865,7 +3997,7 @@
14083 newdlprefiles=
14084 for lib in $dlprefiles; do
14085 name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
14086 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
14087 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
14088 if test -z "$libdir"; then
14089 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
14090 exit 1
14091 @@ -4089,7 +4221,7 @@
14092
14093 *.la)
14094 # Check to see that this really is a libtool archive.
14095 - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
14096 + if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
14097 else
14098 $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
14099 $echo "$help" 1>&2
14100 @@ -4124,12 +4256,30 @@
14101 dir="$dir$objdir"
14102
14103 if test -n "$relink_command"; then
14104 + # Determine the prefix the user has applied to our future dir.
14105 + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
14106 +
14107 + # Don't allow the user to place us outside of our expected
14108 + # location b/c this prevents finding dependent libraries that
14109 + # are installed to the same prefix.
14110 + if test "$inst_prefix_dir" = "$destdir"; then
14111 + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
14112 + exit 1
14113 + fi
14114 +
14115 + if test -n "$inst_prefix_dir"; then
14116 + # Stick the inst_prefix_dir data into the link command.
14117 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
14118 + else
14119 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
14120 + fi
14121 +
14122 $echo "$modename: warning: relinking \`$file'" 1>&2
14123 $show "$relink_command"
14124 if $run eval "$relink_command"; then :
14125 else
14126 $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
14127 - continue
14128 + exit 1
14129 fi
14130 fi
14131
14132 @@ -4165,7 +4315,7 @@
14133 # Do each command in the postinstall commands.
14134 lib="$destdir/$realname"
14135 eval cmds=\"$postinstall_cmds\"
14136 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14137 + save_ifs="$IFS"; IFS='~'
14138 for cmd in $cmds; do
14139 IFS="$save_ifs"
14140 $show "$cmd"
14141 @@ -4238,19 +4388,27 @@
14142 fi
14143
14144 # Do a test to see if this is really a libtool program.
14145 - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14146 + case $host in
14147 + *cygwin*|*mingw*)
14148 + wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
14149 + ;;
14150 + *)
14151 + wrapper=$file
14152 + ;;
14153 + esac
14154 + if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
14155 notinst_deplibs=
14156 relink_command=
14157
14158 # If there is no directory component, then add one.
14159 case $file in
14160 - */* | *\\*) . $file ;;
14161 - *) . ./$file ;;
14162 + */* | *\\*) . $wrapper ;;
14163 + *) . ./$wrapper ;;
14164 esac
14165
14166 # Check the variables that should have been set.
14167 if test -z "$notinst_deplibs"; then
14168 - $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
14169 + $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
14170 exit 1
14171 fi
14172
14173 @@ -4275,8 +4433,8 @@
14174 relink_command=
14175 # If there is no directory component, then add one.
14176 case $file in
14177 - */* | *\\*) . $file ;;
14178 - *) . ./$file ;;
14179 + */* | *\\*) . $wrapper ;;
14180 + *) . ./$wrapper ;;
14181 esac
14182
14183 outputname=
14184 @@ -4324,7 +4482,7 @@
14185 destfile=$destfile.exe
14186 ;;
14187 *:*.exe)
14188 - destfile=`echo $destfile | sed -e 's,.exe$,,'`
14189 + destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
14190 ;;
14191 esac
14192 ;;
14193 @@ -4352,7 +4510,7 @@
14194
14195 # Do each command in the postinstall commands.
14196 eval cmds=\"$old_postinstall_cmds\"
14197 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14198 + save_ifs="$IFS"; IFS='~'
14199 for cmd in $cmds; do
14200 IFS="$save_ifs"
14201 $show "$cmd"
14202 @@ -4368,11 +4526,10 @@
14203 if test -n "$current_libdirs"; then
14204 # Maybe just do a dry run.
14205 test -n "$run" && current_libdirs=" -n$current_libdirs"
14206 - exec $SHELL $0 --finish$current_libdirs
14207 - exit 1
14208 + exec_cmd='$SHELL $0 --finish$current_libdirs'
14209 + else
14210 + exit 0
14211 fi
14212 -
14213 - exit 0
14214 ;;
14215
14216 # libtool finish mode
14217 @@ -4391,7 +4548,7 @@
14218 if test -n "$finish_cmds"; then
14219 # Do each command in the finish commands.
14220 eval cmds=\"$finish_cmds\"
14221 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14222 + save_ifs="$IFS"; IFS='~'
14223 for cmd in $cmds; do
14224 IFS="$save_ifs"
14225 $show "$cmd"
14226 @@ -4473,7 +4630,7 @@
14227 case $file in
14228 *.la)
14229 # Check to see that this really is a libtool archive.
14230 - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
14231 + if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
14232 else
14233 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
14234 $echo "$help" 1>&2
14235 @@ -4544,7 +4701,7 @@
14236 -*) ;;
14237 *)
14238 # Do a test to see if this is really a libtool program.
14239 - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14240 + if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14241 # If there is no directory component, then add one.
14242 case $file in
14243 */* | *\\*) . $file ;;
14244 @@ -4575,11 +4732,8 @@
14245 LANG="$save_LANG"; export LANG
14246 fi
14247
14248 - # Now actually exec the command.
14249 - eval "exec \$cmd$args"
14250 -
14251 - $echo "$modename: cannot exec \$cmd$args"
14252 - exit 1
14253 + # Now prepare to actually exec the command.
14254 + exec_cmd="\$cmd$args"
14255 else
14256 # Display what would be done.
14257 if test -n "$shlibpath_var"; then
14258 @@ -4641,14 +4795,14 @@
14259
14260 # Don't error if the file doesn't exist and rm -f was used.
14261 if (test -L "$file") >/dev/null 2>&1 \
14262 - || (test -h "$file") >/dev/null 2>&1 \
14263 + || (test -h "$file") >/dev/null 2>&1 \
14264 || test -f "$file"; then
14265 - :
14266 + :
14267 elif test -d "$file"; then
14268 - exit_status=1
14269 + exit_status=1
14270 continue
14271 elif test "$rmforce" = yes; then
14272 - continue
14273 + continue
14274 fi
14275
14276 rmfiles="$file"
14277 @@ -4656,7 +4810,7 @@
14278 case $name in
14279 *.la)
14280 # Possibly a libtool archive, so verify it.
14281 - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14282 + if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14283 . $dir/$name
14284
14285 # Delete the libtool libraries and symlinks.
14286 @@ -4670,7 +4824,7 @@
14287 if test -n "$library_names"; then
14288 # Do each command in the postuninstall commands.
14289 eval cmds=\"$postuninstall_cmds\"
14290 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14291 + save_ifs="$IFS"; IFS='~'
14292 for cmd in $cmds; do
14293 IFS="$save_ifs"
14294 $show "$cmd"
14295 @@ -4685,7 +4839,7 @@
14296 if test -n "$old_library"; then
14297 # Do each command in the old_postuninstall commands.
14298 eval cmds=\"$old_postuninstall_cmds\"
14299 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14300 + save_ifs="$IFS"; IFS='~'
14301 for cmd in $cmds; do
14302 IFS="$save_ifs"
14303 $show "$cmd"
14304 @@ -4711,7 +4865,7 @@
14305 *)
14306 # Do a test to see if this is a libtool program.
14307 if test $mode = clean &&
14308 - (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14309 + (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14310 relink_command=
14311 . $dir/$file
14312
14313 @@ -4744,11 +4898,18 @@
14314 ;;
14315 esac
14316
14317 - $echo "$modename: invalid operation mode \`$mode'" 1>&2
14318 - $echo "$generic_help" 1>&2
14319 - exit 1
14320 + if test -z "$exec_cmd"; then
14321 + $echo "$modename: invalid operation mode \`$mode'" 1>&2
14322 + $echo "$generic_help" 1>&2
14323 + exit 1
14324 + fi
14325 fi # test -z "$show_help"
14326
14327 +if test -n "$exec_cmd"; then
14328 + eval exec $exec_cmd
14329 + exit 1
14330 +fi
14331 +
14332 # We need to display help for each of the modes.
14333 case $mode in
14334 "") $echo \
14335 --- linux-atm-2.4.1.orig/m4/Makefile.in
14336 +++ linux-atm-2.4.1/m4/Makefile.in
14337 @@ -1,4 +1,4 @@
14338 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14339 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14340
14341 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14342 # This Makefile.in is free software; the Free Software Foundation
14343 @@ -92,14 +92,14 @@
14344
14345 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14346
14347 -TAR = gtar
14348 +TAR = tar
14349 GZIP_ENV = --best
14350 all: all-redirect
14351 .SUFFIXES:
14352 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14353 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps m4/Makefile
14354 + cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile
14355
14356 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14357 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14358 cd $(top_builddir) \
14359 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14360
14361 @@ -112,6 +112,11 @@
14362 subdir = m4
14363
14364 distdir: $(DISTFILES)
14365 + here=`cd $(top_builddir) && pwd`; \
14366 + top_distdir=`cd $(top_distdir) && pwd`; \
14367 + distdir=`cd $(distdir) && pwd`; \
14368 + cd $(top_srcdir) \
14369 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu m4/Makefile
14370 @for file in $(DISTFILES); do \
14371 d=$(srcdir); \
14372 if test -d $$d/$$file; then \
14373 --- linux-atm-2.4.1.orig/src/Makefile.in
14374 +++ linux-atm-2.4.1/src/Makefile.in
14375 @@ -1,4 +1,4 @@
14376 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14377 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14378
14379 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14380 # This Makefile.in is free software; the Free Software Foundation
14381 @@ -85,8 +85,7 @@
14382 VERSION = @VERSION@
14383 YACC = @YACC@
14384
14385 -SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \
14386 - mpoad switch config extra
14387 +SUBDIRS = include lib
14388
14389 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14390 CONFIG_HEADER = ../config.h
14391 @@ -96,14 +95,14 @@
14392
14393 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14394
14395 -TAR = gtar
14396 +TAR = tar
14397 GZIP_ENV = --best
14398 all: all-redirect
14399 .SUFFIXES:
14400 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14401 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
14402 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
14403
14404 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14405 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14406 cd $(top_builddir) \
14407 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14408
14409 @@ -186,7 +185,7 @@
14410 awk ' { files[$$0] = 1; } \
14411 END { for (i in files) print i; }'`; \
14412 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
14413 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
14414 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
14415
14416 mostlyclean-tags:
14417
14418 @@ -202,6 +201,11 @@
14419 subdir = src
14420
14421 distdir: $(DISTFILES)
14422 + here=`cd $(top_builddir) && pwd`; \
14423 + top_distdir=`cd $(top_distdir) && pwd`; \
14424 + distdir=`cd $(distdir) && pwd`; \
14425 + cd $(top_srcdir) \
14426 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
14427 @for file in $(DISTFILES); do \
14428 d=$(srcdir); \
14429 if test -d $$d/$$file; then \
14430 --- linux-atm-2.4.1.orig/src/include/Makefile.in
14431 +++ linux-atm-2.4.1/src/include/Makefile.in
14432 @@ -1,4 +1,4 @@
14433 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14434 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14435
14436 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14437 # This Makefile.in is free software; the Free Software Foundation
14438 @@ -97,14 +97,14 @@
14439
14440 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14441
14442 -TAR = gtar
14443 +TAR = tar
14444 GZIP_ENV = --best
14445 all: all-redirect
14446 .SUFFIXES:
14447 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14448 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/include/Makefile
14449 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/include/Makefile
14450
14451 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14452 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14453 cd $(top_builddir) \
14454 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14455
14456 @@ -142,7 +142,7 @@
14457 awk ' { files[$$0] = 1; } \
14458 END { for (i in files) print i; }'`; \
14459 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
14460 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
14461 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
14462
14463 mostlyclean-tags:
14464
14465 @@ -158,6 +158,11 @@
14466 subdir = src/include
14467
14468 distdir: $(DISTFILES)
14469 + here=`cd $(top_builddir) && pwd`; \
14470 + top_distdir=`cd $(top_distdir) && pwd`; \
14471 + distdir=`cd $(distdir) && pwd`; \
14472 + cd $(top_srcdir) \
14473 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/include/Makefile
14474 @for file in $(DISTFILES); do \
14475 d=$(srcdir); \
14476 if test -d $$d/$$file; then \
14477 --- linux-atm-2.4.1.orig/src/include/atmd.h
14478 +++ linux-atm-2.4.1/src/include/atmd.h
14479 @@ -24,6 +24,10 @@
14480 (i)->prev = (b)->prev; if ((b)->prev) (b)->prev->next = i; else r = i; \
14481 (b)->prev = i; } else { (i)->next = r; (i)->prev = NULL; \
14482 if (r) (r)->prev = i; r = i; } })
14483 +#define Q_INSERT_BEFORE_TYPED(r,t,i,b) ({ if (b) { (i)->next = b; \
14484 + (i)->prev = (b)->prev; if ((b)->prev) (b)->prev->next = i; else r = i; \
14485 + (b)->prev = i; } else { (i)->next = t r; (i)->prev = NULL; \
14486 + if (t r) (t r)->prev = i; r = i; } })
14487 #define Q_REMOVE(r,i) ({ if ((i)->next) (i)->next->prev = (i)->prev; \
14488 if ((i)->prev) (i)->prev->next = (i)->next; else r = (i)->next; })
14489
14490 --- linux-atm-2.4.1.orig/src/lib/Makefile.in
14491 +++ linux-atm-2.4.1/src/lib/Makefile.in
14492 @@ -1,4 +1,4 @@
14493 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14494 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14495
14496 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14497 # This Makefile.in is free software; the Free Software Foundation
14498 @@ -92,16 +92,10 @@
14499 # ATMLIBS_VERSION comes from configure.in in the toplevel directory
14500 LDFLAGS = -version-info @LIBVER_CURRENT@:@LIBVER_REVISION@:@LIBVER_AGE@
14501
14502 -libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c \
14503 - qos2text.c qosequal.c sap2text.c text2sap.c sapequal.c \
14504 - misc.c atmres.h ans.c \
14505 - common.c diag.c kptr.c text2ip.c timer.c unix.c
14506 +libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c qos2text.c qosequal.c sap2text.c text2sap.c sapequal.c misc.c atmres.h ans.c common.c diag.c kptr.c text2ip.c timer.c unix.c
14507
14508 libatm_la_LIBADD = -lresolv
14509 -libatm_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \
14510 - $(top_builddir)/src/include/atmsap.h \
14511 - $(top_builddir)/src/include/stdint.h \
14512 - $(top_builddir)/src/include/atmd.h
14513 +libatm_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h $(top_builddir)/src/include/atmsap.h $(top_builddir)/src/include/stdint.h $(top_builddir)/src/include/atmd.h
14514
14515 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14516 CONFIG_HEADER = ../../config.h
14517 @@ -126,8 +120,13 @@
14518
14519 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14520
14521 -TAR = gtar
14522 +TAR = tar
14523 GZIP_ENV = --best
14524 +DEP_FILES = .deps/ans.P .deps/atm2text.P .deps/atmequal.P \
14525 +.deps/common.P .deps/diag.P .deps/kptr.P .deps/misc.P .deps/qos2text.P \
14526 +.deps/qosequal.P .deps/sap2text.P .deps/sapequal.P .deps/sdu2cell.P \
14527 +.deps/text2atm.P .deps/text2ip.P .deps/text2qos.P .deps/text2sap.P \
14528 +.deps/timer.P .deps/unix.P
14529 SOURCES = $(libatm_la_SOURCES)
14530 OBJECTS = $(libatm_la_OBJECTS)
14531
14532 @@ -135,9 +134,9 @@
14533 .SUFFIXES:
14534 .SUFFIXES: .S .c .lo .o .obj .s
14535 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14536 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/lib/Makefile
14537 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/Makefile
14538
14539 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14540 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14541 cd $(top_builddir) \
14542 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14543
14544 @@ -167,9 +166,6 @@
14545 $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
14546 done
14547
14548 -.c.o:
14549 - $(COMPILE) -c $<
14550 -
14551 # FIXME: We should only use cygpath when building on Windows,
14552 # and only if it is available.
14553 .c.obj:
14554 @@ -192,9 +188,6 @@
14555
14556 maintainer-clean-compile:
14557
14558 -.c.lo:
14559 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
14560 -
14561 .s.lo:
14562 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
14563
14564 @@ -232,7 +225,7 @@
14565 awk ' { files[$$0] = 1; } \
14566 END { for (i in files) print i; }'`; \
14567 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
14568 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
14569 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
14570
14571 mostlyclean-tags:
14572
14573 @@ -248,6 +241,11 @@
14574 subdir = src/lib
14575
14576 distdir: $(DISTFILES)
14577 + here=`cd $(top_builddir) && pwd`; \
14578 + top_distdir=`cd $(top_distdir) && pwd`; \
14579 + distdir=`cd $(distdir) && pwd`; \
14580 + cd $(top_srcdir) \
14581 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/lib/Makefile
14582 @for file in $(DISTFILES); do \
14583 d=$(srcdir); \
14584 if test -d $$d/$$file; then \
14585 @@ -258,48 +256,38 @@
14586 || cp -p $$d/$$file $(distdir)/$$file || :; \
14587 fi; \
14588 done
14589 -ans.lo ans.o : ans.c ../../config.h ../../src/include/stdint.h \
14590 - ../../src/include/atm.h atmres.h
14591 -atm2text.lo atm2text.o : atm2text.c ../../config.h \
14592 - ../../src/include/atm.h ../../src/include/stdint.h atmres.h
14593 -atmequal.lo atmequal.o : atmequal.c ../../config.h \
14594 - ../../src/include/atm.h ../../src/include/stdint.h
14595 -common.lo common.o : common.c ../../config.h ../../src/include/stdint.h \
14596 - ../../src/include/atmd.h ../../src/include/atm.h
14597 -diag.lo diag.o : diag.c ../../config.h ../../src/include/atmd.h \
14598 - ../../src/include/stdint.h ../../src/include/atm.h
14599 -kptr.lo kptr.o : kptr.c ../../config.h ../../src/include/atm.h \
14600 - ../../src/include/stdint.h ../../src/include/atmd.h
14601 -misc.lo misc.o : misc.c ../../config.h ../../src/include/stdint.h \
14602 - ../../src/include/atm.h ../../src/include/atmsap.h
14603 -qos2text.lo qos2text.o : qos2text.c ../../config.h \
14604 - ../../src/include/atm.h ../../src/include/stdint.h
14605 -qosequal.lo qosequal.o : qosequal.c ../../config.h \
14606 - ../../src/include/atm.h ../../src/include/stdint.h
14607 -sap2text.lo sap2text.o : sap2text.c ../../config.h \
14608 - ../../src/include/atmsap.h ../../src/include/stdint.h \
14609 - ../../src/include/atm.h
14610 -sapequal.lo sapequal.o : sapequal.c ../../config.h \
14611 - ../../src/include/atm.h ../../src/include/stdint.h \
14612 - ../../src/include/atmsap.h
14613 -sdu2cell.lo sdu2cell.o : sdu2cell.c ../../config.h \
14614 - ../../src/include/atm.h ../../src/include/stdint.h
14615 -text2atm.lo text2atm.o : text2atm.c ../../config.h \
14616 - ../../src/include/atm.h ../../src/include/stdint.h \
14617 - ../../src/include/atmsap.h atmres.h
14618 -text2ip.lo text2ip.o : text2ip.c ../../config.h \
14619 - ../../src/include/stdint.h ../../src/include/atm.h \
14620 - ../../src/include/atmd.h
14621 -text2qos.lo text2qos.o : text2qos.c ../../config.h \
14622 - ../../src/include/atm.h ../../src/include/stdint.h
14623 -text2sap.lo text2sap.o : text2sap.c ../../config.h \
14624 - ../../src/include/atmsap.h ../../src/include/stdint.h \
14625 - ../../src/include/atm.h
14626 -timer.lo timer.o : timer.c ../../config.h ../../src/include/atmd.h \
14627 - ../../src/include/stdint.h ../../src/include/atm.h
14628 -unix.lo unix.o : unix.c ../../config.h ../../src/include/atmd.h \
14629 - ../../src/include/stdint.h ../../src/include/atm.h
14630
14631 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
14632 +
14633 +-include $(DEP_FILES)
14634 +
14635 +mostlyclean-depend:
14636 +
14637 +clean-depend:
14638 +
14639 +distclean-depend:
14640 + -rm -rf .deps
14641 +
14642 +maintainer-clean-depend:
14643 +
14644 +%.o: %.c
14645 + @echo '$(COMPILE) -c $<'; \
14646 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14647 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
14648 + tr ' ' '\012' < .deps/$(*F).pp \
14649 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14650 + >> .deps/$(*F).P; \
14651 + rm .deps/$(*F).pp
14652 +
14653 +%.lo: %.c
14654 + @echo '$(LTCOMPILE) -c $<'; \
14655 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14656 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
14657 + < .deps/$(*F).pp > .deps/$(*F).P; \
14658 + tr ' ' '\012' < .deps/$(*F).pp \
14659 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14660 + >> .deps/$(*F).P; \
14661 + rm -f .deps/$(*F).pp
14662 info-am:
14663 info: info-am
14664 dvi-am:
14665 @@ -337,27 +325,27 @@
14666
14667 maintainer-clean-generic:
14668 mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
14669 - mostlyclean-libtool mostlyclean-tags \
14670 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
14671 mostlyclean-generic
14672
14673 mostlyclean: mostlyclean-am
14674
14675 clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
14676 - clean-generic mostlyclean-am
14677 + clean-depend clean-generic mostlyclean-am
14678
14679 clean: clean-am
14680
14681 distclean-am: distclean-libLTLIBRARIES distclean-compile \
14682 - distclean-libtool distclean-tags distclean-generic \
14683 - clean-am
14684 + distclean-libtool distclean-tags distclean-depend \
14685 + distclean-generic clean-am
14686 -rm -f libtool
14687
14688 distclean: distclean-am
14689
14690 maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
14691 maintainer-clean-compile maintainer-clean-libtool \
14692 - maintainer-clean-tags maintainer-clean-generic \
14693 - distclean-am
14694 + maintainer-clean-tags maintainer-clean-depend \
14695 + maintainer-clean-generic distclean-am
14696 @echo "This command is intended for maintainers to use;"
14697 @echo "it deletes files that may require special tools to rebuild."
14698
14699 @@ -369,12 +357,13 @@
14700 distclean-compile clean-compile maintainer-clean-compile \
14701 mostlyclean-libtool distclean-libtool clean-libtool \
14702 maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
14703 -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
14704 -check-am installcheck-am installcheck install-exec-am install-exec \
14705 -install-data-am install-data install-am install uninstall-am uninstall \
14706 -all-redirect all-am all installdirs mostlyclean-generic \
14707 -distclean-generic clean-generic maintainer-clean-generic clean \
14708 -mostlyclean distclean maintainer-clean
14709 +clean-tags maintainer-clean-tags distdir mostlyclean-depend \
14710 +distclean-depend clean-depend maintainer-clean-depend info-am info \
14711 +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
14712 +install-exec install-data-am install-data install-am install \
14713 +uninstall-am uninstall all-redirect all-am all installdirs \
14714 +mostlyclean-generic distclean-generic clean-generic \
14715 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
14716
14717
14718 #libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c \
14719 --- linux-atm-2.4.1.orig/src/lib/sapequal.c
14720 +++ linux-atm-2.4.1/src/lib/sapequal.c
14721 @@ -65,6 +65,7 @@
14722 CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window);
14723 break;
14724 default:
14725 + break;
14726 }
14727 switch (a.l3_proto) {
14728 case ATM_L3_X25:
14729 @@ -83,6 +84,7 @@
14730 if (a.l3.user != b.l3.user) return 0;
14731 break;
14732 default:
14733 + break;
14734 }
14735 return 1;
14736 }
14737 --- linux-atm-2.4.1.orig/src/test/Makefile.in
14738 +++ linux-atm-2.4.1/src/test/Makefile.in
14739 @@ -1,4 +1,4 @@
14740 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14741 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14742
14743 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14744 # This Makefile.in is free software; the Free Software Foundation
14745 @@ -168,8 +168,11 @@
14746
14747 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14748
14749 -TAR = gtar
14750 +TAR = tar
14751 GZIP_ENV = --best
14752 +DEP_FILES = .deps/align.P .deps/aping.P .deps/aread.P .deps/awrite.P \
14753 +.deps/br.P .deps/bw.P .deps/isp.P .deps/ispl_l.P .deps/ispl_y.P \
14754 +.deps/ttcp.P .deps/window.P
14755 SOURCES = $(aread_SOURCES) $(awrite_SOURCES) $(ttcp_atm_SOURCES) $(align_SOURCES) $(aping_SOURCES) $(br_SOURCES) $(bw_SOURCES) $(isp_SOURCES) $(window_SOURCES)
14756 OBJECTS = $(aread_OBJECTS) $(awrite_OBJECTS) $(ttcp_atm_OBJECTS) $(align_OBJECTS) $(aping_OBJECTS) $(br_OBJECTS) $(bw_OBJECTS) $(isp_OBJECTS) $(window_OBJECTS)
14757
14758 @@ -177,9 +180,9 @@
14759 .SUFFIXES:
14760 .SUFFIXES: .S .c .l .lo .o .obj .s .y
14761 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14762 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/test/Makefile
14763 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/test/Makefile
14764
14765 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14766 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14767 cd $(top_builddir) \
14768 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14769
14770 @@ -218,9 +221,6 @@
14771
14772 maintainer-clean-noinstPROGRAMS:
14773
14774 -.c.o:
14775 - $(COMPILE) -c $<
14776 -
14777 # FIXME: We should only use cygpath when building on Windows,
14778 # and only if it is available.
14779 .c.obj:
14780 @@ -243,9 +243,6 @@
14781
14782 maintainer-clean-compile:
14783
14784 -.c.lo:
14785 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
14786 -
14787 .s.lo:
14788 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
14789
14790 @@ -325,7 +322,7 @@
14791 awk ' { files[$$0] = 1; } \
14792 END { for (i in files) print i; }'`; \
14793 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
14794 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
14795 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
14796
14797 mostlyclean-tags:
14798
14799 @@ -341,6 +338,11 @@
14800 subdir = src/test
14801
14802 distdir: $(DISTFILES)
14803 + here=`cd $(top_builddir) && pwd`; \
14804 + top_distdir=`cd $(top_distdir) && pwd`; \
14805 + distdir=`cd $(distdir) && pwd`; \
14806 + cd $(top_srcdir) \
14807 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/test/Makefile
14808 @for file in $(DISTFILES); do \
14809 d=$(srcdir); \
14810 if test -d $$d/$$file; then \
14811 @@ -351,30 +353,38 @@
14812 || cp -p $$d/$$file $(distdir)/$$file || :; \
14813 fi; \
14814 done
14815 -align.o: align.c ../../config.h ../../src/include/atm.h \
14816 - ../../src/include/stdint.h
14817 -aping.o: aping.c ../../config.h ../../src/include/atm.h \
14818 - ../../src/include/stdint.h
14819 -aread.o: aread.c ../../config.h ../../src/include/atm.h \
14820 - ../../src/include/stdint.h
14821 -awrite.o: awrite.c ../../config.h ../../src/include/atm.h \
14822 - ../../src/include/stdint.h
14823 -br.o: br.c ../../config.h ../../src/include/atm.h \
14824 - ../../src/include/stdint.h
14825 -bw.o: bw.c ../../config.h ../../src/include/atm.h \
14826 - ../../src/include/stdint.h
14827 -isp.o: isp.c ../../config.h ../../src/include/atm.h \
14828 - ../../src/include/stdint.h ../../src/include/atmd.h isp.h \
14829 - errnos.inc
14830 -ispl_l.o: ispl_l.c ../../config.h ../../src/include/stdint.h isp.h \
14831 - ../../src/include/atm.h ispl_y.h
14832 -ispl_y.o: ispl_y.c ../../config.h ../../src/include/atm.h \
14833 - ../../src/include/stdint.h isp.h
14834 -ttcp.o: ttcp.c ../../config.h ../../src/include/stdint.h \
14835 - ../../src/include/atm.h ../../src/include/atmsap.h
14836 -window.o: window.c ../../config.h ../../src/include/atm.h \
14837 - ../../src/include/stdint.h
14838
14839 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
14840 +
14841 +-include $(DEP_FILES)
14842 +
14843 +mostlyclean-depend:
14844 +
14845 +clean-depend:
14846 +
14847 +distclean-depend:
14848 + -rm -rf .deps
14849 +
14850 +maintainer-clean-depend:
14851 +
14852 +%.o: %.c
14853 + @echo '$(COMPILE) -c $<'; \
14854 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14855 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
14856 + tr ' ' '\012' < .deps/$(*F).pp \
14857 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14858 + >> .deps/$(*F).P; \
14859 + rm .deps/$(*F).pp
14860 +
14861 +%.lo: %.c
14862 + @echo '$(LTCOMPILE) -c $<'; \
14863 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14864 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
14865 + < .deps/$(*F).pp > .deps/$(*F).P; \
14866 + tr ' ' '\012' < .deps/$(*F).pp \
14867 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14868 + >> .deps/$(*F).P; \
14869 + rm -f .deps/$(*F).pp
14870 info-am:
14871 info: info-am
14872 dvi-am:
14873 @@ -412,21 +422,22 @@
14874 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
14875
14876 maintainer-clean-generic:
14877 - -test -z "ispl_llispl_yhispl_yc" || rm -f ispl_ll ispl_yh ispl_yc
14878 + -test -z "ispl_lcispl_yhispl_yc" || rm -f ispl_lc ispl_yh ispl_yc
14879 mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
14880 mostlyclean-compile mostlyclean-libtool \
14881 - mostlyclean-tags mostlyclean-generic
14882 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
14883
14884 mostlyclean: mostlyclean-am
14885
14886 clean-am: clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
14887 - clean-libtool clean-tags clean-generic mostlyclean-am
14888 + clean-libtool clean-tags clean-depend clean-generic \
14889 + mostlyclean-am
14890
14891 clean: clean-am
14892
14893 distclean-am: distclean-binPROGRAMS distclean-noinstPROGRAMS \
14894 distclean-compile distclean-libtool distclean-tags \
14895 - distclean-generic clean-am
14896 + distclean-depend distclean-generic clean-am
14897 -rm -f libtool
14898
14899 distclean: distclean-am
14900 @@ -434,8 +445,8 @@
14901 maintainer-clean-am: maintainer-clean-binPROGRAMS \
14902 maintainer-clean-noinstPROGRAMS \
14903 maintainer-clean-compile maintainer-clean-libtool \
14904 - maintainer-clean-tags maintainer-clean-generic \
14905 - distclean-am
14906 + maintainer-clean-tags maintainer-clean-depend \
14907 + maintainer-clean-generic distclean-am
14908 @echo "This command is intended for maintainers to use;"
14909 @echo "it deletes files that may require special tools to rebuild."
14910
14911 @@ -448,19 +459,22 @@
14912 mostlyclean-compile distclean-compile clean-compile \
14913 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
14914 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
14915 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
14916 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
14917 -install-exec install-data-am install-data install-am install \
14918 -uninstall-am uninstall all-redirect all-am all installdirs \
14919 -mostlyclean-generic distclean-generic clean-generic \
14920 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
14921 +distclean-tags clean-tags maintainer-clean-tags distdir \
14922 +mostlyclean-depend distclean-depend clean-depend \
14923 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
14924 +installcheck-am installcheck install-exec-am install-exec \
14925 +install-data-am install-data install-am install uninstall-am uninstall \
14926 +all-redirect all-am all installdirs mostlyclean-generic \
14927 +distclean-generic clean-generic maintainer-clean-generic clean \
14928 +mostlyclean distclean maintainer-clean
14929
14930
14931 isp.o: errnos.inc
14932
14933 errnos.inc: mkerrnos.pl
14934 - @PERL@ ./mkerrnos.pl </usr/include/asm/errno.h \
14935 - >errnos.inc || { rm -f errnos.inc; exit 1; }
14936 + cpp -I/usr/include/ -dM /usr/include/asm/errno.h | grep "^#define E" \
14937 + | @PERL@ ./mkerrnos.pl | grep -v EMAXERRNO >errnos.inc \
14938 + || { rm -f errnos.inc; exit 1; }
14939
14940 # Tell versions [3.59,3.63) of GNU make to not export all variables.
14941 # Otherwise a system limit (for SysV at least) may be exceeded.
14942 --- linux-atm-2.4.1.orig/src/test/Makefile.am
14943 +++ linux-atm-2.4.1/src/test/Makefile.am
14944 @@ -26,6 +26,7 @@
14945 isp.o: errnos.inc
14946
14947 errnos.inc: mkerrnos.pl
14948 - @PERL@ ./mkerrnos.pl </usr/include/asm/errno.h \
14949 - >errnos.inc || { rm -f errnos.inc; exit 1; }
14950 -
14951 + cpp -I/usr/include/ -dM /usr/include/asm/errno.h | grep "^#define E" \
14952 + | @PERL@ ./mkerrnos.pl | grep -v EMAXERRNO >errnos.inc \
14953 + || { rm -f errnos.inc; exit 1; }
14954 +
14955 --- linux-atm-2.4.1.orig/src/test/ttcp.c
14956 +++ linux-atm-2.4.1/src/test/ttcp.c
14957 @@ -55,6 +55,8 @@
14958 /* #define SYSV */ /* required on SGI IRIX releases before 3.3 */
14959
14960 #include <stdio.h>
14961 +#include <stdlib.h>
14962 +#include <string.h>
14963 #include <signal.h>
14964 #include <ctype.h>
14965 #include <errno.h>
14966 @@ -67,6 +69,7 @@
14967 #include <sys/time.h> /* struct timeval */
14968 #include <atm.h>
14969 #include <atmsap.h>
14970 +#include <unistd.h>
14971
14972 #if defined(SYSV)
14973 #include <sys/times.h>
14974 @@ -85,7 +88,8 @@
14975 struct sockaddr_atmsvc satm;
14976 struct atm_qos qos;
14977
14978 -int domain, fromlen;
14979 +int domain;
14980 +socklen_t fromlen;
14981 int fd; /* fd of network socket */
14982
14983 int buflen = 8 * 1024; /* length of buffer */
14984 @@ -120,7 +124,6 @@
14985 static struct rusage ru0; /* Resource utilization at the start */
14986
14987 struct hostent *addr;
14988 -extern int errno;
14989 extern int optind;
14990 extern char *optarg;
14991
14992 @@ -158,23 +161,21 @@
14993 unsigned long numCalls; /* # of I/O system calls */
14994 double cput, realt; /* user, real time (seconds) */
14995
14996 -void err();
14997 -void mes();
14998 -int pattern();
14999 -void prep_timer();
15000 -double read_timer();
15001 -int Nread();
15002 -int Nwrite();
15003 -void delay();
15004 -int mread();
15005 -char *outfmt();
15006 -static void prusage();
15007 -static void tvadd();
15008 -static void tvsub();
15009 -static void psecs();
15010 +void err(const char *s);
15011 +void mes(const char *s);
15012 +void prep_timer(void);
15013 +void pattern(char *cp, int cnt);
15014 +int Nread(int nfd, char *Nbuf, int count);
15015 +int Nwrite(int nfd, char *Nbuf, int count);
15016 +void delay(int us);
15017 +int mread(int mfd, char *bufp, unsigned n);
15018 +char *outfmt(double b);
15019 +static void prusage(struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp);
15020 +static void tvadd(struct timeval *tsum, struct timeval *t0, struct timeval *t1);
15021 +static void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
15022 +static void psecs(long l, char *cp);
15023
15024 -void
15025 -sigpipe()
15026 +void sigpipe(int unused)
15027 {
15028 }
15029
15030 @@ -183,16 +184,14 @@
15031 * main -
15032 *-------------------------------------------------------------------------
15033 */
15034 -main(argc,argv)
15035 -int argc;
15036 -char **argv;
15037 +int main(int argc,char **argv)
15038 {
15039 struct timeval td;
15040 unsigned long addr_tmp;
15041 const char *port_name = NULL,*tos = NULL;
15042 int c;
15043 double mbps;
15044 -int no_check = 0;
15045 + int no_check = 0;
15046
15047 if (argc < 2) goto usage;
15048
15049 @@ -275,7 +274,7 @@
15050 }
15051 }
15052
15053 - if (port_name)
15054 + if (port_name) {
15055 if (atm) goto usage;
15056 else {
15057 struct servent *se;
15058 @@ -283,13 +282,13 @@
15059 se = getservbyname(port_name,udp ? "udp" : "tcp");
15060 if (se) port = ntohs(se->s_port);
15061 else {
15062 - const char *end;
15063 + char *end;
15064
15065 port = strtoul(port_name,&end,0);
15066 if (*end) goto usage;
15067 }
15068 }
15069 -
15070 + }
15071 host = argv[optind];
15072
15073 if (atm) {
15074 @@ -435,9 +434,9 @@
15075 #endif
15076
15077 if (!atm || satm.sas_family == AF_ATMPVC || !trans)
15078 - if (bind(fd, atm ? &satm : &sinme, atm ? satm.sas_family == AF_ATMPVC ?
15079 - sizeof(struct sockaddr_atmpvc) : sizeof(struct sockaddr_atmsvc) :
15080 - sizeof(sinme)) < 0)
15081 + if (bind(fd, atm ?
15082 + (struct sockaddr *)&satm : (struct sockaddr *)&sinme,
15083 + atm ? satm.sas_family == AF_ATMPVC ? sizeof(struct sockaddr_atmpvc) : sizeof(struct sockaddr_atmsvc) : sizeof(sinme)) < 0)
15084 err("bind");
15085
15086 if (!udp || (atm && satm.sas_family == AF_ATMSVC)) {
15087 @@ -453,8 +452,8 @@
15088 err("setsockopt");
15089 }
15090
15091 - if (connect(fd, atm ? &satm : &sinhim, atm ? sizeof(satm) :
15092 - sizeof(sinhim)) < 0)
15093 + if (connect(fd,
15094 + atm ? (struct sockaddr *)&satm : (struct sockaddr *)&sinhim, atm ? sizeof(satm) : sizeof(sinhim)) < 0)
15095 err("connect");
15096
15097 mes("connect");
15098 @@ -482,13 +481,13 @@
15099 fromlen = sizeof(frominet);
15100 domain = AF_INET;
15101
15102 - if ((fd=accept(fd, &frominet, &fromlen) ) < 0)
15103 + if ((fd=accept(fd, (struct sockaddr *)&frominet, &fromlen) ) < 0)
15104 err("accept");
15105
15106 {
15107 struct sockaddr_atmsvc peer;
15108 int peerlen = sizeof(peer);
15109 - if (getpeername(fd, (struct sockaddr_in *) &peer,
15110 + if (getpeername(fd, (struct sockaddr *) &peer,
15111 &peerlen) < 0) {
15112 err("getpeername");
15113 }
15114 @@ -638,13 +637,13 @@
15115 nbytes, cput, outfmt((double)nbytes/cput));
15116
15117 fprintf(stdout,
15118 - "ttcp%s: %d I/O calls, msec/call = %.2f, calls/sec = %.2f\n",
15119 + "ttcp%s: %lu I/O calls, msec/call = %.2f, calls/sec = %.2f\n",
15120 trans?"-t":"-r",
15121 numCalls,
15122 1000.0 * realt/((double)numCalls),
15123 ((double)numCalls)/realt);
15124 fprintf(stdout,
15125 - "ttcp%s: buffer address %#x\n",
15126 + "ttcp%s: buffer address %p\n",
15127 trans?"-t":"-r",
15128 buf);
15129 }
15130 @@ -656,8 +655,7 @@
15131 }
15132
15133 void
15134 -err(s)
15135 -char *s;
15136 +err(const char *s)
15137 {
15138 int en = errno;
15139
15140 @@ -670,8 +668,7 @@
15141 }
15142
15143 void
15144 -mes(s)
15145 -char *s;
15146 +mes(const char *s)
15147 {
15148 fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s);
15149 }
15150 @@ -681,9 +678,7 @@
15151 * pattern -
15152 *-------------------------------------------------------------------------
15153 */
15154 -pattern(cp, cnt)
15155 -register char *cp;
15156 -register int cnt;
15157 +void pattern(char *cp, int cnt)
15158 {
15159 register char c;
15160 c = 0;
15161 @@ -694,9 +689,7 @@
15162 }
15163
15164
15165 -char *
15166 -outfmt(b)
15167 -double b;
15168 +char *outfmt(double b)
15169 {
15170 static char obuf[50];
15171 switch (fmt) {
15172 @@ -758,7 +751,7 @@
15173 * P R E P _ T I M E R
15174 */
15175 void
15176 -prep_timer()
15177 +prep_timer(void)
15178 {
15179 gettimeofday(&start_time, (struct timezone *)0);
15180 getrusage(RUSAGE_SELF, &ru0);
15181 @@ -768,8 +761,7 @@
15182 * read_timer -
15183 *-------------------------------------------------------------------------
15184 */
15185 -double read_timer(str,len)
15186 -char *str;
15187 +double read_timer(char *str,int len)
15188 {
15189 struct rusage ru1;
15190 struct timeval tend, tstart, td;
15191 @@ -788,15 +780,11 @@
15192 return( cput );
15193 }
15194
15195 -static void
15196 -prusage(r0, r1, e, b, outp)
15197 - register struct rusage *r0, *r1;
15198 - struct timeval *e, *b;
15199 - char *outp;
15200 +static void prusage(struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp)
15201 {
15202 struct timeval tdiff;
15203 register time_t t;
15204 - register char *cp;
15205 + register const char *cp;
15206 register int i;
15207 int ms;
15208
15209 @@ -823,13 +811,13 @@
15210
15211 case 'U':
15212 tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime);
15213 - sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000);
15214 + sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000);
15215 END(outp);
15216 break;
15217
15218 case 'S':
15219 tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime);
15220 - sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000);
15221 + sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000);
15222 END(outp);
15223 break;
15224
15225 @@ -851,49 +839,49 @@
15226 break;
15227
15228 case 'X':
15229 - sprintf(outp,"%d", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
15230 + sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
15231 END(outp);
15232 break;
15233
15234 case 'D':
15235 - sprintf(outp,"%d", t == 0 ? 0 :
15236 + sprintf(outp,"%ld", t == 0 ? 0 :
15237 (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t);
15238 END(outp);
15239 break;
15240
15241 case 'K':
15242 - sprintf(outp,"%d", t == 0 ? 0 :
15243 + sprintf(outp,"%ld", t == 0 ? 0 :
15244 ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) -
15245 (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t);
15246 END(outp);
15247 break;
15248
15249 case 'M':
15250 - sprintf(outp,"%d", r1->ru_maxrss/2);
15251 + sprintf(outp,"%ld", r1->ru_maxrss/2);
15252 END(outp);
15253 break;
15254
15255 case 'F':
15256 - sprintf(outp,"%d", r1->ru_majflt-r0->ru_majflt);
15257 + sprintf(outp,"%ld", r1->ru_majflt-r0->ru_majflt);
15258 END(outp);
15259 break;
15260
15261 case 'R':
15262 - sprintf(outp,"%d", r1->ru_minflt-r0->ru_minflt);
15263 + sprintf(outp,"%ld", r1->ru_minflt-r0->ru_minflt);
15264 END(outp);
15265 break;
15266
15267 case 'I':
15268 - sprintf(outp,"%d", r1->ru_inblock-r0->ru_inblock);
15269 + sprintf(outp,"%ld", r1->ru_inblock-r0->ru_inblock);
15270 END(outp);
15271 break;
15272
15273 case 'O':
15274 - sprintf(outp,"%d", r1->ru_oublock-r0->ru_oublock);
15275 + sprintf(outp,"%ld", r1->ru_oublock-r0->ru_oublock);
15276 END(outp);
15277 break;
15278 case 'C':
15279 - sprintf(outp,"%d+%d", r1->ru_nvcsw-r0->ru_nvcsw,
15280 + sprintf(outp,"%ld+%ld", r1->ru_nvcsw-r0->ru_nvcsw,
15281 r1->ru_nivcsw-r0->ru_nivcsw );
15282 END(outp);
15283 break;
15284 @@ -903,9 +891,7 @@
15285 *outp = '\0';
15286 }
15287
15288 -static void
15289 -tvadd(tsum, t0, t1)
15290 - struct timeval *tsum, *t0, *t1;
15291 +static void tvadd(struct timeval *tsum, struct timeval *t0, struct timeval *t1)
15292 {
15293
15294 tsum->tv_sec = t0->tv_sec + t1->tv_sec;
15295 @@ -919,8 +905,7 @@
15296 * tvsub - tdiff = t1 - t0
15297 *-------------------------------------------------------------------------
15298 */
15299 -static void tvsub(tdiff, t1, t0)
15300 - struct timeval *tdiff, *t1, *t0;
15301 +static void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
15302 {
15303
15304 tdiff->tv_sec = t1->tv_sec - t0->tv_sec;
15305 @@ -931,10 +916,7 @@
15306 }
15307 }
15308
15309 -static void
15310 -psecs(l,cp)
15311 -long l;
15312 -register char *cp;
15313 +static void psecs(long l, char *cp)
15314 {
15315 register int i;
15316
15317 @@ -958,26 +940,23 @@
15318 /*
15319 * N R E A D
15320 */
15321 -Nread( fd, buf, count )
15322 -int fd;
15323 -char *buf;
15324 -int count;
15325 +int Nread( int nfd, char *Nbuf, int count )
15326 {
15327 struct sockaddr_in from;
15328 int len = sizeof(from);
15329 register int cnt;
15330 if( udp ) {
15331 #if 0
15332 - cnt = recvfrom( fd, buf, count, 0, &from, &len );
15333 + cnt = recvfrom( nfd, Nbuf, count, 0, &from, &len );
15334 #else
15335 - cnt = recv( fd, buf, count, 0);
15336 + cnt = recv( nfd, Nbuf, count, 0);
15337 #endif
15338 numCalls++;
15339 } else {
15340 if( b_flag )
15341 - cnt = mread( fd, buf, count ); /* fill buf */
15342 + cnt = mread( nfd, Nbuf, count ); /* fill buf */
15343 else {
15344 - cnt = read( fd, buf, count );
15345 + cnt = read( nfd, Nbuf, count );
15346 numCalls++;
15347 }
15348 if (touchdata && cnt > 0) {
15349 @@ -994,17 +973,15 @@
15350 * Nwrite -
15351 *-------------------------------------------------------------------------
15352 */
15353 -Nwrite(fd, buf, count)
15354 -int fd;
15355 -char *buf;
15356 -int count;
15357 +int Nwrite(int nfd, char *Nbuf, int count)
15358 {
15359 register int cnt;
15360
15361 if (udp) {
15362 again:
15363 - if (atm) cnt = write(fd, buf, count);
15364 - else cnt = sendto(fd, buf, count, 0, &sinhim, sizeof(sinhim));
15365 + if (atm) cnt = write(nfd, Nbuf, count);
15366 + else cnt = sendto(nfd, Nbuf, count, 0, (struct sockaddr *)&sinhim,
15367 + sizeof(sinhim));
15368 numCalls++;
15369 if ( cnt<0 && errno == ENOBUFS ) {
15370 delay(18000);
15371 @@ -1012,7 +989,7 @@
15372 goto again;
15373 }
15374 } else {
15375 - cnt = write(fd, buf, count);
15376 + cnt = write(nfd, Nbuf, count);
15377 numCalls++;
15378 }
15379 if (cnt < 0) perror("WA:write");
15380 @@ -1020,13 +997,13 @@
15381 }
15382
15383 void
15384 -delay(us)
15385 +delay(int us)
15386 {
15387 struct timeval tv;
15388
15389 tv.tv_sec = 0;
15390 tv.tv_usec = us;
15391 - (void)select( 1, (char *)0, (char *)0, (char *)0, &tv );
15392 + (void)select( 1, NULL, NULL, NULL, &tv );
15393 }
15394
15395 /*
15396 @@ -1038,17 +1015,13 @@
15397 * network connections don't deliver data with the same
15398 * grouping as it is written with. Written by Robert S. Miles, BRL.
15399 */
15400 -int
15401 -mread(fd, bufp, n)
15402 -int fd;
15403 -register char *bufp;
15404 -unsigned n;
15405 +int mread(int mfd, char *bufp, unsigned n)
15406 {
15407 register unsigned count = 0;
15408 register int nread;
15409
15410 do {
15411 - nread = read(fd, bufp, n-count);
15412 + nread = read(mfd, bufp, n-count);
15413 numCalls++;
15414 if(nread < 0) {
15415 perror("ttcp_mread");
15416 --- linux-atm-2.4.1.orig/src/debug/Makefile.in
15417 +++ linux-atm-2.4.1/src/debug/Makefile.in
15418 @@ -1,4 +1,4 @@
15419 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
15420 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
15421
15422 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
15423 # This Makefile.in is free software; the Free Software Foundation
15424 @@ -129,8 +129,9 @@
15425
15426 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
15427
15428 -TAR = gtar
15429 +TAR = tar
15430 GZIP_ENV = --best
15431 +DEP_FILES = .deps/delay.P .deps/svctor.P
15432 SOURCES = $(delay_SOURCES) $(svctor_SOURCES)
15433 OBJECTS = $(delay_OBJECTS) $(svctor_OBJECTS)
15434
15435 @@ -138,9 +139,9 @@
15436 .SUFFIXES:
15437 .SUFFIXES: .S .c .lo .o .obj .s
15438 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
15439 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/debug/Makefile
15440 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/debug/Makefile
15441
15442 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15443 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
15444 cd $(top_builddir) \
15445 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
15446
15447 @@ -154,9 +155,6 @@
15448
15449 maintainer-clean-noinstPROGRAMS:
15450
15451 -.c.o:
15452 - $(COMPILE) -c $<
15453 -
15454 # FIXME: We should only use cygpath when building on Windows,
15455 # and only if it is available.
15456 .c.obj:
15457 @@ -179,9 +177,6 @@
15458
15459 maintainer-clean-compile:
15460
15461 -.c.lo:
15462 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
15463 -
15464 .s.lo:
15465 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
15466
15467 @@ -224,7 +219,7 @@
15468 awk ' { files[$$0] = 1; } \
15469 END { for (i in files) print i; }'`; \
15470 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
15471 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
15472 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
15473
15474 mostlyclean-tags:
15475
15476 @@ -240,6 +235,11 @@
15477 subdir = src/debug
15478
15479 distdir: $(DISTFILES)
15480 + here=`cd $(top_builddir) && pwd`; \
15481 + top_distdir=`cd $(top_distdir) && pwd`; \
15482 + distdir=`cd $(distdir) && pwd`; \
15483 + cd $(top_srcdir) \
15484 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/debug/Makefile
15485 @for file in $(DISTFILES); do \
15486 d=$(srcdir); \
15487 if test -d $$d/$$file; then \
15488 @@ -250,11 +250,38 @@
15489 || cp -p $$d/$$file $(distdir)/$$file || :; \
15490 fi; \
15491 done
15492 -delay.o: delay.c ../../config.h ../../src/include/atm.h \
15493 - ../../src/include/stdint.h
15494 -svctor.o: svctor.c ../../config.h ../../src/include/atm.h \
15495 - ../../src/include/stdint.h
15496
15497 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
15498 +
15499 +-include $(DEP_FILES)
15500 +
15501 +mostlyclean-depend:
15502 +
15503 +clean-depend:
15504 +
15505 +distclean-depend:
15506 + -rm -rf .deps
15507 +
15508 +maintainer-clean-depend:
15509 +
15510 +%.o: %.c
15511 + @echo '$(COMPILE) -c $<'; \
15512 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
15513 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
15514 + tr ' ' '\012' < .deps/$(*F).pp \
15515 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
15516 + >> .deps/$(*F).P; \
15517 + rm .deps/$(*F).pp
15518 +
15519 +%.lo: %.c
15520 + @echo '$(LTCOMPILE) -c $<'; \
15521 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
15522 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
15523 + < .deps/$(*F).pp > .deps/$(*F).P; \
15524 + tr ' ' '\012' < .deps/$(*F).pp \
15525 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
15526 + >> .deps/$(*F).P; \
15527 + rm -f .deps/$(*F).pp
15528 info-am:
15529 info: info-am
15530 dvi-am:
15531 @@ -291,27 +318,27 @@
15532
15533 maintainer-clean-generic:
15534 mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \
15535 - mostlyclean-libtool mostlyclean-tags \
15536 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
15537 mostlyclean-generic
15538
15539 mostlyclean: mostlyclean-am
15540
15541 clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
15542 - clean-generic mostlyclean-am
15543 + clean-depend clean-generic mostlyclean-am
15544
15545 clean: clean-am
15546
15547 distclean-am: distclean-noinstPROGRAMS distclean-compile \
15548 - distclean-libtool distclean-tags distclean-generic \
15549 - clean-am
15550 + distclean-libtool distclean-tags distclean-depend \
15551 + distclean-generic clean-am
15552 -rm -f libtool
15553
15554 distclean: distclean-am
15555
15556 maintainer-clean-am: maintainer-clean-noinstPROGRAMS \
15557 maintainer-clean-compile maintainer-clean-libtool \
15558 - maintainer-clean-tags maintainer-clean-generic \
15559 - distclean-am
15560 + maintainer-clean-tags maintainer-clean-depend \
15561 + maintainer-clean-generic distclean-am
15562 @echo "This command is intended for maintainers to use;"
15563 @echo "it deletes files that may require special tools to rebuild."
15564
15565 @@ -322,12 +349,14 @@
15566 mostlyclean-compile distclean-compile clean-compile \
15567 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
15568 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
15569 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
15570 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
15571 -install-exec install-data-am install-data install-am install \
15572 -uninstall-am uninstall all-redirect all-am all installdirs \
15573 -mostlyclean-generic distclean-generic clean-generic \
15574 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
15575 +distclean-tags clean-tags maintainer-clean-tags distdir \
15576 +mostlyclean-depend distclean-depend clean-depend \
15577 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
15578 +installcheck-am installcheck install-exec-am install-exec \
15579 +install-data-am install-data install-am install uninstall-am uninstall \
15580 +all-redirect all-am all installdirs mostlyclean-generic \
15581 +distclean-generic clean-generic maintainer-clean-generic clean \
15582 +mostlyclean distclean maintainer-clean
15583
15584
15585 # Tell versions [3.59,3.63) of GNU make to not export all variables.
15586 --- linux-atm-2.4.1.orig/src/qgen/Makefile.in
15587 +++ linux-atm-2.4.1/src/qgen/Makefile.in
15588 @@ -1,4 +1,4 @@
15589 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
15590 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
15591
15592 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
15593 # This Makefile.in is free software; the Free Software Foundation
15594 @@ -88,8 +88,7 @@
15595 noinst_PROGRAMS = qgen q.dump # q40.out.o
15596 check_PROGRAMS = q.test
15597
15598 -qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
15599 - qgen.h second.c third.c
15600 +qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c qgen.h second.c third.c
15601
15602 qgen_LDADD = -lfl
15603
15604 @@ -108,17 +107,10 @@
15605
15606 EXTRA_DIST = ql_y.h incl.pl mknl.pl msg.fmt TODO
15607
15608 -CLEANFILES = q.out.h q.out.c q.test.c qd.out.h qd.out.c qd.dump.c qd.test.c \
15609 - default.nl # q40.out.h q40.out.c q40.test.c
15610 +CLEANFILES = q.out.h q.out.c q.test.c qd.out.h qd.out.c qd.dump.c qd.test.c default.nl # q40.out.h q40.out.c q40.test.c
15611
15612
15613 -NLS = atm_ai_msg atm_ai_ie atm_loc atm_cv atm_pu atm_na atm_cond atm_ie \
15614 - atm_msg atm_np atm_ton atm_sat atm_prs atm_scrn atm_vpa atm_poe \
15615 - q2931_cs atm_td atm_bc atm_tc atm_stc atm_upcc q2931_proto atm_flag \
15616 - atm_aalp atm_fd atm_tag atm_l2 atm_l3 atm_tt atm_mc atm_hl atm_imd \
15617 - atm_tdl atm_tni atm_nip atm_shi atm_oci atm_unfm atm_ofi atm_irs \
15618 - atm_it atm_lit atm_lsi atm_tcs atm_css atm_eqo atm_eqp atm_aap \
15619 - atm_asp atm_tor
15620 +NLS = atm_ai_msg atm_ai_ie atm_loc atm_cv atm_pu atm_na atm_cond atm_ie atm_msg atm_np atm_ton atm_sat atm_prs atm_scrn atm_vpa atm_poe q2931_cs atm_td atm_bc atm_tc atm_stc atm_upcc q2931_proto atm_flag atm_aalp atm_fd atm_tag atm_l2 atm_l3 atm_tt atm_mc atm_hl atm_imd atm_tdl atm_tni atm_nip atm_shi atm_oci atm_unfm atm_ofi atm_irs atm_it atm_lit atm_lsi atm_tcs atm_css atm_eqo atm_eqp atm_aap atm_asp atm_tor
15621
15622 SYMFILES = uni.h $(shell @PERL@ incl.pl $(CFLAGS) linux/atmsap.h)
15623 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15624 @@ -155,8 +147,11 @@
15625
15626 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
15627
15628 -TAR = gtar
15629 +TAR = tar
15630 GZIP_ENV = --best
15631 +DEP_FILES = .deps/common.P .deps/file.P .deps/first.P .deps/qgen.P \
15632 +.deps/ql_l.P .deps/ql_y.P .deps/qlib.P .deps/qtest.P .deps/second.P \
15633 +.deps/third.P
15634 SOURCES = $(q_test_SOURCES) $(qgen_SOURCES) $(q_dump_SOURCES) $(EXTRA_q_dump_SOURCES)
15635 OBJECTS = $(q_test_OBJECTS) $(qgen_OBJECTS) $(q_dump_OBJECTS)
15636
15637 @@ -164,9 +159,9 @@
15638 .SUFFIXES:
15639 .SUFFIXES: .S .c .l .lo .o .obj .s .y
15640 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
15641 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/qgen/Makefile
15642 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/qgen/Makefile
15643
15644 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15645 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
15646 cd $(top_builddir) \
15647 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
15648
15649 @@ -189,9 +184,6 @@
15650
15651 maintainer-clean-noinstPROGRAMS:
15652
15653 -.c.o:
15654 - $(COMPILE) -c $<
15655 -
15656 # FIXME: We should only use cygpath when building on Windows,
15657 # and only if it is available.
15658 .c.obj:
15659 @@ -214,9 +206,6 @@
15660
15661 maintainer-clean-compile:
15662
15663 -.c.lo:
15664 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
15665 -
15666 .s.lo:
15667 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
15668
15669 @@ -272,7 +261,7 @@
15670 awk ' { files[$$0] = 1; } \
15671 END { for (i in files) print i; }'`; \
15672 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
15673 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
15674 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
15675
15676 mostlyclean-tags:
15677
15678 @@ -288,6 +277,11 @@
15679 subdir = src/qgen
15680
15681 distdir: $(DISTFILES)
15682 + here=`cd $(top_builddir) && pwd`; \
15683 + top_distdir=`cd $(top_distdir) && pwd`; \
15684 + distdir=`cd $(distdir) && pwd`; \
15685 + cd $(top_srcdir) \
15686 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/qgen/Makefile
15687 @for file in $(DISTFILES); do \
15688 d=$(srcdir); \
15689 if test -d $$d/$$file; then \
15690 @@ -298,15 +292,38 @@
15691 || cp -p $$d/$$file $(distdir)/$$file || :; \
15692 fi; \
15693 done
15694 -common.o: common.c ../../config.h common.h
15695 -file.o: file.c ../../config.h common.h file.h
15696 -first.o: first.c ../../config.h common.h qgen.h file.h
15697 -qgen.o: qgen.c ../../config.h common.h file.h qgen.h
15698 -ql_l.o: ql_l.c ../../config.h common.h qgen.h ql_y.h
15699 -ql_y.o: ql_y.c ../../config.h common.h qgen.h file.h
15700 -second.o: second.c ../../config.h common.h qgen.h file.h
15701 -third.o: third.c ../../config.h common.h qgen.h file.h
15702
15703 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
15704 +
15705 +-include $(DEP_FILES)
15706 +
15707 +mostlyclean-depend:
15708 +
15709 +clean-depend:
15710 +
15711 +distclean-depend:
15712 + -rm -rf .deps
15713 +
15714 +maintainer-clean-depend:
15715 +
15716 +%.o: %.c
15717 + @echo '$(COMPILE) -c $<'; \
15718 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
15719 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
15720 + tr ' ' '\012' < .deps/$(*F).pp \
15721 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
15722 + >> .deps/$(*F).P; \
15723 + rm .deps/$(*F).pp
15724 +
15725 +%.lo: %.c
15726 + @echo '$(LTCOMPILE) -c $<'; \
15727 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
15728 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
15729 + < .deps/$(*F).pp > .deps/$(*F).P; \
15730 + tr ' ' '\012' < .deps/$(*F).pp \
15731 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
15732 + >> .deps/$(*F).P; \
15733 + rm -f .deps/$(*F).pp
15734 info-am:
15735 info: info-am
15736 dvi-am:
15737 @@ -344,21 +361,22 @@
15738 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
15739
15740 maintainer-clean-generic:
15741 - -test -z "ql_llql_yhql_yc" || rm -f ql_ll ql_yh ql_yc
15742 + -test -z "ql_lcql_yhql_yc" || rm -f ql_lc ql_yh ql_yc
15743 mostlyclean-am: mostlyclean-checkPROGRAMS mostlyclean-noinstPROGRAMS \
15744 mostlyclean-compile mostlyclean-libtool \
15745 - mostlyclean-tags mostlyclean-generic
15746 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
15747
15748 mostlyclean: mostlyclean-am
15749
15750 clean-am: clean-checkPROGRAMS clean-noinstPROGRAMS clean-compile \
15751 - clean-libtool clean-tags clean-generic mostlyclean-am
15752 + clean-libtool clean-tags clean-depend clean-generic \
15753 + mostlyclean-am
15754
15755 clean: clean-am
15756
15757 distclean-am: distclean-checkPROGRAMS distclean-noinstPROGRAMS \
15758 distclean-compile distclean-libtool distclean-tags \
15759 - distclean-generic clean-am
15760 + distclean-depend distclean-generic clean-am
15761 -rm -f libtool
15762
15763 distclean: distclean-am
15764 @@ -366,8 +384,8 @@
15765 maintainer-clean-am: maintainer-clean-checkPROGRAMS \
15766 maintainer-clean-noinstPROGRAMS \
15767 maintainer-clean-compile maintainer-clean-libtool \
15768 - maintainer-clean-tags maintainer-clean-generic \
15769 - distclean-am
15770 + maintainer-clean-tags maintainer-clean-depend \
15771 + maintainer-clean-generic distclean-am
15772 @echo "This command is intended for maintainers to use;"
15773 @echo "it deletes files that may require special tools to rebuild."
15774
15775 @@ -380,12 +398,14 @@
15776 mostlyclean-compile distclean-compile clean-compile \
15777 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
15778 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
15779 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
15780 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
15781 -install-exec install-data-am install-data install-am install \
15782 -uninstall-am uninstall all-redirect all-am all installdirs \
15783 -mostlyclean-generic distclean-generic clean-generic \
15784 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
15785 +distclean-tags clean-tags maintainer-clean-tags distdir \
15786 +mostlyclean-depend distclean-depend clean-depend \
15787 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
15788 +installcheck-am installcheck install-exec-am install-exec \
15789 +install-data-am install-data install-am install uninstall-am uninstall \
15790 +all-redirect all-am all installdirs mostlyclean-generic \
15791 +distclean-generic clean-generic maintainer-clean-generic clean \
15792 +mostlyclean distclean maintainer-clean
15793
15794
15795 default.nl: mknl.pl $(SYMFILES)
15796 --- linux-atm-2.4.1.orig/src/qgen/ql_l.c
15797 +++ linux-atm-2.4.1/src/qgen/ql_l.c
15798 @@ -1,32 +1,85 @@
15799 -/* A lexical scanner generated by flex */
15800
15801 -/* Scanner skeleton version:
15802 - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
15803 - */
15804 +#line 3 "lex.yy.c"
15805 +
15806 +#define YY_INT_ALIGNED short int
15807 +
15808 +/* A lexical scanner generated by flex */
15809
15810 #define FLEX_SCANNER
15811 #define YY_FLEX_MAJOR_VERSION 2
15812 #define YY_FLEX_MINOR_VERSION 5
15813 +#define YY_FLEX_SUBMINOR_VERSION 31
15814 +#if YY_FLEX_SUBMINOR_VERSION > 0
15815 +#define FLEX_BETA
15816 +#endif
15817
15818 +/* First, we deal with platform-specific or compiler-specific issues. */
15819 +
15820 +/* begin standard C headers. */
15821 #include <stdio.h>
15822 -#include <unistd.h>
15823 +#include <string.h>
15824 +#include <errno.h>
15825 +#include <stdlib.h>
15826
15827 +/* end standard C headers. */
15828
15829 -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
15830 -#ifdef c_plusplus
15831 -#ifndef __cplusplus
15832 -#define __cplusplus
15833 +/* flex integer type definitions */
15834 +
15835 +#ifndef FLEXINT_H
15836 +#define FLEXINT_H
15837 +
15838 +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
15839 +
15840 +#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
15841 +#include <inttypes.h>
15842 +typedef int8_t flex_int8_t;
15843 +typedef uint8_t flex_uint8_t;
15844 +typedef int16_t flex_int16_t;
15845 +typedef uint16_t flex_uint16_t;
15846 +typedef int32_t flex_int32_t;
15847 +typedef uint32_t flex_uint32_t;
15848 +#else
15849 +typedef signed char flex_int8_t;
15850 +typedef short int flex_int16_t;
15851 +typedef int flex_int32_t;
15852 +typedef unsigned char flex_uint8_t;
15853 +typedef unsigned short int flex_uint16_t;
15854 +typedef unsigned int flex_uint32_t;
15855 +#endif /* ! C99 */
15856 +
15857 +/* Limits of integral types. */
15858 +#ifndef INT8_MIN
15859 +#define INT8_MIN (-128)
15860 +#endif
15861 +#ifndef INT16_MIN
15862 +#define INT16_MIN (-32767-1)
15863 +#endif
15864 +#ifndef INT32_MIN
15865 +#define INT32_MIN (-2147483647-1)
15866 #endif
15867 +#ifndef INT8_MAX
15868 +#define INT8_MAX (127)
15869 +#endif
15870 +#ifndef INT16_MAX
15871 +#define INT16_MAX (32767)
15872 +#endif
15873 +#ifndef INT32_MAX
15874 +#define INT32_MAX (2147483647)
15875 +#endif
15876 +#ifndef UINT8_MAX
15877 +#define UINT8_MAX (255U)
15878 +#endif
15879 +#ifndef UINT16_MAX
15880 +#define UINT16_MAX (65535U)
15881 +#endif
15882 +#ifndef UINT32_MAX
15883 +#define UINT32_MAX (4294967295U)
15884 #endif
15885
15886 +#endif /* ! FLEXINT_H */
15887
15888 #ifdef __cplusplus
15889
15890 -#include <stdlib.h>
15891 -
15892 -/* Use prototypes in function declarations. */
15893 -#define YY_USE_PROTOS
15894 -
15895 /* The "const" storage-class-modifier is valid. */
15896 #define YY_USE_CONST
15897
15898 @@ -34,34 +87,17 @@
15899
15900 #if __STDC__
15901
15902 -#define YY_USE_PROTOS
15903 #define YY_USE_CONST
15904
15905 #endif /* __STDC__ */
15906 #endif /* ! __cplusplus */
15907
15908 -#ifdef __TURBOC__
15909 - #pragma warn -rch
15910 - #pragma warn -use
15911 -#include <io.h>
15912 -#include <stdlib.h>
15913 -#define YY_USE_CONST
15914 -#define YY_USE_PROTOS
15915 -#endif
15916 -
15917 #ifdef YY_USE_CONST
15918 #define yyconst const
15919 #else
15920 #define yyconst
15921 #endif
15922
15923 -
15924 -#ifdef YY_USE_PROTOS
15925 -#define YY_PROTO(proto) proto
15926 -#else
15927 -#define YY_PROTO(proto) ()
15928 -#endif
15929 -
15930 /* Returned upon end-of-file. */
15931 #define YY_NULL 0
15932
15933 @@ -76,71 +112,71 @@
15934 * but we do it the disgusting crufty way forced on us by the ()-less
15935 * definition of BEGIN.
15936 */
15937 -#define BEGIN yy_start = 1 + 2 *
15938 +#define BEGIN (yy_start) = 1 + 2 *
15939
15940 /* Translate the current start state into a value that can be later handed
15941 * to BEGIN to return to the state. The YYSTATE alias is for lex
15942 * compatibility.
15943 */
15944 -#define YY_START ((yy_start - 1) / 2)
15945 +#define YY_START (((yy_start) - 1) / 2)
15946 #define YYSTATE YY_START
15947
15948 /* Action number for EOF rule of a given start state. */
15949 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
15950
15951 /* Special action meaning "start processing a new file". */
15952 -#define YY_NEW_FILE yyrestart( yyin )
15953 +#define YY_NEW_FILE yyrestart(yyin )
15954
15955 #define YY_END_OF_BUFFER_CHAR 0
15956
15957 /* Size of default input buffer. */
15958 +#ifndef YY_BUF_SIZE
15959 #define YY_BUF_SIZE 16384
15960 +#endif
15961
15962 +#ifndef YY_TYPEDEF_YY_BUFFER_STATE
15963 +#define YY_TYPEDEF_YY_BUFFER_STATE
15964 typedef struct yy_buffer_state *YY_BUFFER_STATE;
15965 +#endif
15966
15967 extern int yyleng;
15968 +
15969 extern FILE *yyin, *yyout;
15970
15971 #define EOB_ACT_CONTINUE_SCAN 0
15972 #define EOB_ACT_END_OF_FILE 1
15973 #define EOB_ACT_LAST_MATCH 2
15974
15975 -/* The funky do-while in the following #define is used to turn the definition
15976 - * int a single C statement (which needs a semi-colon terminator). This
15977 - * avoids problems with code like:
15978 - *
15979 - * if ( condition_holds )
15980 - * yyless( 5 );
15981 - * else
15982 - * do_something_else();
15983 - *
15984 - * Prior to using the do-while the compiler would get upset at the
15985 - * "else" because it interpreted the "if" statement as being all
15986 - * done when it reached the ';' after the yyless() call.
15987 - */
15988 -
15989 -/* Return all but the first 'n' matched characters back to the input stream. */
15990 -
15991 + #define YY_LESS_LINENO(n)
15992 +
15993 +/* Return all but the first "n" matched characters back to the input stream. */
15994 #define yyless(n) \
15995 do \
15996 { \
15997 /* Undo effects of setting up yytext. */ \
15998 - *yy_cp = yy_hold_char; \
15999 + int yyless_macro_arg = (n); \
16000 + YY_LESS_LINENO(yyless_macro_arg);\
16001 + *yy_cp = (yy_hold_char); \
16002 YY_RESTORE_YY_MORE_OFFSET \
16003 - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
16004 + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
16005 YY_DO_BEFORE_ACTION; /* set up yytext again */ \
16006 } \
16007 while ( 0 )
16008
16009 -#define unput(c) yyunput( c, yytext_ptr )
16010 +#define unput(c) yyunput( c, (yytext_ptr) )
16011
16012 /* The following is because we cannot portably get our hands on size_t
16013 * (without autoconf's help, which isn't available because we want
16014 * flex-generated scanners to compile on their own).
16015 */
16016 -typedef unsigned int yy_size_t;
16017
16018 +#ifndef YY_TYPEDEF_YY_SIZE_T
16019 +#define YY_TYPEDEF_YY_SIZE_T
16020 +typedef unsigned int yy_size_t;
16021 +#endif
16022
16023 +#ifndef YY_STRUCT_YY_BUFFER_STATE
16024 +#define YY_STRUCT_YY_BUFFER_STATE
16025 struct yy_buffer_state
16026 {
16027 FILE *yy_input_file;
16028 @@ -177,12 +213,16 @@
16029 */
16030 int yy_at_bol;
16031
16032 + int yy_bs_lineno; /**< The line count. */
16033 + int yy_bs_column; /**< The column count. */
16034 +
16035 /* Whether to try to fill the input buffer when we reach the
16036 * end of it.
16037 */
16038 int yy_fill_buffer;
16039
16040 int yy_buffer_status;
16041 +
16042 #define YY_BUFFER_NEW 0
16043 #define YY_BUFFER_NORMAL 1
16044 /* When an EOF's been seen but there's still some text to process
16045 @@ -196,23 +236,33 @@
16046 * just pointing yyin at a new input file.
16047 */
16048 #define YY_BUFFER_EOF_PENDING 2
16049 +
16050 };
16051 +#endif /* !YY_STRUCT_YY_BUFFER_STATE */
16052
16053 -static YY_BUFFER_STATE yy_current_buffer = 0;
16054 +/* Stack of input buffers. */
16055 +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
16056 +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
16057 +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
16058
16059 /* We provide macros for accessing buffer states in case in the
16060 * future we want to put the buffer states in a more general
16061 * "scanner state".
16062 + *
16063 + * Returns the top of the stack, or NULL.
16064 */
16065 -#define YY_CURRENT_BUFFER yy_current_buffer
16066 +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
16067 + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
16068 + : NULL)
16069
16070 +/* Same as previous macro, but useful when we know that the buffer stack is not
16071 + * NULL or when we need an lvalue. For internal use only.
16072 + */
16073 +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
16074
16075 /* yy_hold_char holds the character lost when yytext is formed. */
16076 static char yy_hold_char;
16077 -
16078 static int yy_n_chars; /* number of characters read into yy_ch_buf */
16079 -
16080 -
16081 int yyleng;
16082
16083 /* Points to current character in buffer. */
16084 @@ -225,66 +275,92 @@
16085 */
16086 static int yy_did_buffer_switch_on_eof;
16087
16088 -void yyrestart YY_PROTO(( FILE *input_file ));
16089 -
16090 -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
16091 -void yy_load_buffer_state YY_PROTO(( void ));
16092 -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
16093 -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
16094 -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
16095 -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
16096 -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
16097 -
16098 -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
16099 -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
16100 -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
16101 -
16102 -static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
16103 -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
16104 -static void yy_flex_free YY_PROTO(( void * ));
16105 +void yyrestart (FILE *input_file );
16106 +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer );
16107 +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size );
16108 +void yy_delete_buffer (YY_BUFFER_STATE b );
16109 +void yy_flush_buffer (YY_BUFFER_STATE b );
16110 +void yypush_buffer_state (YY_BUFFER_STATE new_buffer );
16111 +void yypop_buffer_state (void );
16112 +
16113 +static void yyensure_buffer_stack (void );
16114 +static void yy_load_buffer_state (void );
16115 +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
16116 +
16117 +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
16118 +
16119 +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size );
16120 +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str );
16121 +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len );
16122 +
16123 +void *yyalloc (yy_size_t );
16124 +void *yyrealloc (void *,yy_size_t );
16125 +void yyfree (void * );
16126
16127 #define yy_new_buffer yy_create_buffer
16128
16129 #define yy_set_interactive(is_interactive) \
16130 { \
16131 - if ( ! yy_current_buffer ) \
16132 - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
16133 - yy_current_buffer->yy_is_interactive = is_interactive; \
16134 + if ( ! YY_CURRENT_BUFFER ){ \
16135 + yyensure_buffer_stack (); \
16136 + YY_CURRENT_BUFFER_LVALUE = \
16137 + yy_create_buffer(yyin,YY_BUF_SIZE ); \
16138 + } \
16139 + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
16140 }
16141
16142 #define yy_set_bol(at_bol) \
16143 { \
16144 - if ( ! yy_current_buffer ) \
16145 - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
16146 - yy_current_buffer->yy_at_bol = at_bol; \
16147 + if ( ! YY_CURRENT_BUFFER ){\
16148 + yyensure_buffer_stack (); \
16149 + YY_CURRENT_BUFFER_LVALUE = \
16150 + yy_create_buffer(yyin,YY_BUF_SIZE ); \
16151 + } \
16152 + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
16153 }
16154
16155 -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
16156 +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
16157 +
16158 +/* Begin user sect3 */
16159
16160 typedef unsigned char YY_CHAR;
16161 +
16162 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
16163 +
16164 typedef int yy_state_type;
16165 +
16166 +extern int yylineno;
16167 +
16168 +int yylineno = 1;
16169 +
16170 extern char *yytext;
16171 #define yytext_ptr yytext
16172
16173 -static yy_state_type yy_get_previous_state YY_PROTO(( void ));
16174 -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
16175 -static int yy_get_next_buffer YY_PROTO(( void ));
16176 -static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
16177 +static yy_state_type yy_get_previous_state (void );
16178 +static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
16179 +static int yy_get_next_buffer (void );
16180 +static void yy_fatal_error (yyconst char msg[] );
16181
16182 /* Done after the current pattern has been matched and before the
16183 * corresponding action - sets up yytext.
16184 */
16185 #define YY_DO_BEFORE_ACTION \
16186 - yytext_ptr = yy_bp; \
16187 - yyleng = (int) (yy_cp - yy_bp); \
16188 - yy_hold_char = *yy_cp; \
16189 + (yytext_ptr) = yy_bp; \
16190 + yyleng = (size_t) (yy_cp - yy_bp); \
16191 + (yy_hold_char) = *yy_cp; \
16192 *yy_cp = '\0'; \
16193 - yy_c_buf_p = yy_cp;
16194 + (yy_c_buf_p) = yy_cp;
16195
16196 #define YY_NUM_RULES 16
16197 #define YY_END_OF_BUFFER 17
16198 -static yyconst short int yy_accept[70] =
16199 +/* This struct is not used in this scanner,
16200 + but its presence is necessary. */
16201 +struct yy_trans_info
16202 + {
16203 + flex_int32_t yy_verify;
16204 + flex_int32_t yy_nxt;
16205 + };
16206 +static yyconst flex_int16_t yy_accept[70] =
16207 { 0,
16208 10, 10, 17, 15, 10, 10, 15, 15, 9, 9,
16209 9, 9, 9, 9, 9, 9, 9, 10, 0, 0,
16210 @@ -295,7 +371,7 @@
16211 7, 0, 0, 0, 0, 0, 11, 12, 0
16212 } ;
16213
16214 -static yyconst int yy_ec[256] =
16215 +static yyconst flex_int32_t yy_ec[256] =
16216 { 0,
16217 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
16218 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
16219 @@ -327,14 +403,14 @@
16220 1, 1, 1, 1, 1
16221 } ;
16222
16223 -static yyconst int yy_meta[29] =
16224 +static yyconst flex_int32_t yy_meta[29] =
16225 { 0,
16226 1, 2, 2, 1, 3, 1, 4, 5, 5, 4,
16227 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
16228 4, 4, 4, 4, 4, 4, 4, 4
16229 } ;
16230
16231 -static yyconst short int yy_base[75] =
16232 +static yyconst flex_int16_t yy_base[75] =
16233 { 0,
16234 0, 0, 99, 100, 27, 28, 0, 95, 0, 86,
16235 72, 85, 80, 71, 78, 64, 76, 31, 84, 85,
16236 @@ -346,7 +422,7 @@
16237 48, 34, 53, 58
16238 } ;
16239
16240 -static yyconst short int yy_def[75] =
16241 +static yyconst flex_int16_t yy_def[75] =
16242 { 0,
16243 69, 1, 69, 69, 69, 69, 70, 71, 72, 72,
16244 72, 72, 72, 72, 72, 72, 72, 69, 70, 71,
16245 @@ -358,7 +434,7 @@
16246 69, 69, 69, 69
16247 } ;
16248
16249 -static yyconst short int yy_nxt[129] =
16250 +static yyconst flex_int16_t yy_nxt[129] =
16251 { 0,
16252 4, 5, 6, 5, 7, 8, 9, 4, 4, 10,
16253 11, 12, 13, 9, 9, 9, 9, 14, 9, 15,
16254 @@ -376,7 +452,7 @@
16255 69, 69, 69, 69, 69, 69, 69, 69
16256 } ;
16257
16258 -static yyconst short int yy_chk[129] =
16259 +static yyconst flex_int16_t yy_chk[129] =
16260 { 0,
16261 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
16262 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
16263 @@ -397,6 +473,9 @@
16264 static yy_state_type yy_last_accepting_state;
16265 static char *yy_last_accepting_cpos;
16266
16267 +extern int yy_flex_debug;
16268 +int yy_flex_debug = 0;
16269 +
16270 /* The intent behind this definition is that it'll catch
16271 * any uses of REJECT which flex missed.
16272 */
16273 @@ -406,7 +485,6 @@
16274 #define YY_RESTORE_YY_MORE_OFFSET
16275 char *yytext;
16276 #line 1 "ql_l.l"
16277 -#define INITIAL 0
16278 #line 2 "ql_l.l"
16279 /* ql.l - Q.2931 data structures description language */
16280
16281 @@ -451,7 +529,21 @@
16282 return (*walk)->str;
16283 }
16284
16285 -#line 455 "lex.yy.c"
16286 +#line 533 "lex.yy.c"
16287 +
16288 +#define INITIAL 0
16289 +
16290 +#ifndef YY_NO_UNISTD_H
16291 +/* Special case for "unistd.h", since it is non-ANSI. We include it way
16292 + * down here because we want the user's section 1 to have been scanned first.
16293 + * The user has a chance to override it with an option.
16294 + */
16295 +#include <unistd.h>
16296 +#endif
16297 +
16298 +#ifndef YY_EXTRA_TYPE
16299 +#define YY_EXTRA_TYPE void *
16300 +#endif
16301
16302 /* Macros after this point can all be overridden by user definitions in
16303 * section 1.
16304 @@ -459,65 +551,30 @@
16305
16306 #ifndef YY_SKIP_YYWRAP
16307 #ifdef __cplusplus
16308 -extern "C" int yywrap YY_PROTO(( void ));
16309 +extern "C" int yywrap (void );
16310 #else
16311 -extern int yywrap YY_PROTO(( void ));
16312 +extern int yywrap (void );
16313 #endif
16314 #endif
16315
16316 -#ifndef YY_NO_UNPUT
16317 -static void yyunput YY_PROTO(( int c, char *buf_ptr ));
16318 -#endif
16319 -
16320 + static void yyunput (int c,char *buf_ptr );
16321 +
16322 #ifndef yytext_ptr
16323 -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
16324 +static void yy_flex_strncpy (char *,yyconst char *,int );
16325 #endif
16326
16327 #ifdef YY_NEED_STRLEN
16328 -static int yy_flex_strlen YY_PROTO(( yyconst char * ));
16329 +static int yy_flex_strlen (yyconst char * );
16330 #endif
16331
16332 #ifndef YY_NO_INPUT
16333 +
16334 #ifdef __cplusplus
16335 -static int yyinput YY_PROTO(( void ));
16336 +static int yyinput (void );
16337 #else
16338 -static int input YY_PROTO(( void ));
16339 -#endif
16340 -#endif
16341 -
16342 -#if YY_STACK_USED
16343 -static int yy_start_stack_ptr = 0;
16344 -static int yy_start_stack_depth = 0;
16345 -static int *yy_start_stack = 0;
16346 -#ifndef YY_NO_PUSH_STATE
16347 -static void yy_push_state YY_PROTO(( int new_state ));
16348 -#endif
16349 -#ifndef YY_NO_POP_STATE
16350 -static void yy_pop_state YY_PROTO(( void ));
16351 -#endif
16352 -#ifndef YY_NO_TOP_STATE
16353 -static int yy_top_state YY_PROTO(( void ));
16354 +static int input (void );
16355 #endif
16356
16357 -#else
16358 -#define YY_NO_PUSH_STATE 1
16359 -#define YY_NO_POP_STATE 1
16360 -#define YY_NO_TOP_STATE 1
16361 -#endif
16362 -
16363 -#ifdef YY_MALLOC_DECL
16364 -YY_MALLOC_DECL
16365 -#else
16366 -#if __STDC__
16367 -#ifndef __cplusplus
16368 -#include <stdlib.h>
16369 -#endif
16370 -#else
16371 -/* Just try to get by without declaring the routines. This will fail
16372 - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
16373 - * or sizeof(void*) != sizeof(int).
16374 - */
16375 -#endif
16376 #endif
16377
16378 /* Amount of stuff to slurp up with each read. */
16379 @@ -526,7 +583,6 @@
16380 #endif
16381
16382 /* Copy whatever the last rule matched to the standard output. */
16383 -
16384 #ifndef ECHO
16385 /* This used to be an fputs(), but since the string might contain NUL's,
16386 * we now use fwrite().
16387 @@ -539,9 +595,10 @@
16388 */
16389 #ifndef YY_INPUT
16390 #define YY_INPUT(buf,result,max_size) \
16391 - if ( yy_current_buffer->yy_is_interactive ) \
16392 + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
16393 { \
16394 - int c = '*', n; \
16395 + int c = '*'; \
16396 + size_t n; \
16397 for ( n = 0; n < max_size && \
16398 (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
16399 buf[n] = (char) c; \
16400 @@ -551,9 +608,22 @@
16401 YY_FATAL_ERROR( "input in flex scanner failed" ); \
16402 result = n; \
16403 } \
16404 - else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
16405 - && ferror( yyin ) ) \
16406 - YY_FATAL_ERROR( "input in flex scanner failed" );
16407 + else \
16408 + { \
16409 + errno=0; \
16410 + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
16411 + { \
16412 + if( errno != EINTR) \
16413 + { \
16414 + YY_FATAL_ERROR( "input in flex scanner failed" ); \
16415 + break; \
16416 + } \
16417 + errno=0; \
16418 + clearerr(yyin); \
16419 + } \
16420 + }\
16421 +\
16422 +
16423 #endif
16424
16425 /* No semi-colon after return; correct usage is to write "yyterminate();" -
16426 @@ -574,12 +644,18 @@
16427 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
16428 #endif
16429
16430 +/* end tables serialization structures and prototypes */
16431 +
16432 /* Default declaration of generated scanner - a define so the user can
16433 * easily add parameters.
16434 */
16435 #ifndef YY_DECL
16436 -#define YY_DECL int yylex YY_PROTO(( void ))
16437 -#endif
16438 +#define YY_DECL_IS_OURS 1
16439 +
16440 +extern int yylex (void);
16441 +
16442 +#define YY_DECL int yylex (void)
16443 +#endif /* !YY_DECL */
16444
16445 /* Code executed at the beginning of each rule, after yytext and yyleng
16446 * have been set up.
16447 @@ -596,27 +672,29 @@
16448 #define YY_RULE_SETUP \
16449 YY_USER_ACTION
16450
16451 +/** The main scanner function which does all the work.
16452 + */
16453 YY_DECL
16454 - {
16455 +{
16456 register yy_state_type yy_current_state;
16457 - register char *yy_cp = NULL, *yy_bp = NULL;
16458 + register char *yy_cp, *yy_bp;
16459 register int yy_act;
16460 -
16461 +
16462 #line 47 "ql_l.l"
16463
16464
16465 -#line 609 "lex.yy.c"
16466 +#line 687 "lex.yy.c"
16467
16468 - if ( yy_init )
16469 + if ( (yy_init) )
16470 {
16471 - yy_init = 0;
16472 + (yy_init) = 0;
16473
16474 #ifdef YY_USER_INIT
16475 YY_USER_INIT;
16476 #endif
16477
16478 - if ( ! yy_start )
16479 - yy_start = 1; /* first start state */
16480 + if ( ! (yy_start) )
16481 + (yy_start) = 1; /* first start state */
16482
16483 if ( ! yyin )
16484 yyin = stdin;
16485 @@ -624,34 +702,36 @@
16486 if ( ! yyout )
16487 yyout = stdout;
16488
16489 - if ( ! yy_current_buffer )
16490 - yy_current_buffer =
16491 - yy_create_buffer( yyin, YY_BUF_SIZE );
16492 + if ( ! YY_CURRENT_BUFFER ) {
16493 + yyensure_buffer_stack ();
16494 + YY_CURRENT_BUFFER_LVALUE =
16495 + yy_create_buffer(yyin,YY_BUF_SIZE );
16496 + }
16497
16498 - yy_load_buffer_state();
16499 + yy_load_buffer_state( );
16500 }
16501
16502 while ( 1 ) /* loops until end-of-file is reached */
16503 {
16504 - yy_cp = yy_c_buf_p;
16505 + yy_cp = (yy_c_buf_p);
16506
16507 /* Support of yytext. */
16508 - *yy_cp = yy_hold_char;
16509 + *yy_cp = (yy_hold_char);
16510
16511 /* yy_bp points to the position in yy_ch_buf of the start of
16512 * the current run.
16513 */
16514 yy_bp = yy_cp;
16515
16516 - yy_current_state = yy_start;
16517 + yy_current_state = (yy_start);
16518 yy_match:
16519 do
16520 {
16521 register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
16522 if ( yy_accept[yy_current_state] )
16523 {
16524 - yy_last_accepting_state = yy_current_state;
16525 - yy_last_accepting_cpos = yy_cp;
16526 + (yy_last_accepting_state) = yy_current_state;
16527 + (yy_last_accepting_cpos) = yy_cp;
16528 }
16529 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
16530 {
16531 @@ -668,24 +748,22 @@
16532 yy_act = yy_accept[yy_current_state];
16533 if ( yy_act == 0 )
16534 { /* have to back up */
16535 - yy_cp = yy_last_accepting_cpos;
16536 - yy_current_state = yy_last_accepting_state;
16537 + yy_cp = (yy_last_accepting_cpos);
16538 + yy_current_state = (yy_last_accepting_state);
16539 yy_act = yy_accept[yy_current_state];
16540 }
16541
16542 YY_DO_BEFORE_ACTION;
16543
16544 -
16545 do_action: /* This label is used only to access EOF actions. */
16546
16547 -
16548 switch ( yy_act )
16549 { /* beginning of action switch */
16550 case 0: /* must back up */
16551 /* undo the effects of YY_DO_BEFORE_ACTION */
16552 - *yy_cp = yy_hold_char;
16553 - yy_cp = yy_last_accepting_cpos;
16554 - yy_current_state = yy_last_accepting_state;
16555 + *yy_cp = (yy_hold_char);
16556 + yy_cp = (yy_last_accepting_cpos);
16557 + yy_current_state = (yy_last_accepting_state);
16558 goto yy_find_action;
16559
16560 case 1:
16561 @@ -735,6 +813,7 @@
16562 return TOK_ID; }
16563 YY_BREAK
16564 case 10:
16565 +/* rule 10 can match eol */
16566 YY_RULE_SETUP
16567 #line 59 "ql_l.l"
16568 lineno += *yytext == '\n';
16569 @@ -755,6 +834,7 @@
16570 return TOK_STRING; }
16571 YY_BREAK
16572 case 14:
16573 +/* rule 14 can match eol */
16574 YY_RULE_SETUP
16575 #line 66 "ql_l.l"
16576 lineno++;
16577 @@ -769,33 +849,33 @@
16578 #line 69 "ql_l.l"
16579 ECHO;
16580 YY_BREAK
16581 -#line 773 "lex.yy.c"
16582 +#line 853 "lex.yy.c"
16583 case YY_STATE_EOF(INITIAL):
16584 yyterminate();
16585
16586 case YY_END_OF_BUFFER:
16587 {
16588 /* Amount of text matched not including the EOB char. */
16589 - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
16590 + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
16591
16592 /* Undo the effects of YY_DO_BEFORE_ACTION. */
16593 - *yy_cp = yy_hold_char;
16594 + *yy_cp = (yy_hold_char);
16595 YY_RESTORE_YY_MORE_OFFSET
16596
16597 - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
16598 + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
16599 {
16600 /* We're scanning a new file or input source. It's
16601 * possible that this happened because the user
16602 * just pointed yyin at a new source and called
16603 * yylex(). If so, then we have to assure
16604 - * consistency between yy_current_buffer and our
16605 + * consistency between YY_CURRENT_BUFFER and our
16606 * globals. Here is the right place to do so, because
16607 * this is the first action (other than possibly a
16608 * back-up) that will match for the new input source.
16609 */
16610 - yy_n_chars = yy_current_buffer->yy_n_chars;
16611 - yy_current_buffer->yy_input_file = yyin;
16612 - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
16613 + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
16614 + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
16615 + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
16616 }
16617
16618 /* Note that here we test for yy_c_buf_p "<=" to the position
16619 @@ -805,13 +885,13 @@
16620 * end-of-buffer state). Contrast this with the test
16621 * in input().
16622 */
16623 - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
16624 + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
16625 { /* This was really a NUL. */
16626 yy_state_type yy_next_state;
16627
16628 - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
16629 + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
16630
16631 - yy_current_state = yy_get_previous_state();
16632 + yy_current_state = yy_get_previous_state( );
16633
16634 /* Okay, we're now positioned to make the NUL
16635 * transition. We couldn't have
16636 @@ -824,30 +904,30 @@
16637
16638 yy_next_state = yy_try_NUL_trans( yy_current_state );
16639
16640 - yy_bp = yytext_ptr + YY_MORE_ADJ;
16641 + yy_bp = (yytext_ptr) + YY_MORE_ADJ;
16642
16643 if ( yy_next_state )
16644 {
16645 /* Consume the NUL. */
16646 - yy_cp = ++yy_c_buf_p;
16647 + yy_cp = ++(yy_c_buf_p);
16648 yy_current_state = yy_next_state;
16649 goto yy_match;
16650 }
16651
16652 else
16653 {
16654 - yy_cp = yy_c_buf_p;
16655 + yy_cp = (yy_c_buf_p);
16656 goto yy_find_action;
16657 }
16658 }
16659
16660 - else switch ( yy_get_next_buffer() )
16661 + else switch ( yy_get_next_buffer( ) )
16662 {
16663 case EOB_ACT_END_OF_FILE:
16664 {
16665 - yy_did_buffer_switch_on_eof = 0;
16666 + (yy_did_buffer_switch_on_eof) = 0;
16667
16668 - if ( yywrap() )
16669 + if ( yywrap( ) )
16670 {
16671 /* Note: because we've taken care in
16672 * yy_get_next_buffer() to have set up
16673 @@ -858,7 +938,7 @@
16674 * YY_NULL, it'll still work - another
16675 * YY_NULL will get returned.
16676 */
16677 - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
16678 + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
16679
16680 yy_act = YY_STATE_EOF(YY_START);
16681 goto do_action;
16682 @@ -866,30 +946,30 @@
16683
16684 else
16685 {
16686 - if ( ! yy_did_buffer_switch_on_eof )
16687 + if ( ! (yy_did_buffer_switch_on_eof) )
16688 YY_NEW_FILE;
16689 }
16690 break;
16691 }
16692
16693 case EOB_ACT_CONTINUE_SCAN:
16694 - yy_c_buf_p =
16695 - yytext_ptr + yy_amount_of_matched_text;
16696 + (yy_c_buf_p) =
16697 + (yytext_ptr) + yy_amount_of_matched_text;
16698
16699 - yy_current_state = yy_get_previous_state();
16700 + yy_current_state = yy_get_previous_state( );
16701
16702 - yy_cp = yy_c_buf_p;
16703 - yy_bp = yytext_ptr + YY_MORE_ADJ;
16704 + yy_cp = (yy_c_buf_p);
16705 + yy_bp = (yytext_ptr) + YY_MORE_ADJ;
16706 goto yy_match;
16707
16708 case EOB_ACT_LAST_MATCH:
16709 - yy_c_buf_p =
16710 - &yy_current_buffer->yy_ch_buf[yy_n_chars];
16711 + (yy_c_buf_p) =
16712 + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
16713
16714 - yy_current_state = yy_get_previous_state();
16715 + yy_current_state = yy_get_previous_state( );
16716
16717 - yy_cp = yy_c_buf_p;
16718 - yy_bp = yytext_ptr + YY_MORE_ADJ;
16719 + yy_cp = (yy_c_buf_p);
16720 + yy_bp = (yytext_ptr) + YY_MORE_ADJ;
16721 goto yy_find_action;
16722 }
16723 break;
16724 @@ -900,8 +980,7 @@
16725 "fatal flex scanner internal error--no action found" );
16726 } /* end of action switch */
16727 } /* end of scanning one token */
16728 - } /* end of yylex */
16729 -
16730 +} /* end of yylex */
16731
16732 /* yy_get_next_buffer - try to read in a new buffer
16733 *
16734 @@ -910,21 +989,20 @@
16735 * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
16736 * EOB_ACT_END_OF_FILE - end of file
16737 */
16738 -
16739 -static int yy_get_next_buffer()
16740 - {
16741 - register char *dest = yy_current_buffer->yy_ch_buf;
16742 - register char *source = yytext_ptr;
16743 +static int yy_get_next_buffer (void)
16744 +{
16745 + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
16746 + register char *source = (yytext_ptr);
16747 register int number_to_move, i;
16748 int ret_val;
16749
16750 - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
16751 + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
16752 YY_FATAL_ERROR(
16753 "fatal flex scanner internal error--end of buffer missed" );
16754
16755 - if ( yy_current_buffer->yy_fill_buffer == 0 )
16756 + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
16757 { /* Don't try to fill the buffer, so this is an EOF. */
16758 - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
16759 + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
16760 {
16761 /* We matched a single character, the EOB, so
16762 * treat this as a final EOF.
16763 @@ -944,34 +1022,30 @@
16764 /* Try to read more data. */
16765
16766 /* First move last chars to start of buffer. */
16767 - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
16768 + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
16769
16770 for ( i = 0; i < number_to_move; ++i )
16771 *(dest++) = *(source++);
16772
16773 - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
16774 + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
16775 /* don't do the read, it's not guaranteed to return an EOF,
16776 * just force an EOF
16777 */
16778 - yy_current_buffer->yy_n_chars = yy_n_chars = 0;
16779 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
16780
16781 else
16782 {
16783 - int num_to_read =
16784 - yy_current_buffer->yy_buf_size - number_to_move - 1;
16785 + size_t num_to_read =
16786 + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
16787
16788 while ( num_to_read <= 0 )
16789 { /* Not enough room in the buffer - grow it. */
16790 -#ifdef YY_USES_REJECT
16791 - YY_FATAL_ERROR(
16792 -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
16793 -#else
16794
16795 /* just a shorter name for the current buffer */
16796 - YY_BUFFER_STATE b = yy_current_buffer;
16797 + YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
16798
16799 int yy_c_buf_p_offset =
16800 - (int) (yy_c_buf_p - b->yy_ch_buf);
16801 + (int) ((yy_c_buf_p) - b->yy_ch_buf);
16802
16803 if ( b->yy_is_our_buffer )
16804 {
16805 @@ -984,8 +1058,7 @@
16806
16807 b->yy_ch_buf = (char *)
16808 /* Include room in for 2 EOB chars. */
16809 - yy_flex_realloc( (void *) b->yy_ch_buf,
16810 - b->yy_buf_size + 2 );
16811 + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
16812 }
16813 else
16814 /* Can't grow it, we don't own it. */
16815 @@ -995,35 +1068,35 @@
16816 YY_FATAL_ERROR(
16817 "fatal error - scanner input buffer overflow" );
16818
16819 - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
16820 + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
16821
16822 - num_to_read = yy_current_buffer->yy_buf_size -
16823 + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
16824 number_to_move - 1;
16825 -#endif
16826 +
16827 }
16828
16829 if ( num_to_read > YY_READ_BUF_SIZE )
16830 num_to_read = YY_READ_BUF_SIZE;
16831
16832 /* Read in more data. */
16833 - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
16834 - yy_n_chars, num_to_read );
16835 + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
16836 + (yy_n_chars), num_to_read );
16837
16838 - yy_current_buffer->yy_n_chars = yy_n_chars;
16839 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
16840 }
16841
16842 - if ( yy_n_chars == 0 )
16843 + if ( (yy_n_chars) == 0 )
16844 {
16845 if ( number_to_move == YY_MORE_ADJ )
16846 {
16847 ret_val = EOB_ACT_END_OF_FILE;
16848 - yyrestart( yyin );
16849 + yyrestart(yyin );
16850 }
16851
16852 else
16853 {
16854 ret_val = EOB_ACT_LAST_MATCH;
16855 - yy_current_buffer->yy_buffer_status =
16856 + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
16857 YY_BUFFER_EOF_PENDING;
16858 }
16859 }
16860 @@ -1031,32 +1104,31 @@
16861 else
16862 ret_val = EOB_ACT_CONTINUE_SCAN;
16863
16864 - yy_n_chars += number_to_move;
16865 - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
16866 - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
16867 + (yy_n_chars) += number_to_move;
16868 + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
16869 + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
16870
16871 - yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
16872 + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
16873
16874 return ret_val;
16875 - }
16876 -
16877 +}
16878
16879 /* yy_get_previous_state - get the state just before the EOB char was reached */
16880
16881 -static yy_state_type yy_get_previous_state()
16882 - {
16883 + static yy_state_type yy_get_previous_state (void)
16884 +{
16885 register yy_state_type yy_current_state;
16886 register char *yy_cp;
16887 +
16888 + yy_current_state = (yy_start);
16889
16890 - yy_current_state = yy_start;
16891 -
16892 - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
16893 + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
16894 {
16895 register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
16896 if ( yy_accept[yy_current_state] )
16897 {
16898 - yy_last_accepting_state = yy_current_state;
16899 - yy_last_accepting_cpos = yy_cp;
16900 + (yy_last_accepting_state) = yy_current_state;
16901 + (yy_last_accepting_cpos) = yy_cp;
16902 }
16903 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
16904 {
16905 @@ -1068,30 +1140,23 @@
16906 }
16907
16908 return yy_current_state;
16909 - }
16910 -
16911 +}
16912
16913 /* yy_try_NUL_trans - try to make a transition on the NUL character
16914 *
16915 * synopsis
16916 * next_state = yy_try_NUL_trans( current_state );
16917 */
16918 -
16919 -#ifdef YY_USE_PROTOS
16920 -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
16921 -#else
16922 -static yy_state_type yy_try_NUL_trans( yy_current_state )
16923 -yy_state_type yy_current_state;
16924 -#endif
16925 - {
16926 + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
16927 +{
16928 register int yy_is_jam;
16929 - register char *yy_cp = yy_c_buf_p;
16930 + register char *yy_cp = (yy_c_buf_p);
16931
16932 register YY_CHAR yy_c = 1;
16933 if ( yy_accept[yy_current_state] )
16934 {
16935 - yy_last_accepting_state = yy_current_state;
16936 - yy_last_accepting_cpos = yy_cp;
16937 + (yy_last_accepting_state) = yy_current_state;
16938 + (yy_last_accepting_cpos) = yy_cp;
16939 }
16940 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
16941 {
16942 @@ -1103,80 +1168,73 @@
16943 yy_is_jam = (yy_current_state == 69);
16944
16945 return yy_is_jam ? 0 : yy_current_state;
16946 - }
16947 -
16948 +}
16949
16950 -#ifndef YY_NO_UNPUT
16951 -#ifdef YY_USE_PROTOS
16952 -static void yyunput( int c, register char *yy_bp )
16953 -#else
16954 -static void yyunput( c, yy_bp )
16955 -int c;
16956 -register char *yy_bp;
16957 -#endif
16958 - {
16959 - register char *yy_cp = yy_c_buf_p;
16960 + static void yyunput (int c, register char * yy_bp )
16961 +{
16962 + register char *yy_cp;
16963 +
16964 + yy_cp = (yy_c_buf_p);
16965
16966 /* undo effects of setting up yytext */
16967 - *yy_cp = yy_hold_char;
16968 + *yy_cp = (yy_hold_char);
16969
16970 - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
16971 + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
16972 { /* need to shift things up to make room */
16973 /* +2 for EOB chars. */
16974 - register int number_to_move = yy_n_chars + 2;
16975 - register char *dest = &yy_current_buffer->yy_ch_buf[
16976 - yy_current_buffer->yy_buf_size + 2];
16977 + register int number_to_move = (yy_n_chars) + 2;
16978 + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
16979 + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
16980 register char *source =
16981 - &yy_current_buffer->yy_ch_buf[number_to_move];
16982 + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
16983
16984 - while ( source > yy_current_buffer->yy_ch_buf )
16985 + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
16986 *--dest = *--source;
16987
16988 yy_cp += (int) (dest - source);
16989 yy_bp += (int) (dest - source);
16990 - yy_current_buffer->yy_n_chars =
16991 - yy_n_chars = yy_current_buffer->yy_buf_size;
16992 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
16993 + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
16994
16995 - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
16996 + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
16997 YY_FATAL_ERROR( "flex scanner push-back overflow" );
16998 }
16999
17000 *--yy_cp = (char) c;
17001
17002 + (yytext_ptr) = yy_bp;
17003 + (yy_hold_char) = *yy_cp;
17004 + (yy_c_buf_p) = yy_cp;
17005 +}
17006
17007 - yytext_ptr = yy_bp;
17008 - yy_hold_char = *yy_cp;
17009 - yy_c_buf_p = yy_cp;
17010 - }
17011 -#endif /* ifndef YY_NO_UNPUT */
17012 -
17013 -
17014 +#ifndef YY_NO_INPUT
17015 #ifdef __cplusplus
17016 -static int yyinput()
17017 + static int yyinput (void)
17018 #else
17019 -static int input()
17020 + static int input (void)
17021 #endif
17022 - {
17023 - int c;
17024
17025 - *yy_c_buf_p = yy_hold_char;
17026 +{
17027 + int c;
17028 +
17029 + *(yy_c_buf_p) = (yy_hold_char);
17030
17031 - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
17032 + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
17033 {
17034 /* yy_c_buf_p now points to the character we want to return.
17035 * If this occurs *before* the EOB characters, then it's a
17036 * valid NUL; if not, then we've hit the end of the buffer.
17037 */
17038 - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
17039 + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
17040 /* This was really a NUL. */
17041 - *yy_c_buf_p = '\0';
17042 + *(yy_c_buf_p) = '\0';
17043
17044 else
17045 { /* need more input */
17046 - int offset = yy_c_buf_p - yytext_ptr;
17047 - ++yy_c_buf_p;
17048 + int offset = (yy_c_buf_p) - (yytext_ptr);
17049 + ++(yy_c_buf_p);
17050
17051 - switch ( yy_get_next_buffer() )
17052 + switch ( yy_get_next_buffer( ) )
17053 {
17054 case EOB_ACT_LAST_MATCH:
17055 /* This happens because yy_g_n_b()
17056 @@ -1190,16 +1248,16 @@
17057 */
17058
17059 /* Reset buffer status. */
17060 - yyrestart( yyin );
17061 + yyrestart(yyin );
17062
17063 - /* fall through */
17064 + /*FALLTHROUGH*/
17065
17066 case EOB_ACT_END_OF_FILE:
17067 {
17068 - if ( yywrap() )
17069 + if ( yywrap( ) )
17070 return EOF;
17071
17072 - if ( ! yy_did_buffer_switch_on_eof )
17073 + if ( ! (yy_did_buffer_switch_on_eof) )
17074 YY_NEW_FILE;
17075 #ifdef __cplusplus
17076 return yyinput();
17077 @@ -1209,90 +1267,92 @@
17078 }
17079
17080 case EOB_ACT_CONTINUE_SCAN:
17081 - yy_c_buf_p = yytext_ptr + offset;
17082 + (yy_c_buf_p) = (yytext_ptr) + offset;
17083 break;
17084 }
17085 }
17086 }
17087
17088 - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */
17089 - *yy_c_buf_p = '\0'; /* preserve yytext */
17090 - yy_hold_char = *++yy_c_buf_p;
17091 -
17092 + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
17093 + *(yy_c_buf_p) = '\0'; /* preserve yytext */
17094 + (yy_hold_char) = *++(yy_c_buf_p);
17095
17096 return c;
17097 - }
17098 -
17099 -
17100 -#ifdef YY_USE_PROTOS
17101 -void yyrestart( FILE *input_file )
17102 -#else
17103 -void yyrestart( input_file )
17104 -FILE *input_file;
17105 -#endif
17106 - {
17107 - if ( ! yy_current_buffer )
17108 - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
17109 +}
17110 +#endif /* ifndef YY_NO_INPUT */
17111
17112 - yy_init_buffer( yy_current_buffer, input_file );
17113 - yy_load_buffer_state();
17114 +/** Immediately switch to a different input stream.
17115 + * @param input_file A readable stream.
17116 + *
17117 + * @note This function does not reset the start condition to @c INITIAL .
17118 + */
17119 + void yyrestart (FILE * input_file )
17120 +{
17121 +
17122 + if ( ! YY_CURRENT_BUFFER ){
17123 + yyensure_buffer_stack ();
17124 + YY_CURRENT_BUFFER_LVALUE =
17125 + yy_create_buffer(yyin,YY_BUF_SIZE );
17126 }
17127
17128 + yy_init_buffer(YY_CURRENT_BUFFER,input_file );
17129 + yy_load_buffer_state( );
17130 +}
17131
17132 -#ifdef YY_USE_PROTOS
17133 -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
17134 -#else
17135 -void yy_switch_to_buffer( new_buffer )
17136 -YY_BUFFER_STATE new_buffer;
17137 -#endif
17138 - {
17139 - if ( yy_current_buffer == new_buffer )
17140 +/** Switch to a different input buffer.
17141 + * @param new_buffer The new input buffer.
17142 + *
17143 + */
17144 + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer )
17145 +{
17146 +
17147 + /* TODO. We should be able to replace this entire function body
17148 + * with
17149 + * yypop_buffer_state();
17150 + * yypush_buffer_state(new_buffer);
17151 + */
17152 + yyensure_buffer_stack ();
17153 + if ( YY_CURRENT_BUFFER == new_buffer )
17154 return;
17155
17156 - if ( yy_current_buffer )
17157 + if ( YY_CURRENT_BUFFER )
17158 {
17159 /* Flush out information for old buffer. */
17160 - *yy_c_buf_p = yy_hold_char;
17161 - yy_current_buffer->yy_buf_pos = yy_c_buf_p;
17162 - yy_current_buffer->yy_n_chars = yy_n_chars;
17163 + *(yy_c_buf_p) = (yy_hold_char);
17164 + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
17165 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
17166 }
17167
17168 - yy_current_buffer = new_buffer;
17169 - yy_load_buffer_state();
17170 + YY_CURRENT_BUFFER_LVALUE = new_buffer;
17171 + yy_load_buffer_state( );
17172
17173 /* We don't actually know whether we did this switch during
17174 * EOF (yywrap()) processing, but the only time this flag
17175 * is looked at is after yywrap() is called, so it's safe
17176 * to go ahead and always set it.
17177 */
17178 - yy_did_buffer_switch_on_eof = 1;
17179 - }
17180 -
17181 -
17182 -#ifdef YY_USE_PROTOS
17183 -void yy_load_buffer_state( void )
17184 -#else
17185 -void yy_load_buffer_state()
17186 -#endif
17187 - {
17188 - yy_n_chars = yy_current_buffer->yy_n_chars;
17189 - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
17190 - yyin = yy_current_buffer->yy_input_file;
17191 - yy_hold_char = *yy_c_buf_p;
17192 - }
17193 + (yy_did_buffer_switch_on_eof) = 1;
17194 +}
17195
17196 +static void yy_load_buffer_state (void)
17197 +{
17198 + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
17199 + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
17200 + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
17201 + (yy_hold_char) = *(yy_c_buf_p);
17202 +}
17203
17204 -#ifdef YY_USE_PROTOS
17205 -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
17206 -#else
17207 -YY_BUFFER_STATE yy_create_buffer( file, size )
17208 -FILE *file;
17209 -int size;
17210 -#endif
17211 - {
17212 +/** Allocate and initialize an input buffer state.
17213 + * @param file A readable stream.
17214 + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
17215 + *
17216 + * @return the allocated buffer state.
17217 + */
17218 + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size )
17219 +{
17220 YY_BUFFER_STATE b;
17221 -
17222 - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
17223 +
17224 + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
17225 if ( ! b )
17226 YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
17227
17228 @@ -1301,75 +1361,75 @@
17229 /* yy_ch_buf has to be 2 characters longer than the size given because
17230 * we need to put in 2 end-of-buffer characters.
17231 */
17232 - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
17233 + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 );
17234 if ( ! b->yy_ch_buf )
17235 YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
17236
17237 b->yy_is_our_buffer = 1;
17238
17239 - yy_init_buffer( b, file );
17240 + yy_init_buffer(b,file );
17241
17242 return b;
17243 - }
17244 -
17245 +}
17246
17247 -#ifdef YY_USE_PROTOS
17248 -void yy_delete_buffer( YY_BUFFER_STATE b )
17249 -#else
17250 -void yy_delete_buffer( b )
17251 -YY_BUFFER_STATE b;
17252 -#endif
17253 - {
17254 +/** Destroy the buffer.
17255 + * @param b a buffer created with yy_create_buffer()
17256 + *
17257 + */
17258 + void yy_delete_buffer (YY_BUFFER_STATE b )
17259 +{
17260 +
17261 if ( ! b )
17262 return;
17263
17264 - if ( b == yy_current_buffer )
17265 - yy_current_buffer = (YY_BUFFER_STATE) 0;
17266 + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
17267 + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
17268
17269 if ( b->yy_is_our_buffer )
17270 - yy_flex_free( (void *) b->yy_ch_buf );
17271 + yyfree((void *) b->yy_ch_buf );
17272
17273 - yy_flex_free( (void *) b );
17274 - }
17275 -
17276 -
17277 -
17278 -#ifdef YY_USE_PROTOS
17279 -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
17280 -#else
17281 -void yy_init_buffer( b, file )
17282 -YY_BUFFER_STATE b;
17283 -FILE *file;
17284 -#endif
17285 + yyfree((void *) b );
17286 +}
17287
17288 +#ifndef __cplusplus
17289 +extern int isatty (int );
17290 +#endif /* __cplusplus */
17291 +
17292 +/* Initializes or reinitializes a buffer.
17293 + * This function is sometimes called more than once on the same buffer,
17294 + * such as during a yyrestart() or at EOF.
17295 + */
17296 + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file )
17297
17298 - {
17299 - yy_flush_buffer( b );
17300 +{
17301 + int oerrno = errno;
17302 +
17303 + yy_flush_buffer(b );
17304
17305 b->yy_input_file = file;
17306 b->yy_fill_buffer = 1;
17307
17308 -#if YY_ALWAYS_INTERACTIVE
17309 - b->yy_is_interactive = 1;
17310 -#else
17311 -#if YY_NEVER_INTERACTIVE
17312 - b->yy_is_interactive = 0;
17313 -#else
17314 - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
17315 -#endif
17316 -#endif
17317 - }
17318 -
17319 + /* If b is the current buffer, then yy_init_buffer was _probably_
17320 + * called from yyrestart() or through yy_get_next_buffer.
17321 + * In that case, we don't want to reset the lineno or column.
17322 + */
17323 + if (b != YY_CURRENT_BUFFER){
17324 + b->yy_bs_lineno = 1;
17325 + b->yy_bs_column = 0;
17326 + }
17327
17328 -#ifdef YY_USE_PROTOS
17329 -void yy_flush_buffer( YY_BUFFER_STATE b )
17330 -#else
17331 -void yy_flush_buffer( b )
17332 -YY_BUFFER_STATE b;
17333 -#endif
17334 + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
17335 +
17336 + errno = oerrno;
17337 +}
17338
17339 - {
17340 - if ( ! b )
17341 +/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
17342 + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
17343 + *
17344 + */
17345 + void yy_flush_buffer (YY_BUFFER_STATE b )
17346 +{
17347 + if ( ! b )
17348 return;
17349
17350 b->yy_n_chars = 0;
17351 @@ -1386,29 +1446,121 @@
17352 b->yy_at_bol = 1;
17353 b->yy_buffer_status = YY_BUFFER_NEW;
17354
17355 - if ( b == yy_current_buffer )
17356 - yy_load_buffer_state();
17357 + if ( b == YY_CURRENT_BUFFER )
17358 + yy_load_buffer_state( );
17359 +}
17360 +
17361 +/** Pushes the new state onto the stack. The new state becomes
17362 + * the current state. This function will allocate the stack
17363 + * if necessary.
17364 + * @param new_buffer The new state.
17365 + *
17366 + */
17367 +void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
17368 +{
17369 + if (new_buffer == NULL)
17370 + return;
17371 +
17372 + yyensure_buffer_stack();
17373 +
17374 + /* This block is copied from yy_switch_to_buffer. */
17375 + if ( YY_CURRENT_BUFFER )
17376 + {
17377 + /* Flush out information for old buffer. */
17378 + *(yy_c_buf_p) = (yy_hold_char);
17379 + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
17380 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
17381 + }
17382 +
17383 + /* Only push if top exists. Otherwise, replace top. */
17384 + if (YY_CURRENT_BUFFER)
17385 + (yy_buffer_stack_top)++;
17386 + YY_CURRENT_BUFFER_LVALUE = new_buffer;
17387 +
17388 + /* copied from yy_switch_to_buffer. */
17389 + yy_load_buffer_state( );
17390 + (yy_did_buffer_switch_on_eof) = 1;
17391 +}
17392 +
17393 +/** Removes and deletes the top of the stack, if present.
17394 + * The next element becomes the new top.
17395 + *
17396 + */
17397 +void yypop_buffer_state (void)
17398 +{
17399 + if (!YY_CURRENT_BUFFER)
17400 + return;
17401 +
17402 + yy_delete_buffer(YY_CURRENT_BUFFER );
17403 + YY_CURRENT_BUFFER_LVALUE = NULL;
17404 + if ((yy_buffer_stack_top) > 0)
17405 + --(yy_buffer_stack_top);
17406 +
17407 + if (YY_CURRENT_BUFFER) {
17408 + yy_load_buffer_state( );
17409 + (yy_did_buffer_switch_on_eof) = 1;
17410 }
17411 +}
17412
17413 +/* Allocates the stack if it does not exist.
17414 + * Guarantees space for at least one push.
17415 + */
17416 +static void yyensure_buffer_stack (void)
17417 +{
17418 + int num_to_alloc;
17419 +
17420 + if (!(yy_buffer_stack)) {
17421 +
17422 + /* First allocation is just for 2 elements, since we don't know if this
17423 + * scanner will even need a stack. We use 2 instead of 1 to avoid an
17424 + * immediate realloc on the next call.
17425 + */
17426 + num_to_alloc = 1;
17427 + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
17428 + (num_to_alloc * sizeof(struct yy_buffer_state*)
17429 + );
17430 +
17431 + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
17432 +
17433 + (yy_buffer_stack_max) = num_to_alloc;
17434 + (yy_buffer_stack_top) = 0;
17435 + return;
17436 + }
17437
17438 -#ifndef YY_NO_SCAN_BUFFER
17439 -#ifdef YY_USE_PROTOS
17440 -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
17441 -#else
17442 -YY_BUFFER_STATE yy_scan_buffer( base, size )
17443 -char *base;
17444 -yy_size_t size;
17445 -#endif
17446 - {
17447 - YY_BUFFER_STATE b;
17448 + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
17449 +
17450 + /* Increase the buffer to prepare for a possible push. */
17451 + int grow_size = 8 /* arbitrary grow size */;
17452
17453 + num_to_alloc = (yy_buffer_stack_max) + grow_size;
17454 + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
17455 + ((yy_buffer_stack),
17456 + num_to_alloc * sizeof(struct yy_buffer_state*)
17457 + );
17458 +
17459 + /* zero only the new slots.*/
17460 + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
17461 + (yy_buffer_stack_max) = num_to_alloc;
17462 + }
17463 +}
17464 +
17465 +/** Setup the input buffer state to scan directly from a user-specified character buffer.
17466 + * @param base the character buffer
17467 + * @param size the size in bytes of the character buffer
17468 + *
17469 + * @return the newly allocated buffer state object.
17470 + */
17471 +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
17472 +{
17473 + YY_BUFFER_STATE b;
17474 +
17475 if ( size < 2 ||
17476 base[size-2] != YY_END_OF_BUFFER_CHAR ||
17477 base[size-1] != YY_END_OF_BUFFER_CHAR )
17478 /* They forgot to leave room for the EOB's. */
17479 return 0;
17480
17481 - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
17482 + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
17483 if ( ! b )
17484 YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
17485
17486 @@ -1422,47 +1574,42 @@
17487 b->yy_fill_buffer = 0;
17488 b->yy_buffer_status = YY_BUFFER_NEW;
17489
17490 - yy_switch_to_buffer( b );
17491 + yy_switch_to_buffer(b );
17492
17493 return b;
17494 - }
17495 -#endif
17496 -
17497 -
17498 -#ifndef YY_NO_SCAN_STRING
17499 -#ifdef YY_USE_PROTOS
17500 -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
17501 -#else
17502 -YY_BUFFER_STATE yy_scan_string( yy_str )
17503 -yyconst char *yy_str;
17504 -#endif
17505 - {
17506 - int len;
17507 - for ( len = 0; yy_str[len]; ++len )
17508 - ;
17509 -
17510 - return yy_scan_bytes( yy_str, len );
17511 - }
17512 -#endif
17513 +}
17514
17515 +/** Setup the input buffer state to scan a string. The next call to yylex() will
17516 + * scan from a @e copy of @a str.
17517 + * @param str a NUL-terminated string to scan
17518 + *
17519 + * @return the newly allocated buffer state object.
17520 + * @note If you want to scan bytes that may contain NUL values, then use
17521 + * yy_scan_bytes() instead.
17522 + */
17523 +YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
17524 +{
17525 +
17526 + return yy_scan_bytes(yy_str,strlen(yy_str) );
17527 +}
17528
17529 -#ifndef YY_NO_SCAN_BYTES
17530 -#ifdef YY_USE_PROTOS
17531 -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
17532 -#else
17533 -YY_BUFFER_STATE yy_scan_bytes( bytes, len )
17534 -yyconst char *bytes;
17535 -int len;
17536 -#endif
17537 - {
17538 +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
17539 + * scan from a @e copy of @a bytes.
17540 + * @param bytes the byte buffer to scan
17541 + * @param len the number of bytes in the buffer pointed to by @a bytes.
17542 + *
17543 + * @return the newly allocated buffer state object.
17544 + */
17545 +YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len )
17546 +{
17547 YY_BUFFER_STATE b;
17548 char *buf;
17549 yy_size_t n;
17550 int i;
17551 -
17552 +
17553 /* Get memory for full buffer, including space for trailing EOB's. */
17554 n = len + 2;
17555 - buf = (char *) yy_flex_alloc( n );
17556 + buf = (char *) yyalloc(n );
17557 if ( ! buf )
17558 YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
17559
17560 @@ -1471,7 +1618,7 @@
17561
17562 buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
17563
17564 - b = yy_scan_buffer( buf, n );
17565 + b = yy_scan_buffer(buf,n );
17566 if ( ! b )
17567 YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
17568
17569 @@ -1481,148 +1628,164 @@
17570 b->yy_is_our_buffer = 1;
17571
17572 return b;
17573 - }
17574 -#endif
17575 -
17576 +}
17577
17578 -#ifndef YY_NO_PUSH_STATE
17579 -#ifdef YY_USE_PROTOS
17580 -static void yy_push_state( int new_state )
17581 -#else
17582 -static void yy_push_state( new_state )
17583 -int new_state;
17584 +#ifndef YY_EXIT_FAILURE
17585 +#define YY_EXIT_FAILURE 2
17586 #endif
17587 - {
17588 - if ( yy_start_stack_ptr >= yy_start_stack_depth )
17589 - {
17590 - yy_size_t new_size;
17591
17592 - yy_start_stack_depth += YY_START_STACK_INCR;
17593 - new_size = yy_start_stack_depth * sizeof( int );
17594 +static void yy_fatal_error (yyconst char* msg )
17595 +{
17596 + (void) fprintf( stderr, "%s\n", msg );
17597 + exit( YY_EXIT_FAILURE );
17598 +}
17599
17600 - if ( ! yy_start_stack )
17601 - yy_start_stack = (int *) yy_flex_alloc( new_size );
17602 +/* Redefine yyless() so it works in section 3 code. */
17603
17604 - else
17605 - yy_start_stack = (int *) yy_flex_realloc(
17606 - (void *) yy_start_stack, new_size );
17607 +#undef yyless
17608 +#define yyless(n) \
17609 + do \
17610 + { \
17611 + /* Undo effects of setting up yytext. */ \
17612 + int yyless_macro_arg = (n); \
17613 + YY_LESS_LINENO(yyless_macro_arg);\
17614 + yytext[yyleng] = (yy_hold_char); \
17615 + (yy_c_buf_p) = yytext + yyless_macro_arg; \
17616 + (yy_hold_char) = *(yy_c_buf_p); \
17617 + *(yy_c_buf_p) = '\0'; \
17618 + yyleng = yyless_macro_arg; \
17619 + } \
17620 + while ( 0 )
17621
17622 - if ( ! yy_start_stack )
17623 - YY_FATAL_ERROR(
17624 - "out of memory expanding start-condition stack" );
17625 - }
17626 +/* Accessor methods (get/set functions) to struct members. */
17627
17628 - yy_start_stack[yy_start_stack_ptr++] = YY_START;
17629 +/** Get the current line number.
17630 + *
17631 + */
17632 +int yyget_lineno (void)
17633 +{
17634 +
17635 + return yylineno;
17636 +}
17637
17638 - BEGIN(new_state);
17639 - }
17640 -#endif
17641 +/** Get the input stream.
17642 + *
17643 + */
17644 +FILE *yyget_in (void)
17645 +{
17646 + return yyin;
17647 +}
17648
17649 +/** Get the output stream.
17650 + *
17651 + */
17652 +FILE *yyget_out (void)
17653 +{
17654 + return yyout;
17655 +}
17656
17657 -#ifndef YY_NO_POP_STATE
17658 -static void yy_pop_state()
17659 - {
17660 - if ( --yy_start_stack_ptr < 0 )
17661 - YY_FATAL_ERROR( "start-condition stack underflow" );
17662 +/** Get the length of the current token.
17663 + *
17664 + */
17665 +int yyget_leng (void)
17666 +{
17667 + return yyleng;
17668 +}
17669
17670 - BEGIN(yy_start_stack[yy_start_stack_ptr]);
17671 - }
17672 -#endif
17673 +/** Get the current token.
17674 + *
17675 + */
17676
17677 +char *yyget_text (void)
17678 +{
17679 + return yytext;
17680 +}
17681
17682 -#ifndef YY_NO_TOP_STATE
17683 -static int yy_top_state()
17684 - {
17685 - return yy_start_stack[yy_start_stack_ptr - 1];
17686 - }
17687 -#endif
17688 +/** Set the current line number.
17689 + * @param line_number
17690 + *
17691 + */
17692 +void yyset_lineno (int line_number )
17693 +{
17694 +
17695 + yylineno = line_number;
17696 +}
17697
17698 -#ifndef YY_EXIT_FAILURE
17699 -#define YY_EXIT_FAILURE 2
17700 -#endif
17701 +/** Set the input stream. This does not discard the current
17702 + * input buffer.
17703 + * @param in_str A readable stream.
17704 + *
17705 + * @see yy_switch_to_buffer
17706 + */
17707 +void yyset_in (FILE * in_str )
17708 +{
17709 + yyin = in_str ;
17710 +}
17711
17712 -#ifdef YY_USE_PROTOS
17713 -static void yy_fatal_error( yyconst char msg[] )
17714 -#else
17715 -static void yy_fatal_error( msg )
17716 -char msg[];
17717 -#endif
17718 - {
17719 - (void) fprintf( stderr, "%s\n", msg );
17720 - exit( YY_EXIT_FAILURE );
17721 - }
17722 +void yyset_out (FILE * out_str )
17723 +{
17724 + yyout = out_str ;
17725 +}
17726
17727 +int yyget_debug (void)
17728 +{
17729 + return yy_flex_debug;
17730 +}
17731
17732 +void yyset_debug (int bdebug )
17733 +{
17734 + yy_flex_debug = bdebug ;
17735 +}
17736
17737 -/* Redefine yyless() so it works in section 3 code. */
17738 +/* yylex_destroy is for both reentrant and non-reentrant scanners. */
17739 +int yylex_destroy (void)
17740 +{
17741 +
17742 + /* Pop the buffer stack, destroying each element. */
17743 + while(YY_CURRENT_BUFFER){
17744 + yy_delete_buffer(YY_CURRENT_BUFFER );
17745 + YY_CURRENT_BUFFER_LVALUE = NULL;
17746 + yypop_buffer_state();
17747 + }
17748
17749 -#undef yyless
17750 -#define yyless(n) \
17751 - do \
17752 - { \
17753 - /* Undo effects of setting up yytext. */ \
17754 - yytext[yyleng] = yy_hold_char; \
17755 - yy_c_buf_p = yytext + n; \
17756 - yy_hold_char = *yy_c_buf_p; \
17757 - *yy_c_buf_p = '\0'; \
17758 - yyleng = n; \
17759 - } \
17760 - while ( 0 )
17761 + /* Destroy the stack itself. */
17762 + yyfree((yy_buffer_stack) );
17763 + (yy_buffer_stack) = NULL;
17764
17765 + return 0;
17766 +}
17767
17768 -/* Internal utility routines. */
17769 +/*
17770 + * Internal utility routines.
17771 + */
17772
17773 #ifndef yytext_ptr
17774 -#ifdef YY_USE_PROTOS
17775 -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
17776 -#else
17777 -static void yy_flex_strncpy( s1, s2, n )
17778 -char *s1;
17779 -yyconst char *s2;
17780 -int n;
17781 -#endif
17782 - {
17783 +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
17784 +{
17785 register int i;
17786 - for ( i = 0; i < n; ++i )
17787 + for ( i = 0; i < n; ++i )
17788 s1[i] = s2[i];
17789 - }
17790 +}
17791 #endif
17792
17793 #ifdef YY_NEED_STRLEN
17794 -#ifdef YY_USE_PROTOS
17795 -static int yy_flex_strlen( yyconst char *s )
17796 -#else
17797 -static int yy_flex_strlen( s )
17798 -yyconst char *s;
17799 -#endif
17800 - {
17801 +static int yy_flex_strlen (yyconst char * s )
17802 +{
17803 register int n;
17804 - for ( n = 0; s[n]; ++n )
17805 + for ( n = 0; s[n]; ++n )
17806 ;
17807
17808 return n;
17809 - }
17810 +}
17811 #endif
17812
17813 -
17814 -#ifdef YY_USE_PROTOS
17815 -static void *yy_flex_alloc( yy_size_t size )
17816 -#else
17817 -static void *yy_flex_alloc( size )
17818 -yy_size_t size;
17819 -#endif
17820 - {
17821 +void *yyalloc (yy_size_t size )
17822 +{
17823 return (void *) malloc( size );
17824 - }
17825 +}
17826
17827 -#ifdef YY_USE_PROTOS
17828 -static void *yy_flex_realloc( void *ptr, yy_size_t size )
17829 -#else
17830 -static void *yy_flex_realloc( ptr, size )
17831 -void *ptr;
17832 -yy_size_t size;
17833 -#endif
17834 - {
17835 +void *yyrealloc (void * ptr, yy_size_t size )
17836 +{
17837 /* The cast to (char *) in the following accommodates both
17838 * implementations that use char* generic pointers, and those
17839 * that use void* generic pointers. It works with the latter
17840 @@ -1631,30 +1794,34 @@
17841 * as though doing an assignment.
17842 */
17843 return (void *) realloc( (char *) ptr, size );
17844 - }
17845 +}
17846
17847 -#ifdef YY_USE_PROTOS
17848 -static void yy_flex_free( void *ptr )
17849 -#else
17850 -static void yy_flex_free( ptr )
17851 -void *ptr;
17852 -#endif
17853 - {
17854 - free( ptr );
17855 - }
17856 +void yyfree (void * ptr )
17857 +{
17858 + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
17859 +}
17860
17861 -#if YY_MAIN
17862 -int main()
17863 - {
17864 - yylex();
17865 - return 0;
17866 - }
17867 +#define YYTABLES_NAME "yytables"
17868 +
17869 +#undef YY_NEW_FILE
17870 +#undef YY_FLUSH_BUFFER
17871 +#undef yy_set_bol
17872 +#undef yy_new_buffer
17873 +#undef yy_set_interactive
17874 +#undef yytext_ptr
17875 +#undef YY_DO_BEFORE_ACTION
17876 +
17877 +#ifdef YY_DECL_IS_OURS
17878 +#undef YY_DECL_IS_OURS
17879 +#undef YY_DECL
17880 #endif
17881 #line 69 "ql_l.l"
17882
17883
17884 -void yyerror(char *s)
17885 +
17886 +void yyerror(const char *s)
17887 {
17888 fprintf(stderr,"line %d: %s near \"%s\"\n",lineno,s,yytext);
17889 exit(1);
17890 }
17891 +
17892 --- linux-atm-2.4.1.orig/src/qgen/ql_y.c
17893 +++ linux-atm-2.4.1/src/qgen/ql_y.c
17894 @@ -1,21 +1,87 @@
17895 +/* A Bison parser, made by GNU Bison 1.875d. */
17896
17897 -/* A Bison parser, made from ql_y.y
17898 - by GNU Bison version 1.28 */
17899 +/* Skeleton parser for Yacc-like parsing with Bison,
17900 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
17901
17902 -#define YYBISON 1 /* Identify Bison output. */
17903 + This program is free software; you can redistribute it and/or modify
17904 + it under the terms of the GNU General Public License as published by
17905 + the Free Software Foundation; either version 2, or (at your option)
17906 + any later version.
17907
17908 -#define TOK_BREAK 257
17909 -#define TOK_CASE 258
17910 -#define TOK_DEF 259
17911 -#define TOK_DEFAULT 260
17912 -#define TOK_LENGTH 261
17913 -#define TOK_MULTI 262
17914 -#define TOK_RECOVER 263
17915 -#define TOK_ABORT 264
17916 -#define TOK_ID 265
17917 -#define TOK_INCLUDE 266
17918 -#define TOK_STRING 267
17919 + This program is distributed in the hope that it will be useful,
17920 + but WITHOUT ANY WARRANTY; without even the implied warranty of
17921 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17922 + GNU General Public License for more details.
17923
17924 + You should have received a copy of the GNU General Public License
17925 + along with this program; if not, write to the Free Software
17926 + Foundation, Inc., 59 Temple Place - Suite 330,
17927 + Boston, MA 02111-1307, USA. */
17928 +
17929 +/* As a special exception, when this file is copied by Bison into a
17930 + Bison output file, you may use that output file without restriction.
17931 + This special exception was added by the Free Software Foundation
17932 + in version 1.24 of Bison. */
17933 +
17934 +/* Written by Richard Stallman by simplifying the original so called
17935 + ``semantic'' parser. */
17936 +
17937 +/* All symbols defined below should begin with yy or YY, to avoid
17938 + infringing on user name space. This should be done even for local
17939 + variables, as they might otherwise be expanded by user macros.
17940 + There are some unavoidable exceptions within include files to
17941 + define necessary library symbols; they are noted "INFRINGES ON
17942 + USER NAME SPACE" below. */
17943 +
17944 +/* Identify Bison output. */
17945 +#define YYBISON 1
17946 +
17947 +/* Skeleton name. */
17948 +#define YYSKELETON_NAME "yacc.c"
17949 +
17950 +/* Pure parsers. */
17951 +#define YYPURE 0
17952 +
17953 +/* Using locations. */
17954 +#define YYLSP_NEEDED 0
17955 +
17956 +
17957 +
17958 +/* Tokens. */
17959 +#ifndef YYTOKENTYPE
17960 +# define YYTOKENTYPE
17961 + /* Put the tokens into the symbol table, so that GDB and other debuggers
17962 + know about them. */
17963 + enum yytokentype {
17964 + TOK_BREAK = 258,
17965 + TOK_CASE = 259,
17966 + TOK_DEF = 260,
17967 + TOK_DEFAULT = 261,
17968 + TOK_LENGTH = 262,
17969 + TOK_MULTI = 263,
17970 + TOK_RECOVER = 264,
17971 + TOK_ABORT = 265,
17972 + TOK_ID = 266,
17973 + TOK_INCLUDE = 267,
17974 + TOK_STRING = 268
17975 + };
17976 +#endif
17977 +#define TOK_BREAK 258
17978 +#define TOK_CASE 259
17979 +#define TOK_DEF 260
17980 +#define TOK_DEFAULT 261
17981 +#define TOK_LENGTH 262
17982 +#define TOK_MULTI 263
17983 +#define TOK_RECOVER 264
17984 +#define TOK_ABORT 265
17985 +#define TOK_ID 266
17986 +#define TOK_INCLUDE 267
17987 +#define TOK_STRING 268
17988 +
17989 +
17990 +
17991 +
17992 +/* Copy the first part of user declarations. */
17993 #line 1 "ql_y.y"
17994
17995 /* ql.y - Q.2931 data structures description language */
17996 @@ -36,6 +102,8 @@
17997 #include "qgen.h"
17998 #include "file.h"
17999
18000 +extern void yyerror(const char *s);
18001 +
18002
18003 #define MAX_TOKEN 256
18004 #define DEFAULT_NAMELIST_FILE "default.nl"
18005 @@ -77,9 +145,10 @@
18006 for (walk = strchr(start,0)-1; walk > start && isspace(*walk); walk--)
18007 *walk = 0;
18008 if (*start == ':') {
18009 - if (!(searching = strcmp(start+1,name)))
18010 + if (!(searching = strcmp(start+1,name))) {
18011 if (found) yyerror("multiple entries");
18012 else found = 1;
18013 + }
18014 continue;
18015 }
18016 if (searching) continue;
18017 @@ -154,8 +223,23 @@
18018
18019
18020
18021 -#line 139 "ql_y.y"
18022 -typedef union {
18023 +
18024 +/* Enabling traces. */
18025 +#ifndef YYDEBUG
18026 +# define YYDEBUG 0
18027 +#endif
18028 +
18029 +/* Enabling verbose error messages. */
18030 +#ifdef YYERROR_VERBOSE
18031 +# undef YYERROR_VERBOSE
18032 +# define YYERROR_VERBOSE 1
18033 +#else
18034 +# define YYERROR_VERBOSE 0
18035 +#endif
18036 +
18037 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
18038 +#line 142 "ql_y.y"
18039 +typedef union YYSTYPE {
18040 const char *str;
18041 int num;
18042 FIELD *field;
18043 @@ -164,470 +248,762 @@
18044 TAG *tag;
18045 NAME_LIST *nlist;
18046 } YYSTYPE;
18047 -#include <stdio.h>
18048 +/* Line 191 of yacc.c. */
18049 +#line 253 "y.tab.c"
18050 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
18051 +# define YYSTYPE_IS_DECLARED 1
18052 +# define YYSTYPE_IS_TRIVIAL 1
18053 +#endif
18054 +
18055 +
18056 +
18057 +/* Copy the second part of user declarations. */
18058 +
18059 +
18060 +/* Line 214 of yacc.c. */
18061 +#line 265 "y.tab.c"
18062 +
18063 +#if ! defined (yyoverflow) || YYERROR_VERBOSE
18064 +
18065 +# ifndef YYFREE
18066 +# define YYFREE free
18067 +# endif
18068 +# ifndef YYMALLOC
18069 +# define YYMALLOC malloc
18070 +# endif
18071 +
18072 +/* The parser invokes alloca or malloc; define the necessary symbols. */
18073 +
18074 +# ifdef YYSTACK_USE_ALLOCA
18075 +# if YYSTACK_USE_ALLOCA
18076 +# define YYSTACK_ALLOC alloca
18077 +# endif
18078 +# else
18079 +# if defined (alloca) || defined (_ALLOCA_H)
18080 +# define YYSTACK_ALLOC alloca
18081 +# else
18082 +# ifdef __GNUC__
18083 +# define YYSTACK_ALLOC __builtin_alloca
18084 +# endif
18085 +# endif
18086 +# endif
18087 +
18088 +# ifdef YYSTACK_ALLOC
18089 + /* Pacify GCC's `empty if-body' warning. */
18090 +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
18091 +# else
18092 +# if defined (__STDC__) || defined (__cplusplus)
18093 +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
18094 +# define YYSIZE_T size_t
18095 +# endif
18096 +# define YYSTACK_ALLOC YYMALLOC
18097 +# define YYSTACK_FREE YYFREE
18098 +# endif
18099 +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
18100 +
18101 +
18102 +#if (! defined (yyoverflow) \
18103 + && (! defined (__cplusplus) \
18104 + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
18105 +
18106 +/* A type that is properly aligned for any stack member. */
18107 +union yyalloc
18108 +{
18109 + short int yyss;
18110 + YYSTYPE yyvs;
18111 + };
18112 +
18113 +/* The size of the maximum gap between one aligned stack and the next. */
18114 +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
18115 +
18116 +/* The size of an array large to enough to hold all stacks, each with
18117 + N elements. */
18118 +# define YYSTACK_BYTES(N) \
18119 + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
18120 + + YYSTACK_GAP_MAXIMUM)
18121 +
18122 +/* Copy COUNT objects from FROM to TO. The source and destination do
18123 + not overlap. */
18124 +# ifndef YYCOPY
18125 +# if defined (__GNUC__) && 1 < __GNUC__
18126 +# define YYCOPY(To, From, Count) \
18127 + __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
18128 +# else
18129 +# define YYCOPY(To, From, Count) \
18130 + do \
18131 + { \
18132 + register YYSIZE_T yyi; \
18133 + for (yyi = 0; yyi < (Count); yyi++) \
18134 + (To)[yyi] = (From)[yyi]; \
18135 + } \
18136 + while (0)
18137 +# endif
18138 +# endif
18139 +
18140 +/* Relocate STACK from its old location to the new one. The
18141 + local variables YYSIZE and YYSTACKSIZE give the old and new number of
18142 + elements in the stack, and YYPTR gives the new location of the
18143 + stack. Advance YYPTR to a properly aligned location for the next
18144 + stack. */
18145 +# define YYSTACK_RELOCATE(Stack) \
18146 + do \
18147 + { \
18148 + YYSIZE_T yynewbytes; \
18149 + YYCOPY (&yyptr->Stack, Stack, yysize); \
18150 + Stack = &yyptr->Stack; \
18151 + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
18152 + yyptr += yynewbytes / sizeof (*yyptr); \
18153 + } \
18154 + while (0)
18155
18156 -#ifndef __cplusplus
18157 -#ifndef __STDC__
18158 -#define const
18159 -#endif
18160 #endif
18161
18162 +#if defined (__STDC__) || defined (__cplusplus)
18163 + typedef signed char yysigned_char;
18164 +#else
18165 + typedef short int yysigned_char;
18166 +#endif
18167
18168 -
18169 -#define YYFINAL 86
18170 -#define YYFLAG -32768
18171 -#define YYNTBASE 23
18172 -
18173 -#define YYTRANSLATE(x) ((unsigned)(x) <= 267 ? yytranslate[x] : 47)
18174 -
18175 -static const char yytranslate[] = { 0,
18176 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18177 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18178 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18179 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18180 - 2, 2, 2, 21, 18, 2, 2, 2, 2, 2,
18181 - 2, 2, 2, 2, 2, 2, 2, 22, 2, 17,
18182 - 14, 19, 2, 20, 2, 2, 2, 2, 2, 2,
18183 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18184 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18185 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18186 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18187 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18188 - 2, 2, 15, 2, 16, 2, 2, 2, 2, 2,
18189 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18190 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18191 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18192 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18193 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18194 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18195 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18196 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18197 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18198 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18199 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18200 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18201 - 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
18202 - 7, 8, 9, 10, 11, 12, 13
18203 +/* YYFINAL -- State number of the termination state. */
18204 +#define YYFINAL 5
18205 +/* YYLAST -- Last index in YYTABLE. */
18206 +#define YYLAST 65
18207 +
18208 +/* YYNTOKENS -- Number of terminals. */
18209 +#define YYNTOKENS 23
18210 +/* YYNNTS -- Number of nonterminals. */
18211 +#define YYNNTS 25
18212 +/* YYNRULES -- Number of rules. */
18213 +#define YYNRULES 46
18214 +/* YYNRULES -- Number of states. */
18215 +#define YYNSTATES 86
18216 +
18217 +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
18218 +#define YYUNDEFTOK 2
18219 +#define YYMAXUTOK 268
18220 +
18221 +#define YYTRANSLATE(YYX) \
18222 + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
18223 +
18224 +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
18225 +static const unsigned char yytranslate[] =
18226 +{
18227 + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18228 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18229 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18230 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18231 + 2, 2, 2, 2, 21, 18, 2, 2, 2, 2,
18232 + 2, 2, 2, 2, 2, 2, 2, 2, 22, 2,
18233 + 17, 14, 19, 2, 20, 2, 2, 2, 2, 2,
18234 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18235 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18236 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18237 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18238 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18239 + 2, 2, 2, 15, 2, 16, 2, 2, 2, 2,
18240 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18241 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18242 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18243 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18244 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18245 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18246 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18247 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18248 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18249 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18250 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18251 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18252 + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
18253 + 5, 6, 7, 8, 9, 10, 11, 12, 13
18254 };
18255
18256 -#if YYDEBUG != 0
18257 -static const short yyprhs[] = { 0,
18258 - 0, 4, 5, 8, 9, 12, 17, 18, 21, 23,
18259 - 27, 30, 31, 34, 40, 41, 43, 47, 53, 54,
18260 - 57, 59, 60, 63, 64, 67, 69, 74, 79, 83,
18261 - 84, 87, 88, 90, 91, 97, 98, 105, 106, 112,
18262 - 113, 120, 121, 124, 125
18263 +#if YYDEBUG
18264 +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
18265 + YYRHS. */
18266 +static const unsigned char yyprhs[] =
18267 +{
18268 + 0, 0, 3, 7, 8, 11, 12, 15, 20, 21,
18269 + 24, 26, 30, 33, 34, 37, 43, 44, 46, 50,
18270 + 56, 57, 60, 62, 63, 66, 67, 70, 72, 77,
18271 + 82, 86, 87, 90, 91, 93, 94, 100, 101, 108,
18272 + 109, 115, 116, 123, 124, 127, 128
18273 };
18274
18275 -static const short yyrhs[] = { 24,
18276 - 25, 29, 0, 0, 12, 24, 0, 0, 25, 26,
18277 - 0, 5, 11, 14, 29, 0, 0, 28, 29, 0,
18278 - 11, 0, 15, 30, 16, 0, 10, 11, 0, 0,
18279 - 31, 30, 0, 32, 11, 40, 17, 33, 0, 0,
18280 - 3, 0, 18, 35, 19, 0, 35, 34, 36, 19,
18281 - 37, 0, 0, 20, 35, 0, 11, 0, 0, 21,
18282 - 11, 0, 0, 14, 38, 0, 11, 0, 4, 15,
18283 - 41, 16, 0, 8, 15, 43, 16, 0, 39, 7,
18284 - 29, 0, 0, 9, 11, 0, 0, 13, 0, 0,
18285 - 6, 11, 45, 46, 29, 0, 0, 11, 45, 46,
18286 - 29, 42, 41, 0, 0, 6, 11, 45, 46, 27,
18287 - 0, 0, 11, 45, 46, 27, 44, 43, 0, 0,
18288 - 22, 11, 0, 0, 21, 11, 46, 0
18289 +/* YYRHS -- A `-1'-separated list of the rules' RHS. */
18290 +static const yysigned_char yyrhs[] =
18291 +{
18292 + 24, 0, -1, 25, 26, 30, -1, -1, 12, 25,
18293 + -1, -1, 26, 27, -1, 5, 11, 14, 30, -1,
18294 + -1, 29, 30, -1, 11, -1, 15, 31, 16, -1,
18295 + 10, 11, -1, -1, 32, 31, -1, 33, 11, 41,
18296 + 17, 34, -1, -1, 3, -1, 18, 36, 19, -1,
18297 + 36, 35, 37, 19, 38, -1, -1, 20, 36, -1,
18298 + 11, -1, -1, 21, 11, -1, -1, 14, 39, -1,
18299 + 11, -1, 4, 15, 42, 16, -1, 8, 15, 44,
18300 + 16, -1, 40, 7, 30, -1, -1, 9, 11, -1,
18301 + -1, 13, -1, -1, 6, 11, 46, 47, 30, -1,
18302 + -1, 11, 46, 47, 30, 43, 42, -1, -1, 6,
18303 + 11, 46, 47, 28, -1, -1, 11, 46, 47, 28,
18304 + 45, 44, -1, -1, 22, 11, -1, -1, 21, 11,
18305 + 47, -1
18306 };
18307
18308 -#endif
18309 -
18310 -#if YYDEBUG != 0
18311 -static const short yyrline[] = { 0,
18312 - 163, 175, 176, 184, 185, 188, 202, 207, 212, 231,
18313 - 236, 243, 247, 254, 278, 282, 288, 301, 318, 322,
18314 - 329, 339, 343, 350, 354, 360, 367, 374, 380, 390,
18315 - 394, 400, 404, 410, 414, 431, 437, 454, 458, 474,
18316 - 480, 497, 501, 507, 511
18317 +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
18318 +static const unsigned short int yyrline[] =
18319 +{
18320 + 0, 167, 167, 178, 179, 187, 188, 192, 206, 206,
18321 + 216, 234, 239, 247, 250, 258, 282, 285, 292, 304,
18322 + 323, 326, 334, 344, 347, 355, 358, 365, 371, 378,
18323 + 384, 395, 398, 405, 408, 415, 418, 436, 435, 459,
18324 + 462, 479, 478, 502, 505, 512, 515
18325 };
18326 #endif
18327
18328 -
18329 -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
18330 -
18331 -static const char * const yytname[] = { "$","error","$undefined.","TOK_BREAK",
18332 -"TOK_CASE","TOK_DEF","TOK_DEFAULT","TOK_LENGTH","TOK_MULTI","TOK_RECOVER","TOK_ABORT",
18333 -"TOK_ID","TOK_INCLUDE","TOK_STRING","'='","'{'","'}'","'<'","'-'","'>'","'@'",
18334 -"','","':'","all","includes","structures","structure","rep_block","@1","block",
18335 -"fields","field","opt_break","field_cont","opt_pos","decimal","opt_more","opt_val",
18336 -"value","opt_recover","opt_name_list","tags","@2","rep_tags","@3","opt_id","list", NULL
18337 +#if YYDEBUG || YYERROR_VERBOSE
18338 +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
18339 + First, the terminals, then, starting at YYNTOKENS, nonterminals. */
18340 +static const char *const yytname[] =
18341 +{
18342 + "$end", "error", "$undefined", "TOK_BREAK", "TOK_CASE", "TOK_DEF",
18343 + "TOK_DEFAULT", "TOK_LENGTH", "TOK_MULTI", "TOK_RECOVER", "TOK_ABORT",
18344 + "TOK_ID", "TOK_INCLUDE", "TOK_STRING", "'='", "'{'", "'}'", "'<'", "'-'",
18345 + "'>'", "'@'", "','", "':'", "$accept", "all", "includes", "structures",
18346 + "structure", "rep_block", "@1", "block", "fields", "field", "opt_break",
18347 + "field_cont", "opt_pos", "decimal", "opt_more", "opt_val", "value",
18348 + "opt_recover", "opt_name_list", "tags", "@2", "rep_tags", "@3", "opt_id",
18349 + "list", 0
18350 };
18351 #endif
18352
18353 -static const short yyr1[] = { 0,
18354 - 23, 24, 24, 25, 25, 26, 28, 27, 29, 29,
18355 - 29, 30, 30, 31, 32, 32, 33, 33, 34, 34,
18356 - 35, 36, 36, 37, 37, 38, 38, 38, 38, 39,
18357 - 39, 40, 40, 41, 41, 42, 41, 43, 43, 44,
18358 - 43, 45, 45, 46, 46
18359 +# ifdef YYPRINT
18360 +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
18361 + token YYLEX-NUM. */
18362 +static const unsigned short int yytoknum[] =
18363 +{
18364 + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
18365 + 265, 266, 267, 268, 61, 123, 125, 60, 45, 62,
18366 + 64, 44, 58
18367 };
18368 +# endif
18369
18370 -static const short yyr2[] = { 0,
18371 - 3, 0, 2, 0, 2, 4, 0, 2, 1, 3,
18372 - 2, 0, 2, 5, 0, 1, 3, 5, 0, 2,
18373 - 1, 0, 2, 0, 2, 1, 4, 4, 3, 0,
18374 - 2, 0, 1, 0, 5, 0, 6, 0, 5, 0,
18375 - 6, 0, 2, 0, 3
18376 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
18377 +static const unsigned char yyr1[] =
18378 +{
18379 + 0, 23, 24, 25, 25, 26, 26, 27, 29, 28,
18380 + 30, 30, 30, 31, 31, 32, 33, 33, 34, 34,
18381 + 35, 35, 36, 37, 37, 38, 38, 39, 39, 39,
18382 + 39, 40, 40, 41, 41, 42, 42, 43, 42, 44,
18383 + 44, 45, 44, 46, 46, 47, 47
18384 };
18385
18386 -static const short yydefact[] = { 2,
18387 - 2, 4, 3, 0, 0, 0, 9, 12, 5, 1,
18388 - 0, 11, 16, 0, 12, 0, 0, 10, 13, 32,
18389 - 6, 33, 0, 0, 21, 0, 14, 19, 0, 0,
18390 - 22, 17, 20, 0, 0, 23, 24, 30, 18, 0,
18391 - 0, 0, 26, 25, 0, 34, 38, 31, 0, 0,
18392 - 42, 0, 0, 42, 0, 29, 42, 0, 44, 27,
18393 - 42, 44, 28, 44, 43, 0, 0, 44, 7, 0,
18394 - 44, 36, 7, 40, 0, 35, 45, 34, 39, 38,
18395 - 8, 37, 41, 0, 0, 0
18396 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
18397 +static const unsigned char yyr2[] =
18398 +{
18399 + 0, 2, 3, 0, 2, 0, 2, 4, 0, 2,
18400 + 1, 3, 2, 0, 2, 5, 0, 1, 3, 5,
18401 + 0, 2, 1, 0, 2, 0, 2, 1, 4, 4,
18402 + 3, 0, 2, 0, 1, 0, 5, 0, 6, 0,
18403 + 5, 0, 6, 0, 2, 0, 3
18404 };
18405
18406 -static const short yydefgoto[] = { 84,
18407 - 2, 4, 9, 74, 75, 10, 14, 15, 16, 27,
18408 - 31, 28, 35, 39, 44, 45, 23, 52, 78, 55,
18409 - 80, 59, 67
18410 +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
18411 + STATE-NUM when YYTABLE doesn't specify something else to do. Zero
18412 + means the default is an error. */
18413 +static const unsigned char yydefact[] =
18414 +{
18415 + 3, 3, 0, 5, 4, 1, 0, 0, 0, 10,
18416 + 13, 6, 2, 0, 12, 17, 0, 13, 0, 0,
18417 + 11, 14, 33, 7, 34, 0, 0, 22, 0, 15,
18418 + 20, 0, 0, 23, 18, 21, 0, 0, 24, 25,
18419 + 31, 19, 0, 0, 0, 27, 26, 0, 35, 39,
18420 + 32, 0, 0, 43, 0, 0, 43, 0, 30, 43,
18421 + 0, 45, 28, 43, 45, 29, 45, 44, 0, 0,
18422 + 45, 8, 0, 45, 37, 8, 41, 0, 36, 46,
18423 + 35, 40, 39, 9, 38, 42
18424 };
18425
18426 -static const short yypact[] = { -8,
18427 - -8,-32768,-32768, -4, 3, 17,-32768, -1,-32768,-32768,
18428 - 20,-32768,-32768, 21, -1, 22, 11,-32768,-32768, 23,
18429 --32768,-32768, 24, -3,-32768, 27,-32768, 15, 25, 27,
18430 - 26,-32768,-32768, 28, 29,-32768, 31, 9,-32768, 34,
18431 - 36, 32,-32768,-32768, 33, 18, 19,-32768, 11, 35,
18432 - 30, 38, 44, 30, 40,-32768, 30, 46, 39,-32768,
18433 - 30, 39,-32768, 39,-32768, 48, 11, 39,-32768, 11,
18434 - 39,-32768,-32768,-32768, 11,-32768,-32768, 18,-32768, 19,
18435 --32768,-32768,-32768, 42, 61,-32768
18436 +/* YYDEFGOTO[NTERM-NUM]. */
18437 +static const yysigned_char yydefgoto[] =
18438 +{
18439 + -1, 2, 3, 6, 11, 76, 77, 12, 16, 17,
18440 + 18, 29, 33, 30, 37, 41, 46, 47, 25, 54,
18441 + 80, 57, 82, 61, 69
18442 };
18443
18444 -static const short yypgoto[] = {-32768,
18445 - 62,-32768,-32768, -11,-32768, -17, 49,-32768,-32768,-32768,
18446 --32768, 1,-32768,-32768,-32768,-32768,-32768, -13,-32768, -14,
18447 --32768, -38, -59
18448 +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
18449 + STATE-NUM. */
18450 +#define YYPACT_NINF -62
18451 +static const yysigned_char yypact[] =
18452 +{
18453 + -8, -8, 14, -62, -62, -62, -4, 16, 17, -62,
18454 + -1, -62, -62, 20, -62, -62, 21, -1, 22, 11,
18455 + -62, -62, 23, -62, -62, 24, -3, -62, 27, -62,
18456 + 25, 28, 27, 30, -62, -62, 29, 33, -62, 32,
18457 + 9, -62, 34, 39, 31, -62, -62, 36, 18, 19,
18458 + -62, 11, 37, 35, 40, 44, 35, 43, -62, 35,
18459 + 49, 41, -62, 35, 41, -62, 41, -62, 50, 11,
18460 + 41, -62, 11, 41, -62, -62, -62, 11, -62, -62,
18461 + 18, -62, 19, -62, -62, -62
18462 };
18463
18464 -
18465 -#define YYLAST 66
18466 -
18467 -
18468 -static const short yytable[] = { 21,
18469 - 5, 13, 69, 1, 70, 6, 7, 25, 73, -15,
18470 - 8, 77, 40, 11, 26, 62, 41, 42, 64, 43,
18471 - 6, 7, 68, 50, 53, 8, 29, 12, 51, 54,
18472 - 33, 56, 20, 17, 30, 22, 18, 25, 36, 49,
18473 - 24, 85, 48, 32, 38, 57, 34, 37, 46, 72,
18474 - 47, 58, 76, 60, 61, 63, 65, 81, 71, 66,
18475 - 86, 79, 3, 19, 82, 83
18476 +/* YYPGOTO[NTERM-NUM]. */
18477 +static const yysigned_char yypgoto[] =
18478 +{
18479 + -62, -62, 38, -62, -62, -31, -62, -19, 46, -62,
18480 + -62, -62, -62, 3, -62, -62, -62, -62, -62, -16,
18481 + -62, -17, -62, -40, -61
18482 };
18483
18484 -static const short yycheck[] = { 17,
18485 - 5, 3, 62, 12, 64, 10, 11, 11, 68, 11,
18486 - 15, 71, 4, 11, 18, 54, 8, 9, 57, 11,
18487 - 10, 11, 61, 6, 6, 15, 26, 11, 11, 11,
18488 - 30, 49, 11, 14, 20, 13, 16, 11, 11, 7,
18489 - 17, 0, 11, 19, 14, 11, 21, 19, 15, 67,
18490 - 15, 22, 70, 16, 11, 16, 11, 75, 11, 21,
18491 - 0, 73, 1, 15, 78, 80
18492 +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
18493 + positive, shift that token. If negative, reduce the rule which
18494 + number is the opposite. If zero, do what YYDEFACT says.
18495 + If YYTABLE_NINF, syntax error. */
18496 +#define YYTABLE_NINF -17
18497 +static const yysigned_char yytable[] =
18498 +{
18499 + 23, 7, 15, 71, 1, 72, 8, 9, 27, 75,
18500 + -16, 10, 79, 42, 5, 28, 64, 43, 44, 66,
18501 + 45, 8, 9, 70, 52, 55, 10, 13, 14, 53,
18502 + 56, 31, 58, 22, 19, 35, 24, 20, 27, 4,
18503 + 38, 26, 50, 51, 81, 32, 40, 34, 59, 48,
18504 + 74, 36, 39, 78, 49, 63, 62, 60, 83, 65,
18505 + 67, 73, 68, 21, 84, 85
18506 };
18507 -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
18508 -#line 3 "/usr/lib/bison.simple"
18509 -/* This file comes from bison-1.28. */
18510
18511 -/* Skeleton output parser for bison,
18512 - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
18513 -
18514 - This program is free software; you can redistribute it and/or modify
18515 - it under the terms of the GNU General Public License as published by
18516 - the Free Software Foundation; either version 2, or (at your option)
18517 - any later version.
18518 -
18519 - This program is distributed in the hope that it will be useful,
18520 - but WITHOUT ANY WARRANTY; without even the implied warranty of
18521 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18522 - GNU General Public License for more details.
18523 -
18524 - You should have received a copy of the GNU General Public License
18525 - along with this program; if not, write to the Free Software
18526 - Foundation, Inc., 59 Temple Place - Suite 330,
18527 - Boston, MA 02111-1307, USA. */
18528 -
18529 -/* As a special exception, when this file is copied by Bison into a
18530 - Bison output file, you may use that output file without restriction.
18531 - This special exception was added by the Free Software Foundation
18532 - in version 1.24 of Bison. */
18533 +static const unsigned char yycheck[] =
18534 +{
18535 + 19, 5, 3, 64, 12, 66, 10, 11, 11, 70,
18536 + 11, 15, 73, 4, 0, 18, 56, 8, 9, 59,
18537 + 11, 10, 11, 63, 6, 6, 15, 11, 11, 11,
18538 + 11, 28, 51, 11, 14, 32, 13, 16, 11, 1,
18539 + 11, 17, 11, 7, 75, 20, 14, 19, 11, 15,
18540 + 69, 21, 19, 72, 15, 11, 16, 22, 77, 16,
18541 + 11, 11, 21, 17, 80, 82
18542 +};
18543
18544 -/* This is the parser code that is written into each bison parser
18545 - when the %semantic_parser declaration is not specified in the grammar.
18546 - It was written by Richard Stallman by simplifying the hairy parser
18547 - used when %semantic_parser is specified. */
18548 -
18549 -#ifndef YYSTACK_USE_ALLOCA
18550 -#ifdef alloca
18551 -#define YYSTACK_USE_ALLOCA
18552 -#else /* alloca not defined */
18553 -#ifdef __GNUC__
18554 -#define YYSTACK_USE_ALLOCA
18555 -#define alloca __builtin_alloca
18556 -#else /* not GNU C. */
18557 -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
18558 -#define YYSTACK_USE_ALLOCA
18559 -#include <alloca.h>
18560 -#else /* not sparc */
18561 -/* We think this test detects Watcom and Microsoft C. */
18562 -/* This used to test MSDOS, but that is a bad idea
18563 - since that symbol is in the user namespace. */
18564 -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
18565 -#if 0 /* No need for malloc.h, which pollutes the namespace;
18566 - instead, just don't use alloca. */
18567 -#include <malloc.h>
18568 -#endif
18569 -#else /* not MSDOS, or __TURBOC__ */
18570 -#if defined(_AIX)
18571 -/* I don't know what this was needed for, but it pollutes the namespace.
18572 - So I turned it off. rms, 2 May 1997. */
18573 -/* #include <malloc.h> */
18574 - #pragma alloca
18575 -#define YYSTACK_USE_ALLOCA
18576 -#else /* not MSDOS, or __TURBOC__, or _AIX */
18577 -#if 0
18578 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
18579 - and on HPUX 10. Eventually we can turn this on. */
18580 -#define YYSTACK_USE_ALLOCA
18581 -#define alloca __builtin_alloca
18582 -#endif /* __hpux */
18583 -#endif
18584 -#endif /* not _AIX */
18585 -#endif /* not MSDOS, or __TURBOC__ */
18586 -#endif /* not sparc */
18587 -#endif /* not GNU C */
18588 -#endif /* alloca not defined */
18589 -#endif /* YYSTACK_USE_ALLOCA not defined */
18590 +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
18591 + symbol of state STATE-NUM. */
18592 +static const unsigned char yystos[] =
18593 +{
18594 + 0, 12, 24, 25, 25, 0, 26, 5, 10, 11,
18595 + 15, 27, 30, 11, 11, 3, 31, 32, 33, 14,
18596 + 16, 31, 11, 30, 13, 41, 17, 11, 18, 34,
18597 + 36, 36, 20, 35, 19, 36, 21, 37, 11, 19,
18598 + 14, 38, 4, 8, 9, 11, 39, 40, 15, 15,
18599 + 11, 7, 6, 11, 42, 6, 11, 44, 30, 11,
18600 + 22, 46, 16, 11, 46, 16, 46, 11, 21, 47,
18601 + 46, 47, 47, 11, 30, 47, 28, 29, 30, 47,
18602 + 43, 28, 45, 30, 42, 44
18603 +};
18604
18605 -#ifdef YYSTACK_USE_ALLOCA
18606 -#define YYSTACK_ALLOC alloca
18607 -#else
18608 -#define YYSTACK_ALLOC malloc
18609 +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
18610 +# define YYSIZE_T __SIZE_TYPE__
18611 +#endif
18612 +#if ! defined (YYSIZE_T) && defined (size_t)
18613 +# define YYSIZE_T size_t
18614 +#endif
18615 +#if ! defined (YYSIZE_T)
18616 +# if defined (__STDC__) || defined (__cplusplus)
18617 +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
18618 +# define YYSIZE_T size_t
18619 +# endif
18620 +#endif
18621 +#if ! defined (YYSIZE_T)
18622 +# define YYSIZE_T unsigned int
18623 #endif
18624 -
18625 -/* Note: there must be only one dollar sign in this file.
18626 - It is replaced by the list of actions, each action
18627 - as one case of the switch. */
18628
18629 #define yyerrok (yyerrstatus = 0)
18630 #define yyclearin (yychar = YYEMPTY)
18631 -#define YYEMPTY -2
18632 +#define YYEMPTY (-2)
18633 #define YYEOF 0
18634 +
18635 #define YYACCEPT goto yyacceptlab
18636 -#define YYABORT goto yyabortlab
18637 -#define YYERROR goto yyerrlab1
18638 -/* Like YYERROR except do call yyerror.
18639 - This remains here temporarily to ease the
18640 - transition to the new meaning of YYERROR, for GCC.
18641 +#define YYABORT goto yyabortlab
18642 +#define YYERROR goto yyerrorlab
18643 +
18644 +
18645 +/* Like YYERROR except do call yyerror. This remains here temporarily
18646 + to ease the transition to the new meaning of YYERROR, for GCC.
18647 Once GCC version 2 has supplanted version 1, this can go. */
18648 +
18649 #define YYFAIL goto yyerrlab
18650 +
18651 #define YYRECOVERING() (!!yyerrstatus)
18652 -#define YYBACKUP(token, value) \
18653 +
18654 +#define YYBACKUP(Token, Value) \
18655 do \
18656 if (yychar == YYEMPTY && yylen == 1) \
18657 - { yychar = (token), yylval = (value); \
18658 - yychar1 = YYTRANSLATE (yychar); \
18659 + { \
18660 + yychar = (Token); \
18661 + yylval = (Value); \
18662 + yytoken = YYTRANSLATE (yychar); \
18663 YYPOPSTACK; \
18664 goto yybackup; \
18665 } \
18666 else \
18667 - { yyerror ("syntax error: cannot back up"); YYERROR; } \
18668 + { \
18669 + yyerror ("syntax error: cannot back up");\
18670 + YYERROR; \
18671 + } \
18672 while (0)
18673
18674 #define YYTERROR 1
18675 #define YYERRCODE 256
18676
18677 -#ifndef YYPURE
18678 -#define YYLEX yylex()
18679 -#endif
18680 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions
18681 + are run). */
18682
18683 -#ifdef YYPURE
18684 -#ifdef YYLSP_NEEDED
18685 -#ifdef YYLEX_PARAM
18686 -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
18687 -#else
18688 -#define YYLEX yylex(&yylval, &yylloc)
18689 +#ifndef YYLLOC_DEFAULT
18690 +# define YYLLOC_DEFAULT(Current, Rhs, N) \
18691 + ((Current).first_line = (Rhs)[1].first_line, \
18692 + (Current).first_column = (Rhs)[1].first_column, \
18693 + (Current).last_line = (Rhs)[N].last_line, \
18694 + (Current).last_column = (Rhs)[N].last_column)
18695 #endif
18696 -#else /* not YYLSP_NEEDED */
18697 +
18698 +/* YYLEX -- calling `yylex' with the right arguments. */
18699 +
18700 #ifdef YYLEX_PARAM
18701 -#define YYLEX yylex(&yylval, YYLEX_PARAM)
18702 +# define YYLEX yylex (YYLEX_PARAM)
18703 #else
18704 -#define YYLEX yylex(&yylval)
18705 -#endif
18706 -#endif /* not YYLSP_NEEDED */
18707 +# define YYLEX yylex ()
18708 #endif
18709
18710 -/* If nonreentrant, generate the variables here */
18711 +/* Enable debugging if requested. */
18712 +#if YYDEBUG
18713
18714 -#ifndef YYPURE
18715 +# ifndef YYFPRINTF
18716 +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
18717 +# define YYFPRINTF fprintf
18718 +# endif
18719 +
18720 +# define YYDPRINTF(Args) \
18721 +do { \
18722 + if (yydebug) \
18723 + YYFPRINTF Args; \
18724 +} while (0)
18725 +
18726 +# define YYDSYMPRINT(Args) \
18727 +do { \
18728 + if (yydebug) \
18729 + yysymprint Args; \
18730 +} while (0)
18731 +
18732 +# define YYDSYMPRINTF(Title, Token, Value, Location) \
18733 +do { \
18734 + if (yydebug) \
18735 + { \
18736 + YYFPRINTF (stderr, "%s ", Title); \
18737 + yysymprint (stderr, \
18738 + Token, Value); \
18739 + YYFPRINTF (stderr, "\n"); \
18740 + } \
18741 +} while (0)
18742
18743 -int yychar; /* the lookahead symbol */
18744 -YYSTYPE yylval; /* the semantic value of the */
18745 - /* lookahead symbol */
18746 +/*------------------------------------------------------------------.
18747 +| yy_stack_print -- Print the state stack from its BOTTOM up to its |
18748 +| TOP (included). |
18749 +`------------------------------------------------------------------*/
18750
18751 -#ifdef YYLSP_NEEDED
18752 -YYLTYPE yylloc; /* location data for the lookahead */
18753 - /* symbol */
18754 +#if defined (__STDC__) || defined (__cplusplus)
18755 +static void
18756 +yy_stack_print (short int *bottom, short int *top)
18757 +#else
18758 +static void
18759 +yy_stack_print (bottom, top)
18760 + short int *bottom;
18761 + short int *top;
18762 #endif
18763 +{
18764 + YYFPRINTF (stderr, "Stack now");
18765 + for (/* Nothing. */; bottom <= top; ++bottom)
18766 + YYFPRINTF (stderr, " %d", *bottom);
18767 + YYFPRINTF (stderr, "\n");
18768 +}
18769
18770 -int yynerrs; /* number of parse errors so far */
18771 -#endif /* not YYPURE */
18772 +# define YY_STACK_PRINT(Bottom, Top) \
18773 +do { \
18774 + if (yydebug) \
18775 + yy_stack_print ((Bottom), (Top)); \
18776 +} while (0)
18777
18778 -#if YYDEBUG != 0
18779 -int yydebug; /* nonzero means print parse trace */
18780 -/* Since this is uninitialized, it does not stop multiple parsers
18781 - from coexisting. */
18782 +
18783 +/*------------------------------------------------.
18784 +| Report that the YYRULE is going to be reduced. |
18785 +`------------------------------------------------*/
18786 +
18787 +#if defined (__STDC__) || defined (__cplusplus)
18788 +static void
18789 +yy_reduce_print (int yyrule)
18790 +#else
18791 +static void
18792 +yy_reduce_print (yyrule)
18793 + int yyrule;
18794 #endif
18795 +{
18796 + int yyi;
18797 + unsigned int yylno = yyrline[yyrule];
18798 + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
18799 + yyrule - 1, yylno);
18800 + /* Print the symbols being reduced, and their result. */
18801 + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
18802 + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
18803 + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
18804 +}
18805
18806 -/* YYINITDEPTH indicates the initial size of the parser's stacks */
18807 +# define YY_REDUCE_PRINT(Rule) \
18808 +do { \
18809 + if (yydebug) \
18810 + yy_reduce_print (Rule); \
18811 +} while (0)
18812 +
18813 +/* Nonzero means print parse trace. It is left uninitialized so that
18814 + multiple parsers can coexist. */
18815 +int yydebug;
18816 +#else /* !YYDEBUG */
18817 +# define YYDPRINTF(Args)
18818 +# define YYDSYMPRINT(Args)
18819 +# define YYDSYMPRINTF(Title, Token, Value, Location)
18820 +# define YY_STACK_PRINT(Bottom, Top)
18821 +# define YY_REDUCE_PRINT(Rule)
18822 +#endif /* !YYDEBUG */
18823
18824 +
18825 +/* YYINITDEPTH -- initial size of the parser's stacks. */
18826 #ifndef YYINITDEPTH
18827 -#define YYINITDEPTH 200
18828 +# define YYINITDEPTH 200
18829 #endif
18830
18831 -/* YYMAXDEPTH is the maximum size the stacks can grow to
18832 - (effective only if the built-in stack extension method is used). */
18833 +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
18834 + if the built-in stack extension method is used).
18835 +
18836 + Do not make this value too large; the results are undefined if
18837 + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
18838 + evaluated with infinite-precision integer arithmetic. */
18839
18840 -#if YYMAXDEPTH == 0
18841 -#undef YYMAXDEPTH
18842 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
18843 +# undef YYMAXDEPTH
18844 #endif
18845
18846 #ifndef YYMAXDEPTH
18847 -#define YYMAXDEPTH 10000
18848 +# define YYMAXDEPTH 10000
18849 #endif
18850 +
18851 \f
18852 -/* Define __yy_memcpy. Note that the size argument
18853 - should be passed with type unsigned int, because that is what the non-GCC
18854 - definitions require. With GCC, __builtin_memcpy takes an arg
18855 - of type size_t, but it can handle unsigned int. */
18856 -
18857 -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
18858 -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
18859 -#else /* not GNU C or C++ */
18860 -#ifndef __cplusplus
18861
18862 -/* This is the most reliable way to avoid incompatibilities
18863 - in available built-in functions on various systems. */
18864 -static void
18865 -__yy_memcpy (to, from, count)
18866 - char *to;
18867 - char *from;
18868 - unsigned int count;
18869 -{
18870 - register char *f = from;
18871 - register char *t = to;
18872 - register int i = count;
18873 +#if YYERROR_VERBOSE
18874 +
18875 +# ifndef yystrlen
18876 +# if defined (__GLIBC__) && defined (_STRING_H)
18877 +# define yystrlen strlen
18878 +# else
18879 +/* Return the length of YYSTR. */
18880 +static YYSIZE_T
18881 +# if defined (__STDC__) || defined (__cplusplus)
18882 +yystrlen (const char *yystr)
18883 +# else
18884 +yystrlen (yystr)
18885 + const char *yystr;
18886 +# endif
18887 +{
18888 + register const char *yys = yystr;
18889 +
18890 + while (*yys++ != '\0')
18891 + continue;
18892
18893 - while (i-- > 0)
18894 - *t++ = *f++;
18895 + return yys - yystr - 1;
18896 }
18897 +# endif
18898 +# endif
18899
18900 -#else /* __cplusplus */
18901 +# ifndef yystpcpy
18902 +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
18903 +# define yystpcpy stpcpy
18904 +# else
18905 +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
18906 + YYDEST. */
18907 +static char *
18908 +# if defined (__STDC__) || defined (__cplusplus)
18909 +yystpcpy (char *yydest, const char *yysrc)
18910 +# else
18911 +yystpcpy (yydest, yysrc)
18912 + char *yydest;
18913 + const char *yysrc;
18914 +# endif
18915 +{
18916 + register char *yyd = yydest;
18917 + register const char *yys = yysrc;
18918 +
18919 + while ((*yyd++ = *yys++) != '\0')
18920 + continue;
18921 +
18922 + return yyd - 1;
18923 +}
18924 +# endif
18925 +# endif
18926 +
18927 +#endif /* !YYERROR_VERBOSE */
18928 +
18929 +\f
18930 +
18931 +#if YYDEBUG
18932 +/*--------------------------------.
18933 +| Print this symbol on YYOUTPUT. |
18934 +`--------------------------------*/
18935
18936 -/* This is the most reliable way to avoid incompatibilities
18937 - in available built-in functions on various systems. */
18938 +#if defined (__STDC__) || defined (__cplusplus)
18939 static void
18940 -__yy_memcpy (char *to, char *from, unsigned int count)
18941 +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
18942 +#else
18943 +static void
18944 +yysymprint (yyoutput, yytype, yyvaluep)
18945 + FILE *yyoutput;
18946 + int yytype;
18947 + YYSTYPE *yyvaluep;
18948 +#endif
18949 {
18950 - register char *t = to;
18951 - register char *f = from;
18952 - register int i = count;
18953 + /* Pacify ``unused variable'' warnings. */
18954 + (void) yyvaluep;
18955 +
18956 + if (yytype < YYNTOKENS)
18957 + {
18958 + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
18959 +# ifdef YYPRINT
18960 + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
18961 +# endif
18962 + }
18963 + else
18964 + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
18965
18966 - while (i-- > 0)
18967 - *t++ = *f++;
18968 + switch (yytype)
18969 + {
18970 + default:
18971 + break;
18972 + }
18973 + YYFPRINTF (yyoutput, ")");
18974 }
18975
18976 +#endif /* ! YYDEBUG */
18977 +/*-----------------------------------------------.
18978 +| Release the memory associated to this symbol. |
18979 +`-----------------------------------------------*/
18980 +
18981 +#if defined (__STDC__) || defined (__cplusplus)
18982 +static void
18983 +yydestruct (int yytype, YYSTYPE *yyvaluep)
18984 +#else
18985 +static void
18986 +yydestruct (yytype, yyvaluep)
18987 + int yytype;
18988 + YYSTYPE *yyvaluep;
18989 #endif
18990 -#endif
18991 +{
18992 + /* Pacify ``unused variable'' warnings. */
18993 + (void) yyvaluep;
18994 +
18995 + switch (yytype)
18996 + {
18997 +
18998 + default:
18999 + break;
19000 + }
19001 +}
19002 \f
19003 -#line 217 "/usr/lib/bison.simple"
19004
19005 -/* The user can define YYPARSE_PARAM as the name of an argument to be passed
19006 - into yyparse. The argument should have type void *.
19007 - It should actually point to an object.
19008 - Grammar actions can access the variable by casting it
19009 - to the proper pointer type. */
19010 +/* Prevent warnings from -Wmissing-prototypes. */
19011
19012 #ifdef YYPARSE_PARAM
19013 -#ifdef __cplusplus
19014 -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
19015 -#define YYPARSE_PARAM_DECL
19016 -#else /* not __cplusplus */
19017 -#define YYPARSE_PARAM_ARG YYPARSE_PARAM
19018 -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
19019 -#endif /* not __cplusplus */
19020 -#else /* not YYPARSE_PARAM */
19021 -#define YYPARSE_PARAM_ARG
19022 -#define YYPARSE_PARAM_DECL
19023 -#endif /* not YYPARSE_PARAM */
19024 +# if defined (__STDC__) || defined (__cplusplus)
19025 +int yyparse (void *YYPARSE_PARAM);
19026 +# else
19027 +int yyparse ();
19028 +# endif
19029 +#else /* ! YYPARSE_PARAM */
19030 +#if defined (__STDC__) || defined (__cplusplus)
19031 +int yyparse (void);
19032 +#else
19033 +int yyparse ();
19034 +#endif
19035 +#endif /* ! YYPARSE_PARAM */
19036 +
19037 +
19038 +
19039 +/* The lookahead symbol. */
19040 +int yychar;
19041 +
19042 +/* The semantic value of the lookahead symbol. */
19043 +YYSTYPE yylval;
19044 +
19045 +/* Number of syntax errors so far. */
19046 +int yynerrs;
19047 +
19048 +
19049 +
19050 +/*----------.
19051 +| yyparse. |
19052 +`----------*/
19053
19054 -/* Prevent warning if -Wstrict-prototypes. */
19055 -#ifdef __GNUC__
19056 #ifdef YYPARSE_PARAM
19057 -int yyparse (void *);
19058 +# if defined (__STDC__) || defined (__cplusplus)
19059 +int yyparse (void *YYPARSE_PARAM)
19060 +# else
19061 +int yyparse (YYPARSE_PARAM)
19062 + void *YYPARSE_PARAM;
19063 +# endif
19064 +#else /* ! YYPARSE_PARAM */
19065 +#if defined (__STDC__) || defined (__cplusplus)
19066 +int
19067 +yyparse (void)
19068 #else
19069 -int yyparse (void);
19070 +int
19071 +yyparse ()
19072 +
19073 #endif
19074 #endif
19075 -
19076 -int
19077 -yyparse(YYPARSE_PARAM_ARG)
19078 - YYPARSE_PARAM_DECL
19079 {
19080 +
19081 register int yystate;
19082 register int yyn;
19083 - register short *yyssp;
19084 + int yyresult;
19085 + /* Number of tokens to shift before error messages enabled. */
19086 + int yyerrstatus;
19087 + /* Lookahead token as an internal (translated) token number. */
19088 + int yytoken = 0;
19089 +
19090 + /* Three stacks and their tools:
19091 + `yyss': related to states,
19092 + `yyvs': related to semantic values,
19093 + `yyls': related to locations.
19094 +
19095 + Refer to the stacks thru separate pointers, to allow yyoverflow
19096 + to reallocate them elsewhere. */
19097 +
19098 + /* The state stack. */
19099 + short int yyssa[YYINITDEPTH];
19100 + short int *yyss = yyssa;
19101 + register short int *yyssp;
19102 +
19103 + /* The semantic value stack. */
19104 + YYSTYPE yyvsa[YYINITDEPTH];
19105 + YYSTYPE *yyvs = yyvsa;
19106 register YYSTYPE *yyvsp;
19107 - int yyerrstatus; /* number of tokens to shift before error messages enabled */
19108 - int yychar1 = 0; /* lookahead token as an internal (translated) token number */
19109
19110 - short yyssa[YYINITDEPTH]; /* the state stack */
19111 - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */
19112
19113 - short *yyss = yyssa; /* refer to the stacks thru separate pointers */
19114 - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */
19115
19116 -#ifdef YYLSP_NEEDED
19117 - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */
19118 - YYLTYPE *yyls = yylsa;
19119 - YYLTYPE *yylsp;
19120 -
19121 -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
19122 -#else
19123 #define YYPOPSTACK (yyvsp--, yyssp--)
19124 -#endif
19125
19126 - int yystacksize = YYINITDEPTH;
19127 - int yyfree_stacks = 0;
19128 + YYSIZE_T yystacksize = YYINITDEPTH;
19129
19130 -#ifdef YYPURE
19131 - int yychar;
19132 - YYSTYPE yylval;
19133 - int yynerrs;
19134 -#ifdef YYLSP_NEEDED
19135 - YYLTYPE yylloc;
19136 -#endif
19137 -#endif
19138 + /* The variables used to return semantic value and location from the
19139 + action routines. */
19140 + YYSTYPE yyval;
19141
19142 - YYSTYPE yyval; /* the variable used to return */
19143 - /* semantic values from the action */
19144 - /* routines */
19145
19146 + /* When reducing, the number of symbols on the RHS of the reduced
19147 + rule. */
19148 int yylen;
19149
19150 -#if YYDEBUG != 0
19151 - if (yydebug)
19152 - fprintf(stderr, "Starting parse\n");
19153 -#endif
19154 + YYDPRINTF ((stderr, "Starting parse\n"));
19155
19156 yystate = 0;
19157 yyerrstatus = 0;
19158 @@ -639,110 +1015,97 @@
19159 so that they stay on the same level as the state stack.
19160 The wasted elements are never initialized. */
19161
19162 - yyssp = yyss - 1;
19163 + yyssp = yyss;
19164 yyvsp = yyvs;
19165 -#ifdef YYLSP_NEEDED
19166 - yylsp = yyls;
19167 -#endif
19168
19169 -/* Push a new state, which is found in yystate . */
19170 -/* In all cases, when you get here, the value and location stacks
19171 - have just been pushed. so pushing a state here evens the stacks. */
19172 -yynewstate:
19173
19174 - *++yyssp = yystate;
19175 + goto yysetstate;
19176
19177 - if (yyssp >= yyss + yystacksize - 1)
19178 - {
19179 - /* Give user a chance to reallocate the stack */
19180 - /* Use copies of these so that the &'s don't force the real ones into memory. */
19181 - YYSTYPE *yyvs1 = yyvs;
19182 - short *yyss1 = yyss;
19183 -#ifdef YYLSP_NEEDED
19184 - YYLTYPE *yyls1 = yyls;
19185 -#endif
19186 +/*------------------------------------------------------------.
19187 +| yynewstate -- Push a new state, which is found in yystate. |
19188 +`------------------------------------------------------------*/
19189 + yynewstate:
19190 + /* In all cases, when you get here, the value and location stacks
19191 + have just been pushed. so pushing a state here evens the stacks.
19192 + */
19193 + yyssp++;
19194
19195 + yysetstate:
19196 + *yyssp = yystate;
19197 +
19198 + if (yyss + yystacksize - 1 <= yyssp)
19199 + {
19200 /* Get the current used size of the three stacks, in elements. */
19201 - int size = yyssp - yyss + 1;
19202 + YYSIZE_T yysize = yyssp - yyss + 1;
19203
19204 #ifdef yyoverflow
19205 - /* Each stack pointer address is followed by the size of
19206 - the data in use in that stack, in bytes. */
19207 -#ifdef YYLSP_NEEDED
19208 - /* This used to be a conditional around just the two extra args,
19209 - but that might be undefined if yyoverflow is a macro. */
19210 - yyoverflow("parser stack overflow",
19211 - &yyss1, size * sizeof (*yyssp),
19212 - &yyvs1, size * sizeof (*yyvsp),
19213 - &yyls1, size * sizeof (*yylsp),
19214 - &yystacksize);
19215 -#else
19216 - yyoverflow("parser stack overflow",
19217 - &yyss1, size * sizeof (*yyssp),
19218 - &yyvs1, size * sizeof (*yyvsp),
19219 - &yystacksize);
19220 -#endif
19221 -
19222 - yyss = yyss1; yyvs = yyvs1;
19223 -#ifdef YYLSP_NEEDED
19224 - yyls = yyls1;
19225 -#endif
19226 + {
19227 + /* Give user a chance to reallocate the stack. Use copies of
19228 + these so that the &'s don't force the real ones into
19229 + memory. */
19230 + YYSTYPE *yyvs1 = yyvs;
19231 + short int *yyss1 = yyss;
19232 +
19233 +
19234 + /* Each stack pointer address is followed by the size of the
19235 + data in use in that stack, in bytes. This used to be a
19236 + conditional around just the two extra args, but that might
19237 + be undefined if yyoverflow is a macro. */
19238 + yyoverflow ("parser stack overflow",
19239 + &yyss1, yysize * sizeof (*yyssp),
19240 + &yyvs1, yysize * sizeof (*yyvsp),
19241 +
19242 + &yystacksize);
19243 +
19244 + yyss = yyss1;
19245 + yyvs = yyvs1;
19246 + }
19247 #else /* no yyoverflow */
19248 +# ifndef YYSTACK_RELOCATE
19249 + goto yyoverflowlab;
19250 +# else
19251 /* Extend the stack our own way. */
19252 - if (yystacksize >= YYMAXDEPTH)
19253 - {
19254 - yyerror("parser stack overflow");
19255 - if (yyfree_stacks)
19256 - {
19257 - free (yyss);
19258 - free (yyvs);
19259 -#ifdef YYLSP_NEEDED
19260 - free (yyls);
19261 -#endif
19262 - }
19263 - return 2;
19264 - }
19265 + if (YYMAXDEPTH <= yystacksize)
19266 + goto yyoverflowlab;
19267 yystacksize *= 2;
19268 - if (yystacksize > YYMAXDEPTH)
19269 + if (YYMAXDEPTH < yystacksize)
19270 yystacksize = YYMAXDEPTH;
19271 -#ifndef YYSTACK_USE_ALLOCA
19272 - yyfree_stacks = 1;
19273 -#endif
19274 - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
19275 - __yy_memcpy ((char *)yyss, (char *)yyss1,
19276 - size * (unsigned int) sizeof (*yyssp));
19277 - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
19278 - __yy_memcpy ((char *)yyvs, (char *)yyvs1,
19279 - size * (unsigned int) sizeof (*yyvsp));
19280 -#ifdef YYLSP_NEEDED
19281 - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
19282 - __yy_memcpy ((char *)yyls, (char *)yyls1,
19283 - size * (unsigned int) sizeof (*yylsp));
19284 -#endif
19285 +
19286 + {
19287 + short int *yyss1 = yyss;
19288 + union yyalloc *yyptr =
19289 + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
19290 + if (! yyptr)
19291 + goto yyoverflowlab;
19292 + YYSTACK_RELOCATE (yyss);
19293 + YYSTACK_RELOCATE (yyvs);
19294 +
19295 +# undef YYSTACK_RELOCATE
19296 + if (yyss1 != yyssa)
19297 + YYSTACK_FREE (yyss1);
19298 + }
19299 +# endif
19300 #endif /* no yyoverflow */
19301
19302 - yyssp = yyss + size - 1;
19303 - yyvsp = yyvs + size - 1;
19304 -#ifdef YYLSP_NEEDED
19305 - yylsp = yyls + size - 1;
19306 -#endif
19307 + yyssp = yyss + yysize - 1;
19308 + yyvsp = yyvs + yysize - 1;
19309
19310 -#if YYDEBUG != 0
19311 - if (yydebug)
19312 - fprintf(stderr, "Stack size increased to %d\n", yystacksize);
19313 -#endif
19314
19315 - if (yyssp >= yyss + yystacksize - 1)
19316 + YYDPRINTF ((stderr, "Stack size increased to %lu\n",
19317 + (unsigned long int) yystacksize));
19318 +
19319 + if (yyss + yystacksize - 1 <= yyssp)
19320 YYABORT;
19321 }
19322
19323 -#if YYDEBUG != 0
19324 - if (yydebug)
19325 - fprintf(stderr, "Entering state %d\n", yystate);
19326 -#endif
19327 + YYDPRINTF ((stderr, "Entering state %d\n", yystate));
19328
19329 goto yybackup;
19330 - yybackup:
19331 +
19332 +/*-----------.
19333 +| yybackup. |
19334 +`-----------*/
19335 +yybackup:
19336
19337 /* Do appropriate processing given the current state. */
19338 /* Read a lookahead token if we need one and don't already have one. */
19339 @@ -751,154 +1114,120 @@
19340 /* First try to decide what to do without reference to lookahead token. */
19341
19342 yyn = yypact[yystate];
19343 - if (yyn == YYFLAG)
19344 + if (yyn == YYPACT_NINF)
19345 goto yydefault;
19346
19347 /* Not known => get a lookahead token if don't already have one. */
19348
19349 - /* yychar is either YYEMPTY or YYEOF
19350 - or a valid token in external form. */
19351 -
19352 + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
19353 if (yychar == YYEMPTY)
19354 {
19355 -#if YYDEBUG != 0
19356 - if (yydebug)
19357 - fprintf(stderr, "Reading a token: ");
19358 -#endif
19359 + YYDPRINTF ((stderr, "Reading a token: "));
19360 yychar = YYLEX;
19361 }
19362
19363 - /* Convert token to internal form (in yychar1) for indexing tables with */
19364 -
19365 - if (yychar <= 0) /* This means end of input. */
19366 + if (yychar <= YYEOF)
19367 {
19368 - yychar1 = 0;
19369 - yychar = YYEOF; /* Don't call YYLEX any more */
19370 -
19371 -#if YYDEBUG != 0
19372 - if (yydebug)
19373 - fprintf(stderr, "Now at end of input.\n");
19374 -#endif
19375 + yychar = yytoken = YYEOF;
19376 + YYDPRINTF ((stderr, "Now at end of input.\n"));
19377 }
19378 else
19379 {
19380 - yychar1 = YYTRANSLATE(yychar);
19381 -
19382 -#if YYDEBUG != 0
19383 - if (yydebug)
19384 - {
19385 - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
19386 - /* Give the individual parser a way to print the precise meaning
19387 - of a token, for further debugging info. */
19388 -#ifdef YYPRINT
19389 - YYPRINT (stderr, yychar, yylval);
19390 -#endif
19391 - fprintf (stderr, ")\n");
19392 - }
19393 -#endif
19394 + yytoken = YYTRANSLATE (yychar);
19395 + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
19396 }
19397
19398 - yyn += yychar1;
19399 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
19400 + /* If the proper action on seeing token YYTOKEN is to reduce or to
19401 + detect an error, take that action. */
19402 + yyn += yytoken;
19403 + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
19404 goto yydefault;
19405 -
19406 yyn = yytable[yyn];
19407 -
19408 - /* yyn is what to do for this token type in this state.
19409 - Negative => reduce, -yyn is rule number.
19410 - Positive => shift, yyn is new state.
19411 - New state is final state => don't bother to shift,
19412 - just return success.
19413 - 0, or most negative number => error. */
19414 -
19415 - if (yyn < 0)
19416 + if (yyn <= 0)
19417 {
19418 - if (yyn == YYFLAG)
19419 + if (yyn == 0 || yyn == YYTABLE_NINF)
19420 goto yyerrlab;
19421 yyn = -yyn;
19422 goto yyreduce;
19423 }
19424 - else if (yyn == 0)
19425 - goto yyerrlab;
19426
19427 if (yyn == YYFINAL)
19428 YYACCEPT;
19429
19430 /* Shift the lookahead token. */
19431 -
19432 -#if YYDEBUG != 0
19433 - if (yydebug)
19434 - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
19435 -#endif
19436 + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
19437
19438 /* Discard the token being shifted unless it is eof. */
19439 if (yychar != YYEOF)
19440 yychar = YYEMPTY;
19441
19442 *++yyvsp = yylval;
19443 -#ifdef YYLSP_NEEDED
19444 - *++yylsp = yylloc;
19445 -#endif
19446
19447 - /* count tokens shifted since error; after three, turn off error status. */
19448 - if (yyerrstatus) yyerrstatus--;
19449 +
19450 + /* Count tokens shifted since error; after three, turn off error
19451 + status. */
19452 + if (yyerrstatus)
19453 + yyerrstatus--;
19454
19455 yystate = yyn;
19456 goto yynewstate;
19457
19458 -/* Do the default action for the current state. */
19459 -yydefault:
19460
19461 +/*-----------------------------------------------------------.
19462 +| yydefault -- do the default action for the current state. |
19463 +`-----------------------------------------------------------*/
19464 +yydefault:
19465 yyn = yydefact[yystate];
19466 if (yyn == 0)
19467 goto yyerrlab;
19468 + goto yyreduce;
19469
19470 -/* Do a reduction. yyn is the number of a rule to reduce with. */
19471 +
19472 +/*-----------------------------.
19473 +| yyreduce -- Do a reduction. |
19474 +`-----------------------------*/
19475 yyreduce:
19476 + /* yyn is the number of a rule to reduce with. */
19477 yylen = yyr2[yyn];
19478 - if (yylen > 0)
19479 - yyval = yyvsp[1-yylen]; /* implement default value of the action */
19480
19481 -#if YYDEBUG != 0
19482 - if (yydebug)
19483 - {
19484 - int i;
19485 + /* If YYLEN is nonzero, implement the default value of the action:
19486 + `$$ = $1'.
19487
19488 - fprintf (stderr, "Reducing via rule %d (line %d), ",
19489 - yyn, yyrline[yyn]);
19490 + Otherwise, the following line sets YYVAL to garbage.
19491 + This behavior is undocumented and Bison
19492 + users should not rely upon it. Assigning to YYVAL
19493 + unconditionally makes the parser a bit smaller, and it avoids a
19494 + GCC warning that YYVAL may be used uninitialized. */
19495 + yyval = yyvsp[1-yylen];
19496
19497 - /* Print the symbols being reduced, and their result. */
19498 - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
19499 - fprintf (stderr, "%s ", yytname[yyrhs[i]]);
19500 - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
19501 - }
19502 -#endif
19503
19504 -
19505 - switch (yyn) {
19506 -
19507 -case 1:
19508 -#line 165 "ql_y.y"
19509 -{
19510 + YY_REDUCE_PRINT (yyn);
19511 + switch (yyn)
19512 + {
19513 + case 2:
19514 +#line 168 "ql_y.y"
19515 + {
19516 STRUCTURE *walk;
19517
19518 def = yyvsp[0].field;
19519 for (walk = structures; walk; walk = walk->next)
19520 if (!walk->instances)
19521 fprintf(stderr,"unused structure: %s\n",walk->id);
19522 - ;
19523 - break;}
19524 -case 3:
19525 -#line 177 "ql_y.y"
19526 -{
19527 + }
19528 + break;
19529 +
19530 + case 4:
19531 +#line 180 "ql_y.y"
19532 + {
19533 to_c("#%s\n",yyvsp[-1].str);
19534 to_test("#%s\n",yyvsp[-1].str);
19535 if (dump) to_dump("#%s\n",yyvsp[-1].str);
19536 - ;
19537 - break;}
19538 -case 6:
19539 -#line 190 "ql_y.y"
19540 -{
19541 + }
19542 + break;
19543 +
19544 + case 7:
19545 +#line 193 "ql_y.y"
19546 + {
19547 STRUCTURE *n;
19548
19549 n = alloc_t(STRUCTURE);
19550 @@ -907,23 +1236,26 @@
19551 n->instances = 0;
19552 n->next = structures;
19553 structures = n;
19554 - ;
19555 - break;}
19556 -case 7:
19557 -#line 203 "ql_y.y"
19558 -{
19559 + }
19560 + break;
19561 +
19562 + case 8:
19563 +#line 206 "ql_y.y"
19564 + {
19565 abort_id = NULL;
19566 - ;
19567 - break;}
19568 -case 8:
19569 -#line 207 "ql_y.y"
19570 -{
19571 + }
19572 + break;
19573 +
19574 + case 9:
19575 +#line 210 "ql_y.y"
19576 + {
19577 yyval.field = yyvsp[0].field;
19578 - ;
19579 - break;}
19580 -case 9:
19581 -#line 214 "ql_y.y"
19582 -{
19583 + }
19584 + break;
19585 +
19586 + case 10:
19587 +#line 217 "ql_y.y"
19588 + {
19589 STRUCTURE *walk;
19590
19591 for (walk = structures; walk; walk = walk->next)
19592 @@ -939,38 +1271,43 @@
19593 yyval.field->my_block = copy_block(walk->block);
19594 yyval.field->next = NULL;
19595 abort_id = NULL;
19596 - ;
19597 - break;}
19598 -case 10:
19599 -#line 232 "ql_y.y"
19600 -{
19601 + }
19602 + break;
19603 +
19604 + case 11:
19605 +#line 235 "ql_y.y"
19606 + {
19607 yyval.field = yyvsp[-1].field;
19608 abort_id = NULL;
19609 - ;
19610 - break;}
19611 -case 11:
19612 -#line 237 "ql_y.y"
19613 -{
19614 + }
19615 + break;
19616 +
19617 + case 12:
19618 +#line 240 "ql_y.y"
19619 + {
19620 yyval.field = NULL;
19621 abort_id = yyvsp[0].str;
19622 - ;
19623 - break;}
19624 -case 12:
19625 -#line 244 "ql_y.y"
19626 -{
19627 + }
19628 + break;
19629 +
19630 + case 13:
19631 +#line 247 "ql_y.y"
19632 + {
19633 yyval.field = NULL;
19634 - ;
19635 - break;}
19636 -case 13:
19637 -#line 248 "ql_y.y"
19638 -{
19639 + }
19640 + break;
19641 +
19642 + case 14:
19643 +#line 251 "ql_y.y"
19644 + {
19645 yyval.field = yyvsp[-1].field;
19646 yyvsp[-1].field->next = yyvsp[0].field;
19647 - ;
19648 - break;}
19649 -case 14:
19650 -#line 256 "ql_y.y"
19651 -{
19652 + }
19653 + break;
19654 +
19655 + case 15:
19656 +#line 259 "ql_y.y"
19657 + {
19658 TAG *walk;
19659
19660 yyval.field = yyvsp[0].field;
19661 @@ -989,23 +1326,26 @@
19662 "selections");
19663 if (*yyval.field->id != '_' && yyval.field->value && yyval.field->value->type == vt_multi)
19664 yyerror("multi selectors must be unnamed");
19665 - ;
19666 - break;}
19667 -case 15:
19668 -#line 279 "ql_y.y"
19669 -{
19670 + }
19671 + break;
19672 +
19673 + case 16:
19674 +#line 282 "ql_y.y"
19675 + {
19676 yyval.num = 0;
19677 - ;
19678 - break;}
19679 -case 16:
19680 -#line 283 "ql_y.y"
19681 -{
19682 + }
19683 + break;
19684 +
19685 + case 17:
19686 +#line 286 "ql_y.y"
19687 + {
19688 yyval.num = 1;
19689 - ;
19690 - break;}
19691 -case 17:
19692 -#line 290 "ql_y.y"
19693 -{
19694 + }
19695 + break;
19696 +
19697 + case 18:
19698 +#line 293 "ql_y.y"
19699 + {
19700 yyval.field = alloc_t(FIELD);
19701 yyval.field->size = yyvsp[-1].num;
19702 yyval.field->var_len = -2; /* hack */
19703 @@ -1015,140 +1355,159 @@
19704 yyval.field->value = NULL;
19705 yyval.field->structure = NULL;
19706 yyval.field->next = NULL;
19707 - ;
19708 - break;}
19709 -case 18:
19710 -#line 302 "ql_y.y"
19711 -{
19712 + }
19713 + break;
19714 +
19715 + case 19:
19716 +#line 305 "ql_y.y"
19717 + {
19718 yyval.field = alloc_t(FIELD);
19719 yyval.field->size = yyvsp[-4].num;
19720 yyval.field->var_len = -1;
19721 yyval.field->pos = yyvsp[-3].num;
19722 yyval.field->flush = !yyvsp[-2].num;
19723 - if (yyval.field->pos == -1)
19724 + if (yyval.field->pos == -1) {
19725 if (yyval.field->size & 7)
19726 yyerror("position required for small fields");
19727 else yyval.field->pos = 0;
19728 + }
19729 yyval.field->value = yyvsp[0].value;
19730 yyval.field->structure = NULL;
19731 yyval.field->next = NULL;
19732 - ;
19733 - break;}
19734 -case 19:
19735 -#line 319 "ql_y.y"
19736 -{
19737 - yyval.num = -1;
19738 - ;
19739 - break;}
19740 -case 20:
19741 + }
19742 + break;
19743 +
19744 + case 20:
19745 #line 323 "ql_y.y"
19746 -{
19747 + {
19748 + yyval.num = -1;
19749 + }
19750 + break;
19751 +
19752 + case 21:
19753 +#line 327 "ql_y.y"
19754 + {
19755 yyval.num = yyvsp[0].num-1;
19756 if (yyval.num < 0 || yyval.num > 7) yyerror("invalid position");
19757 - ;
19758 - break;}
19759 -case 21:
19760 -#line 331 "ql_y.y"
19761 -{
19762 + }
19763 + break;
19764 +
19765 + case 22:
19766 +#line 335 "ql_y.y"
19767 + {
19768 char *end;
19769
19770 yyval.num = strtoul(yyvsp[0].str,&end,10);
19771 if (*end) yyerror("no a decimal number");
19772 - ;
19773 - break;}
19774 -case 22:
19775 -#line 340 "ql_y.y"
19776 -{
19777 - yyval.num = 0;
19778 - ;
19779 - break;}
19780 -case 23:
19781 + }
19782 + break;
19783 +
19784 + case 23:
19785 #line 344 "ql_y.y"
19786 -{
19787 + {
19788 + yyval.num = 0;
19789 + }
19790 + break;
19791 +
19792 + case 24:
19793 +#line 348 "ql_y.y"
19794 + {
19795 if (strcmp(yyvsp[0].str,"more")) yyerror("\"more\" expected");
19796 yyval.num = 1;
19797 - ;
19798 - break;}
19799 -case 24:
19800 -#line 351 "ql_y.y"
19801 -{
19802 - yyval.value = NULL;
19803 - ;
19804 - break;}
19805 -case 25:
19806 + }
19807 + break;
19808 +
19809 + case 25:
19810 #line 355 "ql_y.y"
19811 -{
19812 + {
19813 + yyval.value = NULL;
19814 + }
19815 + break;
19816 +
19817 + case 26:
19818 +#line 359 "ql_y.y"
19819 + {
19820 yyval.value = yyvsp[0].value;
19821 - ;
19822 - break;}
19823 -case 26:
19824 -#line 362 "ql_y.y"
19825 -{
19826 + }
19827 + break;
19828 +
19829 + case 27:
19830 +#line 366 "ql_y.y"
19831 + {
19832 yyval.value = alloc_t(VALUE);
19833 yyval.value->type = vt_id;
19834 yyval.value->id = yyvsp[0].str;
19835 - ;
19836 - break;}
19837 -case 27:
19838 -#line 368 "ql_y.y"
19839 -{
19840 + }
19841 + break;
19842 +
19843 + case 28:
19844 +#line 372 "ql_y.y"
19845 + {
19846 yyval.value = alloc_t(VALUE);
19847 yyval.value->type = vt_case;
19848 yyval.value->id = NULL;
19849 yyval.value->tags = yyvsp[-1].tag;
19850 - ;
19851 - break;}
19852 -case 28:
19853 -#line 375 "ql_y.y"
19854 -{
19855 + }
19856 + break;
19857 +
19858 + case 29:
19859 +#line 379 "ql_y.y"
19860 + {
19861 yyval.value = alloc_t(VALUE);
19862 yyval.value->type = vt_multi;
19863 yyval.value->tags = yyvsp[-1].tag;
19864 - ;
19865 - break;}
19866 -case 29:
19867 -#line 381 "ql_y.y"
19868 -{
19869 + }
19870 + break;
19871 +
19872 + case 30:
19873 +#line 385 "ql_y.y"
19874 + {
19875 yyval.value = alloc_t(VALUE);
19876 yyval.value->type = vt_length;
19877 yyval.value->recovery = yyvsp[-2].str;
19878 yyval.value->block = yyvsp[0].field;
19879 yyval.value->abort_id = abort_id;
19880 - ;
19881 - break;}
19882 -case 30:
19883 -#line 391 "ql_y.y"
19884 -{
19885 - yyval.str = NULL;
19886 - ;
19887 - break;}
19888 -case 31:
19889 + }
19890 + break;
19891 +
19892 + case 31:
19893 #line 395 "ql_y.y"
19894 -{
19895 + {
19896 + yyval.str = NULL;
19897 + }
19898 + break;
19899 +
19900 + case 32:
19901 +#line 399 "ql_y.y"
19902 + {
19903 yyval.str = yyvsp[0].str;
19904 - ;
19905 - break;}
19906 -case 32:
19907 -#line 401 "ql_y.y"
19908 -{
19909 - yyval.nlist = NULL;
19910 - ;
19911 - break;}
19912 -case 33:
19913 + }
19914 + break;
19915 +
19916 + case 33:
19917 #line 405 "ql_y.y"
19918 -{
19919 + {
19920 + yyval.nlist = NULL;
19921 + }
19922 + break;
19923 +
19924 + case 34:
19925 +#line 409 "ql_y.y"
19926 + {
19927 yyval.nlist = get_name_list(yyvsp[0].str);
19928 - ;
19929 - break;}
19930 -case 34:
19931 -#line 411 "ql_y.y"
19932 -{
19933 - yyval.tag = NULL;
19934 - ;
19935 - break;}
19936 -case 35:
19937 + }
19938 + break;
19939 +
19940 + case 35:
19941 #line 415 "ql_y.y"
19942 -{
19943 + {
19944 + yyval.tag = NULL;
19945 + }
19946 + break;
19947 +
19948 + case 36:
19949 +#line 419 "ql_y.y"
19950 + {
19951 yyval.tag = alloc_t(TAG);
19952 yyval.tag->deflt = 1;
19953 if (yyvsp[-2].str) {
19954 @@ -1163,18 +1522,20 @@
19955 yyval.tag->block = yyvsp[0].field;
19956 yyval.tag->next = NULL;
19957 yyval.tag->abort_id = abort_id;
19958 - ;
19959 - break;}
19960 -case 36:
19961 -#line 432 "ql_y.y"
19962 -{
19963 + }
19964 + break;
19965 +
19966 + case 37:
19967 +#line 436 "ql_y.y"
19968 + {
19969 yyval.tag = alloc_t(TAG);
19970 yyval.tag->abort_id = abort_id;
19971 - ;
19972 - break;}
19973 -case 37:
19974 -#line 437 "ql_y.y"
19975 -{
19976 + }
19977 + break;
19978 +
19979 + case 38:
19980 +#line 441 "ql_y.y"
19981 + {
19982 yyval.tag = yyvsp[-1].tag;
19983 yyval.tag->deflt = 0;
19984 if (yyvsp[-4].str) {
19985 @@ -1188,17 +1549,19 @@
19986 yyval.tag->more = yyvsp[-3].list;
19987 yyval.tag->block = yyvsp[-2].field;
19988 yyval.tag->next = yyvsp[0].tag;
19989 - ;
19990 - break;}
19991 -case 38:
19992 -#line 455 "ql_y.y"
19993 -{
19994 - yyval.tag = NULL;
19995 - ;
19996 - break;}
19997 -case 39:
19998 + }
19999 + break;
20000 +
20001 + case 39:
20002 #line 459 "ql_y.y"
20003 -{
20004 + {
20005 + yyval.tag = NULL;
20006 + }
20007 + break;
20008 +
20009 + case 40:
20010 +#line 463 "ql_y.y"
20011 + {
20012 yyval.tag = alloc_t(TAG);
20013 yyval.tag->deflt = 1;
20014 if (yyvsp[-2].str) {
20015 @@ -1212,18 +1575,20 @@
20016 yyval.tag->more = yyvsp[-1].list;
20017 yyval.tag->block = yyvsp[0].field;
20018 yyval.tag->next = NULL;
20019 - ;
20020 - break;}
20021 -case 40:
20022 -#line 475 "ql_y.y"
20023 -{
20024 + }
20025 + break;
20026 +
20027 + case 41:
20028 +#line 479 "ql_y.y"
20029 + {
20030 yyval.tag = alloc_t(TAG);
20031 yyval.tag->abort_id = abort_id;
20032 - ;
20033 - break;}
20034 -case 41:
20035 -#line 480 "ql_y.y"
20036 -{
20037 + }
20038 + break;
20039 +
20040 + case 42:
20041 +#line 484 "ql_y.y"
20042 + {
20043 yyval.tag = yyvsp[-1].tag;
20044 yyval.tag->deflt = 0;
20045 if (yyvsp[-4].str) {
20046 @@ -1237,254 +1602,266 @@
20047 yyval.tag->more = yyvsp[-3].list;
20048 yyval.tag->block = yyvsp[-2].field;
20049 yyval.tag->next = yyvsp[0].tag;
20050 - ;
20051 - break;}
20052 -case 42:
20053 -#line 498 "ql_y.y"
20054 -{
20055 - yyval.str = NULL;
20056 - ;
20057 - break;}
20058 -case 43:
20059 + }
20060 + break;
20061 +
20062 + case 43:
20063 #line 502 "ql_y.y"
20064 -{
20065 + {
20066 + yyval.str = NULL;
20067 + }
20068 + break;
20069 +
20070 + case 44:
20071 +#line 506 "ql_y.y"
20072 + {
20073 yyval.str = yyvsp[0].str;
20074 - ;
20075 - break;}
20076 -case 44:
20077 -#line 508 "ql_y.y"
20078 -{
20079 - yyval.list = NULL;
20080 - ;
20081 - break;}
20082 -case 45:
20083 + }
20084 + break;
20085 +
20086 + case 45:
20087 #line 512 "ql_y.y"
20088 -{
20089 + {
20090 + yyval.list = NULL;
20091 + }
20092 + break;
20093 +
20094 + case 46:
20095 +#line 516 "ql_y.y"
20096 + {
20097 yyval.list = alloc_t(VALUE_LIST);
20098 yyval.list->value = yyvsp[-1].str;
20099 yyval.list->next = yyvsp[0].list;
20100 - ;
20101 - break;}
20102 -}
20103 - /* the action file gets copied in in place of this dollarsign */
20104 -#line 543 "/usr/lib/bison.simple"
20105 + }
20106 + break;
20107 +
20108 +
20109 + }
20110 +
20111 +/* Line 1010 of yacc.c. */
20112 +#line 1643 "y.tab.c"
20113 \f
20114 yyvsp -= yylen;
20115 yyssp -= yylen;
20116 -#ifdef YYLSP_NEEDED
20117 - yylsp -= yylen;
20118 -#endif
20119
20120 -#if YYDEBUG != 0
20121 - if (yydebug)
20122 - {
20123 - short *ssp1 = yyss - 1;
20124 - fprintf (stderr, "state stack now");
20125 - while (ssp1 != yyssp)
20126 - fprintf (stderr, " %d", *++ssp1);
20127 - fprintf (stderr, "\n");
20128 - }
20129 -#endif
20130 +
20131 + YY_STACK_PRINT (yyss, yyssp);
20132
20133 *++yyvsp = yyval;
20134
20135 -#ifdef YYLSP_NEEDED
20136 - yylsp++;
20137 - if (yylen == 0)
20138 - {
20139 - yylsp->first_line = yylloc.first_line;
20140 - yylsp->first_column = yylloc.first_column;
20141 - yylsp->last_line = (yylsp-1)->last_line;
20142 - yylsp->last_column = (yylsp-1)->last_column;
20143 - yylsp->text = 0;
20144 - }
20145 - else
20146 - {
20147 - yylsp->last_line = (yylsp+yylen-1)->last_line;
20148 - yylsp->last_column = (yylsp+yylen-1)->last_column;
20149 - }
20150 -#endif
20151
20152 - /* Now "shift" the result of the reduction.
20153 - Determine what state that goes to,
20154 - based on the state we popped back to
20155 - and the rule number reduced by. */
20156 + /* Now `shift' the result of the reduction. Determine what state
20157 + that goes to, based on the state we popped back to and the rule
20158 + number reduced by. */
20159
20160 yyn = yyr1[yyn];
20161
20162 - yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
20163 - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
20164 + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
20165 + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
20166 yystate = yytable[yystate];
20167 else
20168 - yystate = yydefgoto[yyn - YYNTBASE];
20169 + yystate = yydefgoto[yyn - YYNTOKENS];
20170
20171 goto yynewstate;
20172
20173 -yyerrlab: /* here on detecting error */
20174
20175 - if (! yyerrstatus)
20176 - /* If not already recovering from an error, report this error. */
20177 +/*------------------------------------.
20178 +| yyerrlab -- here on detecting error |
20179 +`------------------------------------*/
20180 +yyerrlab:
20181 + /* If not already recovering from an error, report this error. */
20182 + if (!yyerrstatus)
20183 {
20184 ++yynerrs;
20185 -
20186 -#ifdef YYERROR_VERBOSE
20187 +#if YYERROR_VERBOSE
20188 yyn = yypact[yystate];
20189
20190 - if (yyn > YYFLAG && yyn < YYLAST)
20191 + if (YYPACT_NINF < yyn && yyn < YYLAST)
20192 {
20193 - int size = 0;
20194 - char *msg;
20195 - int x, count;
20196 -
20197 - count = 0;
20198 - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
20199 - for (x = (yyn < 0 ? -yyn : 0);
20200 - x < (sizeof(yytname) / sizeof(char *)); x++)
20201 - if (yycheck[x + yyn] == x)
20202 - size += strlen(yytname[x]) + 15, count++;
20203 - msg = (char *) malloc(size + 15);
20204 - if (msg != 0)
20205 + YYSIZE_T yysize = 0;
20206 + int yytype = YYTRANSLATE (yychar);
20207 + const char* yyprefix;
20208 + char *yymsg;
20209 + int yyx;
20210 +
20211 + /* Start YYX at -YYN if negative to avoid negative indexes in
20212 + YYCHECK. */
20213 + int yyxbegin = yyn < 0 ? -yyn : 0;
20214 +
20215 + /* Stay within bounds of both yycheck and yytname. */
20216 + int yychecklim = YYLAST - yyn;
20217 + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
20218 + int yycount = 0;
20219 +
20220 + yyprefix = ", expecting ";
20221 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
20222 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
20223 + {
20224 + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
20225 + yycount += 1;
20226 + if (yycount == 5)
20227 + {
20228 + yysize = 0;
20229 + break;
20230 + }
20231 + }
20232 + yysize += (sizeof ("syntax error, unexpected ")
20233 + + yystrlen (yytname[yytype]));
20234 + yymsg = (char *) YYSTACK_ALLOC (yysize);
20235 + if (yymsg != 0)
20236 {
20237 - strcpy(msg, "parse error");
20238 + char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
20239 + yyp = yystpcpy (yyp, yytname[yytype]);
20240
20241 - if (count < 5)
20242 + if (yycount < 5)
20243 {
20244 - count = 0;
20245 - for (x = (yyn < 0 ? -yyn : 0);
20246 - x < (sizeof(yytname) / sizeof(char *)); x++)
20247 - if (yycheck[x + yyn] == x)
20248 + yyprefix = ", expecting ";
20249 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
20250 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
20251 {
20252 - strcat(msg, count == 0 ? ", expecting `" : " or `");
20253 - strcat(msg, yytname[x]);
20254 - strcat(msg, "'");
20255 - count++;
20256 + yyp = yystpcpy (yyp, yyprefix);
20257 + yyp = yystpcpy (yyp, yytname[yyx]);
20258 + yyprefix = " or ";
20259 }
20260 }
20261 - yyerror(msg);
20262 - free(msg);
20263 + yyerror (yymsg);
20264 + YYSTACK_FREE (yymsg);
20265 }
20266 else
20267 - yyerror ("parse error; also virtual memory exceeded");
20268 + yyerror ("syntax error; also virtual memory exhausted");
20269 }
20270 else
20271 #endif /* YYERROR_VERBOSE */
20272 - yyerror("parse error");
20273 + yyerror ("syntax error");
20274 }
20275
20276 - goto yyerrlab1;
20277 -yyerrlab1: /* here on error raised explicitly by an action */
20278 +
20279
20280 if (yyerrstatus == 3)
20281 {
20282 - /* if just tried and failed to reuse lookahead token after an error, discard it. */
20283 + /* If just tried and failed to reuse lookahead token after an
20284 + error, discard it. */
20285
20286 - /* return failure if at end of input */
20287 - if (yychar == YYEOF)
20288 - YYABORT;
20289 -
20290 -#if YYDEBUG != 0
20291 - if (yydebug)
20292 - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
20293 -#endif
20294 + if (yychar <= YYEOF)
20295 + {
20296 + /* If at end of input, pop the error token,
20297 + then the rest of the stack, then return failure. */
20298 + if (yychar == YYEOF)
20299 + for (;;)
20300 + {
20301 + YYPOPSTACK;
20302 + if (yyssp == yyss)
20303 + YYABORT;
20304 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
20305 + yydestruct (yystos[*yyssp], yyvsp);
20306 + }
20307 + }
20308 + else
20309 + {
20310 + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
20311 + yydestruct (yytoken, &yylval);
20312 + yychar = YYEMPTY;
20313
20314 - yychar = YYEMPTY;
20315 + }
20316 }
20317
20318 - /* Else will try to reuse lookahead token
20319 - after shifting the error token. */
20320 -
20321 - yyerrstatus = 3; /* Each real token shifted decrements this */
20322 + /* Else will try to reuse lookahead token after shifting the error
20323 + token. */
20324 + goto yyerrlab1;
20325
20326 - goto yyerrhandle;
20327
20328 -yyerrdefault: /* current state does not do anything special for the error token. */
20329 +/*---------------------------------------------------.
20330 +| yyerrorlab -- error raised explicitly by YYERROR. |
20331 +`---------------------------------------------------*/
20332 +yyerrorlab:
20333
20334 -#if 0
20335 - /* This is wrong; only states that explicitly want error tokens
20336 - should shift them. */
20337 - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/
20338 - if (yyn) goto yydefault;
20339 +#ifdef __GNUC__
20340 + /* Pacify GCC when the user code never invokes YYERROR and the label
20341 + yyerrorlab therefore never appears in user code. */
20342 + if (0)
20343 + goto yyerrorlab;
20344 #endif
20345
20346 -yyerrpop: /* pop the current state because it cannot handle the error token */
20347 -
20348 - if (yyssp == yyss) YYABORT;
20349 - yyvsp--;
20350 - yystate = *--yyssp;
20351 -#ifdef YYLSP_NEEDED
20352 - yylsp--;
20353 -#endif
20354 + yyvsp -= yylen;
20355 + yyssp -= yylen;
20356 + yystate = *yyssp;
20357 + goto yyerrlab1;
20358
20359 -#if YYDEBUG != 0
20360 - if (yydebug)
20361 - {
20362 - short *ssp1 = yyss - 1;
20363 - fprintf (stderr, "Error: state stack now");
20364 - while (ssp1 != yyssp)
20365 - fprintf (stderr, " %d", *++ssp1);
20366 - fprintf (stderr, "\n");
20367 - }
20368 -#endif
20369
20370 -yyerrhandle:
20371 +/*-------------------------------------------------------------.
20372 +| yyerrlab1 -- common code for both syntax error and YYERROR. |
20373 +`-------------------------------------------------------------*/
20374 +yyerrlab1:
20375 + yyerrstatus = 3; /* Each real token shifted decrements this. */
20376
20377 - yyn = yypact[yystate];
20378 - if (yyn == YYFLAG)
20379 - goto yyerrdefault;
20380 + for (;;)
20381 + {
20382 + yyn = yypact[yystate];
20383 + if (yyn != YYPACT_NINF)
20384 + {
20385 + yyn += YYTERROR;
20386 + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
20387 + {
20388 + yyn = yytable[yyn];
20389 + if (0 < yyn)
20390 + break;
20391 + }
20392 + }
20393
20394 - yyn += YYTERROR;
20395 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
20396 - goto yyerrdefault;
20397 + /* Pop the current state because it cannot handle the error token. */
20398 + if (yyssp == yyss)
20399 + YYABORT;
20400
20401 - yyn = yytable[yyn];
20402 - if (yyn < 0)
20403 - {
20404 - if (yyn == YYFLAG)
20405 - goto yyerrpop;
20406 - yyn = -yyn;
20407 - goto yyreduce;
20408 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
20409 + yydestruct (yystos[yystate], yyvsp);
20410 + YYPOPSTACK;
20411 + yystate = *yyssp;
20412 + YY_STACK_PRINT (yyss, yyssp);
20413 }
20414 - else if (yyn == 0)
20415 - goto yyerrpop;
20416
20417 if (yyn == YYFINAL)
20418 YYACCEPT;
20419
20420 -#if YYDEBUG != 0
20421 - if (yydebug)
20422 - fprintf(stderr, "Shifting error token, ");
20423 -#endif
20424 + YYDPRINTF ((stderr, "Shifting error token, "));
20425
20426 *++yyvsp = yylval;
20427 -#ifdef YYLSP_NEEDED
20428 - *++yylsp = yylloc;
20429 -#endif
20430 +
20431
20432 yystate = yyn;
20433 goto yynewstate;
20434
20435 - yyacceptlab:
20436 - /* YYACCEPT comes here. */
20437 - if (yyfree_stacks)
20438 - {
20439 - free (yyss);
20440 - free (yyvs);
20441 -#ifdef YYLSP_NEEDED
20442 - free (yyls);
20443 -#endif
20444 - }
20445 - return 0;
20446
20447 - yyabortlab:
20448 - /* YYABORT comes here. */
20449 - if (yyfree_stacks)
20450 - {
20451 - free (yyss);
20452 - free (yyvs);
20453 -#ifdef YYLSP_NEEDED
20454 - free (yyls);
20455 +/*-------------------------------------.
20456 +| yyacceptlab -- YYACCEPT comes here. |
20457 +`-------------------------------------*/
20458 +yyacceptlab:
20459 + yyresult = 0;
20460 + goto yyreturn;
20461 +
20462 +/*-----------------------------------.
20463 +| yyabortlab -- YYABORT comes here. |
20464 +`-----------------------------------*/
20465 +yyabortlab:
20466 + yyresult = 1;
20467 + goto yyreturn;
20468 +
20469 +#ifndef yyoverflow
20470 +/*----------------------------------------------.
20471 +| yyoverflowlab -- parser overflow comes here. |
20472 +`----------------------------------------------*/
20473 +yyoverflowlab:
20474 + yyerror ("parser stack overflow");
20475 + yyresult = 2;
20476 + /* Fall through. */
20477 +#endif
20478 +
20479 +yyreturn:
20480 +#ifndef yyoverflow
20481 + if (yyss != yyssa)
20482 + YYSTACK_FREE (yyss);
20483 #endif
20484 - }
20485 - return 1;
20486 + return yyresult;
20487 }
20488 -#line 518 "ql_y.y"
20489 +
20490 +
20491 +
20492 --- linux-atm-2.4.1.orig/src/qgen/ql_y.y
20493 +++ linux-atm-2.4.1/src/qgen/ql_y.y
20494 @@ -17,6 +17,8 @@
20495 #include "qgen.h"
20496 #include "file.h"
20497
20498 +extern void yyerror(const char *s);
20499 +
20500
20501 #define MAX_TOKEN 256
20502 #define DEFAULT_NAMELIST_FILE "default.nl"
20503 @@ -58,9 +60,10 @@
20504 for (walk = strchr(start,0)-1; walk > start && isspace(*walk); walk--)
20505 *walk = 0;
20506 if (*start == ':') {
20507 - if (!(searching = strcmp(start+1,name)))
20508 + if (!(searching = strcmp(start+1,name))) {
20509 if (found) yyerror("multiple entries");
20510 else found = 1;
20511 + }
20512 continue;
20513 }
20514 if (searching) continue;
20515 @@ -305,10 +308,11 @@
20516 $$->var_len = -1;
20517 $$->pos = $2;
20518 $$->flush = !$3;
20519 - if ($$->pos == -1)
20520 + if ($$->pos == -1) {
20521 if ($$->size & 7)
20522 yyerror("position required for small fields");
20523 else $$->pos = 0;
20524 + }
20525 $$->value = $5;
20526 $$->structure = NULL;
20527 $$->next = NULL;
20528 --- linux-atm-2.4.1.orig/src/qgen/ql_l.l
20529 +++ linux-atm-2.4.1/src/qgen/ql_l.l
20530 @@ -68,7 +68,7 @@
20531
20532 %%
20533
20534 -void yyerror(char *s)
20535 +void yyerror(const char *s)
20536 {
20537 fprintf(stderr,"line %d: %s near \"%s\"\n",lineno,s,yytext);
20538 exit(1);
20539 --- linux-atm-2.4.1.orig/src/qgen/qlib.c
20540 +++ linux-atm-2.4.1/src/qgen/qlib.c
20541 @@ -26,14 +26,14 @@
20542 #include "op.h"
20543
20544
20545 -static int debug = 0;
20546 +static int q_debug = 0;
20547
20548
20549 void PREFIX(report)(int severity,const char *msg,...)
20550 {
20551 va_list ap;
20552
20553 - if (!debug && severity > Q_ERROR) return;
20554 + if (!q_debug && severity > Q_ERROR) return;
20555 va_start(ap,msg);
20556 vprintf(msg,ap);
20557 printf("\n");
20558 @@ -836,7 +836,7 @@
20559 Q_DSC dsc;
20560 int len,c;
20561
20562 - debug = argc != 1;
20563 + q_debug = argc != 1;
20564 len = 0;
20565 while (scanf("%x",&c) == 1) msg[len++] = c;
20566 qd_start();
20567 --- linux-atm-2.4.1.orig/src/qgen/qlib.h
20568 +++ linux-atm-2.4.1/src/qgen/qlib.h
20569 @@ -23,7 +23,9 @@
20570 #define Q_FATAL -1
20571
20572
20573 +#ifndef DUMP_MODE
20574 extern int q_dump;
20575 +#endif
20576 extern void q_report(int severity,const char *msg,...);
20577
20578 #ifdef DUMP_MODE
20579 --- linux-atm-2.4.1.orig/src/qgen/ql_y.h
20580 +++ linux-atm-2.4.1/src/qgen/ql_y.h
20581 @@ -1,4 +1,65 @@
20582 -typedef union {
20583 +/* A Bison parser, made by GNU Bison 1.875d. */
20584 +
20585 +/* Skeleton parser for Yacc-like parsing with Bison,
20586 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
20587 +
20588 + This program is free software; you can redistribute it and/or modify
20589 + it under the terms of the GNU General Public License as published by
20590 + the Free Software Foundation; either version 2, or (at your option)
20591 + any later version.
20592 +
20593 + This program is distributed in the hope that it will be useful,
20594 + but WITHOUT ANY WARRANTY; without even the implied warranty of
20595 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20596 + GNU General Public License for more details.
20597 +
20598 + You should have received a copy of the GNU General Public License
20599 + along with this program; if not, write to the Free Software
20600 + Foundation, Inc., 59 Temple Place - Suite 330,
20601 + Boston, MA 02111-1307, USA. */
20602 +
20603 +/* As a special exception, when this file is copied by Bison into a
20604 + Bison output file, you may use that output file without restriction.
20605 + This special exception was added by the Free Software Foundation
20606 + in version 1.24 of Bison. */
20607 +
20608 +/* Tokens. */
20609 +#ifndef YYTOKENTYPE
20610 +# define YYTOKENTYPE
20611 + /* Put the tokens into the symbol table, so that GDB and other debuggers
20612 + know about them. */
20613 + enum yytokentype {
20614 + TOK_BREAK = 258,
20615 + TOK_CASE = 259,
20616 + TOK_DEF = 260,
20617 + TOK_DEFAULT = 261,
20618 + TOK_LENGTH = 262,
20619 + TOK_MULTI = 263,
20620 + TOK_RECOVER = 264,
20621 + TOK_ABORT = 265,
20622 + TOK_ID = 266,
20623 + TOK_INCLUDE = 267,
20624 + TOK_STRING = 268
20625 + };
20626 +#endif
20627 +#define TOK_BREAK 258
20628 +#define TOK_CASE 259
20629 +#define TOK_DEF 260
20630 +#define TOK_DEFAULT 261
20631 +#define TOK_LENGTH 262
20632 +#define TOK_MULTI 263
20633 +#define TOK_RECOVER 264
20634 +#define TOK_ABORT 265
20635 +#define TOK_ID 266
20636 +#define TOK_INCLUDE 267
20637 +#define TOK_STRING 268
20638 +
20639 +
20640 +
20641 +
20642 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
20643 +#line 142 "ql_y.y"
20644 +typedef union YYSTYPE {
20645 const char *str;
20646 int num;
20647 FIELD *field;
20648 @@ -7,17 +68,14 @@
20649 TAG *tag;
20650 NAME_LIST *nlist;
20651 } YYSTYPE;
20652 -#define TOK_BREAK 257
20653 -#define TOK_CASE 258
20654 -#define TOK_DEF 259
20655 -#define TOK_DEFAULT 260
20656 -#define TOK_LENGTH 261
20657 -#define TOK_MULTI 262
20658 -#define TOK_RECOVER 263
20659 -#define TOK_ABORT 264
20660 -#define TOK_ID 265
20661 -#define TOK_INCLUDE 266
20662 -#define TOK_STRING 267
20663 -
20664 +/* Line 1285 of yacc.c. */
20665 +#line 73 "y.tab.h"
20666 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
20667 +# define YYSTYPE_IS_DECLARED 1
20668 +# define YYSTYPE_IS_TRIVIAL 1
20669 +#endif
20670
20671 extern YYSTYPE yylval;
20672 +
20673 +
20674 +
20675 --- linux-atm-2.4.1.orig/src/qgen/incl.pl
20676 +++ linux-atm-2.4.1/src/qgen/incl.pl
20677 @@ -24,7 +24,7 @@
20678 }
20679 die "no include file specified" unless defined $last;
20680 for (@STD,@USR) {
20681 - next unless defined stat $_."/".$last;
20682 + next unless -e "$_/$last";
20683 print $_."/".$last."\n" || die "print STDOUT: $!";
20684 exit 0;
20685 }
20686 --- linux-atm-2.4.1.orig/src/qgen/msg.fmt
20687 +++ linux-atm-2.4.1/src/qgen/msg.fmt
20688 @@ -53,7 +53,7 @@
20689 ATM_TD_FW_PCR_0 { p##fw_pcr_0 <24> } \
20690 ATM_TD_BW_PCR_0 { p##bw_pcr_0 <24> } \
20691 ATM_TD_FW_PCR_01 { p##fw_pcr_01 <24> } \
20692 - ATM_TD_BW_PCR_01 { p##bw_pcr_01 <24> } \
20693 + ATM_TD_BW_PCR_01 { p##bw_pcr_01 <24> }
20694
20695 #define TRAFFIC_DESCRIPTOR_VBR(p) \
20696 ATM_TD_FW_SCR_0 { p##fw_scr_0 <24> } \
20697 @@ -63,15 +63,15 @@
20698 ATM_TD_FW_MBS_0 { p##fw_mbs_0 <24> } \
20699 ATM_TD_BW_MBS_0 { p##bw_mbs_0 <24> } \
20700 ATM_TD_FW_MBS_01 { p##fw_mbs_01 <24> } \
20701 - ATM_TD_BW_MBS_01 { p##bw_mbs_01 <24> } \
20702 + ATM_TD_BW_MBS_01 { p##bw_mbs_01 <24> }
20703
20704 #define TRAFFIC_DESCRIPTOR_BE(p) \
20705 - ATM_TD_BEST_EFFORT { p##best_effort <0> } \
20706 + ATM_TD_BEST_EFFORT { p##best_effort <0> }
20707
20708 #if defined(UNI40) || defined(DYNAMIC_UNI)
20709 #define TRAFFIC_DESCRIPTOR_ABR(p) \
20710 ATM_TD_FW_MCR_01 { p##fw_mcr_01 <24> } \
20711 - ATM_TD_BW_MCR_01 { p##bw_mcr_01 <24> } \
20712 + ATM_TD_BW_MCR_01 { p##bw_mcr_01 <24> }
20713
20714 #else
20715 #define TRAFFIC_DESCRIPTOR_ABR(p) /* not yet */
20716 --- linux-atm-2.4.1.orig/src/qgen/output
20717 +++ linux-atm-2.4.1/src/qgen/output
20718 @@ -0,0 +1,704 @@
20719 +# 1 "<stdin>"
20720 +# 1 "<built-in>"
20721 +# 1 "<command line>"
20722 +# 1 "<stdin>"
20723 +
20724 +
20725 +
20726 +
20727 +
20728 +# 1 "../../config.h" 1
20729 +# 7 "<stdin>" 2
20730 +
20731 +
20732 +
20733 +
20734 +include "atmsap.h"
20735 +include "uni.h"
20736 +# 26 "<stdin>"
20737 +def ie_aal = {
20738 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
20739 + aal_type <8> = case {
20740 + 5 {
20741 + _id "atm_aalp" <8> = multi {
20742 + ATM_AALP_FW_MAX_SDU {
20743 + fw_max_sdu <16>
20744 + }
20745 + ATM_AALP_BW_MAX_SDU {
20746 + bw_max_sdu <16>
20747 + }
20748 +
20749 + ATM_AALP_AAL_MODE {
20750 + aal_mode <8> # UNI 3.0 only
20751 + }
20752 +
20753 + ATM_AALP_SSCS {
20754 + sscs_type <8>
20755 + }
20756 + }
20757 + }
20758 + }
20759 + }
20760 +}
20761 +# 90 "<stdin>"
20762 +def ie_td = { # UNI 3.0 calls this "User Cell Rate"
20763 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
20764 + _id "atm_td" <8> = multi {
20765 + ATM_TD_FW_PCR_0 { _dummy <0> = length {}fw_pcr_0 <24> } ATM_TD_BW_PCR_0 { _dummy <0> = length {}bw_pcr_0 <24> } ATM_TD_FW_PCR_01 { _dummy <0> = length {}fw_pcr_01 <24> } ATM_TD_BW_PCR_01 { _dummy <0> = length {}bw_pcr_01 <24> } ATM_TD_FW_SCR_0 { _dummy <0> = length {}fw_scr_0 <24> } ATM_TD_BW_SCR_0 { _dummy <0> = length {}bw_scr_0 <24> } ATM_TD_FW_SCR_01 { _dummy <0> = length {}fw_scr_01 <24> } ATM_TD_BW_SCR_01 { _dummy <0> = length {}bw_scr_01 <24> } ATM_TD_FW_MBS_0 { _dummy <0> = length {}fw_mbs_0 <24> } ATM_TD_BW_MBS_0 { _dummy <0> = length {}bw_mbs_0 <24> } ATM_TD_FW_MBS_01 { _dummy <0> = length {}fw_mbs_01 <24> } ATM_TD_BW_MBS_01 { _dummy <0> = length {}bw_mbs_01 <24> } ATM_TD_BEST_EFFORT { _dummy <0> = length {}best_effort <0> }
20766 +# 104 "<stdin>"
20767 + ATM_TD_TM_OPT { # @@@ should this also go into the TD macro ?
20768 +
20769 + fw_fdisc "atm_fd" <1@8,more> = ATM_FD_NO
20770 + bw_fdisc "atm_fd" <1@7,more> = ATM_FD_NO
20771 +
20772 + bw_tag "atm_tag" <1@2,more> = ATM_TAG_NO
20773 + fw_tag "atm_tag" <1@1> = ATM_TAG_NO
20774 + }
20775 + }
20776 + }
20777 +}
20778 +
20779 +
20780 +def ie_bbcap = {
20781 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
20782 + bearer_class "atm_bc" <5@1,more>
20783 + _ext <1@8> = case {
20784 + 0 {
20785 + _ext <1@8,more> = 1
20786 + trans_cap "atm_tc" <7@1>
20787 + }
20788 + default 1 {}
20789 + }
20790 + _ext <1@8,more> = 1
20791 + susc_clip "atm_stc" <2@6,more> = ATM_STC_NO
20792 + upcc "atm_upcc" <2@1> = ATM_UPCC_P2P
20793 + }
20794 +}
20795 +
20796 +
20797 +def ie_bhli = {
20798 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
20799 + _ext <1@8,more> = 1
20800 + hli_type <7@1> = case {
20801 +
20802 +
20803 + 0 { # ISO
20804 + iso_hli <-64>
20805 + }
20806 + 1 { # User Specific
20807 + user_hli <-64>
20808 + }
20809 +
20810 + 2 { # High layer profile - UNI 3.0 only
20811 + hlp <32>
20812 + }
20813 +
20814 + 3 { # Vendor-Specific Application identifier
20815 + hli_oui <24>
20816 + app_id <32>
20817 + }
20818 +
20819 + 4 { # Reference to ITU-T SG 1 B-ISDN Teleservice Recommendation
20820 + tobedefined <8>
20821 + }
20822 +
20823 + }
20824 + }
20825 +}
20826 +
20827 +
20828 +def ie_blli = {
20829 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
20830 + _lid <2@6,more> = multi {
20831 + 1 {
20832 + _ext <1@8,more> = 1
20833 + uil1_proto <5@1>
20834 + }
20835 + 2 {
20836 + uil2_proto "atm_l2" <5@1,more> = case {
20837 + ATM_L2_X25_LL,ATM_L2_X25_ML,ATM_L2_HDLC_ARM,
20838 + ATM_L2_HDLC_NRM,ATM_L2_HDLC_ABM,ATM_L2_Q922,
20839 + ATM_L2_ISO7776 { # CCITT encoding
20840 + _ext <1@8> = case {
20841 + 0 {
20842 + l2_mode "atm_imd" <2@6,more> = ATM_IMD_NORMAL
20843 + q933 <2@1,more> = 0
20844 + _ext <1@8> = case {
20845 + 0 {
20846 + window_size <7@1,more>
20847 + _ext <1@8> = 1
20848 + }
20849 + default 1 {}
20850 + }
20851 + }
20852 + default 1 {}
20853 + }
20854 + }
20855 + ATM_L2_USER { # User specified
20856 + _ext <1@8> = 0
20857 + user_l2 <7@1,more>
20858 + _ext <1@8> = 1
20859 + }
20860 + default ATM_L2_ISO1745,ATM_L2_Q291,ATM_L2_LAPB,
20861 + ATM_L2_ISO8802,ATM_L2_X75 { # No additional data
20862 + _ext <1@8> = 1
20863 + }
20864 + }
20865 + }
20866 + 3 {
20867 + uil3_proto "atm_l3" <5@1,more> = case {
20868 + ATM_L3_X25,ATM_L3_ISO8208,ATM_L3_X223 { # CCITT coding
20869 + _ext <1@8> = case {
20870 + 0 {
20871 + l3_mode "atm_imd" <2@6,more> = ATM_IMD_NORMAL
20872 + _ext <1@8> = case {
20873 + 0 {
20874 + def_pck_size <4@1,more>
20875 + _ext <1@8> = case {
20876 + 0 {
20877 + _ext <1@8> = 1
20878 + pck_win_size <7@1>
20879 + }
20880 + default 1 {}
20881 + }
20882 + }
20883 + default 1 {}
20884 + }
20885 + }
20886 + default 1 {}
20887 + }
20888 + }
20889 +
20890 + ATM_L3_H310 { # ITU-T Rec. H.310
20891 + _ext <1@8> = case {
20892 + 0 {
20893 + term_type "atm_tt" <4@1,more> = ATM_TT_RXTX
20894 + _ext <1@8> = case {
20895 + 0 {
20896 + _ext <1@8,more> = 1
20897 + fw_mpx_cap "atm_mc" <3@4,more> =
20898 + ATM_MC_NONE
20899 + bw_mpx_cap "atm_mc" <3@1> = ATM_MC_NONE
20900 + }
20901 + default 1 {}
20902 + }
20903 + }
20904 + default 1 {}
20905 + }
20906 + }
20907 +
20908 + ATM_L3_TR9577 { # ISO/IEC TR9577
20909 + _ext <1@8> = case {
20910 + 0 {
20911 + _ext <1@8,more> = 0
20912 + ipi_high <7@1> = case {
20913 + 0x40 { # SNAP hack
20914 + _ext <1@8,more> = 1
20915 + _ipi_low <1@7> = case { # ugly
20916 + 0 {
20917 + _ext <1@8,more> = 1
20918 + _snap_id <2@6> = 0
20919 + oui <24>
20920 + pid <16>
20921 + }
20922 + default 1 {}
20923 + }
20924 + }
20925 + default 0x0 { # ugly
20926 + _ext <1@8,more> = 1
20927 + ipi_low <1@7>
20928 + }
20929 + }
20930 + }
20931 + default 1 {}
20932 + }
20933 + }
20934 + ATM_L3_USER { # User specified
20935 + _ext <1@8> = 0
20936 + user_l3 <7@1,more>
20937 + _ext <1@8> = 1
20938 + }
20939 + }
20940 + }
20941 + }
20942 + }
20943 +}
20944 +
20945 +
20946 +def ie_call_state = {
20947 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
20948 + call_state <6@1>
20949 + }
20950 +}
20951 +
20952 +
20953 +def ie_cdpn = {
20954 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
20955 + _ext <1@8,more> = 1
20956 + _plan "atm_np" <4@1,more> = case {
20957 + ATM_NP_E164 {
20958 + _type "atm_ton" <3@5> = ATM_TON_INTRNTNL
20959 + cdpn_e164 <-96>
20960 + }
20961 + ATM_NP_AEA { # ATM Endsystem Address
20962 + _type "atm_ton" <3@5> = ATM_TON_UNKNOWN
20963 + cdpn_esa <-160>
20964 + }
20965 + }
20966 + }
20967 +}
20968 +
20969 +
20970 +def ie_cdps = {
20971 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
20972 + _ext <1@8,more> = 1
20973 +
20974 +
20975 +
20976 +
20977 + cdps_type "atm_sat" <3@5,more> = ATM_SAT_AEA
20978 +
20979 + _oddeven <1@4> = 0
20980 + cdps <-160>
20981 + }
20982 +}
20983 +
20984 +
20985 +def ie_cgpn = { # @@@ extend language to allow same trick as for cdpn
20986 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
20987 + cgpn_plan "atm_np" <4@1,more>
20988 + cgpn_type "atm_ton" <3@5,more>
20989 + _ext <1@8> = case {
20990 + 0 {
20991 + _ext <1@8,more> = 1
20992 + pres_ind "atm_prs" <2@6,more> = ATM_PRS_ALLOW
20993 + scr_ind "atm_scrn" <2@1> = ATM_SCRN_UP_NS
20994 + }
20995 + default 1 {}
20996 + }
20997 + cgpn <-160>
20998 + }
20999 +}
21000 +
21001 +
21002 +def ie_cgps = {
21003 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21004 + _ext <1@8,more> = 1
21005 +
21006 +
21007 +
21008 +
21009 + cgps_type "atm_sat" <3@5,more> = ATM_SAT_AEA
21010 +
21011 + _oddeven <1@4> = 0
21012 + cgps <-160>
21013 + }
21014 +}
21015 +
21016 +
21017 +def ie_cause = {
21018 + _ext <1@8,more> = 1 cause_cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21019 + _ext <1@8,more> = 1
21020 + location "atm_loc" <4@1> = ATM_LOC_USER
21021 + _ext <1@8,more> = 1
21022 + cause "atm_cv" <7@1> = case {
21023 + ATM_CV_UNALLOC,ATM_CV_NO_ROUTE_DEST,ATM_CV_QOS_UNAVAIL { # Note 2
21024 + break
21025 + _ext <1@8,more> = 1
21026 + pu "atm_pu" <1@4,more> = ATM_PU_USER
21027 + na "atm_na" <1@3,more> = ATM_NA_NORMAL
21028 + cond2 "atm_cond" <2@1> = ATM_COND_UNKNOWN
21029 + }
21030 + ATM_CV_CALL_REJ { # Note 3
21031 + break
21032 + _ext <1@8,more> = 1
21033 + cond3 "atm_cond" <2@1,more> = ATM_COND_UNKNOWN
21034 + reason <5@3> = case {
21035 + ATM_RSN_USER {
21036 + user_diag <-216>
21037 + }
21038 + ATM_RSN_IE_MISS,ATM_RSN_IE_INSUFF {
21039 + ie_id3 "atm_ie" <8>
21040 + }
21041 + }
21042 + }
21043 + ATM_CV_NUM_CHANGED { # Note 4
21044 + break
21045 + new_dest <-224> # good luck ...
21046 + }
21047 + ATM_CV_REJ_CLIR { # Note 5
21048 + break
21049 + invalid <8> # not supported
21050 + }
21051 + ATM_CV_ACC_INF_DISC,ATM_CV_INCOMP_DEST,ATM_CV_MAND_IE_MISSING,
21052 + ATM_CV_UNKNOWN_IE,ATM_CV_INVALID_IE { # Note 6
21053 + break
21054 + ie_id6 <-224>
21055 + }
21056 +
21057 + ATM_CV_UCR_UNAVAIL_OLD,ATM_CV_UCR_UNAVAIL_NEW { # Note 8
21058 +
21059 +
21060 +
21061 +
21062 +
21063 +
21064 +
21065 + break
21066 + ucr_id <-224>
21067 + }
21068 + ATM_CV_NO_SUCH_CHAN { # Note 9
21069 + break
21070 + unav_vpci <16>
21071 + unav_vci <16>
21072 + }
21073 + ATM_CV_UNKNOWN_MSG_TYPE,ATM_CV_INCOMP_MSG { # Note 10
21074 + break
21075 + bad_msg_type "atm_msg" <8>
21076 + }
21077 + ATM_CV_TIMER_EXP { # Note 11
21078 + break
21079 + timer <24>
21080 + }
21081 + default 0 {}
21082 + }
21083 + }
21084 +}
21085 +
21086 +
21087 +def ie_conn_id = {
21088 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21089 + _ext <1@8,more> = 1
21090 + _vp_ass "atm_vpa" <2@4,more> = ATM_VPA_EXPL
21091 + _pref_exc "atm_poe" <3@1> = 0
21092 + vpi <16>
21093 + vci <16>
21094 + }
21095 +}
21096 +
21097 +
21098 +
21099 +
21100 +def ie_e2e_tdl = {
21101 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21102 + _id "atm_tdl" <8> = multi {
21103 + ATM_TDL_CUM {
21104 + cum_delay <16>
21105 + }
21106 + ATM_TDL_E2EMAX {
21107 + max_delay <16>
21108 + }
21109 + ATM_TDL_NGI {}
21110 + }
21111 +
21112 + }
21113 +}
21114 +
21115 +
21116 +
21117 +
21118 +def ie_qos = {
21119 +# 467 "<stdin>"
21120 + _ext <1@8,more> = 1 qos_cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21121 +
21122 + qos_fw <8> = 0
21123 + qos_bw <8> = 0
21124 + }
21125 +}
21126 +
21127 +
21128 +def ie_bbrep = {
21129 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21130 + _ext <1@8,more> = 1
21131 + rep_ind <4@1> = 2
21132 + }
21133 +}
21134 +
21135 +
21136 +def ie_restart = {
21137 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21138 + _ext <1@8,more> = 1
21139 + rst_class <3@1>
21140 + }
21141 +}
21142 +
21143 +
21144 +def ie_bbs_comp = {
21145 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21146 + _ext <1@8,more> = 1
21147 + bbsc_ind <7@1> = 0x21
21148 + }
21149 +}
21150 +
21151 +
21152 +def ie_tns = {
21153 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21154 + _ext <1@8,more> = 1
21155 + _net_type "atm_tni" <3@5,more> = ATM_TNI_NNI
21156 + _carrier_id "atm_nip" <4@1> = ATM_NIP_CARRIER
21157 + net_id <-32>
21158 + }
21159 +}
21160 +
21161 +
21162 +
21163 +
21164 +def ie_notify = {
21165 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21166 + notification <-32> # @@@ how many actually ?
21167 + }
21168 +}
21169 +
21170 +
21171 +def ie_oam_td = {
21172 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21173 + _ext <1@8,more> = 1
21174 + shaping "atm_shi" <2@6,more> = ATM_SHI_NONE
21175 + compliance "atm_oci" <1@5,more> = ATM_OCI_OPT
21176 + fault "atm_unfm" <3@1> = ATM_UNFM_NONE
21177 + _ext <1@8,more> = 1
21178 + fwd_ofi "atm_ofi" <3@5,more> = ATM_OFI_0_0
21179 + bwd_ofi "atm_ofi" <3@1> = ATM_OFI_0_0
21180 + }
21181 +}
21182 +
21183 +
21184 +def ie_git = {
21185 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length { # @@@ UNI 4.0 does not specify the coding
21186 + _dummy <1@8> = 0 # bit is "spare", although not indicated in spec
21187 + id_std_app "atm_irs" <7@1> = case {
21188 + ATM_IRS_DSMCC,ATM_IRS_H245 {
21189 + _type "atm_it" <8> = ATM_IT_SESSION
21190 + _length <8> = length {
21191 + session_id <-160>
21192 + }
21193 + _type "atm_it" <8> = ATM_IT_RESOURCE
21194 + _length <8> = length {
21195 + resource_id <-32>
21196 + }
21197 + }
21198 + default 0 {
21199 + unrecognized_git_identifiers <-224> # 33-5 bytes
21200 + }
21201 + }
21202 + }
21203 +}
21204 +
21205 +
21206 +def ie_lij_id = {
21207 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length { # @@@ UNI 4.0 does not specify the coding
21208 + _ext <1@8,more> = 1
21209 + lij_id_type "atm_lit" <7@1> = ATM_LIT_ROOT
21210 + lij_id <32>
21211 + }
21212 +}
21213 +
21214 +
21215 +def ie_lij_prm = {
21216 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length { # @@@ UNI 4.0 does not specify the coding
21217 + _ext <1@8,more> = 1
21218 + lij_scr_ind "atm_lsi" <2@1>
21219 + }
21220 +}
21221 +
21222 +
21223 +def ie_leaf_sn = {
21224 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length { # @@@ UNI 4.0 does not specify the coding
21225 + leaf_sn <32>
21226 + }
21227 +}
21228 +
21229 +
21230 +def ie_scope_sel = {
21231 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length { # @@@ UNI 4.0 does not specify the coding
21232 + _ext <1@8,more> = 1
21233 + scope_type "atm_tcs" <4@1> = ATM_TCS_ORGANIZATIONAL
21234 + scope_sel "atm_css" <8>
21235 + }
21236 +}
21237 +
21238 +
21239 +def ie_alt_td = {
21240 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21241 + _id "atm_td" <8> = multi {
21242 + ATM_TD_FW_PCR_0 { altfw_pcr_0 <24> } ATM_TD_BW_PCR_0 { altbw_pcr_0 <24> } ATM_TD_FW_PCR_01 { altfw_pcr_01 <24> } ATM_TD_BW_PCR_01 { altbw_pcr_01 <24> } ATM_TD_FW_SCR_0 { altfw_scr_0 <24> } ATM_TD_BW_SCR_0 { altbw_scr_0 <24> } ATM_TD_FW_SCR_01 { altfw_scr_01 <24> } ATM_TD_BW_SCR_01 { altbw_scr_01 <24> } ATM_TD_FW_MBS_0 { altfw_mbs_0 <24> } ATM_TD_BW_MBS_0 { altbw_mbs_0 <24> } ATM_TD_FW_MBS_01 { altfw_mbs_01 <24> } ATM_TD_BW_MBS_01 { altbw_mbs_01 <24> } ATM_TD_BEST_EFFORT { altbest_effort <0> }
21243 + }
21244 + }
21245 +}
21246 +
21247 +
21248 +def ie_min_td = {
21249 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length { # @@@ UNI 4.0 does not specify the coding
21250 + _id "atm_td" <8> = multi {
21251 + ATM_TD_FW_PCR_0 { minfw_pcr_0 <24> } ATM_TD_BW_PCR_0 { minbw_pcr_0 <24> } ATM_TD_FW_PCR_01 { minfw_pcr_01 <24> } ATM_TD_BW_PCR_01 { minbw_pcr_01 <24> }
21252 + ATM_TD_FW_MCR_01 { minfw_mcr_01 <24> } ATM_TD_BW_MCR_01 { minbw_mcr_01 <24> }
21253 + }
21254 + }
21255 +}
21256 +
21257 +
21258 +def ie_eqos = {
21259 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21260 + eqos_origin "atm_eqo" <8>
21261 + _id "atm_eqp" <8> = multi {
21262 + ATM_EQP_ACC_FW_CDV {
21263 + acc_fw_cdv <24>
21264 + }
21265 + ATM_EQP_ACC_BW_CDV {
21266 + acc_bw_cdv <24>
21267 + }
21268 + ATM_EQP_CUM_FW_CDV {
21269 + cum_fw_cdv <24>
21270 + }
21271 + ATM_EQP_CUM_BW_CDV {
21272 + cum_bw_cdv <24>
21273 + }
21274 + ATM_EQP_ACC_FW_CLR {
21275 + acc_fw_clr <8>
21276 + }
21277 + ATM_EQP_ACC_BW_CLR {
21278 + acc_bw_clr <8>
21279 + }
21280 + }
21281 + }
21282 +}
21283 +
21284 +
21285 +def ie_abr_add_prm = {
21286 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21287 + _id "atm_aap" <8> = multi {
21288 + ATM_AAP_FW_REC {
21289 + abr_fw_add_rec <32>
21290 + }
21291 + ATM_AAP_BW_REC {
21292 + abr_bw_add_rec <32>
21293 + }
21294 + }
21295 + }
21296 +}
21297 +
21298 +
21299 +def ie_abr_set_prm = {
21300 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_NET _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length { # @@@ UNI 4.0 does not specify the coding
21301 + _id "atm_asp" <8> = multi {
21302 + ATM_ASP_FW_ICR {
21303 + abr_fw_icr <24>
21304 + }
21305 + ATM_ASP_BW_ICR {
21306 + abr_bw_icr <24>
21307 + }
21308 + ATM_ASP_FW_TBE {
21309 + abr_fw_tbe <24>
21310 + }
21311 + ATM_ASP_BW_TBE {
21312 + abr_bw_tbe <24>
21313 + }
21314 + ATM_ASP_CRF_RTT {
21315 + atm_crf_rtt <24>
21316 + }
21317 + ATM_ASP_FW_RIF {
21318 + atm_fw_rif <8>
21319 + }
21320 + ATM_ASP_BW_RIF {
21321 + atm_bw_rif <8>
21322 + }
21323 + ATM_ASP_FW_RDF {
21324 + atm_fw_rdf <8>
21325 + }
21326 + ATM_ASP_BW_RDF {
21327 + atm_bw_rdf <8>
21328 + }
21329 + }
21330 + }
21331 +}
21332 +
21333 +
21334 +
21335 +
21336 +def ie_ep_ref = {
21337 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21338 + _ep_type <8> = 0
21339 + ep_ref <16>
21340 + }
21341 +}
21342 +
21343 +
21344 +def ie_ep_state = {
21345 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21346 + ep_state <6@1>
21347 + }
21348 +}
21349 +
21350 +
21351 +
21352 +
21353 +def ie_bbrt = {
21354 + _ext <1@8,more> = 1 _cs "q2931_cs" <2@6,more> = Q2931_CS_ITU _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length {
21355 + type_of_report "atm_tor" <8>
21356 + }
21357 +}
21358 +
21359 +
21360 +
21361 +
21362 +{
21363 + _pdsc "q2931_proto" <8> = Q2931_PROTO_DSC
21364 + _cr_len <8> = 3
21365 + call_ref <24>
21366 + msg_type "atm_msg" <8>
21367 + _ext <1@8,more> = 1
21368 + _flag "atm_flag" <1@5,more> = ATM_FLAG_NO
21369 + _action_ind "atm_ai_msg" <2@1> = 0
21370 + msg_len <16> = length {
21371 + _ie_id "atm_ie" <8> = multi {
21372 + aal: ATM_IE_AAL ie_aal
21373 + td: ATM_IE_TD ie_td
21374 + bbcap: ATM_IE_BBCAP ie_bbcap
21375 + bhli: ATM_IE_BHLI ie_bhli
21376 + blli1: ATM_IE_BLLI ie_blli
21377 + blli2: ATM_IE_BLLI ie_blli
21378 + blli3: ATM_IE_BLLI ie_blli
21379 + call_state: ATM_IE_CALL_STATE ie_call_state
21380 + cdpn: ATM_IE_CDPN ie_cdpn
21381 + cdps: ATM_IE_CDPS ie_cdps
21382 + cgpn: ATM_IE_CGPN ie_cgpn
21383 + cgps: ATM_IE_CGPS ie_cgps
21384 + cause: ATM_IE_CAUSE ie_cause
21385 + cause2: ATM_IE_CAUSE ie_cause
21386 + conn_id: ATM_IE_CONN_ID ie_conn_id
21387 +
21388 + e2e_tdl: ATM_IE_E2E_TDL ie_e2e_tdl
21389 +
21390 + qos: ATM_IE_QOS ie_qos
21391 + bbrep: ATM_IE_BBREP ie_bbrep
21392 + restart: ATM_IE_RESTART ie_restart
21393 + bbs_comp: ATM_IE_BBS_COMP ie_bbs_comp
21394 + tns: ATM_IE_TNS ie_tns
21395 +
21396 + notify: ATM_IE_NOTIFY ie_notify
21397 + oam_td: ATM_IE_OAM_TD ie_oam_td
21398 + git: ATM_IE_GIT ie_git
21399 + git2: ATM_IE_GIT ie_git
21400 + git3: ATM_IE_GIT ie_git
21401 + lij_id: ATM_IE_LIJ_ID ie_lij_id
21402 + lij_prm: ATM_IE_LIJ_PRM ie_lij_prm
21403 + leaf_sn: ATM_IE_LEAF_SN ie_leaf_sn
21404 + scope_sel: ATM_IE_SCOPE_SEL ie_scope_sel
21405 + alt_td: ATM_IE_ALT_TD ie_alt_td
21406 + min_td: ATM_IE_MIN_TD ie_min_td
21407 + eqos: ATM_IE_EQOS ie_eqos
21408 + abr_add_prm:ATM_IE_ABR_ADD_PRM ie_abr_add_prm
21409 + abr_set_prm:ATM_IE_ABR_SET_PRM ie_abr_set_prm
21410 +
21411 + ep_ref: ATM_IE_EPR ie_ep_ref
21412 + ep_state: ATM_IE_EP_STATE ie_ep_state
21413 +
21414 + bbrt: ATM_IE_BBRT ie_bbrt
21415 +
21416 + default 0 {
21417 + _ext <1@8,more> = 1 __cs "q2931_cs" <2@6,more> = 0 _flag "atm_flag" <1@5,more> = ATM_FLAG_NO _action_ind "atm_ai_ie" <3@1> = 0 _ie_len <16> = recover RECOV_IND_IE length
21418 + abort RECOV_ASE_UNKNOWN_IE
21419 + }
21420 + }
21421 + }
21422 +}
21423 --- linux-atm-2.4.1.orig/src/saal/Makefile.in
21424 +++ linux-atm-2.4.1/src/saal/Makefile.in
21425 @@ -1,4 +1,4 @@
21426 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
21427 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
21428
21429 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
21430 # This Makefile.in is free software; the Free Software Foundation
21431 @@ -87,8 +87,7 @@
21432
21433 noinst_LIBRARIES = libsaal.a
21434
21435 -libsaal_a_SOURCES = pdu.h queue.h saal.h sscf.h sscop.h pdu.c queue.c saal.c \
21436 - sscf.c sscop.c
21437 +libsaal_a_SOURCES = pdu.h queue.h saal.h sscf.h sscop.h pdu.c queue.c saal.c sscf.c sscop.c
21438
21439 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
21440 CONFIG_HEADER = ../../config.h
21441 @@ -114,8 +113,10 @@
21442
21443 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
21444
21445 -TAR = gtar
21446 +TAR = tar
21447 GZIP_ENV = --best
21448 +DEP_FILES = .deps/pdu.P .deps/queue.P .deps/saal.P .deps/sscf.P \
21449 +.deps/sscop.P
21450 SOURCES = $(libsaal_a_SOURCES)
21451 OBJECTS = $(libsaal_a_OBJECTS)
21452
21453 @@ -123,9 +124,9 @@
21454 .SUFFIXES:
21455 .SUFFIXES: .S .c .lo .o .obj .s
21456 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
21457 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/saal/Makefile
21458 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/saal/Makefile
21459
21460 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
21461 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
21462 cd $(top_builddir) \
21463 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
21464
21465 @@ -139,9 +140,6 @@
21466
21467 maintainer-clean-noinstLIBRARIES:
21468
21469 -.c.o:
21470 - $(COMPILE) -c $<
21471 -
21472 # FIXME: We should only use cygpath when building on Windows,
21473 # and only if it is available.
21474 .c.obj:
21475 @@ -164,9 +162,6 @@
21476
21477 maintainer-clean-compile:
21478
21479 -.c.lo:
21480 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
21481 -
21482 .s.lo:
21483 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
21484
21485 @@ -206,7 +201,7 @@
21486 awk ' { files[$$0] = 1; } \
21487 END { for (i in files) print i; }'`; \
21488 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
21489 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
21490 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
21491
21492 mostlyclean-tags:
21493
21494 @@ -222,6 +217,11 @@
21495 subdir = src/saal
21496
21497 distdir: $(DISTFILES)
21498 + here=`cd $(top_builddir) && pwd`; \
21499 + top_distdir=`cd $(top_distdir) && pwd`; \
21500 + distdir=`cd $(distdir) && pwd`; \
21501 + cd $(top_srcdir) \
21502 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/saal/Makefile
21503 @for file in $(DISTFILES); do \
21504 d=$(srcdir); \
21505 if test -d $$d/$$file; then \
21506 @@ -232,20 +232,38 @@
21507 || cp -p $$d/$$file $(distdir)/$$file || :; \
21508 fi; \
21509 done
21510 -pdu.o: pdu.c ../../config.h ../../src/include/stdint.h pdu.h \
21511 - ../../src/include/atmd.h ../../src/include/atm.h
21512 -queue.o: queue.c ../../config.h ../../src/include/atmd.h \
21513 - ../../src/include/stdint.h ../../src/include/atm.h queue.h
21514 -saal.o: saal.c ../../config.h sscop.h ../../src/include/stdint.h \
21515 - ../../src/include/atmd.h ../../src/include/atm.h queue.h saal.h \
21516 - sscf.h
21517 -sscf.o: sscf.c ../../config.h ../../src/include/atmd.h \
21518 - ../../src/include/stdint.h ../../src/include/atm.h sscop.h \
21519 - queue.h sscf.h
21520 -sscop.o: sscop.c ../../config.h ../../src/include/stdint.h \
21521 - ../../src/include/atmd.h ../../src/include/atm.h sscop.h \
21522 - queue.h pdu.h
21523
21524 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
21525 +
21526 +-include $(DEP_FILES)
21527 +
21528 +mostlyclean-depend:
21529 +
21530 +clean-depend:
21531 +
21532 +distclean-depend:
21533 + -rm -rf .deps
21534 +
21535 +maintainer-clean-depend:
21536 +
21537 +%.o: %.c
21538 + @echo '$(COMPILE) -c $<'; \
21539 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
21540 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
21541 + tr ' ' '\012' < .deps/$(*F).pp \
21542 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
21543 + >> .deps/$(*F).P; \
21544 + rm .deps/$(*F).pp
21545 +
21546 +%.lo: %.c
21547 + @echo '$(LTCOMPILE) -c $<'; \
21548 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
21549 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
21550 + < .deps/$(*F).pp > .deps/$(*F).P; \
21551 + tr ' ' '\012' < .deps/$(*F).pp \
21552 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
21553 + >> .deps/$(*F).P; \
21554 + rm -f .deps/$(*F).pp
21555 info-am:
21556 info: info-am
21557 dvi-am:
21558 @@ -282,27 +300,27 @@
21559
21560 maintainer-clean-generic:
21561 mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
21562 - mostlyclean-libtool mostlyclean-tags \
21563 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
21564 mostlyclean-generic
21565
21566 mostlyclean: mostlyclean-am
21567
21568 clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
21569 - clean-generic mostlyclean-am
21570 + clean-depend clean-generic mostlyclean-am
21571
21572 clean: clean-am
21573
21574 distclean-am: distclean-noinstLIBRARIES distclean-compile \
21575 - distclean-libtool distclean-tags distclean-generic \
21576 - clean-am
21577 + distclean-libtool distclean-tags distclean-depend \
21578 + distclean-generic clean-am
21579 -rm -f libtool
21580
21581 distclean: distclean-am
21582
21583 maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
21584 maintainer-clean-compile maintainer-clean-libtool \
21585 - maintainer-clean-tags maintainer-clean-generic \
21586 - distclean-am
21587 + maintainer-clean-tags maintainer-clean-depend \
21588 + maintainer-clean-generic distclean-am
21589 @echo "This command is intended for maintainers to use;"
21590 @echo "it deletes files that may require special tools to rebuild."
21591
21592 @@ -313,12 +331,14 @@
21593 mostlyclean-compile distclean-compile clean-compile \
21594 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
21595 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
21596 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
21597 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
21598 -install-exec install-data-am install-data install-am install \
21599 -uninstall-am uninstall all-redirect all-am all installdirs \
21600 -mostlyclean-generic distclean-generic clean-generic \
21601 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
21602 +distclean-tags clean-tags maintainer-clean-tags distdir \
21603 +mostlyclean-depend distclean-depend clean-depend \
21604 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
21605 +installcheck-am installcheck install-exec-am install-exec \
21606 +install-data-am install-data install-am install uninstall-am uninstall \
21607 +all-redirect all-am all installdirs mostlyclean-generic \
21608 +distclean-generic clean-generic maintainer-clean-generic clean \
21609 +mostlyclean distclean maintainer-clean
21610
21611
21612 # Tell versions [3.59,3.63) of GNU make to not export all variables.
21613 --- linux-atm-2.4.1.orig/src/sigd/Makefile.in
21614 +++ linux-atm-2.4.1/src/sigd/Makefile.in
21615 @@ -1,4 +1,4 @@
21616 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
21617 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
21618
21619 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
21620 # This Makefile.in is free software; the Free Software Foundation
21621 @@ -88,14 +88,9 @@
21622 INCLUDES = -I$(top_builddir)/src/qgen -I$(top_builddir)/src/saal -I.
21623
21624 sbin_PROGRAMS = atmsigd
21625 -atmsigd_SOURCES = atmsigd.c io.c io.h kernel.c proto.c proto.h uni.c \
21626 - sap.c sap.h timeout.c timeout.h trace.c trace.h \
21627 - policy.c policy.h cfg_y.y cfg_l.l
21628 -
21629 -atmsigd_XTRAS = mess.o $(top_builddir)/src/qgen/q.out.o \
21630 - $(top_builddir)/src/qgen/qd.dump.o \
21631 - $(top_builddir)/src/lib/libatm.la \
21632 - $(top_builddir)/src/saal/libsaal.a
21633 +atmsigd_SOURCES = atmsigd.c io.c io.h kernel.c proto.c proto.h uni.c sap.c sap.h timeout.c timeout.h trace.c trace.h policy.c policy.h cfg_y.y cfg_l.l
21634 +
21635 +atmsigd_XTRAS = mess.o $(top_builddir)/src/qgen/q.out.o $(top_builddir)/src/qgen/qd.dump.o $(top_builddir)/src/lib/libatm.la $(top_builddir)/src/saal/libsaal.a
21636
21637 atmsigd_LDADD = $(atmsigd_XTRAS) -lfl
21638 atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
21639 @@ -140,8 +135,11 @@
21640
21641 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
21642
21643 -TAR = gtar
21644 +TAR = tar
21645 GZIP_ENV = --best
21646 +DEP_FILES = .deps/atmsigd.P .deps/cfg_l.P .deps/cfg_y.P .deps/io.P \
21647 +.deps/kernel.P .deps/policy.P .deps/proto.P .deps/sap.P .deps/timeout.P \
21648 +.deps/trace.P .deps/uni.P
21649 SOURCES = $(atmsigd_SOURCES)
21650 OBJECTS = $(atmsigd_OBJECTS)
21651
21652 @@ -149,9 +147,9 @@
21653 .SUFFIXES:
21654 .SUFFIXES: .S .c .l .lo .o .obj .s .y
21655 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
21656 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/sigd/Makefile
21657 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/sigd/Makefile
21658
21659 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
21660 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
21661 cd $(top_builddir) \
21662 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
21663
21664 @@ -181,9 +179,6 @@
21665 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
21666 done
21667
21668 -.c.o:
21669 - $(COMPILE) -c $<
21670 -
21671 # FIXME: We should only use cygpath when building on Windows,
21672 # and only if it is available.
21673 .c.obj:
21674 @@ -206,9 +201,6 @@
21675
21676 maintainer-clean-compile:
21677
21678 -.c.lo:
21679 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
21680 -
21681 .s.lo:
21682 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
21683
21684 @@ -347,7 +339,7 @@
21685 awk ' { files[$$0] = 1; } \
21686 END { for (i in files) print i; }'`; \
21687 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
21688 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
21689 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
21690
21691 mostlyclean-tags:
21692
21693 @@ -363,6 +355,11 @@
21694 subdir = src/sigd
21695
21696 distdir: $(DISTFILES)
21697 + here=`cd $(top_builddir) && pwd`; \
21698 + top_distdir=`cd $(top_distdir) && pwd`; \
21699 + distdir=`cd $(distdir) && pwd`; \
21700 + cd $(top_srcdir) \
21701 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/sigd/Makefile
21702 @for file in $(DISTFILES); do \
21703 d=$(srcdir); \
21704 if test -d $$d/$$file; then \
21705 @@ -373,69 +370,38 @@
21706 || cp -p $$d/$$file $(distdir)/$$file || :; \
21707 fi; \
21708 done
21709 -atmsigd.o: atmsigd.c ../../config.h ../../src/include/atm.h \
21710 - ../../src/include/stdint.h ../../src/include/atmd.h \
21711 - ../../src/qgen/qlib.h io.h proto.h ../../src/include/atmsap.h \
21712 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21713 - ../../src/saal/sscop.h ../../src/saal/queue.h trace.h
21714 -cfg_l.o: cfg_l.c ../../config.h ../../src/include/atm.h \
21715 - ../../src/include/stdint.h cfg_y.h
21716 -cfg_y.o: cfg_y.c ../../config.h ../../src/include/atm.h \
21717 - ../../src/include/stdint.h ../../src/include/atmd.h proto.h \
21718 - ../../src/include/atmsap.h ../../src/saal/saal.h \
21719 - ../../src/saal/sscf.h ../../src/saal/sscop.h \
21720 - ../../src/saal/queue.h io.h trace.h policy.h
21721 -io.o: io.c ../../config.h ../../src/include/atm.h \
21722 - ../../src/include/stdint.h ../../src/include/atmd.h \
21723 - ../../src/qgen/uni.h ../../src/saal/pdu.h proto.h \
21724 - ../../src/include/atmsap.h ../../src/saal/saal.h \
21725 - ../../src/saal/sscf.h ../../src/saal/sscop.h \
21726 - ../../src/saal/queue.h io.h trace.h
21727 -kernel.o: kernel.c ../../config.h ../../src/include/atm.h \
21728 - ../../src/include/stdint.h ../../src/include/atmd.h \
21729 - ../../src/qgen/uni.h ../../src/qgen/qlib.h \
21730 - ../../src/qgen/q.out.h proto.h ../../src/include/atmsap.h \
21731 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21732 - ../../src/saal/sscop.h ../../src/saal/queue.h sap.h io.h \
21733 - policy.h timeout.h
21734 -mess.o: mess.c ../../config.h
21735 -policy.o: policy.c ../../config.h ../../src/include/atm.h \
21736 - ../../src/include/stdint.h ../../src/include/atmd.h proto.h \
21737 - ../../src/include/atmsap.h ../../src/saal/saal.h \
21738 - ../../src/saal/sscf.h ../../src/saal/sscop.h \
21739 - ../../src/saal/queue.h policy.h
21740 -proto.o: proto.c ../../config.h ../../src/include/atmd.h \
21741 - ../../src/include/stdint.h ../../src/include/atm.h \
21742 - ../../src/qgen/uni.h ../../src/qgen/qlib.h \
21743 - ../../src/qgen/q.out.h io.h proto.h ../../src/include/atmsap.h \
21744 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21745 - ../../src/saal/sscop.h ../../src/saal/queue.h sap.h
21746 -sap.o: sap.c ../../config.h ../../src/include/atm.h \
21747 - ../../src/include/stdint.h ../../src/include/atmd.h \
21748 - ../../src/qgen/uni.h ../../src/qgen/qlib.h \
21749 - ../../src/qgen/q.out.h ../../src/qgen/common.h proto.h \
21750 - ../../src/include/atmsap.h ../../src/saal/saal.h \
21751 - ../../src/saal/sscf.h ../../src/saal/sscop.h \
21752 - ../../src/saal/queue.h sap.h
21753 -timeout.o: timeout.c ../../config.h ../../src/include/atm.h \
21754 - ../../src/include/stdint.h ../../src/include/atmd.h \
21755 - ../../src/qgen/uni.h proto.h ../../src/include/atmsap.h \
21756 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21757 - ../../src/saal/sscop.h ../../src/saal/queue.h timeout.h
21758 -trace.o: trace.c ../../config.h ../../src/include/atm.h \
21759 - ../../src/include/stdint.h ../../src/include/atmd.h \
21760 - ../../src/include/atmsap.h trace.h proto.h \
21761 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21762 - ../../src/saal/sscop.h ../../src/saal/queue.h \
21763 - ../../src/qgen/qlib.h
21764 -uni.o: uni.c ../../config.h ../../src/include/atm.h \
21765 - ../../src/include/stdint.h ../../src/include/atmd.h \
21766 - ../../src/qgen/uni.h ../../src/qgen/qlib.h \
21767 - ../../src/qgen/q.out.h proto.h ../../src/include/atmsap.h \
21768 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21769 - ../../src/saal/sscop.h ../../src/saal/queue.h sap.h io.h \
21770 - policy.h timeout.h trace.h
21771
21772 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
21773 +
21774 +-include $(DEP_FILES)
21775 +
21776 +mostlyclean-depend:
21777 +
21778 +clean-depend:
21779 +
21780 +distclean-depend:
21781 + -rm -rf .deps
21782 +
21783 +maintainer-clean-depend:
21784 +
21785 +%.o: %.c
21786 + @echo '$(COMPILE) -c $<'; \
21787 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
21788 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
21789 + tr ' ' '\012' < .deps/$(*F).pp \
21790 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
21791 + >> .deps/$(*F).P; \
21792 + rm .deps/$(*F).pp
21793 +
21794 +%.lo: %.c
21795 + @echo '$(LTCOMPILE) -c $<'; \
21796 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
21797 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
21798 + < .deps/$(*F).pp > .deps/$(*F).P; \
21799 + tr ' ' '\012' < .deps/$(*F).pp \
21800 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
21801 + >> .deps/$(*F).P; \
21802 + rm -f .deps/$(*F).pp
21803 info-am:
21804 info: info-am
21805 dvi-am:
21806 @@ -474,29 +440,29 @@
21807 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
21808
21809 maintainer-clean-generic:
21810 - -test -z "cfg_llcfg_yhcfg_yc" || rm -f cfg_ll cfg_yh cfg_yc
21811 + -test -z "cfg_lccfg_yhcfg_yc" || rm -f cfg_lc cfg_yh cfg_yc
21812 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
21813 - mostlyclean-libtool mostlyclean-tags \
21814 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
21815 mostlyclean-generic
21816
21817 mostlyclean: mostlyclean-am
21818
21819 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
21820 - clean-generic mostlyclean-am
21821 + clean-depend clean-generic mostlyclean-am
21822
21823 clean: clean-am
21824
21825 distclean-am: distclean-sbinPROGRAMS distclean-compile \
21826 - distclean-libtool distclean-tags distclean-generic \
21827 - clean-am
21828 + distclean-libtool distclean-tags distclean-depend \
21829 + distclean-generic clean-am
21830 -rm -f libtool
21831
21832 distclean: distclean-am
21833
21834 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
21835 maintainer-clean-compile maintainer-clean-libtool \
21836 - maintainer-clean-tags maintainer-clean-generic \
21837 - distclean-am
21838 + maintainer-clean-tags maintainer-clean-depend \
21839 + maintainer-clean-generic distclean-am
21840 @echo "This command is intended for maintainers to use;"
21841 @echo "it deletes files that may require special tools to rebuild."
21842
21843 @@ -509,12 +475,14 @@
21844 distclean-libtool clean-libtool maintainer-clean-libtool install-man4 \
21845 uninstall-man4 install-man8 uninstall-man8 install-man uninstall-man \
21846 uninstall-sysconfDATA install-sysconfDATA tags mostlyclean-tags \
21847 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
21848 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
21849 -install-exec install-data-am install-data install-am install \
21850 -uninstall-am uninstall all-redirect all-am all installdirs \
21851 -mostlyclean-generic distclean-generic clean-generic \
21852 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
21853 +distclean-tags clean-tags maintainer-clean-tags distdir \
21854 +mostlyclean-depend distclean-depend clean-depend \
21855 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
21856 +installcheck-am installcheck install-exec-am install-exec \
21857 +install-data-am install-data install-am install uninstall-am uninstall \
21858 +all-redirect all-am all installdirs mostlyclean-generic \
21859 +distclean-generic clean-generic maintainer-clean-generic clean \
21860 +mostlyclean distclean maintainer-clean
21861
21862
21863 mess.c: $(top_builddir)/src/qgen/uni.h mkmess.pl
21864 --- linux-atm-2.4.1.orig/src/sigd/cfg_y.c
21865 +++ linux-atm-2.4.1/src/sigd/cfg_y.c
21866 @@ -1,46 +1,137 @@
21867 +/* A Bison parser, made by GNU Bison 1.875d. */
21868
21869 -/* A Bison parser, made from cfg_y.y
21870 - by GNU Bison version 1.28 */
21871 +/* Skeleton parser for Yacc-like parsing with Bison,
21872 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
21873
21874 -#define YYBISON 1 /* Identify Bison output. */
21875 + This program is free software; you can redistribute it and/or modify
21876 + it under the terms of the GNU General Public License as published by
21877 + the Free Software Foundation; either version 2, or (at your option)
21878 + any later version.
21879
21880 -#define TOK_LEVEL 257
21881 -#define TOK_DEBUG 258
21882 -#define TOK_INFO 259
21883 -#define TOK_WARN 260
21884 -#define TOK_ERROR 261
21885 -#define TOK_FATAL 262
21886 -#define TOK_SIG 263
21887 -#define TOK_UNI30 264
21888 -#define TOK_UNI31 265
21889 -#define TOK_UNI40 266
21890 -#define TOK_Q2963_1 267
21891 -#define TOK_SAAL 268
21892 -#define TOK_VC 269
21893 -#define TOK_IO 270
21894 -#define TOK_MODE 271
21895 -#define TOK_USER 272
21896 -#define TOK_NET 273
21897 -#define TOK_SWITCH 274
21898 -#define TOK_VPCI 275
21899 -#define TOK_ITF 276
21900 -#define TOK_PCR 277
21901 -#define TOK_TRACE 278
21902 -#define TOK_POLICY 279
21903 -#define TOK_ALLOW 280
21904 -#define TOK_REJECT 281
21905 -#define TOK_ENTITY 282
21906 -#define TOK_DEFAULT 283
21907 -#define TOK_NUMBER 284
21908 -#define TOK_MAX_RATE 285
21909 -#define TOK_DUMP_DIR 286
21910 -#define TOK_LOGFILE 287
21911 -#define TOK_QOS 288
21912 -#define TOK_FROM 289
21913 -#define TOK_TO 290
21914 -#define TOK_ROUTE 291
21915 -#define TOK_PVC 292
21916 + This program is distributed in the hope that it will be useful,
21917 + but WITHOUT ANY WARRANTY; without even the implied warranty of
21918 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21919 + GNU General Public License for more details.
21920
21921 + You should have received a copy of the GNU General Public License
21922 + along with this program; if not, write to the Free Software
21923 + Foundation, Inc., 59 Temple Place - Suite 330,
21924 + Boston, MA 02111-1307, USA. */
21925 +
21926 +/* As a special exception, when this file is copied by Bison into a
21927 + Bison output file, you may use that output file without restriction.
21928 + This special exception was added by the Free Software Foundation
21929 + in version 1.24 of Bison. */
21930 +
21931 +/* Written by Richard Stallman by simplifying the original so called
21932 + ``semantic'' parser. */
21933 +
21934 +/* All symbols defined below should begin with yy or YY, to avoid
21935 + infringing on user name space. This should be done even for local
21936 + variables, as they might otherwise be expanded by user macros.
21937 + There are some unavoidable exceptions within include files to
21938 + define necessary library symbols; they are noted "INFRINGES ON
21939 + USER NAME SPACE" below. */
21940 +
21941 +/* Identify Bison output. */
21942 +#define YYBISON 1
21943 +
21944 +/* Skeleton name. */
21945 +#define YYSKELETON_NAME "yacc.c"
21946 +
21947 +/* Pure parsers. */
21948 +#define YYPURE 0
21949 +
21950 +/* Using locations. */
21951 +#define YYLSP_NEEDED 0
21952 +
21953 +
21954 +
21955 +/* Tokens. */
21956 +#ifndef YYTOKENTYPE
21957 +# define YYTOKENTYPE
21958 + /* Put the tokens into the symbol table, so that GDB and other debuggers
21959 + know about them. */
21960 + enum yytokentype {
21961 + TOK_LEVEL = 258,
21962 + TOK_DEBUG = 259,
21963 + TOK_INFO = 260,
21964 + TOK_WARN = 261,
21965 + TOK_ERROR = 262,
21966 + TOK_FATAL = 263,
21967 + TOK_SIG = 264,
21968 + TOK_UNI30 = 265,
21969 + TOK_UNI31 = 266,
21970 + TOK_UNI40 = 267,
21971 + TOK_Q2963_1 = 268,
21972 + TOK_SAAL = 269,
21973 + TOK_VC = 270,
21974 + TOK_IO = 271,
21975 + TOK_MODE = 272,
21976 + TOK_USER = 273,
21977 + TOK_NET = 274,
21978 + TOK_SWITCH = 275,
21979 + TOK_VPCI = 276,
21980 + TOK_ITF = 277,
21981 + TOK_PCR = 278,
21982 + TOK_TRACE = 279,
21983 + TOK_POLICY = 280,
21984 + TOK_ALLOW = 281,
21985 + TOK_REJECT = 282,
21986 + TOK_ENTITY = 283,
21987 + TOK_DEFAULT = 284,
21988 + TOK_NUMBER = 285,
21989 + TOK_MAX_RATE = 286,
21990 + TOK_DUMP_DIR = 287,
21991 + TOK_LOGFILE = 288,
21992 + TOK_QOS = 289,
21993 + TOK_FROM = 290,
21994 + TOK_TO = 291,
21995 + TOK_ROUTE = 292,
21996 + TOK_PVC = 293
21997 + };
21998 +#endif
21999 +#define TOK_LEVEL 258
22000 +#define TOK_DEBUG 259
22001 +#define TOK_INFO 260
22002 +#define TOK_WARN 261
22003 +#define TOK_ERROR 262
22004 +#define TOK_FATAL 263
22005 +#define TOK_SIG 264
22006 +#define TOK_UNI30 265
22007 +#define TOK_UNI31 266
22008 +#define TOK_UNI40 267
22009 +#define TOK_Q2963_1 268
22010 +#define TOK_SAAL 269
22011 +#define TOK_VC 270
22012 +#define TOK_IO 271
22013 +#define TOK_MODE 272
22014 +#define TOK_USER 273
22015 +#define TOK_NET 274
22016 +#define TOK_SWITCH 275
22017 +#define TOK_VPCI 276
22018 +#define TOK_ITF 277
22019 +#define TOK_PCR 278
22020 +#define TOK_TRACE 279
22021 +#define TOK_POLICY 280
22022 +#define TOK_ALLOW 281
22023 +#define TOK_REJECT 282
22024 +#define TOK_ENTITY 283
22025 +#define TOK_DEFAULT 284
22026 +#define TOK_NUMBER 285
22027 +#define TOK_MAX_RATE 286
22028 +#define TOK_DUMP_DIR 287
22029 +#define TOK_LOGFILE 288
22030 +#define TOK_QOS 289
22031 +#define TOK_FROM 290
22032 +#define TOK_TO 291
22033 +#define TOK_ROUTE 292
22034 +#define TOK_PVC 293
22035 +
22036 +
22037 +
22038 +
22039 +/* Copy the first part of user declarations. */
22040 #line 1 "cfg_y.y"
22041
22042 /* cfg.y - configuration language */
22043 @@ -51,6 +142,7 @@
22044 #include <config.h>
22045 #endif
22046
22047 +#include <stdlib.h>
22048 #include <string.h>
22049 #include <ctype.h>
22050 #include <limits.h>
22051 @@ -63,6 +155,8 @@
22052 #include "trace.h"
22053 #include "policy.h"
22054
22055 +extern void yywarn(const char *s);
22056 +extern void yyerror(const char *s);
22057
22058 static RULE *rule;
22059 static SIG_ENTITY *curr_sig = &_entity;
22060 @@ -93,516 +187,830 @@
22061 }
22062
22063
22064 -#line 53 "cfg_y.y"
22065 -typedef union {
22066 +
22067 +/* Enabling traces. */
22068 +#ifndef YYDEBUG
22069 +# define YYDEBUG 0
22070 +#endif
22071 +
22072 +/* Enabling verbose error messages. */
22073 +#ifdef YYERROR_VERBOSE
22074 +# undef YYERROR_VERBOSE
22075 +# define YYERROR_VERBOSE 1
22076 +#else
22077 +# define YYERROR_VERBOSE 0
22078 +#endif
22079 +
22080 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
22081 +#line 56 "cfg_y.y"
22082 +typedef union YYSTYPE {
22083 int num;
22084 char *str;
22085 struct sockaddr_atmpvc pvc;
22086 } YYSTYPE;
22087 -#include <stdio.h>
22088 +/* Line 191 of yacc.c. */
22089 +#line 213 "y.tab.c"
22090 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
22091 +# define YYSTYPE_IS_DECLARED 1
22092 +# define YYSTYPE_IS_TRIVIAL 1
22093 +#endif
22094 +
22095 +
22096 +
22097 +/* Copy the second part of user declarations. */
22098 +
22099 +
22100 +/* Line 214 of yacc.c. */
22101 +#line 225 "y.tab.c"
22102 +
22103 +#if ! defined (yyoverflow) || YYERROR_VERBOSE
22104 +
22105 +# ifndef YYFREE
22106 +# define YYFREE free
22107 +# endif
22108 +# ifndef YYMALLOC
22109 +# define YYMALLOC malloc
22110 +# endif
22111 +
22112 +/* The parser invokes alloca or malloc; define the necessary symbols. */
22113 +
22114 +# ifdef YYSTACK_USE_ALLOCA
22115 +# if YYSTACK_USE_ALLOCA
22116 +# define YYSTACK_ALLOC alloca
22117 +# endif
22118 +# else
22119 +# if defined (alloca) || defined (_ALLOCA_H)
22120 +# define YYSTACK_ALLOC alloca
22121 +# else
22122 +# ifdef __GNUC__
22123 +# define YYSTACK_ALLOC __builtin_alloca
22124 +# endif
22125 +# endif
22126 +# endif
22127 +
22128 +# ifdef YYSTACK_ALLOC
22129 + /* Pacify GCC's `empty if-body' warning. */
22130 +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
22131 +# else
22132 +# if defined (__STDC__) || defined (__cplusplus)
22133 +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
22134 +# define YYSIZE_T size_t
22135 +# endif
22136 +# define YYSTACK_ALLOC YYMALLOC
22137 +# define YYSTACK_FREE YYFREE
22138 +# endif
22139 +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
22140 +
22141 +
22142 +#if (! defined (yyoverflow) \
22143 + && (! defined (__cplusplus) \
22144 + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
22145 +
22146 +/* A type that is properly aligned for any stack member. */
22147 +union yyalloc
22148 +{
22149 + short int yyss;
22150 + YYSTYPE yyvs;
22151 + };
22152 +
22153 +/* The size of the maximum gap between one aligned stack and the next. */
22154 +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
22155 +
22156 +/* The size of an array large to enough to hold all stacks, each with
22157 + N elements. */
22158 +# define YYSTACK_BYTES(N) \
22159 + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
22160 + + YYSTACK_GAP_MAXIMUM)
22161 +
22162 +/* Copy COUNT objects from FROM to TO. The source and destination do
22163 + not overlap. */
22164 +# ifndef YYCOPY
22165 +# if defined (__GNUC__) && 1 < __GNUC__
22166 +# define YYCOPY(To, From, Count) \
22167 + __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
22168 +# else
22169 +# define YYCOPY(To, From, Count) \
22170 + do \
22171 + { \
22172 + register YYSIZE_T yyi; \
22173 + for (yyi = 0; yyi < (Count); yyi++) \
22174 + (To)[yyi] = (From)[yyi]; \
22175 + } \
22176 + while (0)
22177 +# endif
22178 +# endif
22179 +
22180 +/* Relocate STACK from its old location to the new one. The
22181 + local variables YYSIZE and YYSTACKSIZE give the old and new number of
22182 + elements in the stack, and YYPTR gives the new location of the
22183 + stack. Advance YYPTR to a properly aligned location for the next
22184 + stack. */
22185 +# define YYSTACK_RELOCATE(Stack) \
22186 + do \
22187 + { \
22188 + YYSIZE_T yynewbytes; \
22189 + YYCOPY (&yyptr->Stack, Stack, yysize); \
22190 + Stack = &yyptr->Stack; \
22191 + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
22192 + yyptr += yynewbytes / sizeof (*yyptr); \
22193 + } \
22194 + while (0)
22195
22196 -#ifndef __cplusplus
22197 -#ifndef __STDC__
22198 -#define const
22199 -#endif
22200 #endif
22201
22202 +#if defined (__STDC__) || defined (__cplusplus)
22203 + typedef signed char yysigned_char;
22204 +#else
22205 + typedef short int yysigned_char;
22206 +#endif
22207
22208 -
22209 -#define YYFINAL 117
22210 -#define YYFLAG -32768
22211 -#define YYNTBASE 41
22212 -
22213 -#define YYTRANSLATE(x) ((unsigned)(x) <= 292 ? yytranslate[x] : 71)
22214 -
22215 -static const char yytranslate[] = { 0,
22216 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22217 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22218 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22219 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22220 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22221 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22222 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22223 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22224 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22225 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22226 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22227 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22228 - 2, 2, 39, 2, 40, 2, 2, 2, 2, 2,
22229 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22230 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22231 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22232 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22233 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22234 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22235 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22236 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22237 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22238 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22239 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22240 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22241 - 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
22242 - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
22243 - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
22244 - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
22245 - 37, 38
22246 +/* YYFINAL -- State number of the termination state. */
22247 +#define YYFINAL 53
22248 +/* YYLAST -- Last index in YYTABLE. */
22249 +#define YYLAST 108
22250 +
22251 +/* YYNTOKENS -- Number of terminals. */
22252 +#define YYNTOKENS 41
22253 +/* YYNNTS -- Number of nonterminals. */
22254 +#define YYNNTS 31
22255 +/* YYNRULES -- Number of rules. */
22256 +#define YYNRULES 79
22257 +/* YYNRULES -- Number of states. */
22258 +#define YYNSTATES 117
22259 +
22260 +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
22261 +#define YYUNDEFTOK 2
22262 +#define YYMAXUTOK 293
22263 +
22264 +#define YYTRANSLATE(YYX) \
22265 + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
22266 +
22267 +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
22268 +static const unsigned char yytranslate[] =
22269 +{
22270 + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22271 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22272 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22273 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22274 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22275 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22276 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22277 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22278 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22279 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22280 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22281 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22282 + 2, 2, 2, 39, 2, 40, 2, 2, 2, 2,
22283 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22284 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22285 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22286 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22287 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22288 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22289 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22290 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22291 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22292 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22293 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22294 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22295 + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
22296 + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
22297 + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
22298 + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
22299 + 35, 36, 37, 38
22300 };
22301
22302 -#if YYDEBUG != 0
22303 -static const short yyprhs[] = { 0,
22304 - 0, 3, 4, 7, 8, 11, 14, 17, 20, 23,
22305 - 26, 29, 30, 35, 36, 40, 41, 44, 49, 52,
22306 - 54, 56, 58, 60, 62, 66, 67, 70, 72, 76,
22307 - 77, 80, 82, 86, 87, 90, 92, 96, 97, 100,
22308 - 102, 106, 107, 110, 113, 118, 120, 122, 124, 126,
22309 - 128, 131, 134, 137, 140, 143, 145, 147, 150, 152,
22310 - 154, 157, 158, 160, 162, 164, 166, 168, 170, 172,
22311 - 174, 176, 179, 180, 184, 186, 188, 190
22312 +#if YYDEBUG
22313 +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
22314 + YYRHS. */
22315 +static const unsigned char yyprhs[] =
22316 +{
22317 + 0, 0, 3, 6, 7, 10, 11, 14, 17, 20,
22318 + 23, 26, 29, 32, 33, 38, 39, 43, 44, 47,
22319 + 52, 55, 57, 59, 61, 63, 65, 69, 70, 73,
22320 + 75, 79, 80, 83, 85, 89, 90, 93, 95, 99,
22321 + 100, 103, 105, 109, 110, 113, 116, 121, 123, 125,
22322 + 127, 129, 131, 134, 137, 140, 143, 146, 148, 150,
22323 + 153, 155, 157, 160, 161, 163, 165, 167, 169, 171,
22324 + 173, 175, 177, 179, 182, 183, 187, 189, 191, 193
22325 };
22326
22327 -static const short yyrhs[] = { 42,
22328 - 43, 0, 0, 44, 42, 0, 0, 45, 43, 0,
22329 - 3, 65, 0, 9, 50, 0, 14, 52, 0, 16,
22330 - 54, 0, 4, 56, 0, 25, 58, 0, 0, 28,
22331 - 38, 46, 47, 0, 0, 39, 48, 40, 0, 0,
22332 - 49, 48, 0, 21, 30, 22, 30, 0, 17, 66,
22333 - 0, 34, 0, 31, 0, 37, 0, 29, 0, 60,
22334 - 0, 39, 51, 40, 0, 0, 60, 51, 0, 61,
22335 - 0, 39, 53, 40, 0, 0, 61, 53, 0, 62,
22336 - 0, 39, 55, 40, 0, 0, 62, 55, 0, 63,
22337 - 0, 39, 57, 40, 0, 0, 63, 57, 0, 67,
22338 - 0, 39, 59, 40, 0, 0, 67, 59, 0, 3,
22339 - 65, 0, 21, 30, 22, 30, 0, 10, 0, 11,
22340 - 0, 12, 0, 13, 0, 19, 0, 17, 66, 0,
22341 - 3, 65, 0, 3, 65, 0, 15, 38, 0, 23,
22342 - 30, 0, 34, 0, 31, 0, 3, 65, 0, 32,
22343 - 0, 33, 0, 24, 64, 0, 0, 30, 0, 4,
22344 - 0, 5, 0, 6, 0, 7, 0, 8, 0, 18,
22345 - 0, 19, 0, 20, 0, 3, 65, 0, 0, 69,
22346 - 68, 70, 0, 26, 0, 27, 0, 35, 0, 36,
22347 - 0
22348 +/* YYRHS -- A `-1'-separated list of the rules' RHS. */
22349 +static const yysigned_char yyrhs[] =
22350 +{
22351 + 42, 0, -1, 43, 44, -1, -1, 45, 43, -1,
22352 + -1, 46, 44, -1, 3, 66, -1, 9, 51, -1,
22353 + 14, 53, -1, 16, 55, -1, 4, 57, -1, 25,
22354 + 59, -1, -1, 28, 38, 47, 48, -1, -1, 39,
22355 + 49, 40, -1, -1, 50, 49, -1, 21, 30, 22,
22356 + 30, -1, 17, 67, -1, 34, -1, 31, -1, 37,
22357 + -1, 29, -1, 61, -1, 39, 52, 40, -1, -1,
22358 + 61, 52, -1, 62, -1, 39, 54, 40, -1, -1,
22359 + 62, 54, -1, 63, -1, 39, 56, 40, -1, -1,
22360 + 63, 56, -1, 64, -1, 39, 58, 40, -1, -1,
22361 + 64, 58, -1, 68, -1, 39, 60, 40, -1, -1,
22362 + 68, 60, -1, 3, 66, -1, 21, 30, 22, 30,
22363 + -1, 10, -1, 11, -1, 12, -1, 13, -1, 19,
22364 + -1, 17, 67, -1, 3, 66, -1, 3, 66, -1,
22365 + 15, 38, -1, 23, 30, -1, 34, -1, 31, -1,
22366 + 3, 66, -1, 32, -1, 33, -1, 24, 65, -1,
22367 + -1, 30, -1, 4, -1, 5, -1, 6, -1, 7,
22368 + -1, 8, -1, 18, -1, 19, -1, 20, -1, 3,
22369 + 66, -1, -1, 70, 69, 71, -1, 26, -1, 27,
22370 + -1, 35, -1, 36, -1
22371 };
22372
22373 -#endif
22374 -
22375 -#if YYDEBUG != 0
22376 -static const short yyrline[] = { 0,
22377 - 73, 77, 78, 81, 82, 105, 110, 111, 112, 113,
22378 - 114, 117, 138, 140, 141, 144, 145, 148, 153, 154,
22379 - 158, 162, 176, 182, 184, 187, 188, 191, 193, 196,
22380 - 197, 200, 202, 205, 206, 209, 211, 214, 215, 218,
22381 - 220, 223, 224, 227, 234, 238, 247, 256, 265, 274,
22382 - 279, 282, 290, 295, 299, 304, 308, 314, 319, 324,
22383 - 328, 334, 338, 344, 349, 353, 357, 361, 367, 372,
22384 - 376, 382, 387, 393, 395, 400, 406, 412
22385 +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
22386 +static const unsigned short int yyrline[] =
22387 +{
22388 + 0, 77, 77, 80, 81, 84, 85, 109, 113, 114,
22389 + 115, 116, 117, 122, 121, 151, 152, 155, 156, 160,
22390 + 164, 165, 169, 173, 187, 194, 195, 198, 199, 203,
22391 + 204, 207, 208, 212, 213, 216, 217, 221, 222, 225,
22392 + 226, 230, 231, 234, 235, 239, 245, 249, 258, 267,
22393 + 276, 285, 290, 294, 302, 306, 310, 315, 319, 326,
22394 + 330, 335, 339, 346, 349, 356, 360, 364, 368, 372,
22395 + 379, 383, 387, 394, 399, 398, 407, 411, 418, 423
22396 };
22397 #endif
22398
22399 -
22400 -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
22401 -
22402 -static const char * const yytname[] = { "$","error","$undefined.","TOK_LEVEL",
22403 -"TOK_DEBUG","TOK_INFO","TOK_WARN","TOK_ERROR","TOK_FATAL","TOK_SIG","TOK_UNI30",
22404 -"TOK_UNI31","TOK_UNI40","TOK_Q2963_1","TOK_SAAL","TOK_VC","TOK_IO","TOK_MODE",
22405 -"TOK_USER","TOK_NET","TOK_SWITCH","TOK_VPCI","TOK_ITF","TOK_PCR","TOK_TRACE",
22406 -"TOK_POLICY","TOK_ALLOW","TOK_REJECT","TOK_ENTITY","TOK_DEFAULT","TOK_NUMBER",
22407 -"TOK_MAX_RATE","TOK_DUMP_DIR","TOK_LOGFILE","TOK_QOS","TOK_FROM","TOK_TO","TOK_ROUTE",
22408 -"TOK_PVC","'{'","'}'","all","global","local","item","entity","@1","opt_options",
22409 -"options","option","sig","sig_items","saal","saal_items","io","io_items","debug",
22410 -"debug_items","policy","policy_items","sig_item","saal_item","io_item","debug_item",
22411 -"opt_trace_size","level","mode","policy_item","@2","action","direction", NULL
22412 +#if YYDEBUG || YYERROR_VERBOSE
22413 +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
22414 + First, the terminals, then, starting at YYNTOKENS, nonterminals. */
22415 +static const char *const yytname[] =
22416 +{
22417 + "$end", "error", "$undefined", "TOK_LEVEL", "TOK_DEBUG", "TOK_INFO",
22418 + "TOK_WARN", "TOK_ERROR", "TOK_FATAL", "TOK_SIG", "TOK_UNI30",
22419 + "TOK_UNI31", "TOK_UNI40", "TOK_Q2963_1", "TOK_SAAL", "TOK_VC", "TOK_IO",
22420 + "TOK_MODE", "TOK_USER", "TOK_NET", "TOK_SWITCH", "TOK_VPCI", "TOK_ITF",
22421 + "TOK_PCR", "TOK_TRACE", "TOK_POLICY", "TOK_ALLOW", "TOK_REJECT",
22422 + "TOK_ENTITY", "TOK_DEFAULT", "TOK_NUMBER", "TOK_MAX_RATE",
22423 + "TOK_DUMP_DIR", "TOK_LOGFILE", "TOK_QOS", "TOK_FROM", "TOK_TO",
22424 + "TOK_ROUTE", "TOK_PVC", "'{'", "'}'", "$accept", "all", "global",
22425 + "local", "item", "entity", "@1", "opt_options", "options", "option",
22426 + "sig", "sig_items", "saal", "saal_items", "io", "io_items", "debug",
22427 + "debug_items", "policy", "policy_items", "sig_item", "saal_item",
22428 + "io_item", "debug_item", "opt_trace_size", "level", "mode",
22429 + "policy_item", "@2", "action", "direction", 0
22430 };
22431 #endif
22432
22433 -static const short yyr1[] = { 0,
22434 - 41, 42, 42, 43, 43, 44, 44, 44, 44, 44,
22435 - 44, 46, 45, 47, 47, 48, 48, 49, 49, 49,
22436 - 49, 49, 49, 50, 50, 51, 51, 52, 52, 53,
22437 - 53, 54, 54, 55, 55, 56, 56, 57, 57, 58,
22438 - 58, 59, 59, 60, 60, 60, 60, 60, 60, 60,
22439 - 60, 61, 62, 62, 62, 62, 62, 63, 63, 63,
22440 - 63, 64, 64, 65, 65, 65, 65, 65, 66, 66,
22441 - 66, 67, 68, 67, 69, 69, 70, 70
22442 +# ifdef YYPRINT
22443 +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
22444 + token YYLEX-NUM. */
22445 +static const unsigned short int yytoknum[] =
22446 +{
22447 + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
22448 + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
22449 + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
22450 + 285, 286, 287, 288, 289, 290, 291, 292, 293, 123,
22451 + 125
22452 };
22453 +# endif
22454
22455 -static const short yyr2[] = { 0,
22456 - 2, 0, 2, 0, 2, 2, 2, 2, 2, 2,
22457 - 2, 0, 4, 0, 3, 0, 2, 4, 2, 1,
22458 - 1, 1, 1, 1, 3, 0, 2, 1, 3, 0,
22459 - 2, 1, 3, 0, 2, 1, 3, 0, 2, 1,
22460 - 3, 0, 2, 2, 4, 1, 1, 1, 1, 1,
22461 - 2, 2, 2, 2, 2, 1, 1, 2, 1, 1,
22462 - 2, 0, 1, 1, 1, 1, 1, 1, 1, 1,
22463 - 1, 2, 0, 3, 1, 1, 1, 1
22464 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
22465 +static const unsigned char yyr1[] =
22466 +{
22467 + 0, 41, 42, 43, 43, 44, 44, 45, 45, 45,
22468 + 45, 45, 45, 47, 46, 48, 48, 49, 49, 50,
22469 + 50, 50, 50, 50, 50, 51, 51, 52, 52, 53,
22470 + 53, 54, 54, 55, 55, 56, 56, 57, 57, 58,
22471 + 58, 59, 59, 60, 60, 61, 61, 61, 61, 61,
22472 + 61, 61, 61, 62, 63, 63, 63, 63, 63, 64,
22473 + 64, 64, 64, 65, 65, 66, 66, 66, 66, 66,
22474 + 67, 67, 67, 68, 69, 68, 70, 70, 71, 71
22475 };
22476
22477 -static const short yydefact[] = { 2,
22478 - 0, 0, 0, 0, 0, 0, 4, 2, 64, 65,
22479 - 66, 67, 68, 6, 0, 62, 59, 60, 38, 10,
22480 - 36, 0, 46, 47, 48, 49, 0, 50, 0, 26,
22481 - 7, 24, 0, 30, 8, 28, 0, 0, 0, 57,
22482 - 56, 34, 9, 32, 0, 75, 76, 42, 11, 40,
22483 - 73, 0, 1, 4, 3, 58, 63, 61, 0, 38,
22484 - 44, 69, 70, 71, 51, 0, 0, 26, 52, 0,
22485 - 30, 53, 54, 55, 0, 34, 72, 0, 42, 0,
22486 - 12, 5, 37, 39, 0, 25, 27, 29, 31, 33,
22487 - 35, 41, 43, 77, 78, 74, 14, 45, 16, 13,
22488 - 0, 0, 23, 21, 20, 22, 0, 16, 19, 0,
22489 - 15, 17, 0, 18, 0, 0, 0
22490 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
22491 +static const unsigned char yyr2[] =
22492 +{
22493 + 0, 2, 2, 0, 2, 0, 2, 2, 2, 2,
22494 + 2, 2, 2, 0, 4, 0, 3, 0, 2, 4,
22495 + 2, 1, 1, 1, 1, 1, 3, 0, 2, 1,
22496 + 3, 0, 2, 1, 3, 0, 2, 1, 3, 0,
22497 + 2, 1, 3, 0, 2, 2, 4, 1, 1, 1,
22498 + 1, 1, 2, 2, 2, 2, 2, 1, 1, 2,
22499 + 1, 1, 2, 0, 1, 1, 1, 1, 1, 1,
22500 + 1, 1, 1, 2, 0, 3, 1, 1, 1, 1
22501 };
22502
22503 -static const short yydefgoto[] = { 115,
22504 - 7, 53, 8, 54, 97, 100, 107, 108, 31, 67,
22505 - 35, 70, 43, 75, 20, 59, 49, 78, 68, 71,
22506 - 76, 60, 58, 14, 65, 79, 80, 51, 96
22507 +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
22508 + STATE-NUM when YYTABLE doesn't specify something else to do. Zero
22509 + means the default is an error. */
22510 +static const unsigned char yydefact[] =
22511 +{
22512 + 3, 0, 0, 0, 0, 0, 0, 0, 5, 3,
22513 + 65, 66, 67, 68, 69, 7, 0, 63, 60, 61,
22514 + 39, 11, 37, 0, 47, 48, 49, 50, 0, 51,
22515 + 0, 27, 8, 25, 0, 31, 9, 29, 0, 0,
22516 + 0, 58, 57, 35, 10, 33, 0, 76, 77, 43,
22517 + 12, 41, 74, 1, 0, 2, 5, 4, 59, 64,
22518 + 62, 0, 39, 45, 70, 71, 72, 52, 0, 0,
22519 + 27, 53, 0, 31, 54, 55, 56, 0, 35, 73,
22520 + 0, 43, 0, 13, 6, 38, 40, 0, 26, 28,
22521 + 30, 32, 34, 36, 42, 44, 78, 79, 75, 15,
22522 + 46, 17, 14, 0, 0, 24, 22, 21, 23, 0,
22523 + 17, 20, 0, 16, 18, 0, 19
22524 };
22525
22526 -static const short yypact[] = { 52,
22527 - 100, 1, -3, -1, -2, 0, -17, 52,-32768,-32768,
22528 --32768,-32768,-32768,-32768, 100, -18,-32768,-32768, 25,-32768,
22529 --32768, 100,-32768,-32768,-32768,-32768, 60,-32768, -15, 82,
22530 --32768,-32768, 100, 14,-32768,-32768, 100, -19, -10,-32768,
22531 --32768, 20,-32768,-32768, 100,-32768,-32768, 19,-32768,-32768,
22532 --32768, -14,-32768, -17,-32768,-32768,-32768,-32768, -9, 25,
22533 --32768,-32768,-32768,-32768,-32768, 8, 2, 82,-32768, 4,
22534 - 14,-32768,-32768,-32768, 7, 20,-32768, 10, 19, -30,
22535 --32768,-32768,-32768,-32768, 22,-32768,-32768,-32768,-32768,-32768,
22536 --32768,-32768,-32768,-32768,-32768,-32768, 21,-32768, 53,-32768,
22537 - 60, 23,-32768,-32768,-32768,-32768, 24, 53,-32768, 40,
22538 --32768,-32768, 35,-32768, 67, 69,-32768
22539 +/* YYDEFGOTO[NTERM-NUM]. */
22540 +static const yysigned_char yydefgoto[] =
22541 +{
22542 + -1, 7, 8, 55, 9, 56, 99, 102, 109, 110,
22543 + 32, 69, 36, 72, 44, 77, 21, 61, 50, 80,
22544 + 70, 73, 78, 62, 60, 15, 67, 81, 82, 52,
22545 + 98
22546 };
22547
22548 -static const short yypgoto[] = {-32768,
22549 - 64, 27,-32768,-32768,-32768,-32768, -35,-32768,-32768, 15,
22550 --32768, 5,-32768, 12,-32768, 29,-32768, -4, 83, 87,
22551 - 91, 95,-32768, 26, 9, 92,-32768,-32768,-32768
22552 +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
22553 + STATE-NUM. */
22554 +#define YYPACT_NINF -31
22555 +static const yysigned_char yypact[] =
22556 +{
22557 + 53, 69, 1, -3, -1, -2, 0, 11, -16, 53,
22558 + -31, -31, -31, -31, -31, -31, 69, -15, -31, -31,
22559 + 28, -31, -31, 69, -31, -31, -31, -31, 46, -31,
22560 + -13, 80, -31, -31, 69, 16, -31, -31, 69, -18,
22561 + -6, -31, -31, 20, -31, -31, 69, -31, -31, 19,
22562 + -31, -31, -31, -31, -10, -31, -16, -31, -31, -31,
22563 + -31, 2, 28, -31, -31, -31, -31, -31, 8, 4,
22564 + 80, -31, 7, 16, -31, -31, -31, 9, 20, -31,
22565 + 10, 19, -30, -31, -31, -31, -31, 23, -31, -31,
22566 + -31, -31, -31, -31, -31, -31, -31, -31, -31, 31,
22567 + -31, 51, -31, 46, 49, -31, -31, -31, -31, 15,
22568 + 51, -31, 36, -31, -31, 54, -31
22569 };
22570
22571 -
22572 -#define YYLAST 110
22573 -
22574 -
22575 -static const short yytable[] = { 22,
22576 - 37, 33, 45, 15, 94, 95, 23, 24, 25, 26,
22577 - 52, 57, 38, 27, 66, 28, 33, 29, 73, 74,
22578 - 39, 45, 37, 81, 16, 46, 47, 15, 40, 85,
22579 - 83, 41, 17, 18, 38, 30, 42, 34, 48, 19,
22580 - 56, 86, 39, 88, 46, 47, 90, 61, 16, 92,
22581 - 40, 98, 110, 41, 1, 2, 17, 18, 69, 99,
22582 - 3, 113, 72, 111, 114, 4, 116, 5, 117, 101,
22583 - 77, 55, 112, 102, 93, 89, 6, 62, 63, 64,
22584 - 82, 103, 87, 104, 22, 32, 105, 91, 84, 106,
22585 - 36, 23, 24, 25, 26, 44, 21, 50, 27, 0,
22586 - 28, 0, 29, 9, 10, 11, 12, 13, 0, 109
22587 +/* YYPGOTO[NTERM-NUM]. */
22588 +static const yysigned_char yypgoto[] =
22589 +{
22590 + -31, -31, 72, 30, -31, -31, -31, -31, -23, -31,
22591 + -31, 24, -31, 22, -31, 18, -31, 27, -31, 17,
22592 + 97, 98, 99, 101, -31, 25, 3, 102, -31, -31,
22593 + -31
22594 };
22595
22596 -static const short yycheck[] = { 3,
22597 - 3, 3, 3, 3, 35, 36, 10, 11, 12, 13,
22598 - 28, 30, 15, 17, 30, 19, 3, 21, 38, 30,
22599 - 23, 3, 3, 38, 24, 26, 27, 3, 31, 22,
22600 - 40, 34, 32, 33, 15, 39, 39, 39, 39, 39,
22601 - 15, 40, 23, 40, 26, 27, 40, 22, 24, 40,
22602 - 31, 30, 30, 34, 3, 4, 32, 33, 33, 39,
22603 - 9, 22, 37, 40, 30, 14, 0, 16, 0, 17,
22604 - 45, 8, 108, 21, 79, 71, 25, 18, 19, 20,
22605 - 54, 29, 68, 31, 3, 3, 34, 76, 60, 37,
22606 - 4, 10, 11, 12, 13, 5, 2, 6, 17, -1,
22607 - 19, -1, 21, 4, 5, 6, 7, 8, -1, 101
22608 +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
22609 + positive, shift that token. If negative, reduce the rule which
22610 + number is the opposite. If zero, do what YYDEFACT says.
22611 + If YYTABLE_NINF, syntax error. */
22612 +#define YYTABLE_NINF -1
22613 +static const unsigned char yytable[] =
22614 +{
22615 + 23, 38, 34, 46, 16, 96, 97, 24, 25, 26,
22616 + 27, 53, 54, 39, 28, 59, 29, 68, 30, 34,
22617 + 75, 40, 46, 38, 76, 17, 47, 48, 83, 41,
22618 + 87, 16, 42, 18, 19, 39, 31, 43, 35, 49,
22619 + 20, 58, 85, 40, 88, 47, 48, 90, 63, 92,
22620 + 94, 41, 17, 100, 42, 113, 1, 2, 115, 71,
22621 + 18, 19, 3, 74, 64, 65, 66, 4, 103, 5,
22622 + 101, 79, 104, 10, 11, 12, 13, 14, 6, 112,
22623 + 105, 57, 106, 23, 116, 107, 84, 114, 108, 86,
22624 + 24, 25, 26, 27, 89, 91, 93, 28, 95, 29,
22625 + 33, 30, 37, 22, 45, 0, 111, 0, 51
22626 };
22627 -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
22628 -#line 3 "/usr/lib/bison.simple"
22629 -/* This file comes from bison-1.28. */
22630 -
22631 -/* Skeleton output parser for bison,
22632 - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
22633 -
22634 - This program is free software; you can redistribute it and/or modify
22635 - it under the terms of the GNU General Public License as published by
22636 - the Free Software Foundation; either version 2, or (at your option)
22637 - any later version.
22638
22639 - This program is distributed in the hope that it will be useful,
22640 - but WITHOUT ANY WARRANTY; without even the implied warranty of
22641 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22642 - GNU General Public License for more details.
22643 -
22644 - You should have received a copy of the GNU General Public License
22645 - along with this program; if not, write to the Free Software
22646 - Foundation, Inc., 59 Temple Place - Suite 330,
22647 - Boston, MA 02111-1307, USA. */
22648 -
22649 -/* As a special exception, when this file is copied by Bison into a
22650 - Bison output file, you may use that output file without restriction.
22651 - This special exception was added by the Free Software Foundation
22652 - in version 1.24 of Bison. */
22653 +static const yysigned_char yycheck[] =
22654 +{
22655 + 3, 3, 3, 3, 3, 35, 36, 10, 11, 12,
22656 + 13, 0, 28, 15, 17, 30, 19, 30, 21, 3,
22657 + 38, 23, 3, 3, 30, 24, 26, 27, 38, 31,
22658 + 22, 3, 34, 32, 33, 15, 39, 39, 39, 39,
22659 + 39, 16, 40, 23, 40, 26, 27, 40, 23, 40,
22660 + 40, 31, 24, 30, 34, 40, 3, 4, 22, 34,
22661 + 32, 33, 9, 38, 18, 19, 20, 14, 17, 16,
22662 + 39, 46, 21, 4, 5, 6, 7, 8, 25, 30,
22663 + 29, 9, 31, 3, 30, 34, 56, 110, 37, 62,
22664 + 10, 11, 12, 13, 70, 73, 78, 17, 81, 19,
22665 + 3, 21, 4, 2, 5, -1, 103, -1, 6
22666 +};
22667
22668 -/* This is the parser code that is written into each bison parser
22669 - when the %semantic_parser declaration is not specified in the grammar.
22670 - It was written by Richard Stallman by simplifying the hairy parser
22671 - used when %semantic_parser is specified. */
22672 -
22673 -#ifndef YYSTACK_USE_ALLOCA
22674 -#ifdef alloca
22675 -#define YYSTACK_USE_ALLOCA
22676 -#else /* alloca not defined */
22677 -#ifdef __GNUC__
22678 -#define YYSTACK_USE_ALLOCA
22679 -#define alloca __builtin_alloca
22680 -#else /* not GNU C. */
22681 -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
22682 -#define YYSTACK_USE_ALLOCA
22683 -#include <alloca.h>
22684 -#else /* not sparc */
22685 -/* We think this test detects Watcom and Microsoft C. */
22686 -/* This used to test MSDOS, but that is a bad idea
22687 - since that symbol is in the user namespace. */
22688 -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
22689 -#if 0 /* No need for malloc.h, which pollutes the namespace;
22690 - instead, just don't use alloca. */
22691 -#include <malloc.h>
22692 -#endif
22693 -#else /* not MSDOS, or __TURBOC__ */
22694 -#if defined(_AIX)
22695 -/* I don't know what this was needed for, but it pollutes the namespace.
22696 - So I turned it off. rms, 2 May 1997. */
22697 -/* #include <malloc.h> */
22698 - #pragma alloca
22699 -#define YYSTACK_USE_ALLOCA
22700 -#else /* not MSDOS, or __TURBOC__, or _AIX */
22701 -#if 0
22702 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
22703 - and on HPUX 10. Eventually we can turn this on. */
22704 -#define YYSTACK_USE_ALLOCA
22705 -#define alloca __builtin_alloca
22706 -#endif /* __hpux */
22707 -#endif
22708 -#endif /* not _AIX */
22709 -#endif /* not MSDOS, or __TURBOC__ */
22710 -#endif /* not sparc */
22711 -#endif /* not GNU C */
22712 -#endif /* alloca not defined */
22713 -#endif /* YYSTACK_USE_ALLOCA not defined */
22714 +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
22715 + symbol of state STATE-NUM. */
22716 +static const unsigned char yystos[] =
22717 +{
22718 + 0, 3, 4, 9, 14, 16, 25, 42, 43, 45,
22719 + 4, 5, 6, 7, 8, 66, 3, 24, 32, 33,
22720 + 39, 57, 64, 3, 10, 11, 12, 13, 17, 19,
22721 + 21, 39, 51, 61, 3, 39, 53, 62, 3, 15,
22722 + 23, 31, 34, 39, 55, 63, 3, 26, 27, 39,
22723 + 59, 68, 70, 0, 28, 44, 46, 43, 66, 30,
22724 + 65, 58, 64, 66, 18, 19, 20, 67, 30, 52,
22725 + 61, 66, 54, 62, 66, 38, 30, 56, 63, 66,
22726 + 60, 68, 69, 38, 44, 40, 58, 22, 40, 52,
22727 + 40, 54, 40, 56, 40, 60, 35, 36, 71, 47,
22728 + 30, 39, 48, 17, 21, 29, 31, 34, 37, 49,
22729 + 50, 67, 30, 40, 49, 22, 30
22730 +};
22731
22732 -#ifdef YYSTACK_USE_ALLOCA
22733 -#define YYSTACK_ALLOC alloca
22734 -#else
22735 -#define YYSTACK_ALLOC malloc
22736 +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
22737 +# define YYSIZE_T __SIZE_TYPE__
22738 +#endif
22739 +#if ! defined (YYSIZE_T) && defined (size_t)
22740 +# define YYSIZE_T size_t
22741 +#endif
22742 +#if ! defined (YYSIZE_T)
22743 +# if defined (__STDC__) || defined (__cplusplus)
22744 +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
22745 +# define YYSIZE_T size_t
22746 +# endif
22747 +#endif
22748 +#if ! defined (YYSIZE_T)
22749 +# define YYSIZE_T unsigned int
22750 #endif
22751 -
22752 -/* Note: there must be only one dollar sign in this file.
22753 - It is replaced by the list of actions, each action
22754 - as one case of the switch. */
22755
22756 #define yyerrok (yyerrstatus = 0)
22757 #define yyclearin (yychar = YYEMPTY)
22758 -#define YYEMPTY -2
22759 +#define YYEMPTY (-2)
22760 #define YYEOF 0
22761 +
22762 #define YYACCEPT goto yyacceptlab
22763 -#define YYABORT goto yyabortlab
22764 -#define YYERROR goto yyerrlab1
22765 -/* Like YYERROR except do call yyerror.
22766 - This remains here temporarily to ease the
22767 - transition to the new meaning of YYERROR, for GCC.
22768 +#define YYABORT goto yyabortlab
22769 +#define YYERROR goto yyerrorlab
22770 +
22771 +
22772 +/* Like YYERROR except do call yyerror. This remains here temporarily
22773 + to ease the transition to the new meaning of YYERROR, for GCC.
22774 Once GCC version 2 has supplanted version 1, this can go. */
22775 +
22776 #define YYFAIL goto yyerrlab
22777 +
22778 #define YYRECOVERING() (!!yyerrstatus)
22779 -#define YYBACKUP(token, value) \
22780 +
22781 +#define YYBACKUP(Token, Value) \
22782 do \
22783 if (yychar == YYEMPTY && yylen == 1) \
22784 - { yychar = (token), yylval = (value); \
22785 - yychar1 = YYTRANSLATE (yychar); \
22786 + { \
22787 + yychar = (Token); \
22788 + yylval = (Value); \
22789 + yytoken = YYTRANSLATE (yychar); \
22790 YYPOPSTACK; \
22791 goto yybackup; \
22792 } \
22793 else \
22794 - { yyerror ("syntax error: cannot back up"); YYERROR; } \
22795 + { \
22796 + yyerror ("syntax error: cannot back up");\
22797 + YYERROR; \
22798 + } \
22799 while (0)
22800
22801 #define YYTERROR 1
22802 #define YYERRCODE 256
22803
22804 -#ifndef YYPURE
22805 -#define YYLEX yylex()
22806 -#endif
22807 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions
22808 + are run). */
22809
22810 -#ifdef YYPURE
22811 -#ifdef YYLSP_NEEDED
22812 -#ifdef YYLEX_PARAM
22813 -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
22814 -#else
22815 -#define YYLEX yylex(&yylval, &yylloc)
22816 +#ifndef YYLLOC_DEFAULT
22817 +# define YYLLOC_DEFAULT(Current, Rhs, N) \
22818 + ((Current).first_line = (Rhs)[1].first_line, \
22819 + (Current).first_column = (Rhs)[1].first_column, \
22820 + (Current).last_line = (Rhs)[N].last_line, \
22821 + (Current).last_column = (Rhs)[N].last_column)
22822 #endif
22823 -#else /* not YYLSP_NEEDED */
22824 +
22825 +/* YYLEX -- calling `yylex' with the right arguments. */
22826 +
22827 #ifdef YYLEX_PARAM
22828 -#define YYLEX yylex(&yylval, YYLEX_PARAM)
22829 +# define YYLEX yylex (YYLEX_PARAM)
22830 #else
22831 -#define YYLEX yylex(&yylval)
22832 -#endif
22833 -#endif /* not YYLSP_NEEDED */
22834 +# define YYLEX yylex ()
22835 #endif
22836
22837 -/* If nonreentrant, generate the variables here */
22838 +/* Enable debugging if requested. */
22839 +#if YYDEBUG
22840
22841 -#ifndef YYPURE
22842 +# ifndef YYFPRINTF
22843 +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
22844 +# define YYFPRINTF fprintf
22845 +# endif
22846 +
22847 +# define YYDPRINTF(Args) \
22848 +do { \
22849 + if (yydebug) \
22850 + YYFPRINTF Args; \
22851 +} while (0)
22852 +
22853 +# define YYDSYMPRINT(Args) \
22854 +do { \
22855 + if (yydebug) \
22856 + yysymprint Args; \
22857 +} while (0)
22858 +
22859 +# define YYDSYMPRINTF(Title, Token, Value, Location) \
22860 +do { \
22861 + if (yydebug) \
22862 + { \
22863 + YYFPRINTF (stderr, "%s ", Title); \
22864 + yysymprint (stderr, \
22865 + Token, Value); \
22866 + YYFPRINTF (stderr, "\n"); \
22867 + } \
22868 +} while (0)
22869
22870 -int yychar; /* the lookahead symbol */
22871 -YYSTYPE yylval; /* the semantic value of the */
22872 - /* lookahead symbol */
22873 +/*------------------------------------------------------------------.
22874 +| yy_stack_print -- Print the state stack from its BOTTOM up to its |
22875 +| TOP (included). |
22876 +`------------------------------------------------------------------*/
22877
22878 -#ifdef YYLSP_NEEDED
22879 -YYLTYPE yylloc; /* location data for the lookahead */
22880 - /* symbol */
22881 +#if defined (__STDC__) || defined (__cplusplus)
22882 +static void
22883 +yy_stack_print (short int *bottom, short int *top)
22884 +#else
22885 +static void
22886 +yy_stack_print (bottom, top)
22887 + short int *bottom;
22888 + short int *top;
22889 #endif
22890 +{
22891 + YYFPRINTF (stderr, "Stack now");
22892 + for (/* Nothing. */; bottom <= top; ++bottom)
22893 + YYFPRINTF (stderr, " %d", *bottom);
22894 + YYFPRINTF (stderr, "\n");
22895 +}
22896 +
22897 +# define YY_STACK_PRINT(Bottom, Top) \
22898 +do { \
22899 + if (yydebug) \
22900 + yy_stack_print ((Bottom), (Top)); \
22901 +} while (0)
22902
22903 -int yynerrs; /* number of parse errors so far */
22904 -#endif /* not YYPURE */
22905
22906 -#if YYDEBUG != 0
22907 -int yydebug; /* nonzero means print parse trace */
22908 -/* Since this is uninitialized, it does not stop multiple parsers
22909 - from coexisting. */
22910 +/*------------------------------------------------.
22911 +| Report that the YYRULE is going to be reduced. |
22912 +`------------------------------------------------*/
22913 +
22914 +#if defined (__STDC__) || defined (__cplusplus)
22915 +static void
22916 +yy_reduce_print (int yyrule)
22917 +#else
22918 +static void
22919 +yy_reduce_print (yyrule)
22920 + int yyrule;
22921 #endif
22922 +{
22923 + int yyi;
22924 + unsigned int yylno = yyrline[yyrule];
22925 + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
22926 + yyrule - 1, yylno);
22927 + /* Print the symbols being reduced, and their result. */
22928 + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
22929 + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
22930 + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
22931 +}
22932 +
22933 +# define YY_REDUCE_PRINT(Rule) \
22934 +do { \
22935 + if (yydebug) \
22936 + yy_reduce_print (Rule); \
22937 +} while (0)
22938 +
22939 +/* Nonzero means print parse trace. It is left uninitialized so that
22940 + multiple parsers can coexist. */
22941 +int yydebug;
22942 +#else /* !YYDEBUG */
22943 +# define YYDPRINTF(Args)
22944 +# define YYDSYMPRINT(Args)
22945 +# define YYDSYMPRINTF(Title, Token, Value, Location)
22946 +# define YY_STACK_PRINT(Bottom, Top)
22947 +# define YY_REDUCE_PRINT(Rule)
22948 +#endif /* !YYDEBUG */
22949
22950 -/* YYINITDEPTH indicates the initial size of the parser's stacks */
22951
22952 +/* YYINITDEPTH -- initial size of the parser's stacks. */
22953 #ifndef YYINITDEPTH
22954 -#define YYINITDEPTH 200
22955 +# define YYINITDEPTH 200
22956 #endif
22957
22958 -/* YYMAXDEPTH is the maximum size the stacks can grow to
22959 - (effective only if the built-in stack extension method is used). */
22960 +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
22961 + if the built-in stack extension method is used).
22962
22963 -#if YYMAXDEPTH == 0
22964 -#undef YYMAXDEPTH
22965 + Do not make this value too large; the results are undefined if
22966 + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
22967 + evaluated with infinite-precision integer arithmetic. */
22968 +
22969 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
22970 +# undef YYMAXDEPTH
22971 #endif
22972
22973 #ifndef YYMAXDEPTH
22974 -#define YYMAXDEPTH 10000
22975 +# define YYMAXDEPTH 10000
22976 #endif
22977 +
22978 \f
22979 -/* Define __yy_memcpy. Note that the size argument
22980 - should be passed with type unsigned int, because that is what the non-GCC
22981 - definitions require. With GCC, __builtin_memcpy takes an arg
22982 - of type size_t, but it can handle unsigned int. */
22983 -
22984 -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
22985 -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
22986 -#else /* not GNU C or C++ */
22987 -#ifndef __cplusplus
22988
22989 -/* This is the most reliable way to avoid incompatibilities
22990 - in available built-in functions on various systems. */
22991 -static void
22992 -__yy_memcpy (to, from, count)
22993 - char *to;
22994 - char *from;
22995 - unsigned int count;
22996 -{
22997 - register char *f = from;
22998 - register char *t = to;
22999 - register int i = count;
23000 +#if YYERROR_VERBOSE
23001
23002 - while (i-- > 0)
23003 - *t++ = *f++;
23004 +# ifndef yystrlen
23005 +# if defined (__GLIBC__) && defined (_STRING_H)
23006 +# define yystrlen strlen
23007 +# else
23008 +/* Return the length of YYSTR. */
23009 +static YYSIZE_T
23010 +# if defined (__STDC__) || defined (__cplusplus)
23011 +yystrlen (const char *yystr)
23012 +# else
23013 +yystrlen (yystr)
23014 + const char *yystr;
23015 +# endif
23016 +{
23017 + register const char *yys = yystr;
23018 +
23019 + while (*yys++ != '\0')
23020 + continue;
23021 +
23022 + return yys - yystr - 1;
23023 }
23024 +# endif
23025 +# endif
23026
23027 -#else /* __cplusplus */
23028 +# ifndef yystpcpy
23029 +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
23030 +# define yystpcpy stpcpy
23031 +# else
23032 +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
23033 + YYDEST. */
23034 +static char *
23035 +# if defined (__STDC__) || defined (__cplusplus)
23036 +yystpcpy (char *yydest, const char *yysrc)
23037 +# else
23038 +yystpcpy (yydest, yysrc)
23039 + char *yydest;
23040 + const char *yysrc;
23041 +# endif
23042 +{
23043 + register char *yyd = yydest;
23044 + register const char *yys = yysrc;
23045 +
23046 + while ((*yyd++ = *yys++) != '\0')
23047 + continue;
23048 +
23049 + return yyd - 1;
23050 +}
23051 +# endif
23052 +# endif
23053
23054 -/* This is the most reliable way to avoid incompatibilities
23055 - in available built-in functions on various systems. */
23056 +#endif /* !YYERROR_VERBOSE */
23057 +
23058 +\f
23059 +
23060 +#if YYDEBUG
23061 +/*--------------------------------.
23062 +| Print this symbol on YYOUTPUT. |
23063 +`--------------------------------*/
23064 +
23065 +#if defined (__STDC__) || defined (__cplusplus)
23066 static void
23067 -__yy_memcpy (char *to, char *from, unsigned int count)
23068 +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
23069 +#else
23070 +static void
23071 +yysymprint (yyoutput, yytype, yyvaluep)
23072 + FILE *yyoutput;
23073 + int yytype;
23074 + YYSTYPE *yyvaluep;
23075 +#endif
23076 {
23077 - register char *t = to;
23078 - register char *f = from;
23079 - register int i = count;
23080 + /* Pacify ``unused variable'' warnings. */
23081 + (void) yyvaluep;
23082
23083 - while (i-- > 0)
23084 - *t++ = *f++;
23085 + if (yytype < YYNTOKENS)
23086 + {
23087 + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
23088 +# ifdef YYPRINT
23089 + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
23090 +# endif
23091 + }
23092 + else
23093 + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
23094 +
23095 + switch (yytype)
23096 + {
23097 + default:
23098 + break;
23099 + }
23100 + YYFPRINTF (yyoutput, ")");
23101 }
23102
23103 +#endif /* ! YYDEBUG */
23104 +/*-----------------------------------------------.
23105 +| Release the memory associated to this symbol. |
23106 +`-----------------------------------------------*/
23107 +
23108 +#if defined (__STDC__) || defined (__cplusplus)
23109 +static void
23110 +yydestruct (int yytype, YYSTYPE *yyvaluep)
23111 +#else
23112 +static void
23113 +yydestruct (yytype, yyvaluep)
23114 + int yytype;
23115 + YYSTYPE *yyvaluep;
23116 #endif
23117 -#endif
23118 +{
23119 + /* Pacify ``unused variable'' warnings. */
23120 + (void) yyvaluep;
23121 +
23122 + switch (yytype)
23123 + {
23124 +
23125 + default:
23126 + break;
23127 + }
23128 +}
23129 \f
23130 -#line 217 "/usr/lib/bison.simple"
23131
23132 -/* The user can define YYPARSE_PARAM as the name of an argument to be passed
23133 - into yyparse. The argument should have type void *.
23134 - It should actually point to an object.
23135 - Grammar actions can access the variable by casting it
23136 - to the proper pointer type. */
23137 +/* Prevent warnings from -Wmissing-prototypes. */
23138
23139 #ifdef YYPARSE_PARAM
23140 -#ifdef __cplusplus
23141 -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
23142 -#define YYPARSE_PARAM_DECL
23143 -#else /* not __cplusplus */
23144 -#define YYPARSE_PARAM_ARG YYPARSE_PARAM
23145 -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
23146 -#endif /* not __cplusplus */
23147 -#else /* not YYPARSE_PARAM */
23148 -#define YYPARSE_PARAM_ARG
23149 -#define YYPARSE_PARAM_DECL
23150 -#endif /* not YYPARSE_PARAM */
23151 +# if defined (__STDC__) || defined (__cplusplus)
23152 +int yyparse (void *YYPARSE_PARAM);
23153 +# else
23154 +int yyparse ();
23155 +# endif
23156 +#else /* ! YYPARSE_PARAM */
23157 +#if defined (__STDC__) || defined (__cplusplus)
23158 +int yyparse (void);
23159 +#else
23160 +int yyparse ();
23161 +#endif
23162 +#endif /* ! YYPARSE_PARAM */
23163 +
23164 +
23165 +
23166 +/* The lookahead symbol. */
23167 +int yychar;
23168 +
23169 +/* The semantic value of the lookahead symbol. */
23170 +YYSTYPE yylval;
23171 +
23172 +/* Number of syntax errors so far. */
23173 +int yynerrs;
23174 +
23175 +
23176 +
23177 +/*----------.
23178 +| yyparse. |
23179 +`----------*/
23180
23181 -/* Prevent warning if -Wstrict-prototypes. */
23182 -#ifdef __GNUC__
23183 #ifdef YYPARSE_PARAM
23184 -int yyparse (void *);
23185 +# if defined (__STDC__) || defined (__cplusplus)
23186 +int yyparse (void *YYPARSE_PARAM)
23187 +# else
23188 +int yyparse (YYPARSE_PARAM)
23189 + void *YYPARSE_PARAM;
23190 +# endif
23191 +#else /* ! YYPARSE_PARAM */
23192 +#if defined (__STDC__) || defined (__cplusplus)
23193 +int
23194 +yyparse (void)
23195 #else
23196 -int yyparse (void);
23197 +int
23198 +yyparse ()
23199 +
23200 #endif
23201 #endif
23202 -
23203 -int
23204 -yyparse(YYPARSE_PARAM_ARG)
23205 - YYPARSE_PARAM_DECL
23206 {
23207 +
23208 register int yystate;
23209 register int yyn;
23210 - register short *yyssp;
23211 + int yyresult;
23212 + /* Number of tokens to shift before error messages enabled. */
23213 + int yyerrstatus;
23214 + /* Lookahead token as an internal (translated) token number. */
23215 + int yytoken = 0;
23216 +
23217 + /* Three stacks and their tools:
23218 + `yyss': related to states,
23219 + `yyvs': related to semantic values,
23220 + `yyls': related to locations.
23221 +
23222 + Refer to the stacks thru separate pointers, to allow yyoverflow
23223 + to reallocate them elsewhere. */
23224 +
23225 + /* The state stack. */
23226 + short int yyssa[YYINITDEPTH];
23227 + short int *yyss = yyssa;
23228 + register short int *yyssp;
23229 +
23230 + /* The semantic value stack. */
23231 + YYSTYPE yyvsa[YYINITDEPTH];
23232 + YYSTYPE *yyvs = yyvsa;
23233 register YYSTYPE *yyvsp;
23234 - int yyerrstatus; /* number of tokens to shift before error messages enabled */
23235 - int yychar1 = 0; /* lookahead token as an internal (translated) token number */
23236
23237 - short yyssa[YYINITDEPTH]; /* the state stack */
23238 - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */
23239
23240 - short *yyss = yyssa; /* refer to the stacks thru separate pointers */
23241 - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */
23242
23243 -#ifdef YYLSP_NEEDED
23244 - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */
23245 - YYLTYPE *yyls = yylsa;
23246 - YYLTYPE *yylsp;
23247 -
23248 -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
23249 -#else
23250 #define YYPOPSTACK (yyvsp--, yyssp--)
23251 -#endif
23252
23253 - int yystacksize = YYINITDEPTH;
23254 - int yyfree_stacks = 0;
23255 + YYSIZE_T yystacksize = YYINITDEPTH;
23256
23257 -#ifdef YYPURE
23258 - int yychar;
23259 - YYSTYPE yylval;
23260 - int yynerrs;
23261 -#ifdef YYLSP_NEEDED
23262 - YYLTYPE yylloc;
23263 -#endif
23264 -#endif
23265 + /* The variables used to return semantic value and location from the
23266 + action routines. */
23267 + YYSTYPE yyval;
23268
23269 - YYSTYPE yyval; /* the variable used to return */
23270 - /* semantic values from the action */
23271 - /* routines */
23272
23273 + /* When reducing, the number of symbols on the RHS of the reduced
23274 + rule. */
23275 int yylen;
23276
23277 -#if YYDEBUG != 0
23278 - if (yydebug)
23279 - fprintf(stderr, "Starting parse\n");
23280 -#endif
23281 + YYDPRINTF ((stderr, "Starting parse\n"));
23282
23283 yystate = 0;
23284 yyerrstatus = 0;
23285 @@ -614,110 +1022,97 @@
23286 so that they stay on the same level as the state stack.
23287 The wasted elements are never initialized. */
23288
23289 - yyssp = yyss - 1;
23290 + yyssp = yyss;
23291 yyvsp = yyvs;
23292 -#ifdef YYLSP_NEEDED
23293 - yylsp = yyls;
23294 -#endif
23295
23296 -/* Push a new state, which is found in yystate . */
23297 -/* In all cases, when you get here, the value and location stacks
23298 - have just been pushed. so pushing a state here evens the stacks. */
23299 -yynewstate:
23300
23301 - *++yyssp = yystate;
23302 + goto yysetstate;
23303
23304 - if (yyssp >= yyss + yystacksize - 1)
23305 - {
23306 - /* Give user a chance to reallocate the stack */
23307 - /* Use copies of these so that the &'s don't force the real ones into memory. */
23308 - YYSTYPE *yyvs1 = yyvs;
23309 - short *yyss1 = yyss;
23310 -#ifdef YYLSP_NEEDED
23311 - YYLTYPE *yyls1 = yyls;
23312 -#endif
23313 +/*------------------------------------------------------------.
23314 +| yynewstate -- Push a new state, which is found in yystate. |
23315 +`------------------------------------------------------------*/
23316 + yynewstate:
23317 + /* In all cases, when you get here, the value and location stacks
23318 + have just been pushed. so pushing a state here evens the stacks.
23319 + */
23320 + yyssp++;
23321
23322 + yysetstate:
23323 + *yyssp = yystate;
23324 +
23325 + if (yyss + yystacksize - 1 <= yyssp)
23326 + {
23327 /* Get the current used size of the three stacks, in elements. */
23328 - int size = yyssp - yyss + 1;
23329 + YYSIZE_T yysize = yyssp - yyss + 1;
23330
23331 #ifdef yyoverflow
23332 - /* Each stack pointer address is followed by the size of
23333 - the data in use in that stack, in bytes. */
23334 -#ifdef YYLSP_NEEDED
23335 - /* This used to be a conditional around just the two extra args,
23336 - but that might be undefined if yyoverflow is a macro. */
23337 - yyoverflow("parser stack overflow",
23338 - &yyss1, size * sizeof (*yyssp),
23339 - &yyvs1, size * sizeof (*yyvsp),
23340 - &yyls1, size * sizeof (*yylsp),
23341 - &yystacksize);
23342 -#else
23343 - yyoverflow("parser stack overflow",
23344 - &yyss1, size * sizeof (*yyssp),
23345 - &yyvs1, size * sizeof (*yyvsp),
23346 - &yystacksize);
23347 -#endif
23348 -
23349 - yyss = yyss1; yyvs = yyvs1;
23350 -#ifdef YYLSP_NEEDED
23351 - yyls = yyls1;
23352 -#endif
23353 + {
23354 + /* Give user a chance to reallocate the stack. Use copies of
23355 + these so that the &'s don't force the real ones into
23356 + memory. */
23357 + YYSTYPE *yyvs1 = yyvs;
23358 + short int *yyss1 = yyss;
23359 +
23360 +
23361 + /* Each stack pointer address is followed by the size of the
23362 + data in use in that stack, in bytes. This used to be a
23363 + conditional around just the two extra args, but that might
23364 + be undefined if yyoverflow is a macro. */
23365 + yyoverflow ("parser stack overflow",
23366 + &yyss1, yysize * sizeof (*yyssp),
23367 + &yyvs1, yysize * sizeof (*yyvsp),
23368 +
23369 + &yystacksize);
23370 +
23371 + yyss = yyss1;
23372 + yyvs = yyvs1;
23373 + }
23374 #else /* no yyoverflow */
23375 +# ifndef YYSTACK_RELOCATE
23376 + goto yyoverflowlab;
23377 +# else
23378 /* Extend the stack our own way. */
23379 - if (yystacksize >= YYMAXDEPTH)
23380 - {
23381 - yyerror("parser stack overflow");
23382 - if (yyfree_stacks)
23383 - {
23384 - free (yyss);
23385 - free (yyvs);
23386 -#ifdef YYLSP_NEEDED
23387 - free (yyls);
23388 -#endif
23389 - }
23390 - return 2;
23391 - }
23392 + if (YYMAXDEPTH <= yystacksize)
23393 + goto yyoverflowlab;
23394 yystacksize *= 2;
23395 - if (yystacksize > YYMAXDEPTH)
23396 + if (YYMAXDEPTH < yystacksize)
23397 yystacksize = YYMAXDEPTH;
23398 -#ifndef YYSTACK_USE_ALLOCA
23399 - yyfree_stacks = 1;
23400 -#endif
23401 - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
23402 - __yy_memcpy ((char *)yyss, (char *)yyss1,
23403 - size * (unsigned int) sizeof (*yyssp));
23404 - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
23405 - __yy_memcpy ((char *)yyvs, (char *)yyvs1,
23406 - size * (unsigned int) sizeof (*yyvsp));
23407 -#ifdef YYLSP_NEEDED
23408 - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
23409 - __yy_memcpy ((char *)yyls, (char *)yyls1,
23410 - size * (unsigned int) sizeof (*yylsp));
23411 -#endif
23412 +
23413 + {
23414 + short int *yyss1 = yyss;
23415 + union yyalloc *yyptr =
23416 + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
23417 + if (! yyptr)
23418 + goto yyoverflowlab;
23419 + YYSTACK_RELOCATE (yyss);
23420 + YYSTACK_RELOCATE (yyvs);
23421 +
23422 +# undef YYSTACK_RELOCATE
23423 + if (yyss1 != yyssa)
23424 + YYSTACK_FREE (yyss1);
23425 + }
23426 +# endif
23427 #endif /* no yyoverflow */
23428
23429 - yyssp = yyss + size - 1;
23430 - yyvsp = yyvs + size - 1;
23431 -#ifdef YYLSP_NEEDED
23432 - yylsp = yyls + size - 1;
23433 -#endif
23434 + yyssp = yyss + yysize - 1;
23435 + yyvsp = yyvs + yysize - 1;
23436
23437 -#if YYDEBUG != 0
23438 - if (yydebug)
23439 - fprintf(stderr, "Stack size increased to %d\n", yystacksize);
23440 -#endif
23441
23442 - if (yyssp >= yyss + yystacksize - 1)
23443 + YYDPRINTF ((stderr, "Stack size increased to %lu\n",
23444 + (unsigned long int) yystacksize));
23445 +
23446 + if (yyss + yystacksize - 1 <= yyssp)
23447 YYABORT;
23448 }
23449
23450 -#if YYDEBUG != 0
23451 - if (yydebug)
23452 - fprintf(stderr, "Entering state %d\n", yystate);
23453 -#endif
23454 + YYDPRINTF ((stderr, "Entering state %d\n", yystate));
23455
23456 goto yybackup;
23457 - yybackup:
23458 +
23459 +/*-----------.
23460 +| yybackup. |
23461 +`-----------*/
23462 +yybackup:
23463
23464 /* Do appropriate processing given the current state. */
23465 /* Read a lookahead token if we need one and don't already have one. */
23466 @@ -726,135 +1121,99 @@
23467 /* First try to decide what to do without reference to lookahead token. */
23468
23469 yyn = yypact[yystate];
23470 - if (yyn == YYFLAG)
23471 + if (yyn == YYPACT_NINF)
23472 goto yydefault;
23473
23474 /* Not known => get a lookahead token if don't already have one. */
23475
23476 - /* yychar is either YYEMPTY or YYEOF
23477 - or a valid token in external form. */
23478 -
23479 + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
23480 if (yychar == YYEMPTY)
23481 {
23482 -#if YYDEBUG != 0
23483 - if (yydebug)
23484 - fprintf(stderr, "Reading a token: ");
23485 -#endif
23486 + YYDPRINTF ((stderr, "Reading a token: "));
23487 yychar = YYLEX;
23488 }
23489
23490 - /* Convert token to internal form (in yychar1) for indexing tables with */
23491 -
23492 - if (yychar <= 0) /* This means end of input. */
23493 + if (yychar <= YYEOF)
23494 {
23495 - yychar1 = 0;
23496 - yychar = YYEOF; /* Don't call YYLEX any more */
23497 -
23498 -#if YYDEBUG != 0
23499 - if (yydebug)
23500 - fprintf(stderr, "Now at end of input.\n");
23501 -#endif
23502 + yychar = yytoken = YYEOF;
23503 + YYDPRINTF ((stderr, "Now at end of input.\n"));
23504 }
23505 else
23506 {
23507 - yychar1 = YYTRANSLATE(yychar);
23508 -
23509 -#if YYDEBUG != 0
23510 - if (yydebug)
23511 - {
23512 - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
23513 - /* Give the individual parser a way to print the precise meaning
23514 - of a token, for further debugging info. */
23515 -#ifdef YYPRINT
23516 - YYPRINT (stderr, yychar, yylval);
23517 -#endif
23518 - fprintf (stderr, ")\n");
23519 - }
23520 -#endif
23521 + yytoken = YYTRANSLATE (yychar);
23522 + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
23523 }
23524
23525 - yyn += yychar1;
23526 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
23527 + /* If the proper action on seeing token YYTOKEN is to reduce or to
23528 + detect an error, take that action. */
23529 + yyn += yytoken;
23530 + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
23531 goto yydefault;
23532 -
23533 yyn = yytable[yyn];
23534 -
23535 - /* yyn is what to do for this token type in this state.
23536 - Negative => reduce, -yyn is rule number.
23537 - Positive => shift, yyn is new state.
23538 - New state is final state => don't bother to shift,
23539 - just return success.
23540 - 0, or most negative number => error. */
23541 -
23542 - if (yyn < 0)
23543 + if (yyn <= 0)
23544 {
23545 - if (yyn == YYFLAG)
23546 + if (yyn == 0 || yyn == YYTABLE_NINF)
23547 goto yyerrlab;
23548 yyn = -yyn;
23549 goto yyreduce;
23550 }
23551 - else if (yyn == 0)
23552 - goto yyerrlab;
23553
23554 if (yyn == YYFINAL)
23555 YYACCEPT;
23556
23557 /* Shift the lookahead token. */
23558 -
23559 -#if YYDEBUG != 0
23560 - if (yydebug)
23561 - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
23562 -#endif
23563 + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
23564
23565 /* Discard the token being shifted unless it is eof. */
23566 if (yychar != YYEOF)
23567 yychar = YYEMPTY;
23568
23569 *++yyvsp = yylval;
23570 -#ifdef YYLSP_NEEDED
23571 - *++yylsp = yylloc;
23572 -#endif
23573
23574 - /* count tokens shifted since error; after three, turn off error status. */
23575 - if (yyerrstatus) yyerrstatus--;
23576 +
23577 + /* Count tokens shifted since error; after three, turn off error
23578 + status. */
23579 + if (yyerrstatus)
23580 + yyerrstatus--;
23581
23582 yystate = yyn;
23583 goto yynewstate;
23584
23585 -/* Do the default action for the current state. */
23586 -yydefault:
23587
23588 +/*-----------------------------------------------------------.
23589 +| yydefault -- do the default action for the current state. |
23590 +`-----------------------------------------------------------*/
23591 +yydefault:
23592 yyn = yydefact[yystate];
23593 if (yyn == 0)
23594 goto yyerrlab;
23595 + goto yyreduce;
23596 +
23597
23598 -/* Do a reduction. yyn is the number of a rule to reduce with. */
23599 +/*-----------------------------.
23600 +| yyreduce -- Do a reduction. |
23601 +`-----------------------------*/
23602 yyreduce:
23603 + /* yyn is the number of a rule to reduce with. */
23604 yylen = yyr2[yyn];
23605 - if (yylen > 0)
23606 - yyval = yyvsp[1-yylen]; /* implement default value of the action */
23607
23608 -#if YYDEBUG != 0
23609 - if (yydebug)
23610 - {
23611 - int i;
23612 -
23613 - fprintf (stderr, "Reducing via rule %d (line %d), ",
23614 - yyn, yyrline[yyn]);
23615 + /* If YYLEN is nonzero, implement the default value of the action:
23616 + `$$ = $1'.
23617
23618 - /* Print the symbols being reduced, and their result. */
23619 - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
23620 - fprintf (stderr, "%s ", yytname[yyrhs[i]]);
23621 - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
23622 - }
23623 -#endif
23624 + Otherwise, the following line sets YYVAL to garbage.
23625 + This behavior is undocumented and Bison
23626 + users should not rely upon it. Assigning to YYVAL
23627 + unconditionally makes the parser a bit smaller, and it avoids a
23628 + GCC warning that YYVAL may be used uninitialized. */
23629 + yyval = yyvsp[1-yylen];
23630
23631
23632 - switch (yyn) {
23633 -
23634 -case 5:
23635 -#line 83 "cfg_y.y"
23636 -{
23637 + YY_REDUCE_PRINT (yyn);
23638 + switch (yyn)
23639 + {
23640 + case 6:
23641 +#line 86 "cfg_y.y"
23642 + {
23643 if (!curr_sig->uni)
23644 curr_sig->uni =
23645 #if defined(UNI30) || defined(DYNAMIC_UNI)
23646 @@ -873,17 +1232,19 @@
23647 #endif
23648 #endif
23649 ;
23650 - ;
23651 - break;}
23652 -case 6:
23653 -#line 107 "cfg_y.y"
23654 -{
23655 + }
23656 + break;
23657 +
23658 + case 7:
23659 +#line 110 "cfg_y.y"
23660 + {
23661 set_verbosity(NULL,yyvsp[0].num);
23662 - ;
23663 - break;}
23664 -case 12:
23665 -#line 119 "cfg_y.y"
23666 -{
23667 + }
23668 + break;
23669 +
23670 + case 13:
23671 +#line 122 "cfg_y.y"
23672 + {
23673 SIG_ENTITY *sig,**walk;
23674
23675 if (atmpvc_addr_in_use(_entity.signaling_pvc))
23676 @@ -892,37 +1253,49 @@
23677 if (entities == &_entity) entities = NULL;
23678 for (sig = entities; sig; sig = sig->next)
23679 if (atm_equal((struct sockaddr *) &sig->signaling_pvc,
23680 - (struct sockaddr *) &yyvsp[0].pvc,0,0))
23681 - yyerror("duplicate PVC address %d.%d.%d",S_PVC(sig));
23682 + (struct sockaddr *) &yyvsp[0].pvc,0,0)) {
23683 + const char *err;
23684 + asprintf(&err,"duplicate PVC address %d.%d.%d",S_PVC(sig));
23685 + if(err) {
23686 + yyerror(err);
23687 + free(err);
23688 + }
23689 + else
23690 + yyerror("duplicate PVC address");
23691 + }
23692 curr_sig = alloc_t(SIG_ENTITY);
23693 *curr_sig = _entity;
23694 curr_sig->signaling_pvc = yyvsp[0].pvc;
23695 curr_sig->next = NULL;
23696 for (walk = &entities; *walk; walk = &(*walk)->next);
23697 *walk = curr_sig;
23698 - ;
23699 - break;}
23700 -case 18:
23701 -#line 150 "cfg_y.y"
23702 -{
23703 + }
23704 + break;
23705 +
23706 + case 19:
23707 +#line 161 "cfg_y.y"
23708 + {
23709 enter_vpci(curr_sig,yyvsp[-2].num,yyvsp[0].num);
23710 - ;
23711 - break;}
23712 -case 20:
23713 -#line 155 "cfg_y.y"
23714 -{
23715 + }
23716 + break;
23717 +
23718 + case 21:
23719 +#line 166 "cfg_y.y"
23720 + {
23721 curr_sig->sig_qos = yyvsp[0].str;
23722 - ;
23723 - break;}
23724 -case 21:
23725 -#line 159 "cfg_y.y"
23726 -{
23727 + }
23728 + break;
23729 +
23730 + case 22:
23731 +#line 170 "cfg_y.y"
23732 + {
23733 curr_sig->max_rate = yyvsp[0].num;
23734 - ;
23735 - break;}
23736 -case 22:
23737 -#line 163 "cfg_y.y"
23738 -{
23739 + }
23740 + break;
23741 +
23742 + case 23:
23743 +#line 174 "cfg_y.y"
23744 + {
23745 struct sockaddr_atmsvc addr;
23746 char *mask;
23747
23748 @@ -931,464 +1304,506 @@
23749 if (text2atm(yyvsp[0].str,(struct sockaddr *) &addr,sizeof(addr),
23750 T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) {
23751 yyerror("invalid address");
23752 - return;
23753 + return 0;
23754 }
23755 add_route(curr_sig,&addr,mask ? strtol(mask,NULL,10) : INT_MAX);
23756 - ;
23757 - break;}
23758 -case 23:
23759 -#line 177 "cfg_y.y"
23760 -{
23761 + }
23762 + break;
23763 +
23764 + case 24:
23765 +#line 188 "cfg_y.y"
23766 + {
23767 add_route(curr_sig,NULL,0);
23768 - ;
23769 - break;}
23770 -case 44:
23771 -#line 229 "cfg_y.y"
23772 -{
23773 + }
23774 + break;
23775 +
23776 + case 45:
23777 +#line 240 "cfg_y.y"
23778 + {
23779 set_verbosity("UNI",yyvsp[0].num);
23780 set_verbosity("KERNEL",yyvsp[0].num);
23781 set_verbosity("SAP",yyvsp[0].num);
23782 - ;
23783 - break;}
23784 -case 45:
23785 -#line 235 "cfg_y.y"
23786 -{
23787 + }
23788 + break;
23789 +
23790 + case 46:
23791 +#line 246 "cfg_y.y"
23792 + {
23793 enter_vpci(curr_sig,yyvsp[-2].num,yyvsp[0].num);
23794 - ;
23795 - break;}
23796 -case 46:
23797 -#line 239 "cfg_y.y"
23798 -{
23799 + }
23800 + break;
23801 +
23802 + case 47:
23803 +#line 250 "cfg_y.y"
23804 + {
23805 #if defined(UNI30) || defined(ALLOW_UNI30) || defined(DYNAMIC_UNI)
23806 if (curr_sig->uni & ~S_UNI31) yyerror("UNI mode is already set");
23807 curr_sig->uni |= S_UNI30;
23808 #else
23809 yyerror("Sorry, not supported yet");
23810 #endif
23811 - ;
23812 - break;}
23813 -case 47:
23814 -#line 248 "cfg_y.y"
23815 -{
23816 + }
23817 + break;
23818 +
23819 + case 48:
23820 +#line 259 "cfg_y.y"
23821 + {
23822 #if defined(UNI31) || defined(ALLOW_UNI30) || defined(DYNAMIC_UNI)
23823 if (curr_sig->uni & ~S_UNI30) yyerror("UNI mode is already set");
23824 curr_sig->uni |= S_UNI31;
23825 #else
23826 yyerror("Sorry, not supported yet");
23827 #endif
23828 - ;
23829 - break;}
23830 -case 48:
23831 -#line 257 "cfg_y.y"
23832 -{
23833 + }
23834 + break;
23835 +
23836 + case 49:
23837 +#line 268 "cfg_y.y"
23838 + {
23839 #if defined(UNI40) || defined(DYNAMIC_UNI)
23840 if (curr_sig->uni) yyerror("UNI mode is already set");
23841 curr_sig->uni = S_UNI40;
23842 #else
23843 yyerror("Sorry, not supported yet");
23844 #endif
23845 - ;
23846 - break;}
23847 -case 49:
23848 -#line 266 "cfg_y.y"
23849 -{
23850 + }
23851 + break;
23852 +
23853 + case 50:
23854 +#line 277 "cfg_y.y"
23855 + {
23856 #if defined(Q2963_1) || defined(DYNAMIC_UNI)
23857 if (!(curr_sig->uni & S_UNI40)) yyerror("Incompatible UNI mode");
23858 curr_sig->uni |= S_Q2963_1;
23859 #else
23860 yyerror("Sorry, not supported yet");
23861 #endif
23862 - ;
23863 - break;}
23864 -case 50:
23865 -#line 275 "cfg_y.y"
23866 -{
23867 + }
23868 + break;
23869 +
23870 + case 51:
23871 +#line 286 "cfg_y.y"
23872 + {
23873 yywarn("sig net is obsolete, please use sig mode net instead");
23874 curr_sig->mode = sm_net;
23875 - ;
23876 - break;}
23877 -case 52:
23878 -#line 284 "cfg_y.y"
23879 -{
23880 + }
23881 + break;
23882 +
23883 + case 53:
23884 +#line 295 "cfg_y.y"
23885 + {
23886 set_verbosity("SSCF",yyvsp[0].num);
23887 set_verbosity("SSCOP",yyvsp[0].num);
23888 - ;
23889 - break;}
23890 -case 53:
23891 -#line 292 "cfg_y.y"
23892 -{
23893 + }
23894 + break;
23895 +
23896 + case 54:
23897 +#line 303 "cfg_y.y"
23898 + {
23899 set_verbosity("IO",yyvsp[0].num);
23900 - ;
23901 - break;}
23902 -case 54:
23903 -#line 296 "cfg_y.y"
23904 -{
23905 + }
23906 + break;
23907 +
23908 + case 55:
23909 +#line 307 "cfg_y.y"
23910 + {
23911 curr_sig->signaling_pvc = yyvsp[0].pvc;
23912 - ;
23913 - break;}
23914 -case 55:
23915 -#line 300 "cfg_y.y"
23916 -{
23917 + }
23918 + break;
23919 +
23920 + case 56:
23921 +#line 311 "cfg_y.y"
23922 + {
23923 yywarn("io pcr is obsolete, please use io qos instead");
23924 curr_sig->sig_pcr = yyvsp[0].num;
23925 - ;
23926 - break;}
23927 -case 56:
23928 -#line 305 "cfg_y.y"
23929 -{
23930 + }
23931 + break;
23932 +
23933 + case 57:
23934 +#line 316 "cfg_y.y"
23935 + {
23936 curr_sig->sig_qos = yyvsp[0].str;
23937 - ;
23938 - break;}
23939 -case 57:
23940 -#line 309 "cfg_y.y"
23941 -{
23942 + }
23943 + break;
23944 +
23945 + case 58:
23946 +#line 320 "cfg_y.y"
23947 + {
23948 curr_sig->max_rate = yyvsp[0].num;
23949 - ;
23950 - break;}
23951 -case 58:
23952 -#line 316 "cfg_y.y"
23953 -{
23954 + }
23955 + break;
23956 +
23957 + case 59:
23958 +#line 327 "cfg_y.y"
23959 + {
23960 set_verbosity(NULL,yyvsp[0].num);
23961 - ;
23962 - break;}
23963 -case 59:
23964 -#line 320 "cfg_y.y"
23965 -{
23966 + }
23967 + break;
23968 +
23969 + case 60:
23970 +#line 331 "cfg_y.y"
23971 + {
23972 dump_dir = yyvsp[0].str;
23973 if (!trace_size) trace_size = DEFAULT_TRACE_SIZE;
23974 - ;
23975 - break;}
23976 -case 60:
23977 -#line 325 "cfg_y.y"
23978 -{
23979 + }
23980 + break;
23981 +
23982 + case 61:
23983 +#line 336 "cfg_y.y"
23984 + {
23985 set_logfile(yyvsp[0].str);
23986 - ;
23987 - break;}
23988 -case 61:
23989 -#line 329 "cfg_y.y"
23990 -{
23991 + }
23992 + break;
23993 +
23994 + case 62:
23995 +#line 340 "cfg_y.y"
23996 + {
23997 trace_size = yyvsp[0].num;
23998 - ;
23999 - break;}
24000 -case 62:
24001 -#line 335 "cfg_y.y"
24002 -{
24003 + }
24004 + break;
24005 +
24006 + case 63:
24007 +#line 346 "cfg_y.y"
24008 + {
24009 yyval.num = DEFAULT_TRACE_SIZE;
24010 - ;
24011 - break;}
24012 -case 63:
24013 -#line 339 "cfg_y.y"
24014 -{
24015 + }
24016 + break;
24017 +
24018 + case 64:
24019 +#line 350 "cfg_y.y"
24020 + {
24021 yyval.num = yyvsp[0].num;
24022 - ;
24023 - break;}
24024 -case 64:
24025 -#line 346 "cfg_y.y"
24026 -{
24027 + }
24028 + break;
24029 +
24030 + case 65:
24031 +#line 357 "cfg_y.y"
24032 + {
24033 yyval.num = DIAG_DEBUG;
24034 - ;
24035 - break;}
24036 -case 65:
24037 -#line 350 "cfg_y.y"
24038 -{
24039 + }
24040 + break;
24041 +
24042 + case 66:
24043 +#line 361 "cfg_y.y"
24044 + {
24045 yyval.num = DIAG_INFO;
24046 - ;
24047 - break;}
24048 -case 66:
24049 -#line 354 "cfg_y.y"
24050 -{
24051 + }
24052 + break;
24053 +
24054 + case 67:
24055 +#line 365 "cfg_y.y"
24056 + {
24057 yyval.num = DIAG_WARN;
24058 - ;
24059 - break;}
24060 -case 67:
24061 -#line 358 "cfg_y.y"
24062 -{
24063 + }
24064 + break;
24065 +
24066 + case 68:
24067 +#line 369 "cfg_y.y"
24068 + {
24069 yyval.num = DIAG_ERROR;
24070 - ;
24071 - break;}
24072 -case 68:
24073 -#line 362 "cfg_y.y"
24074 -{
24075 + }
24076 + break;
24077 +
24078 + case 69:
24079 +#line 373 "cfg_y.y"
24080 + {
24081 yyval.num = DIAG_FATAL;
24082 - ;
24083 - break;}
24084 -case 69:
24085 -#line 369 "cfg_y.y"
24086 -{
24087 + }
24088 + break;
24089 +
24090 + case 70:
24091 +#line 380 "cfg_y.y"
24092 + {
24093 curr_sig->mode = sm_user;
24094 - ;
24095 - break;}
24096 -case 70:
24097 -#line 373 "cfg_y.y"
24098 -{
24099 + }
24100 + break;
24101 +
24102 + case 71:
24103 +#line 384 "cfg_y.y"
24104 + {
24105 curr_sig->mode = sm_net;
24106 - ;
24107 - break;}
24108 -case 71:
24109 -#line 377 "cfg_y.y"
24110 -{
24111 + }
24112 + break;
24113 +
24114 + case 72:
24115 +#line 388 "cfg_y.y"
24116 + {
24117 curr_sig->mode = sm_switch;
24118 - ;
24119 - break;}
24120 -case 72:
24121 -#line 384 "cfg_y.y"
24122 -{
24123 + }
24124 + break;
24125 +
24126 + case 73:
24127 +#line 395 "cfg_y.y"
24128 + {
24129 set_verbosity("POLICY",yyvsp[0].num);
24130 - ;
24131 - break;}
24132 -case 73:
24133 -#line 388 "cfg_y.y"
24134 -{
24135 + }
24136 + break;
24137 +
24138 + case 74:
24139 +#line 399 "cfg_y.y"
24140 + {
24141 rule = alloc_t(RULE);
24142 rule->type = yyvsp[0].num;
24143 - ;
24144 - break;}
24145 -case 75:
24146 -#line 397 "cfg_y.y"
24147 -{
24148 + }
24149 + break;
24150 +
24151 + case 76:
24152 +#line 408 "cfg_y.y"
24153 + {
24154 yyval.num = ACL_ALLOW;
24155 - ;
24156 - break;}
24157 -case 76:
24158 -#line 401 "cfg_y.y"
24159 -{
24160 + }
24161 + break;
24162 +
24163 + case 77:
24164 +#line 412 "cfg_y.y"
24165 + {
24166 yyval.num = ACL_REJECT;
24167 - ;
24168 - break;}
24169 -case 77:
24170 -#line 408 "cfg_y.y"
24171 -{
24172 + }
24173 + break;
24174 +
24175 + case 78:
24176 +#line 419 "cfg_y.y"
24177 + {
24178 rule->type |= ACL_IN;
24179 put_address(yyvsp[0].str);
24180 - ;
24181 - break;}
24182 -case 78:
24183 -#line 413 "cfg_y.y"
24184 -{
24185 + }
24186 + break;
24187 +
24188 + case 79:
24189 +#line 424 "cfg_y.y"
24190 + {
24191 rule->type |= ACL_OUT;
24192 put_address(yyvsp[0].str);
24193 - ;
24194 - break;}
24195 -}
24196 - /* the action file gets copied in in place of this dollarsign */
24197 -#line 543 "/usr/lib/bison.simple"
24198 + }
24199 + break;
24200 +
24201 +
24202 + }
24203 +
24204 +/* Line 1010 of yacc.c. */
24205 +#line 1585 "y.tab.c"
24206 \f
24207 yyvsp -= yylen;
24208 yyssp -= yylen;
24209 -#ifdef YYLSP_NEEDED
24210 - yylsp -= yylen;
24211 -#endif
24212
24213 -#if YYDEBUG != 0
24214 - if (yydebug)
24215 - {
24216 - short *ssp1 = yyss - 1;
24217 - fprintf (stderr, "state stack now");
24218 - while (ssp1 != yyssp)
24219 - fprintf (stderr, " %d", *++ssp1);
24220 - fprintf (stderr, "\n");
24221 - }
24222 -#endif
24223 +
24224 + YY_STACK_PRINT (yyss, yyssp);
24225
24226 *++yyvsp = yyval;
24227
24228 -#ifdef YYLSP_NEEDED
24229 - yylsp++;
24230 - if (yylen == 0)
24231 - {
24232 - yylsp->first_line = yylloc.first_line;
24233 - yylsp->first_column = yylloc.first_column;
24234 - yylsp->last_line = (yylsp-1)->last_line;
24235 - yylsp->last_column = (yylsp-1)->last_column;
24236 - yylsp->text = 0;
24237 - }
24238 - else
24239 - {
24240 - yylsp->last_line = (yylsp+yylen-1)->last_line;
24241 - yylsp->last_column = (yylsp+yylen-1)->last_column;
24242 - }
24243 -#endif
24244
24245 - /* Now "shift" the result of the reduction.
24246 - Determine what state that goes to,
24247 - based on the state we popped back to
24248 - and the rule number reduced by. */
24249 + /* Now `shift' the result of the reduction. Determine what state
24250 + that goes to, based on the state we popped back to and the rule
24251 + number reduced by. */
24252
24253 yyn = yyr1[yyn];
24254
24255 - yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
24256 - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
24257 + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
24258 + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
24259 yystate = yytable[yystate];
24260 else
24261 - yystate = yydefgoto[yyn - YYNTBASE];
24262 + yystate = yydefgoto[yyn - YYNTOKENS];
24263
24264 goto yynewstate;
24265
24266 -yyerrlab: /* here on detecting error */
24267
24268 - if (! yyerrstatus)
24269 - /* If not already recovering from an error, report this error. */
24270 +/*------------------------------------.
24271 +| yyerrlab -- here on detecting error |
24272 +`------------------------------------*/
24273 +yyerrlab:
24274 + /* If not already recovering from an error, report this error. */
24275 + if (!yyerrstatus)
24276 {
24277 ++yynerrs;
24278 -
24279 -#ifdef YYERROR_VERBOSE
24280 +#if YYERROR_VERBOSE
24281 yyn = yypact[yystate];
24282
24283 - if (yyn > YYFLAG && yyn < YYLAST)
24284 + if (YYPACT_NINF < yyn && yyn < YYLAST)
24285 {
24286 - int size = 0;
24287 - char *msg;
24288 - int x, count;
24289 -
24290 - count = 0;
24291 - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
24292 - for (x = (yyn < 0 ? -yyn : 0);
24293 - x < (sizeof(yytname) / sizeof(char *)); x++)
24294 - if (yycheck[x + yyn] == x)
24295 - size += strlen(yytname[x]) + 15, count++;
24296 - msg = (char *) malloc(size + 15);
24297 - if (msg != 0)
24298 + YYSIZE_T yysize = 0;
24299 + int yytype = YYTRANSLATE (yychar);
24300 + const char* yyprefix;
24301 + char *yymsg;
24302 + int yyx;
24303 +
24304 + /* Start YYX at -YYN if negative to avoid negative indexes in
24305 + YYCHECK. */
24306 + int yyxbegin = yyn < 0 ? -yyn : 0;
24307 +
24308 + /* Stay within bounds of both yycheck and yytname. */
24309 + int yychecklim = YYLAST - yyn;
24310 + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
24311 + int yycount = 0;
24312 +
24313 + yyprefix = ", expecting ";
24314 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
24315 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
24316 + {
24317 + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
24318 + yycount += 1;
24319 + if (yycount == 5)
24320 + {
24321 + yysize = 0;
24322 + break;
24323 + }
24324 + }
24325 + yysize += (sizeof ("syntax error, unexpected ")
24326 + + yystrlen (yytname[yytype]));
24327 + yymsg = (char *) YYSTACK_ALLOC (yysize);
24328 + if (yymsg != 0)
24329 {
24330 - strcpy(msg, "parse error");
24331 + char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
24332 + yyp = yystpcpy (yyp, yytname[yytype]);
24333
24334 - if (count < 5)
24335 + if (yycount < 5)
24336 {
24337 - count = 0;
24338 - for (x = (yyn < 0 ? -yyn : 0);
24339 - x < (sizeof(yytname) / sizeof(char *)); x++)
24340 - if (yycheck[x + yyn] == x)
24341 + yyprefix = ", expecting ";
24342 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
24343 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
24344 {
24345 - strcat(msg, count == 0 ? ", expecting `" : " or `");
24346 - strcat(msg, yytname[x]);
24347 - strcat(msg, "'");
24348 - count++;
24349 + yyp = yystpcpy (yyp, yyprefix);
24350 + yyp = yystpcpy (yyp, yytname[yyx]);
24351 + yyprefix = " or ";
24352 }
24353 }
24354 - yyerror(msg);
24355 - free(msg);
24356 + yyerror (yymsg);
24357 + YYSTACK_FREE (yymsg);
24358 }
24359 else
24360 - yyerror ("parse error; also virtual memory exceeded");
24361 + yyerror ("syntax error; also virtual memory exhausted");
24362 }
24363 else
24364 #endif /* YYERROR_VERBOSE */
24365 - yyerror("parse error");
24366 + yyerror ("syntax error");
24367 }
24368
24369 - goto yyerrlab1;
24370 -yyerrlab1: /* here on error raised explicitly by an action */
24371 +
24372
24373 if (yyerrstatus == 3)
24374 {
24375 - /* if just tried and failed to reuse lookahead token after an error, discard it. */
24376 + /* If just tried and failed to reuse lookahead token after an
24377 + error, discard it. */
24378
24379 - /* return failure if at end of input */
24380 - if (yychar == YYEOF)
24381 - YYABORT;
24382 -
24383 -#if YYDEBUG != 0
24384 - if (yydebug)
24385 - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
24386 -#endif
24387 + if (yychar <= YYEOF)
24388 + {
24389 + /* If at end of input, pop the error token,
24390 + then the rest of the stack, then return failure. */
24391 + if (yychar == YYEOF)
24392 + for (;;)
24393 + {
24394 + YYPOPSTACK;
24395 + if (yyssp == yyss)
24396 + YYABORT;
24397 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
24398 + yydestruct (yystos[*yyssp], yyvsp);
24399 + }
24400 + }
24401 + else
24402 + {
24403 + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
24404 + yydestruct (yytoken, &yylval);
24405 + yychar = YYEMPTY;
24406
24407 - yychar = YYEMPTY;
24408 + }
24409 }
24410
24411 - /* Else will try to reuse lookahead token
24412 - after shifting the error token. */
24413 -
24414 - yyerrstatus = 3; /* Each real token shifted decrements this */
24415 + /* Else will try to reuse lookahead token after shifting the error
24416 + token. */
24417 + goto yyerrlab1;
24418
24419 - goto yyerrhandle;
24420
24421 -yyerrdefault: /* current state does not do anything special for the error token. */
24422 +/*---------------------------------------------------.
24423 +| yyerrorlab -- error raised explicitly by YYERROR. |
24424 +`---------------------------------------------------*/
24425 +yyerrorlab:
24426
24427 -#if 0
24428 - /* This is wrong; only states that explicitly want error tokens
24429 - should shift them. */
24430 - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/
24431 - if (yyn) goto yydefault;
24432 +#ifdef __GNUC__
24433 + /* Pacify GCC when the user code never invokes YYERROR and the label
24434 + yyerrorlab therefore never appears in user code. */
24435 + if (0)
24436 + goto yyerrorlab;
24437 #endif
24438
24439 -yyerrpop: /* pop the current state because it cannot handle the error token */
24440 -
24441 - if (yyssp == yyss) YYABORT;
24442 - yyvsp--;
24443 - yystate = *--yyssp;
24444 -#ifdef YYLSP_NEEDED
24445 - yylsp--;
24446 -#endif
24447 + yyvsp -= yylen;
24448 + yyssp -= yylen;
24449 + yystate = *yyssp;
24450 + goto yyerrlab1;
24451
24452 -#if YYDEBUG != 0
24453 - if (yydebug)
24454 - {
24455 - short *ssp1 = yyss - 1;
24456 - fprintf (stderr, "Error: state stack now");
24457 - while (ssp1 != yyssp)
24458 - fprintf (stderr, " %d", *++ssp1);
24459 - fprintf (stderr, "\n");
24460 - }
24461 -#endif
24462
24463 -yyerrhandle:
24464 +/*-------------------------------------------------------------.
24465 +| yyerrlab1 -- common code for both syntax error and YYERROR. |
24466 +`-------------------------------------------------------------*/
24467 +yyerrlab1:
24468 + yyerrstatus = 3; /* Each real token shifted decrements this. */
24469
24470 - yyn = yypact[yystate];
24471 - if (yyn == YYFLAG)
24472 - goto yyerrdefault;
24473 + for (;;)
24474 + {
24475 + yyn = yypact[yystate];
24476 + if (yyn != YYPACT_NINF)
24477 + {
24478 + yyn += YYTERROR;
24479 + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
24480 + {
24481 + yyn = yytable[yyn];
24482 + if (0 < yyn)
24483 + break;
24484 + }
24485 + }
24486
24487 - yyn += YYTERROR;
24488 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
24489 - goto yyerrdefault;
24490 + /* Pop the current state because it cannot handle the error token. */
24491 + if (yyssp == yyss)
24492 + YYABORT;
24493
24494 - yyn = yytable[yyn];
24495 - if (yyn < 0)
24496 - {
24497 - if (yyn == YYFLAG)
24498 - goto yyerrpop;
24499 - yyn = -yyn;
24500 - goto yyreduce;
24501 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
24502 + yydestruct (yystos[yystate], yyvsp);
24503 + YYPOPSTACK;
24504 + yystate = *yyssp;
24505 + YY_STACK_PRINT (yyss, yyssp);
24506 }
24507 - else if (yyn == 0)
24508 - goto yyerrpop;
24509
24510 if (yyn == YYFINAL)
24511 YYACCEPT;
24512
24513 -#if YYDEBUG != 0
24514 - if (yydebug)
24515 - fprintf(stderr, "Shifting error token, ");
24516 -#endif
24517 + YYDPRINTF ((stderr, "Shifting error token, "));
24518
24519 *++yyvsp = yylval;
24520 -#ifdef YYLSP_NEEDED
24521 - *++yylsp = yylloc;
24522 -#endif
24523 +
24524
24525 yystate = yyn;
24526 goto yynewstate;
24527
24528 - yyacceptlab:
24529 - /* YYACCEPT comes here. */
24530 - if (yyfree_stacks)
24531 - {
24532 - free (yyss);
24533 - free (yyvs);
24534 -#ifdef YYLSP_NEEDED
24535 - free (yyls);
24536 -#endif
24537 - }
24538 - return 0;
24539
24540 - yyabortlab:
24541 - /* YYABORT comes here. */
24542 - if (yyfree_stacks)
24543 - {
24544 - free (yyss);
24545 - free (yyvs);
24546 -#ifdef YYLSP_NEEDED
24547 - free (yyls);
24548 +/*-------------------------------------.
24549 +| yyacceptlab -- YYACCEPT comes here. |
24550 +`-------------------------------------*/
24551 +yyacceptlab:
24552 + yyresult = 0;
24553 + goto yyreturn;
24554 +
24555 +/*-----------------------------------.
24556 +| yyabortlab -- YYABORT comes here. |
24557 +`-----------------------------------*/
24558 +yyabortlab:
24559 + yyresult = 1;
24560 + goto yyreturn;
24561 +
24562 +#ifndef yyoverflow
24563 +/*----------------------------------------------.
24564 +| yyoverflowlab -- parser overflow comes here. |
24565 +`----------------------------------------------*/
24566 +yyoverflowlab:
24567 + yyerror ("parser stack overflow");
24568 + yyresult = 2;
24569 + /* Fall through. */
24570 +#endif
24571 +
24572 +yyreturn:
24573 +#ifndef yyoverflow
24574 + if (yyss != yyssa)
24575 + YYSTACK_FREE (yyss);
24576 #endif
24577 - }
24578 - return 1;
24579 + return yyresult;
24580 }
24581 -#line 418 "cfg_y.y"
24582 +
24583 +
24584 +
24585 --- linux-atm-2.4.1.orig/src/sigd/proto.c
24586 +++ linux-atm-2.4.1/src/sigd/proto.c
24587 @@ -259,6 +259,7 @@
24588 break;
24589 }
24590 default:
24591 + break;
24592 }
24593 va_end(ap);
24594 if ((size = q_close(&dsc)) >= 0) to_signaling(sock->sig,q_buffer,size);
24595 @@ -288,6 +289,7 @@
24596 }
24597 break;
24598 default:
24599 + break;
24600 }
24601 va_end(ap);
24602 }
24603 --- linux-atm-2.4.1.orig/src/sigd/cfg_y.y
24604 +++ linux-atm-2.4.1/src/sigd/cfg_y.y
24605 @@ -7,6 +7,7 @@
24606 #include <config.h>
24607 #endif
24608
24609 +#include <stdlib.h>
24610 #include <string.h>
24611 #include <ctype.h>
24612 #include <limits.h>
24613 @@ -19,6 +20,8 @@
24614 #include "trace.h"
24615 #include "policy.h"
24616
24617 +extern void yywarn(const char *s);
24618 +extern void yyerror(const char *s);
24619
24620 static RULE *rule;
24621 static SIG_ENTITY *curr_sig = &_entity;
24622 @@ -125,8 +128,16 @@
24623 if (entities == &_entity) entities = NULL;
24624 for (sig = entities; sig; sig = sig->next)
24625 if (atm_equal((struct sockaddr *) &sig->signaling_pvc,
24626 - (struct sockaddr *) &$2,0,0))
24627 - yyerror("duplicate PVC address %d.%d.%d",S_PVC(sig));
24628 + (struct sockaddr *) &$2,0,0)) {
24629 + const char *err;
24630 + asprintf(&err,"duplicate PVC address %d.%d.%d",S_PVC(sig));
24631 + if(err) {
24632 + yyerror(err);
24633 + free(err);
24634 + }
24635 + else
24636 + yyerror("duplicate PVC address");
24637 + }
24638 curr_sig = alloc_t(SIG_ENTITY);
24639 *curr_sig = _entity;
24640 curr_sig->signaling_pvc = $2;
24641 @@ -169,7 +180,7 @@
24642 if (text2atm($1,(struct sockaddr *) &addr,sizeof(addr),
24643 T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) {
24644 yyerror("invalid address");
24645 - return;
24646 + return 0;
24647 }
24648 add_route(curr_sig,&addr,mask ? strtol(mask,NULL,10) : INT_MAX);
24649 }
24650 --- linux-atm-2.4.1.orig/src/sigd/cfg_y.h
24651 +++ linux-atm-2.4.1/src/sigd/cfg_y.h
24652 @@ -1,44 +1,127 @@
24653 -typedef union {
24654 +/* A Bison parser, made by GNU Bison 1.875d. */
24655 +
24656 +/* Skeleton parser for Yacc-like parsing with Bison,
24657 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
24658 +
24659 + This program is free software; you can redistribute it and/or modify
24660 + it under the terms of the GNU General Public License as published by
24661 + the Free Software Foundation; either version 2, or (at your option)
24662 + any later version.
24663 +
24664 + This program is distributed in the hope that it will be useful,
24665 + but WITHOUT ANY WARRANTY; without even the implied warranty of
24666 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24667 + GNU General Public License for more details.
24668 +
24669 + You should have received a copy of the GNU General Public License
24670 + along with this program; if not, write to the Free Software
24671 + Foundation, Inc., 59 Temple Place - Suite 330,
24672 + Boston, MA 02111-1307, USA. */
24673 +
24674 +/* As a special exception, when this file is copied by Bison into a
24675 + Bison output file, you may use that output file without restriction.
24676 + This special exception was added by the Free Software Foundation
24677 + in version 1.24 of Bison. */
24678 +
24679 +/* Tokens. */
24680 +#ifndef YYTOKENTYPE
24681 +# define YYTOKENTYPE
24682 + /* Put the tokens into the symbol table, so that GDB and other debuggers
24683 + know about them. */
24684 + enum yytokentype {
24685 + TOK_LEVEL = 258,
24686 + TOK_DEBUG = 259,
24687 + TOK_INFO = 260,
24688 + TOK_WARN = 261,
24689 + TOK_ERROR = 262,
24690 + TOK_FATAL = 263,
24691 + TOK_SIG = 264,
24692 + TOK_UNI30 = 265,
24693 + TOK_UNI31 = 266,
24694 + TOK_UNI40 = 267,
24695 + TOK_Q2963_1 = 268,
24696 + TOK_SAAL = 269,
24697 + TOK_VC = 270,
24698 + TOK_IO = 271,
24699 + TOK_MODE = 272,
24700 + TOK_USER = 273,
24701 + TOK_NET = 274,
24702 + TOK_SWITCH = 275,
24703 + TOK_VPCI = 276,
24704 + TOK_ITF = 277,
24705 + TOK_PCR = 278,
24706 + TOK_TRACE = 279,
24707 + TOK_POLICY = 280,
24708 + TOK_ALLOW = 281,
24709 + TOK_REJECT = 282,
24710 + TOK_ENTITY = 283,
24711 + TOK_DEFAULT = 284,
24712 + TOK_NUMBER = 285,
24713 + TOK_MAX_RATE = 286,
24714 + TOK_DUMP_DIR = 287,
24715 + TOK_LOGFILE = 288,
24716 + TOK_QOS = 289,
24717 + TOK_FROM = 290,
24718 + TOK_TO = 291,
24719 + TOK_ROUTE = 292,
24720 + TOK_PVC = 293
24721 + };
24722 +#endif
24723 +#define TOK_LEVEL 258
24724 +#define TOK_DEBUG 259
24725 +#define TOK_INFO 260
24726 +#define TOK_WARN 261
24727 +#define TOK_ERROR 262
24728 +#define TOK_FATAL 263
24729 +#define TOK_SIG 264
24730 +#define TOK_UNI30 265
24731 +#define TOK_UNI31 266
24732 +#define TOK_UNI40 267
24733 +#define TOK_Q2963_1 268
24734 +#define TOK_SAAL 269
24735 +#define TOK_VC 270
24736 +#define TOK_IO 271
24737 +#define TOK_MODE 272
24738 +#define TOK_USER 273
24739 +#define TOK_NET 274
24740 +#define TOK_SWITCH 275
24741 +#define TOK_VPCI 276
24742 +#define TOK_ITF 277
24743 +#define TOK_PCR 278
24744 +#define TOK_TRACE 279
24745 +#define TOK_POLICY 280
24746 +#define TOK_ALLOW 281
24747 +#define TOK_REJECT 282
24748 +#define TOK_ENTITY 283
24749 +#define TOK_DEFAULT 284
24750 +#define TOK_NUMBER 285
24751 +#define TOK_MAX_RATE 286
24752 +#define TOK_DUMP_DIR 287
24753 +#define TOK_LOGFILE 288
24754 +#define TOK_QOS 289
24755 +#define TOK_FROM 290
24756 +#define TOK_TO 291
24757 +#define TOK_ROUTE 292
24758 +#define TOK_PVC 293
24759 +
24760 +
24761 +
24762 +
24763 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
24764 +#line 56 "cfg_y.y"
24765 +typedef union YYSTYPE {
24766 int num;
24767 char *str;
24768 struct sockaddr_atmpvc pvc;
24769 } YYSTYPE;
24770 -#define TOK_LEVEL 257
24771 -#define TOK_DEBUG 258
24772 -#define TOK_INFO 259
24773 -#define TOK_WARN 260
24774 -#define TOK_ERROR 261
24775 -#define TOK_FATAL 262
24776 -#define TOK_SIG 263
24777 -#define TOK_UNI30 264
24778 -#define TOK_UNI31 265
24779 -#define TOK_UNI40 266
24780 -#define TOK_Q2963_1 267
24781 -#define TOK_SAAL 268
24782 -#define TOK_VC 269
24783 -#define TOK_IO 270
24784 -#define TOK_MODE 271
24785 -#define TOK_USER 272
24786 -#define TOK_NET 273
24787 -#define TOK_SWITCH 274
24788 -#define TOK_VPCI 275
24789 -#define TOK_ITF 276
24790 -#define TOK_PCR 277
24791 -#define TOK_TRACE 278
24792 -#define TOK_POLICY 279
24793 -#define TOK_ALLOW 280
24794 -#define TOK_REJECT 281
24795 -#define TOK_ENTITY 282
24796 -#define TOK_DEFAULT 283
24797 -#define TOK_NUMBER 284
24798 -#define TOK_MAX_RATE 285
24799 -#define TOK_DUMP_DIR 286
24800 -#define TOK_LOGFILE 287
24801 -#define TOK_QOS 288
24802 -#define TOK_FROM 289
24803 -#define TOK_TO 290
24804 -#define TOK_ROUTE 291
24805 -#define TOK_PVC 292
24806 -
24807 +/* Line 1285 of yacc.c. */
24808 +#line 119 "y.tab.h"
24809 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
24810 +# define YYSTYPE_IS_DECLARED 1
24811 +# define YYSTYPE_IS_TRIVIAL 1
24812 +#endif
24813
24814 extern YYSTYPE yylval;
24815 +
24816 +
24817 +
24818 --- linux-atm-2.4.1.orig/src/maint/Makefile.in
24819 +++ linux-atm-2.4.1/src/maint/Makefile.in
24820 @@ -1,4 +1,4 @@
24821 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
24822 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
24823
24824 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
24825 # This Makefile.in is free software; the Free Software Foundation
24826 @@ -181,8 +181,11 @@
24827
24828 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
24829
24830 -TAR = gtar
24831 +TAR = tar
24832 GZIP_ENV = --best
24833 +DEP_FILES = .deps/atmaddr.P .deps/atmdiag.P .deps/atmdump.P \
24834 +.deps/atmloop.P .deps/atmtcp.P .deps/enitune.P .deps/esi.P \
24835 +.deps/saaldump.P .deps/sonetdiag.P .deps/zntune.P
24836 SOURCES = $(atmdiag_SOURCES) $(atmdump_SOURCES) $(sonetdiag_SOURCES) $(saaldump_SOURCES) $(atmaddr_SOURCES) $(esi_SOURCES) $(atmloop_SOURCES) $(atmtcp_SOURCES) $(enitune_SOURCES) $(zntune_SOURCES)
24837 OBJECTS = $(atmdiag_OBJECTS) $(atmdump_OBJECTS) $(sonetdiag_OBJECTS) $(saaldump_OBJECTS) $(atmaddr_OBJECTS) $(esi_OBJECTS) $(atmloop_OBJECTS) $(atmtcp_OBJECTS) $(enitune_OBJECTS) $(zntune_OBJECTS)
24838
24839 @@ -190,9 +193,9 @@
24840 .SUFFIXES:
24841 .SUFFIXES: .S .c .lo .o .obj .s
24842 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
24843 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/maint/Makefile
24844 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/maint/Makefile
24845
24846 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
24847 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
24848 cd $(top_builddir) \
24849 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
24850
24851 @@ -247,9 +250,6 @@
24852 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
24853 done
24854
24855 -.c.o:
24856 - $(COMPILE) -c $<
24857 -
24858 # FIXME: We should only use cygpath when building on Windows,
24859 # and only if it is available.
24860 .c.obj:
24861 @@ -272,9 +272,6 @@
24862
24863 maintainer-clean-compile:
24864
24865 -.c.lo:
24866 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
24867 -
24868 .s.lo:
24869 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
24870
24871 @@ -388,7 +385,7 @@
24872 awk ' { files[$$0] = 1; } \
24873 END { for (i in files) print i; }'`; \
24874 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
24875 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
24876 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
24877
24878 mostlyclean-tags:
24879
24880 @@ -404,6 +401,11 @@
24881 subdir = src/maint
24882
24883 distdir: $(DISTFILES)
24884 + here=`cd $(top_builddir) && pwd`; \
24885 + top_distdir=`cd $(top_distdir) && pwd`; \
24886 + distdir=`cd $(distdir) && pwd`; \
24887 + cd $(top_srcdir) \
24888 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/maint/Makefile
24889 @for file in $(DISTFILES); do \
24890 d=$(srcdir); \
24891 if test -d $$d/$$file; then \
24892 @@ -414,28 +416,38 @@
24893 || cp -p $$d/$$file $(distdir)/$$file || :; \
24894 fi; \
24895 done
24896 -atmaddr.o: atmaddr.c ../../config.h ../../src/include/atm.h \
24897 - ../../src/include/stdint.h
24898 -atmdiag.o: atmdiag.c ../../config.h ../../src/include/atm.h \
24899 - ../../src/include/stdint.h
24900 -atmdump.o: atmdump.c ../../config.h ../../src/include/stdint.h \
24901 - ../../src/include/atm.h
24902 -atmloop.o: atmloop.c ../../config.h ../../src/include/atm.h \
24903 - ../../src/include/stdint.h
24904 -atmtcp.o: atmtcp.c ../../config.h ../../src/include/stdint.h \
24905 - ../../src/include/atm.h ../../src/include/atmd.h
24906 -enitune.o: enitune.c ../../config.h ../../src/include/atm.h \
24907 - ../../src/include/stdint.h
24908 -esi.o: esi.c ../../config.h ../../src/include/atm.h \
24909 - ../../src/include/stdint.h
24910 -saaldump.o: saaldump.c ../../config.h ../../src/include/atm.h \
24911 - ../../src/include/stdint.h ../../src/saal/pdu.h \
24912 - ../../src/include/atmd.h ../../src/qgen/qlib.h
24913 -sonetdiag.o: sonetdiag.c ../../config.h ../../src/include/atm.h \
24914 - ../../src/include/stdint.h
24915 -zntune.o: zntune.c ../../config.h ../../src/include/atm.h \
24916 - ../../src/include/stdint.h
24917
24918 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
24919 +
24920 +-include $(DEP_FILES)
24921 +
24922 +mostlyclean-depend:
24923 +
24924 +clean-depend:
24925 +
24926 +distclean-depend:
24927 + -rm -rf .deps
24928 +
24929 +maintainer-clean-depend:
24930 +
24931 +%.o: %.c
24932 + @echo '$(COMPILE) -c $<'; \
24933 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
24934 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
24935 + tr ' ' '\012' < .deps/$(*F).pp \
24936 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
24937 + >> .deps/$(*F).P; \
24938 + rm .deps/$(*F).pp
24939 +
24940 +%.lo: %.c
24941 + @echo '$(LTCOMPILE) -c $<'; \
24942 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
24943 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
24944 + < .deps/$(*F).pp > .deps/$(*F).P; \
24945 + tr ' ' '\012' < .deps/$(*F).pp \
24946 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
24947 + >> .deps/$(*F).P; \
24948 + rm -f .deps/$(*F).pp
24949 info-am:
24950 info: info-am
24951 dvi-am:
24952 @@ -475,18 +487,19 @@
24953 maintainer-clean-generic:
24954 mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-sbinPROGRAMS \
24955 mostlyclean-compile mostlyclean-libtool \
24956 - mostlyclean-tags mostlyclean-generic
24957 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
24958
24959 mostlyclean: mostlyclean-am
24960
24961 clean-am: clean-binPROGRAMS clean-sbinPROGRAMS clean-compile \
24962 - clean-libtool clean-tags clean-generic mostlyclean-am
24963 + clean-libtool clean-tags clean-depend clean-generic \
24964 + mostlyclean-am
24965
24966 clean: clean-am
24967
24968 distclean-am: distclean-binPROGRAMS distclean-sbinPROGRAMS \
24969 distclean-compile distclean-libtool distclean-tags \
24970 - distclean-generic clean-am
24971 + distclean-depend distclean-generic clean-am
24972 -rm -f libtool
24973
24974 distclean: distclean-am
24975 @@ -494,7 +507,8 @@
24976 maintainer-clean-am: maintainer-clean-binPROGRAMS \
24977 maintainer-clean-sbinPROGRAMS maintainer-clean-compile \
24978 maintainer-clean-libtool maintainer-clean-tags \
24979 - maintainer-clean-generic distclean-am
24980 + maintainer-clean-depend maintainer-clean-generic \
24981 + distclean-am
24982 @echo "This command is intended for maintainers to use;"
24983 @echo "it deletes files that may require special tools to rebuild."
24984
24985 @@ -508,12 +522,14 @@
24986 clean-compile maintainer-clean-compile mostlyclean-libtool \
24987 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
24988 uninstall-man8 install-man uninstall-man tags mostlyclean-tags \
24989 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
24990 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
24991 -install-exec install-data-am install-data install-am install \
24992 -uninstall-am uninstall all-redirect all-am all installdirs \
24993 -mostlyclean-generic distclean-generic clean-generic \
24994 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
24995 +distclean-tags clean-tags maintainer-clean-tags distdir \
24996 +mostlyclean-depend distclean-depend clean-depend \
24997 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
24998 +installcheck-am installcheck install-exec-am install-exec \
24999 +install-data-am install-data install-am install uninstall-am uninstall \
25000 +all-redirect all-am all installdirs mostlyclean-generic \
25001 +distclean-generic clean-generic maintainer-clean-generic clean \
25002 +mostlyclean distclean maintainer-clean
25003
25004
25005 # Tell versions [3.59,3.63) of GNU make to not export all variables.
25006 --- linux-atm-2.4.1.orig/src/maint/atmtcp.c
25007 +++ linux-atm-2.4.1/src/maint/atmtcp.c
25008 @@ -60,7 +60,7 @@
25009 static IN *inputs = NULL;
25010 static fd_set in_set;
25011 static int fds = 0;
25012 -static int debug = 0;
25013 +static int atmtcp_debug = 0;
25014 static int links = 0;
25015
25016
25017 @@ -86,7 +86,7 @@
25018 {
25019 OUT *out;
25020
25021 - if (debug)
25022 + if (atmtcp_debug)
25023 fprintf(stderr,"Emit: %d.%d, %d bytes\n",ntohs(hdr->vpi),
25024 ntohs(hdr->vci),(int) ntohl(hdr->length));
25025 for (out = outputs; out; out = out->next)
25026 @@ -99,7 +99,7 @@
25027 OUT *out;
25028 int changed = 0;
25029
25030 - if (debug)
25031 + if (atmtcp_debug)
25032 fprintf(stderr,"Control: (%d.%d) %s %d.%d, vcc %s\n",
25033 ntohs(msg->hdr.vpi),ntohs(msg->hdr.vci),
25034 msg->type == ATMTCP_CTRL_OPEN ? "OPEN" :
25035 @@ -295,19 +295,19 @@
25036 }
25037 if ((s = socket(PF_ATMPVC,SOCK_DGRAM,0)) < 0) {
25038 msg->result = -errno;
25039 - if (debug) perror("socket");
25040 + if (atmtcp_debug) perror("socket");
25041 return 1;
25042 }
25043 if (setsockopt(s,SOL_ATM,SO_ATMQOS,&msg->qos,sizeof(msg->qos)) < 0) {
25044 msg->result = -errno;
25045 - if (debug) perror("setsockopt SO_ATMQOS");
25046 + if (atmtcp_debug) perror("setsockopt SO_ATMQOS");
25047 return 1;
25048 }
25049 msg->addr.sap_addr.itf = data->itf;
25050 if (connect(s,(struct sockaddr *) &msg->addr,
25051 sizeof(struct sockaddr_atmpvc)) < 0) {
25052 msg->result = -errno;
25053 - if (debug) perror("connect");
25054 + if (atmtcp_debug) perror("connect");
25055 return 1;
25056 }
25057 (*vcc) = alloc_t(VCC);
25058 @@ -333,7 +333,7 @@
25059 addr.sap_addr.vci = ntohs(hdr->vci);
25060 vcc = real_lookup(data,&addr);
25061 if (!*vcc) {
25062 - if (debug)
25063 + if (atmtcp_debug)
25064 fprintf(stderr,"VCC %d.%d not found\n",addr.sap_addr.vpi,
25065 addr.sap_addr.vci);
25066 return;
25067 @@ -430,7 +430,7 @@
25068 exit(1);
25069 }
25070 if (in->bytes < sizeof(*hdr)+ntohl(hdr->length)) return;
25071 - if (debug)
25072 + if (atmtcp_debug)
25073 fprintf(stderr,"TCP %d.%d, %d bytes\n",ntohs(hdr->vpi),
25074 ntohs(hdr->vci),(unsigned int) ntohl(hdr->length));
25075 in->bytes = 0;
25076 @@ -447,7 +447,7 @@
25077 fprintf(stderr,"unrecognized control message \"%s\"\n",msg);
25078 return;
25079 }
25080 - if (debug) fprintf(stderr,"received control \"%s\"\n",msg);
25081 + if (atmtcp_debug) fprintf(stderr,"received control \"%s\"\n",msg);
25082 ctl.hdr.vpi = htons(vpi);
25083 ctl.hdr.vci = htons(vci);
25084 ctl.hdr.length = htonl(ATMTCP_HDR_MAGIC);
25085 @@ -508,7 +508,7 @@
25086 }
25087 hdr->vpi = hdr->vci = htons(0);
25088 hdr->length = htonl(pos-start);
25089 - if (debug) fprintf(stderr,"sending control \"%s\"\n",start);
25090 + if (atmtcp_debug) fprintf(stderr,"sending control \"%s\"\n",start);
25091 tcp_do_send(*(int *) out->user,buf,pos-buf);
25092 return 0;
25093 }
25094 @@ -555,7 +555,7 @@
25095 exit(1);
25096 }
25097 if (in->bytes < sizeof(int)+sizeof(*hdr)+ntohl(hdr->length)) return;
25098 - if (debug)
25099 + if (atmtcp_debug)
25100 fprintf(stderr,"File %d.%d, %d bytes\n",ntohs(hdr->vpi),
25101 ntohs(hdr->vci),(unsigned int) ntohl(hdr->length));
25102 }
25103 @@ -708,7 +708,7 @@
25104 while ((c = getopt(argc,argv,"dvV")) != EOF)
25105 switch (c) {
25106 case 'd':
25107 - debug = 1;
25108 + atmtcp_debug = 1;
25109 break;
25110 case 'v':
25111 verbose = 1;
25112 @@ -817,7 +817,8 @@
25113 }
25114 else if (!strcmp(ARG,"listen") ||
25115 (do_background = !strcmp(ARG,"listen-bg"))) {
25116 - int fd,port,addr_len;
25117 + int fd,port;
25118 + size_t addr_len;
25119 int *fd2 = alloc_t(int);
25120
25121 if ((fd = socket(PF_INET,SOCK_STREAM,0)) < 0) {
25122 --- linux-atm-2.4.1.orig/src/maint/enitune.c
25123 +++ linux-atm-2.4.1/src/maint/enitune.c
25124 @@ -44,6 +44,7 @@
25125 if (*end || mult.rx <= 100) usage(name);
25126 break;
25127 default:
25128 + break;
25129 }
25130 if (argc != optind+1) usage(name);
25131 sioc.number = strtol(argv[optind],&end,0);
25132 --- linux-atm-2.4.1.orig/src/arpd/Makefile.in
25133 +++ linux-atm-2.4.1/src/arpd/Makefile.in
25134 @@ -1,4 +1,4 @@
25135 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
25136 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
25137
25138 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
25139 # This Makefile.in is free software; the Free Software Foundation
25140 @@ -90,8 +90,7 @@
25141 sbin_PROGRAMS = atmarp atmarpd
25142
25143 atmarp_SOURCES = atmarp.c atmarp.h atmarpd.h
25144 -atmarpd_SOURCES = atmarpd.c atmarpd.h arp.c arp.h io.c io.h itf.c itf.h \
25145 - table.c table.h atmarp.h
25146 +atmarpd_SOURCES = atmarpd.c atmarpd.h arp.c arp.h io.c io.h itf.c itf.h table.c table.h atmarp.h
25147
25148
25149 include_HEADERS = atmarp.h atmarpd.h
25150 @@ -135,8 +134,10 @@
25151
25152 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
25153
25154 -TAR = gtar
25155 +TAR = tar
25156 GZIP_ENV = --best
25157 +DEP_FILES = .deps/arp.P .deps/atmarp.P .deps/atmarpd.P .deps/io.P \
25158 +.deps/itf.P .deps/table.P
25159 SOURCES = $(atmarp_SOURCES) $(atmarpd_SOURCES)
25160 OBJECTS = $(atmarp_OBJECTS) $(atmarpd_OBJECTS)
25161
25162 @@ -144,9 +145,9 @@
25163 .SUFFIXES:
25164 .SUFFIXES: .S .c .lo .o .obj .s
25165 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
25166 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/arpd/Makefile
25167 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/arpd/Makefile
25168
25169 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
25170 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
25171 cd $(top_builddir) \
25172 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
25173
25174 @@ -176,9 +177,6 @@
25175 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
25176 done
25177
25178 -.c.o:
25179 - $(COMPILE) -c $<
25180 -
25181 # FIXME: We should only use cygpath when building on Windows,
25182 # and only if it is available.
25183 .c.obj:
25184 @@ -201,9 +199,6 @@
25185
25186 maintainer-clean-compile:
25187
25188 -.c.lo:
25189 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25190 -
25191 .s.lo:
25192 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25193
25194 @@ -300,7 +295,7 @@
25195 awk ' { files[$$0] = 1; } \
25196 END { for (i in files) print i; }'`; \
25197 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
25198 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
25199 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
25200
25201 mostlyclean-tags:
25202
25203 @@ -316,6 +311,11 @@
25204 subdir = src/arpd
25205
25206 distdir: $(DISTFILES)
25207 + here=`cd $(top_builddir) && pwd`; \
25208 + top_distdir=`cd $(top_distdir) && pwd`; \
25209 + distdir=`cd $(distdir) && pwd`; \
25210 + cd $(top_srcdir) \
25211 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/arpd/Makefile
25212 @for file in $(DISTFILES); do \
25213 d=$(srcdir); \
25214 if test -d $$d/$$file; then \
25215 @@ -326,24 +326,38 @@
25216 || cp -p $$d/$$file $(distdir)/$$file || :; \
25217 fi; \
25218 done
25219 -arp.o: arp.c ../../config.h ../../src/include/stdint.h \
25220 - ../../src/include/atm.h ../../src/include/atmd.h atmarp.h \
25221 - atmarpd.h table.h itf.h io.h arp.h
25222 -atmarp.o: atmarp.c ../../config.h ../../src/include/stdint.h \
25223 - ../../src/include/atm.h ../../src/include/atmd.h atmarpd.h
25224 -atmarpd.o: atmarpd.c ../../config.h ../../src/include/atm.h \
25225 - ../../src/include/stdint.h ../../src/include/atmd.h atmarpd.h \
25226 - io.h table.h
25227 -io.o: io.c ../../config.h ../../src/include/stdint.h \
25228 - ../../src/include/atm.h ../../src/include/atmd.h atmarpd.h \
25229 - table.h arp.h atmarp.h itf.h io.h
25230 -itf.o: itf.c ../../config.h ../../src/include/stdint.h \
25231 - ../../src/include/atmd.h ../../src/include/atm.h table.h io.h \
25232 - itf.h arp.h atmarp.h atmarpd.h
25233 -table.o: table.c ../../config.h ../../src/include/stdint.h \
25234 - ../../src/include/atm.h ../../src/include/atmd.h atmarpd.h \
25235 - table.h
25236
25237 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
25238 +
25239 +-include $(DEP_FILES)
25240 +
25241 +mostlyclean-depend:
25242 +
25243 +clean-depend:
25244 +
25245 +distclean-depend:
25246 + -rm -rf .deps
25247 +
25248 +maintainer-clean-depend:
25249 +
25250 +%.o: %.c
25251 + @echo '$(COMPILE) -c $<'; \
25252 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25253 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
25254 + tr ' ' '\012' < .deps/$(*F).pp \
25255 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25256 + >> .deps/$(*F).P; \
25257 + rm .deps/$(*F).pp
25258 +
25259 +%.lo: %.c
25260 + @echo '$(LTCOMPILE) -c $<'; \
25261 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25262 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
25263 + < .deps/$(*F).pp > .deps/$(*F).P; \
25264 + tr ' ' '\012' < .deps/$(*F).pp \
25265 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25266 + >> .deps/$(*F).P; \
25267 + rm -f .deps/$(*F).pp
25268 info-am:
25269 info: info-am
25270 dvi-am:
25271 @@ -383,27 +397,27 @@
25272
25273 maintainer-clean-generic:
25274 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
25275 - mostlyclean-libtool mostlyclean-tags \
25276 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
25277 mostlyclean-generic
25278
25279 mostlyclean: mostlyclean-am
25280
25281 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
25282 - clean-generic mostlyclean-am
25283 + clean-depend clean-generic mostlyclean-am
25284
25285 clean: clean-am
25286
25287 distclean-am: distclean-sbinPROGRAMS distclean-compile \
25288 - distclean-libtool distclean-tags distclean-generic \
25289 - clean-am
25290 + distclean-libtool distclean-tags distclean-depend \
25291 + distclean-generic clean-am
25292 -rm -f libtool
25293
25294 distclean: distclean-am
25295
25296 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
25297 maintainer-clean-compile maintainer-clean-libtool \
25298 - maintainer-clean-tags maintainer-clean-generic \
25299 - distclean-am
25300 + maintainer-clean-tags maintainer-clean-depend \
25301 + maintainer-clean-generic distclean-am
25302 @echo "This command is intended for maintainers to use;"
25303 @echo "it deletes files that may require special tools to rebuild."
25304
25305 @@ -416,8 +430,9 @@
25306 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
25307 uninstall-man8 install-man uninstall-man uninstall-includeHEADERS \
25308 install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
25309 -maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
25310 -installcheck-am installcheck install-exec-am install-exec \
25311 +maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
25312 +clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
25313 +check-am installcheck-am installcheck install-exec-am install-exec \
25314 install-data-am install-data install-am install uninstall-am uninstall \
25315 all-redirect all-am all installdirs mostlyclean-generic \
25316 distclean-generic clean-generic maintainer-clean-generic clean \
25317 --- linux-atm-2.4.1.orig/src/arpd/atmarp.c
25318 +++ linux-atm-2.4.1/src/arpd/atmarp.c
25319 @@ -92,7 +92,7 @@
25320 perror("read " ATMARP_DUMP_DIR "/" ATMARP_DUMP_FILE);
25321 return 1;
25322 }
25323 - if (write(0,buffer,size) < 0) {
25324 + if (write(1,buffer,size) < 0) {
25325 perror("write stdout");
25326 return 1;
25327 }
25328 --- linux-atm-2.4.1.orig/src/ilmid/Makefile.in
25329 +++ linux-atm-2.4.1/src/ilmid/Makefile.in
25330 @@ -1,4 +1,4 @@
25331 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
25332 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
25333
25334 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
25335 # This Makefile.in is free software; the Free Software Foundation
25336 @@ -91,13 +91,9 @@
25337
25338 sbin_PROGRAMS = ilmid
25339
25340 -ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \
25341 - util.c util.h io.c io.h message.c message.h \
25342 - atmf_uni.c atmf_uni.h mib.c mib.h \
25343 - sysgroup.c sysgroup.h ilmid.c
25344 +ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h util.c util.h io.c io.h message.c message.h atmf_uni.c atmf_uni.h mib.c mib.h sysgroup.c sysgroup.h ilmid.c
25345
25346 -ilmid_LDADD = $(top_builddir)/src/lib/libatm.la \
25347 - $(top_builddir)/src/ilmid/asn1/libasn1.a
25348 +ilmid_LDADD = $(top_builddir)/src/lib/libatm.la $(top_builddir)/src/ilmid/asn1/libasn1.a
25349
25350 ilmid_DEPENDENCIES = $(ilmid_LDADD)
25351
25352 @@ -127,8 +123,11 @@
25353
25354 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
25355
25356 -TAR = gtar
25357 +TAR = tar
25358 GZIP_ENV = --best
25359 +DEP_FILES = .deps/atmf_uni.P .deps/ilmid.P .deps/io.P .deps/message.P \
25360 +.deps/mib.P .deps/rfc1155_smi.P .deps/rfc1157_snmp.P .deps/sysgroup.P \
25361 +.deps/util.P
25362 SOURCES = $(ilmid_SOURCES)
25363 OBJECTS = $(ilmid_OBJECTS)
25364
25365 @@ -136,9 +135,9 @@
25366 .SUFFIXES:
25367 .SUFFIXES: .S .c .lo .o .obj .s
25368 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
25369 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/ilmid/Makefile
25370 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/ilmid/Makefile
25371
25372 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
25373 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
25374 cd $(top_builddir) \
25375 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
25376
25377 @@ -168,9 +167,6 @@
25378 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
25379 done
25380
25381 -.c.o:
25382 - $(COMPILE) -c $<
25383 -
25384 # FIXME: We should only use cygpath when building on Windows,
25385 # and only if it is available.
25386 .c.obj:
25387 @@ -193,9 +189,6 @@
25388
25389 maintainer-clean-compile:
25390
25391 -.c.lo:
25392 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25393 -
25394 .s.lo:
25395 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25396
25397 @@ -294,7 +287,7 @@
25398 awk ' { files[$$0] = 1; } \
25399 END { for (i in files) print i; }'`; \
25400 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
25401 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
25402 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
25403
25404 mostlyclean-tags:
25405
25406 @@ -310,6 +303,11 @@
25407 subdir = src/ilmid
25408
25409 distdir: $(DISTFILES)
25410 + here=`cd $(top_builddir) && pwd`; \
25411 + top_distdir=`cd $(top_distdir) && pwd`; \
25412 + distdir=`cd $(distdir) && pwd`; \
25413 + cd $(top_srcdir) \
25414 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/ilmid/Makefile
25415 @for file in $(DISTFILES); do \
25416 d=$(srcdir); \
25417 if test -d $$d/$$file; then \
25418 @@ -330,62 +328,38 @@
25419 || exit 1; \
25420 fi; \
25421 done
25422 -atmf_uni.o: atmf_uni.c ../../config.h atmf_uni.h asn1/asn_incl.h \
25423 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25424 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25425 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25426 - rfc1155_smi.h rfc1157_snmp.h mib.h ../../src/include/atmd.h \
25427 - ../../src/include/stdint.h ../../src/include/atm.h util.h
25428 -ilmid.o: ilmid.c ../../config.h asn1/asn_incl.h asn1/asn_config.h \
25429 - asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h asn1/asn_len.h \
25430 - asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h asn1/asn_bits.h \
25431 - asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h rfc1155_smi.h \
25432 - rfc1157_snmp.h message.h util.h ../../src/include/atmd.h \
25433 - ../../src/include/stdint.h ../../src/include/atm.h io.h mib.h \
25434 - atmf_uni.h sysgroup.h
25435 -io.o: io.c ../../config.h ../../src/include/stdint.h \
25436 - ../../src/include/atm.h io.h asn1/asn_incl.h asn1/asn_config.h \
25437 - asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h asn1/asn_len.h \
25438 - asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h asn1/asn_bits.h \
25439 - asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h rfc1155_smi.h \
25440 - rfc1157_snmp.h ../../src/include/atmd.h atmf_uni.h mib.h
25441 -message.o: message.c ../../config.h message.h asn1/asn_incl.h \
25442 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25443 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25444 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25445 - rfc1155_smi.h rfc1157_snmp.h atmf_uni.h mib.h \
25446 - ../../src/include/atmd.h ../../src/include/stdint.h \
25447 - ../../src/include/atm.h util.h
25448 -mib.o: mib.c ../../config.h mib.h ../../src/include/atmd.h \
25449 - ../../src/include/stdint.h ../../src/include/atm.h \
25450 - asn1/asn_incl.h asn1/asn_config.h asn1/nibble_alloc.h \
25451 - asn1/sbuf.h asn1/print.h asn1/asn_len.h asn1/asn_tag.h \
25452 - asn1/asn_int.h asn1/asn_octs.h asn1/asn_bits.h asn1/asn_oid.h \
25453 - asn1/asn_null.h asn1/asn_list.h rfc1155_smi.h rfc1157_snmp.h \
25454 - sysgroup.h atmf_uni.h util.h
25455 -rfc1155_smi.o: rfc1155_smi.c ../../config.h asn1/asn_incl.h \
25456 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25457 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25458 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25459 - rfc1155_smi.h rfc1157_snmp.h
25460 -rfc1157_snmp.o: rfc1157_snmp.c ../../config.h asn1/asn_incl.h \
25461 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25462 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25463 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25464 - rfc1155_smi.h rfc1157_snmp.h
25465 -sysgroup.o: sysgroup.c ../../config.h sysgroup.h asn1/asn_incl.h \
25466 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25467 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25468 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25469 - rfc1155_smi.h rfc1157_snmp.h mib.h ../../src/include/atmd.h \
25470 - ../../src/include/stdint.h ../../src/include/atm.h
25471 -util.o: util.c ../../config.h util.h asn1/asn_incl.h asn1/asn_config.h \
25472 - asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h asn1/asn_len.h \
25473 - asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h asn1/asn_bits.h \
25474 - asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h rfc1155_smi.h \
25475 - rfc1157_snmp.h ../../src/include/atmd.h \
25476 - ../../src/include/stdint.h ../../src/include/atm.h
25477
25478 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
25479 +
25480 +-include $(DEP_FILES)
25481 +
25482 +mostlyclean-depend:
25483 +
25484 +clean-depend:
25485 +
25486 +distclean-depend:
25487 + -rm -rf .deps
25488 +
25489 +maintainer-clean-depend:
25490 +
25491 +%.o: %.c
25492 + @echo '$(COMPILE) -c $<'; \
25493 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25494 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
25495 + tr ' ' '\012' < .deps/$(*F).pp \
25496 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25497 + >> .deps/$(*F).P; \
25498 + rm .deps/$(*F).pp
25499 +
25500 +%.lo: %.c
25501 + @echo '$(LTCOMPILE) -c $<'; \
25502 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25503 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
25504 + < .deps/$(*F).pp > .deps/$(*F).P; \
25505 + tr ' ' '\012' < .deps/$(*F).pp \
25506 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25507 + >> .deps/$(*F).P; \
25508 + rm -f .deps/$(*F).pp
25509 info-am:
25510 info: info-recursive
25511 dvi-am:
25512 @@ -424,27 +398,27 @@
25513
25514 maintainer-clean-generic:
25515 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
25516 - mostlyclean-libtool mostlyclean-tags \
25517 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
25518 mostlyclean-generic
25519
25520 mostlyclean: mostlyclean-recursive
25521
25522 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
25523 - clean-generic mostlyclean-am
25524 + clean-depend clean-generic mostlyclean-am
25525
25526 clean: clean-recursive
25527
25528 distclean-am: distclean-sbinPROGRAMS distclean-compile \
25529 - distclean-libtool distclean-tags distclean-generic \
25530 - clean-am
25531 + distclean-libtool distclean-tags distclean-depend \
25532 + distclean-generic clean-am
25533 -rm -f libtool
25534
25535 distclean: distclean-recursive
25536
25537 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
25538 maintainer-clean-compile maintainer-clean-libtool \
25539 - maintainer-clean-tags maintainer-clean-generic \
25540 - distclean-am
25541 + maintainer-clean-tags maintainer-clean-depend \
25542 + maintainer-clean-generic distclean-am
25543 @echo "This command is intended for maintainers to use;"
25544 @echo "it deletes files that may require special tools to rebuild."
25545
25546 @@ -460,12 +434,14 @@
25547 all-recursive check-recursive installcheck-recursive info-recursive \
25548 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
25549 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
25550 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
25551 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
25552 -install-exec install-data-am install-data install-am install \
25553 -uninstall-am uninstall all-redirect all-am all installdirs-am \
25554 -installdirs mostlyclean-generic distclean-generic clean-generic \
25555 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
25556 +distclean-tags clean-tags maintainer-clean-tags distdir \
25557 +mostlyclean-depend distclean-depend clean-depend \
25558 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
25559 +installcheck-am installcheck install-exec-am install-exec \
25560 +install-data-am install-data install-am install uninstall-am uninstall \
25561 +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
25562 +distclean-generic clean-generic maintainer-clean-generic clean \
25563 +mostlyclean distclean maintainer-clean
25564
25565
25566 # Tell versions [3.59,3.63) of GNU make to not export all variables.
25567 --- linux-atm-2.4.1.orig/src/ilmid/io.c
25568 +++ linux-atm-2.4.1/src/ilmid/io.c
25569 @@ -32,6 +32,7 @@
25570 #include <net/if.h>
25571 #include <atm.h>
25572 #include <linux/atmdev.h>
25573 +#include <unistd.h>
25574 #include "io.h"
25575 #include "atmd.h"
25576 #include "atmf_uni.h"
25577 @@ -299,4 +300,5 @@
25578 diag(COMPONENT,DIAG_ERROR,"ioctl ATM_GETCIRANGE: %s",strerror(errno));
25579 return error;
25580 }
25581 + return 0;
25582 }
25583 --- linux-atm-2.4.1.orig/src/ilmid/atmf_uni.c
25584 +++ linux-atm-2.4.1/src/ilmid/atmf_uni.c
25585 @@ -187,7 +187,7 @@
25586 newPrefix->name = alloc_t(AsnOid);
25587 newPrefix->name->octs = alloc(varBindName->octetLen);
25588 AsnOidCopy(newPrefix->name, varBindName);
25589 - Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix);
25590 + Q_INSERT_BEFORE_TYPED(var->value,(NetPrefixNode *), newPrefix, prefix);
25591 if(atmNetPrefix.octs == NULL)
25592 {
25593 atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2;
25594 @@ -197,7 +197,7 @@
25595 }
25596 else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual)
25597 {
25598 - Q_REMOVE((NetPrefixNode *) var->value, prefix);
25599 + Q_REMOVE(var->value, prefix);
25600 }
25601
25602 return NOERROR;
25603 --- linux-atm-2.4.1.orig/src/ilmid/mib.c
25604 +++ linux-atm-2.4.1/src/ilmid/mib.c
25605 @@ -58,13 +58,13 @@
25606 { NULL }
25607 };
25608
25609 -void MIBget(VarBindList *list, PDUInt *status, AsnInt *index)
25610 +void MIBget(VarBindList *list, PDUInt *status, AsnInt *Mindex)
25611 {
25612 VarBind *varbind;
25613 Variable *var;
25614 AsnOidResult result;
25615
25616 - *index = 1;
25617 + *Mindex = 1;
25618 FOR_EACH_LIST_ELMT(varbind, list)
25619 {
25620 /* Find the first MIB object not lexigraphically less than the *
25621 @@ -91,20 +91,20 @@
25622 if(*status != NOERROR)
25623 return;
25624
25625 - (*index)++;
25626 + (*Mindex)++;
25627 }
25628 - *index = 0;
25629 + *Mindex = 0;
25630 return;
25631 }
25632
25633
25634 -void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *index)
25635 +void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *Mindex)
25636 {
25637 VarBind *varbind;
25638 Variable *var;
25639 AsnOidResult result;
25640
25641 - *index = 1;
25642 + *Mindex = 1;
25643 FOR_EACH_LIST_ELMT(varbind, list)
25644 {
25645 /* Find the first complex MIB object not lexigraphically less than *
25646 @@ -139,19 +139,19 @@
25647 if(*status != NOERROR)
25648 return;
25649
25650 - (*index)++;
25651 + (*Mindex)++;
25652 }
25653 - *index = 0;
25654 + *Mindex = 0;
25655 return;
25656 }
25657
25658 -void MIBset(VarBindList *list, PDUInt *status, AsnInt *index)
25659 +void MIBset(VarBindList *list, PDUInt *status, AsnInt *Mindex)
25660 {
25661 VarBind *varbind;
25662 Variable *var;
25663 AsnOidResult result;
25664
25665 - *index = 1;
25666 + *Mindex = 1;
25667 FOR_EACH_LIST_ELMT(varbind, list)
25668 {
25669 /* Find the first MIB object not lexigraphically less than the *
25670 @@ -182,9 +182,9 @@
25671 if(*status != NOERROR)
25672 return;
25673
25674 - (*index)++;
25675 + (*Mindex)++;
25676 }
25677 - *index = 0;
25678 + *Mindex = 0;
25679 return;
25680 }
25681
25682 --- linux-atm-2.4.1.orig/src/ilmid/mib.h
25683 +++ linux-atm-2.4.1/src/ilmid/mib.h
25684 @@ -39,9 +39,9 @@
25685 void *value;
25686 } Variable;
25687
25688 -void MIBget(VarBindList *list, PDUInt *status, AsnInt *index);
25689 -void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *index);
25690 -void MIBset(VarBindList *list, PDUInt *status, AsnInt *index);
25691 +void MIBget(VarBindList *list, PDUInt *status, AsnInt *Mindex);
25692 +void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *Mindex);
25693 +void MIBset(VarBindList *list, PDUInt *status, AsnInt *Mindex);
25694 void *MIBdelete(AsnOid *oid);
25695
25696 AsnInt getString(VarBind *varbind, Variable *var);
25697 --- linux-atm-2.4.1.orig/src/ilmid/ilmid.c
25698 +++ linux-atm-2.4.1/src/ilmid/ilmid.c
25699 @@ -33,6 +33,7 @@
25700 #include <config.h>
25701 #endif
25702
25703 +#include <stdlib.h>
25704 #include <unistd.h>
25705 #include <sys/time.h>
25706 #include <errno.h>
25707 --- linux-atm-2.4.1.orig/src/ilmid/asn1/Makefile.in
25708 +++ linux-atm-2.4.1/src/ilmid/asn1/Makefile.in
25709 @@ -1,4 +1,4 @@
25710 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
25711 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
25712
25713 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
25714 # This Makefile.in is free software; the Free Software Foundation
25715 @@ -87,13 +87,7 @@
25716
25717 noinst_LIBRARIES = libasn1.a
25718
25719 -libasn1_a_SOURCES = asn_len.c asn_len.h asn_tag.c asn_tag.h \
25720 - asn_int.c asn_int.h asn_octs.c asn_octs.h \
25721 - asn_bits.c asn_bits.h str_stk.c str_stk.h \
25722 - asn_oid.c asn_oid.h asn_null.c asn_null.h \
25723 - asn_list.c asn_list.h nibble_alloc.c nibble_alloc.h \
25724 - print.c print.h \
25725 - asn_config.h min_buf.h sbuf.h exp_buf.h
25726 +libasn1_a_SOURCES = asn_len.c asn_len.h asn_tag.c asn_tag.h asn_int.c asn_int.h asn_octs.c asn_octs.h asn_bits.c asn_bits.h str_stk.c str_stk.h asn_oid.c asn_oid.h asn_null.c asn_null.h asn_list.c asn_list.h nibble_alloc.c nibble_alloc.h print.c print.h asn_config.h min_buf.h sbuf.h exp_buf.h
25727
25728
25729 EXTRA_libasn1_a_SOURCES = asn_incl.h exp_buf.c
25730 @@ -125,8 +119,12 @@
25731
25732 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
25733
25734 -TAR = gtar
25735 +TAR = tar
25736 GZIP_ENV = --best
25737 +DEP_FILES = .deps/asn_bits.P .deps/asn_int.P .deps/asn_len.P \
25738 +.deps/asn_list.P .deps/asn_null.P .deps/asn_octs.P .deps/asn_oid.P \
25739 +.deps/asn_tag.P .deps/exp_buf.P .deps/nibble_alloc.P .deps/print.P \
25740 +.deps/str_stk.P
25741 SOURCES = $(libasn1_a_SOURCES) $(EXTRA_libasn1_a_SOURCES)
25742 OBJECTS = $(libasn1_a_OBJECTS)
25743
25744 @@ -134,9 +132,9 @@
25745 .SUFFIXES:
25746 .SUFFIXES: .S .c .lo .o .obj .s
25747 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
25748 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/ilmid/asn1/Makefile
25749 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/ilmid/asn1/Makefile
25750
25751 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
25752 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
25753 cd $(top_builddir) \
25754 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
25755
25756 @@ -150,9 +148,6 @@
25757
25758 maintainer-clean-noinstLIBRARIES:
25759
25760 -.c.o:
25761 - $(COMPILE) -c $<
25762 -
25763 # FIXME: We should only use cygpath when building on Windows,
25764 # and only if it is available.
25765 .c.obj:
25766 @@ -175,9 +170,6 @@
25767
25768 maintainer-clean-compile:
25769
25770 -.c.lo:
25771 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25772 -
25773 .s.lo:
25774 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25775
25776 @@ -217,7 +209,7 @@
25777 awk ' { files[$$0] = 1; } \
25778 END { for (i in files) print i; }'`; \
25779 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
25780 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
25781 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
25782
25783 mostlyclean-tags:
25784
25785 @@ -233,6 +225,11 @@
25786 subdir = src/ilmid/asn1
25787
25788 distdir: $(DISTFILES)
25789 + here=`cd $(top_builddir) && pwd`; \
25790 + top_distdir=`cd $(top_distdir) && pwd`; \
25791 + distdir=`cd $(distdir) && pwd`; \
25792 + cd $(top_srcdir) \
25793 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/ilmid/asn1/Makefile
25794 @for file in $(DISTFILES); do \
25795 d=$(srcdir); \
25796 if test -d $$d/$$file; then \
25797 @@ -243,30 +240,38 @@
25798 || cp -p $$d/$$file $(distdir)/$$file || :; \
25799 fi; \
25800 done
25801 -asn_bits.o: asn_bits.c ../../../config.h asn_config.h nibble_alloc.h \
25802 - sbuf.h print.h asn_len.h asn_tag.h str_stk.h asn_bits.h
25803 -asn_int.o: asn_int.c ../../../config.h asn_config.h nibble_alloc.h \
25804 - sbuf.h print.h asn_len.h asn_tag.h asn_int.h
25805 -asn_len.o: asn_len.c ../../../config.h asn_config.h nibble_alloc.h \
25806 - sbuf.h print.h asn_len.h
25807 -asn_list.o: asn_list.c ../../../config.h asn_config.h nibble_alloc.h \
25808 - sbuf.h print.h asn_list.h
25809 -asn_null.o: asn_null.c ../../../config.h asn_config.h nibble_alloc.h \
25810 - sbuf.h print.h asn_len.h asn_tag.h asn_null.h
25811 -asn_octs.o: asn_octs.c ../../../config.h asn_config.h nibble_alloc.h \
25812 - sbuf.h print.h asn_len.h asn_tag.h str_stk.h asn_bits.h \
25813 - asn_octs.h
25814 -asn_oid.o: asn_oid.c ../../../config.h asn_config.h nibble_alloc.h \
25815 - sbuf.h print.h asn_len.h asn_tag.h asn_octs.h asn_oid.h
25816 -asn_tag.o: asn_tag.c ../../../config.h asn_config.h nibble_alloc.h \
25817 - sbuf.h print.h asn_len.h asn_tag.h
25818 -nibble_alloc.o: nibble_alloc.c ../../../config.h asn_config.h \
25819 - nibble_alloc.h sbuf.h print.h
25820 -print.o: print.c ../../../config.h asn_config.h nibble_alloc.h sbuf.h \
25821 - print.h
25822 -str_stk.o: str_stk.c ../../../config.h asn_config.h nibble_alloc.h \
25823 - sbuf.h print.h str_stk.h
25824
25825 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
25826 +
25827 +-include $(DEP_FILES)
25828 +
25829 +mostlyclean-depend:
25830 +
25831 +clean-depend:
25832 +
25833 +distclean-depend:
25834 + -rm -rf .deps
25835 +
25836 +maintainer-clean-depend:
25837 +
25838 +%.o: %.c
25839 + @echo '$(COMPILE) -c $<'; \
25840 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25841 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
25842 + tr ' ' '\012' < .deps/$(*F).pp \
25843 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25844 + >> .deps/$(*F).P; \
25845 + rm .deps/$(*F).pp
25846 +
25847 +%.lo: %.c
25848 + @echo '$(LTCOMPILE) -c $<'; \
25849 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25850 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
25851 + < .deps/$(*F).pp > .deps/$(*F).P; \
25852 + tr ' ' '\012' < .deps/$(*F).pp \
25853 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25854 + >> .deps/$(*F).P; \
25855 + rm -f .deps/$(*F).pp
25856 info-am:
25857 info: info-am
25858 dvi-am:
25859 @@ -303,27 +308,27 @@
25860
25861 maintainer-clean-generic:
25862 mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
25863 - mostlyclean-libtool mostlyclean-tags \
25864 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
25865 mostlyclean-generic
25866
25867 mostlyclean: mostlyclean-am
25868
25869 clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
25870 - clean-generic mostlyclean-am
25871 + clean-depend clean-generic mostlyclean-am
25872
25873 clean: clean-am
25874
25875 distclean-am: distclean-noinstLIBRARIES distclean-compile \
25876 - distclean-libtool distclean-tags distclean-generic \
25877 - clean-am
25878 + distclean-libtool distclean-tags distclean-depend \
25879 + distclean-generic clean-am
25880 -rm -f libtool
25881
25882 distclean: distclean-am
25883
25884 maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
25885 maintainer-clean-compile maintainer-clean-libtool \
25886 - maintainer-clean-tags maintainer-clean-generic \
25887 - distclean-am
25888 + maintainer-clean-tags maintainer-clean-depend \
25889 + maintainer-clean-generic distclean-am
25890 @echo "This command is intended for maintainers to use;"
25891 @echo "it deletes files that may require special tools to rebuild."
25892
25893 @@ -334,12 +339,14 @@
25894 mostlyclean-compile distclean-compile clean-compile \
25895 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
25896 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
25897 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
25898 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
25899 -install-exec install-data-am install-data install-am install \
25900 -uninstall-am uninstall all-redirect all-am all installdirs \
25901 -mostlyclean-generic distclean-generic clean-generic \
25902 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
25903 +distclean-tags clean-tags maintainer-clean-tags distdir \
25904 +mostlyclean-depend distclean-depend clean-depend \
25905 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
25906 +installcheck-am installcheck install-exec-am install-exec \
25907 +install-data-am install-data install-am install uninstall-am uninstall \
25908 +all-redirect all-am all installdirs mostlyclean-generic \
25909 +distclean-generic clean-generic maintainer-clean-generic clean \
25910 +mostlyclean distclean maintainer-clean
25911
25912
25913 # Tell versions [3.59,3.63) of GNU make to not export all variables.
25914 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_int.c
25915 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_int.c
25916 @@ -185,7 +185,7 @@
25917 AsnInt* v _AND_
25918 unsigned short int indent)
25919 {
25920 - fprintf(f,"%d", *v);
25921 + fprintf(f,"%ld", *v);
25922 }
25923
25924
25925 @@ -252,7 +252,6 @@
25926 UAsnInt* data)
25927 {
25928 int len;
25929 - int retLen;
25930 int i;
25931 unsigned long int mask;
25932 unsigned long int dataCpy;
25933 @@ -370,5 +369,5 @@
25934 UAsnInt* v _AND_
25935 unsigned short int indent)
25936 {
25937 - fprintf(f,"%u", *v);
25938 + fprintf(f,"%lu", *v);
25939 }
25940 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_octs.c
25941 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_octs.c
25942 @@ -21,6 +21,9 @@
25943 #include <config.h>
25944 #endif
25945
25946 +#include <stdlib.h>
25947 +#include <string.h>
25948 +
25949 #include "asn_config.h"
25950 #include "asn_len.h"
25951 #include "asn_tag.h"
25952 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_bits.c
25953 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_bits.c
25954 @@ -21,6 +21,9 @@
25955 #include <config.h>
25956 #endif
25957
25958 +#include <stdlib.h>
25959 +#include <string.h>
25960 +
25961 #include "asn_config.h"
25962 #include "asn_len.h"
25963 #include "asn_tag.h"
25964 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_oid.c
25965 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_oid.c
25966 @@ -21,6 +21,9 @@
25967 #include <config.h>
25968 #endif
25969
25970 +#include <stdlib.h>
25971 +#include <string.h>
25972 +
25973 #include "asn_config.h"
25974 #include "asn_len.h"
25975 #include "asn_tag.h"
25976 @@ -125,7 +128,7 @@
25977 if (firstArcNum > 2)
25978 firstArcNum = 2;
25979
25980 - fprintf(f,"%u %u", firstArcNum, arcNum - (firstArcNum * 40));
25981 + fprintf(f,"%d %lu", firstArcNum, arcNum - (firstArcNum * 40));
25982
25983 for (; i < v->octetLen ; )
25984 {
25985 @@ -134,7 +137,7 @@
25986
25987 arcNum = (arcNum << 7) + (v->octs[i] & 0x7f);
25988 i++;
25989 - fprintf(f," %u", arcNum);
25990 + fprintf(f," %lu", arcNum);
25991 }
25992 fprintf(f,"}");
25993
25994 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_list.c
25995 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_list.c
25996 @@ -20,6 +20,8 @@
25997 #include <config.h>
25998 #endif
25999
26000 +#include <stdlib.h>
26001 +
26002 #include "asn_config.h"
26003 #include "asn_list.h"
26004
26005 --- linux-atm-2.4.1.orig/src/ilmid/asn1/nibble_alloc.c
26006 +++ linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.c
26007 @@ -20,7 +20,9 @@
26008 #include <config.h>
26009 #endif
26010
26011 +#include <string.h>
26012 #include <memory.h>
26013 +#include <stdlib.h>
26014 #include "asn_config.h"
26015 #include "nibble_alloc.h"
26016
26017 --- linux-atm-2.4.1.orig/src/ilmid/asn1/nibble_alloc.h
26018 +++ linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.h
26019 @@ -39,13 +39,13 @@
26020 void InitNibbleMem PROTO((unsigned long int initialSize,
26021 unsigned long int incrementSize));
26022
26023 -void ShutdownNibbleMem();
26024 +void ShutdownNibbleMem(void);
26025
26026 void ServiceNibbleFault PROTO((unsigned long int size));
26027
26028 void* NibbleAlloc PROTO((unsigned long int size));
26029
26030 -void ResetNibbleMem();
26031 +void ResetNibbleMem(void);
26032
26033
26034 #endif /* conditional include */
26035 --- linux-atm-2.4.1.orig/src/man/Makefile.in
26036 +++ linux-atm-2.4.1/src/man/Makefile.in
26037 @@ -1,4 +1,4 @@
26038 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26039 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26040
26041 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26042 # This Makefile.in is free software; the Free Software Foundation
26043 @@ -100,14 +100,14 @@
26044
26045 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26046
26047 -TAR = gtar
26048 +TAR = tar
26049 GZIP_ENV = --best
26050 all: all-redirect
26051 .SUFFIXES:
26052 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26053 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/man/Makefile
26054 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/man/Makefile
26055
26056 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26057 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26058 cd $(top_builddir) \
26059 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26060
26061 @@ -159,6 +159,11 @@
26062 subdir = src/man
26063
26064 distdir: $(DISTFILES)
26065 + here=`cd $(top_builddir) && pwd`; \
26066 + top_distdir=`cd $(top_distdir) && pwd`; \
26067 + distdir=`cd $(distdir) && pwd`; \
26068 + cd $(top_srcdir) \
26069 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/man/Makefile
26070 @for file in $(DISTFILES); do \
26071 d=$(srcdir); \
26072 if test -d $$d/$$file; then \
26073 --- linux-atm-2.4.1.orig/src/led/Makefile.in
26074 +++ linux-atm-2.4.1/src/led/Makefile.in
26075 @@ -1,4 +1,4 @@
26076 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26077 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26078
26079 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26080 # This Makefile.in is free software; the Free Software Foundation
26081 @@ -87,9 +87,7 @@
26082
26083 sbin_PROGRAMS = zeppelin
26084
26085 -zeppelin_SOURCES = join.c join.h conn.c conn.h main.c address.c address.h \
26086 - frames.c frames.h display.c display.h \
26087 - kernel.c kernel.h frame_defs.h lec.h
26088 +zeppelin_SOURCES = join.c join.h conn.c conn.h main.c address.c address.h frames.c frames.h display.c display.h kernel.c kernel.h frame_defs.h lec.h
26089
26090 zeppelin_LDADD = $(top_builddir)/src/lib/libatm.la
26091 zeppelin_DEPENDENCIES = $(zeppelin_LDADD)
26092 @@ -125,8 +123,10 @@
26093
26094 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26095
26096 -TAR = gtar
26097 +TAR = tar
26098 GZIP_ENV = --best
26099 +DEP_FILES = .deps/address.P .deps/conn.P .deps/display.P .deps/frames.P \
26100 +.deps/join.P .deps/kernel.P .deps/main.P
26101 SOURCES = $(zeppelin_SOURCES)
26102 OBJECTS = $(zeppelin_OBJECTS)
26103
26104 @@ -134,9 +134,9 @@
26105 .SUFFIXES:
26106 .SUFFIXES: .S .c .lo .o .obj .s
26107 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26108 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/led/Makefile
26109 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/led/Makefile
26110
26111 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26112 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26113 cd $(top_builddir) \
26114 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26115
26116 @@ -166,9 +166,6 @@
26117 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
26118 done
26119
26120 -.c.o:
26121 - $(COMPILE) -c $<
26122 -
26123 # FIXME: We should only use cygpath when building on Windows,
26124 # and only if it is available.
26125 .c.obj:
26126 @@ -191,9 +188,6 @@
26127
26128 maintainer-clean-compile:
26129
26130 -.c.lo:
26131 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26132 -
26133 .s.lo:
26134 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26135
26136 @@ -271,7 +265,7 @@
26137 awk ' { files[$$0] = 1; } \
26138 END { for (i in files) print i; }'`; \
26139 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
26140 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
26141 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
26142
26143 mostlyclean-tags:
26144
26145 @@ -287,6 +281,11 @@
26146 subdir = src/led
26147
26148 distdir: $(DISTFILES)
26149 + here=`cd $(top_builddir) && pwd`; \
26150 + top_distdir=`cd $(top_distdir) && pwd`; \
26151 + distdir=`cd $(distdir) && pwd`; \
26152 + cd $(top_srcdir) \
26153 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/led/Makefile
26154 @for file in $(DISTFILES); do \
26155 d=$(srcdir); \
26156 if test -d $$d/$$file; then \
26157 @@ -297,28 +296,38 @@
26158 || cp -p $$d/$$file $(distdir)/$$file || :; \
26159 fi; \
26160 done
26161 -address.o: address.c ../../config.h ../../src/include/atm.h \
26162 - ../../src/include/stdint.h ../../src/include/atmd.h address.h
26163 -conn.o: conn.c ../../config.h ../../src/include/atm.h \
26164 - ../../src/include/stdint.h ../../src/include/atmsap.h \
26165 - ../../src/include/atmd.h conn.h display.h lec.h frames.h \
26166 - frame_defs.h kernel.h
26167 -display.o: display.c ../../config.h ../../src/include/atm.h \
26168 - ../../src/include/stdint.h ../../src/include/atmd.h display.h \
26169 - frame_defs.h
26170 -frames.o: frames.c ../../config.h ../../src/include/atm.h \
26171 - ../../src/include/stdint.h ../../src/include/atmd.h conn.h \
26172 - lec.h frames.h frame_defs.h display.h kernel.h
26173 -join.o: join.c ../../config.h ../../src/include/atm.h \
26174 - ../../src/include/stdint.h ../../src/include/atmd.h conn.h \
26175 - lec.h join.h frames.h frame_defs.h display.h
26176 -kernel.o: kernel.c ../../config.h ../../src/include/atm.h \
26177 - ../../src/include/stdint.h ../../src/include/atmd.h kernel.h \
26178 - lec.h conn.h frames.h frame_defs.h
26179 -main.o: main.c ../../config.h ../../src/include/atm.h \
26180 - ../../src/include/stdint.h ../../src/include/atmd.h join.h \
26181 - lec.h conn.h address.h display.h kernel.h
26182
26183 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
26184 +
26185 +-include $(DEP_FILES)
26186 +
26187 +mostlyclean-depend:
26188 +
26189 +clean-depend:
26190 +
26191 +distclean-depend:
26192 + -rm -rf .deps
26193 +
26194 +maintainer-clean-depend:
26195 +
26196 +%.o: %.c
26197 + @echo '$(COMPILE) -c $<'; \
26198 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26199 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
26200 + tr ' ' '\012' < .deps/$(*F).pp \
26201 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26202 + >> .deps/$(*F).P; \
26203 + rm .deps/$(*F).pp
26204 +
26205 +%.lo: %.c
26206 + @echo '$(LTCOMPILE) -c $<'; \
26207 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26208 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
26209 + < .deps/$(*F).pp > .deps/$(*F).P; \
26210 + tr ' ' '\012' < .deps/$(*F).pp \
26211 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26212 + >> .deps/$(*F).P; \
26213 + rm -f .deps/$(*F).pp
26214 info-am:
26215 info: info-am
26216 dvi-am:
26217 @@ -356,27 +365,27 @@
26218
26219 maintainer-clean-generic:
26220 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
26221 - mostlyclean-libtool mostlyclean-tags \
26222 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
26223 mostlyclean-generic
26224
26225 mostlyclean: mostlyclean-am
26226
26227 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
26228 - clean-generic mostlyclean-am
26229 + clean-depend clean-generic mostlyclean-am
26230
26231 clean: clean-am
26232
26233 distclean-am: distclean-sbinPROGRAMS distclean-compile \
26234 - distclean-libtool distclean-tags distclean-generic \
26235 - clean-am
26236 + distclean-libtool distclean-tags distclean-depend \
26237 + distclean-generic clean-am
26238 -rm -f libtool
26239
26240 distclean: distclean-am
26241
26242 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
26243 maintainer-clean-compile maintainer-clean-libtool \
26244 - maintainer-clean-tags maintainer-clean-generic \
26245 - distclean-am
26246 + maintainer-clean-tags maintainer-clean-depend \
26247 + maintainer-clean-generic distclean-am
26248 @echo "This command is intended for maintainers to use;"
26249 @echo "it deletes files that may require special tools to rebuild."
26250
26251 @@ -388,12 +397,14 @@
26252 clean-compile maintainer-clean-compile mostlyclean-libtool \
26253 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
26254 uninstall-man8 install-man uninstall-man tags mostlyclean-tags \
26255 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
26256 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
26257 -install-exec install-data-am install-data install-am install \
26258 -uninstall-am uninstall all-redirect all-am all installdirs \
26259 -mostlyclean-generic distclean-generic clean-generic \
26260 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
26261 +distclean-tags clean-tags maintainer-clean-tags distdir \
26262 +mostlyclean-depend distclean-depend clean-depend \
26263 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
26264 +installcheck-am installcheck install-exec-am install-exec \
26265 +install-data-am install-data install-am install uninstall-am uninstall \
26266 +all-redirect all-am all installdirs mostlyclean-generic \
26267 +distclean-generic clean-generic maintainer-clean-generic clean \
26268 +mostlyclean distclean maintainer-clean
26269
26270
26271 # Tell versions [3.59,3.63) of GNU make to not export all variables.
26272 --- linux-atm-2.4.1.orig/src/lane/Makefile.in
26273 +++ linux-atm-2.4.1/src/lane/Makefile.in
26274 @@ -1,4 +1,4 @@
26275 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26276 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26277
26278 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26279 # This Makefile.in is free software; the Free Software Foundation
26280 @@ -89,14 +89,11 @@
26281
26282 LDADD = $(top_builddir)/src/lib/libatm.la
26283
26284 -LES_BUS_SRCS = mem.c mem.h load.c load.h units.c units.h load_lex.l load_lex.h \
26285 - timers.c timers.h dump.c dump.h lane_atm.c lane_atm.h \
26286 - events.c events.h lane.c lane.h
26287 +LES_BUS_SRCS = mem.c mem.h load.c load.h units.c units.h load_lex.l load_lex.h timers.c timers.h dump.c dump.h lane_atm.c lane_atm.h events.c events.h lane.c lane.h
26288
26289 les_SOURCES = $(LES_BUS_SRCS) packet.c packet.h connect.c connect.h db.c db.h
26290 bus_SOURCES = $(LES_BUS_SRCS) connect_bus.c
26291 -lecs_SOURCES = lecs_db.l lecs_db.h lecs_load.c lecs_load.h lecs.c lecs.h \
26292 - ldb.c ldb.h mem_lecs.c mem_lecs.h atm_lecs.c atm_lecs.h
26293 +lecs_SOURCES = lecs_db.l lecs_db.h lecs_load.c lecs_load.h lecs.c lecs.h ldb.c ldb.h mem_lecs.c mem_lecs.h atm_lecs.c atm_lecs.h
26294
26295
26296 man_MANS = les.8 lecs.8 bus.8
26297 @@ -148,8 +145,13 @@
26298
26299 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26300
26301 -TAR = gtar
26302 +TAR = tar
26303 GZIP_ENV = --best
26304 +DEP_FILES = .deps/atm_lecs.P .deps/connect.P .deps/connect_bus.P \
26305 +.deps/db.P .deps/dump.P .deps/events.P .deps/lane.P .deps/lane_atm.P \
26306 +.deps/ldb.P .deps/lecs.P .deps/lecs_db.P .deps/lecs_load.P .deps/load.P \
26307 +.deps/load_lex.P .deps/mem.P .deps/mem_lecs.P .deps/packet.P \
26308 +.deps/timers.P .deps/units.P
26309 SOURCES = $(les_SOURCES) $(bus_SOURCES) $(lecs_SOURCES)
26310 OBJECTS = $(les_OBJECTS) $(bus_OBJECTS) $(lecs_OBJECTS)
26311
26312 @@ -157,9 +159,9 @@
26313 .SUFFIXES:
26314 .SUFFIXES: .S .c .l .lo .o .obj .s
26315 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26316 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/lane/Makefile
26317 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lane/Makefile
26318
26319 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26320 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26321 cd $(top_builddir) \
26322 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26323
26324 @@ -189,9 +191,6 @@
26325 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
26326 done
26327
26328 -.c.o:
26329 - $(COMPILE) -c $<
26330 -
26331 # FIXME: We should only use cygpath when building on Windows,
26332 # and only if it is available.
26333 .c.obj:
26334 @@ -214,9 +213,6 @@
26335
26336 maintainer-clean-compile:
26337
26338 -.c.lo:
26339 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26340 -
26341 .s.lo:
26342 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26343
26344 @@ -304,7 +300,7 @@
26345 awk ' { files[$$0] = 1; } \
26346 END { for (i in files) print i; }'`; \
26347 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
26348 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
26349 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
26350
26351 mostlyclean-tags:
26352
26353 @@ -320,6 +316,11 @@
26354 subdir = src/lane
26355
26356 distdir: $(DISTFILES)
26357 + here=`cd $(top_builddir) && pwd`; \
26358 + top_distdir=`cd $(top_distdir) && pwd`; \
26359 + distdir=`cd $(distdir) && pwd`; \
26360 + cd $(top_srcdir) \
26361 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/lane/Makefile
26362 @for file in $(DISTFILES); do \
26363 d=$(srcdir); \
26364 if test -d $$d/$$file; then \
26365 @@ -330,62 +331,38 @@
26366 || cp -p $$d/$$file $(distdir)/$$file || :; \
26367 fi; \
26368 done
26369 -atm_lecs.o: atm_lecs.c ../../config.h ../../src/include/atm.h \
26370 - ../../src/include/stdint.h ../../src/include/atmsap.h \
26371 - atm_lecs.h
26372 -connect.o: connect.c ../../config.h ../../src/include/stdint.h mem.h \
26373 - units.h lane.h dump.h ../../src/include/atm.h \
26374 - ../../src/include/atmsap.h load.h connect.h timers.h events.h \
26375 - db.h packet.h lane_atm.h
26376 -connect_bus.o: connect_bus.c ../../config.h ../../src/include/stdint.h \
26377 - mem.h units.h lane.h dump.h ../../src/include/atm.h \
26378 - ../../src/include/atmsap.h load.h connect.h timers.h events.h \
26379 - lane_atm.h
26380 -db.o: db.c ../../config.h ../../src/include/stdint.h mem.h units.h \
26381 - lane.h dump.h ../../src/include/atm.h \
26382 - ../../src/include/atmsap.h load.h connect.h timers.h events.h \
26383 - db.h
26384 -dump.o: dump.c ../../config.h ../../src/include/stdint.h \
26385 - ../../src/include/atm.h ../../src/include/atmsap.h dump.h \
26386 - units.h lane.h load.h
26387 -events.o: events.c ../../config.h events.h units.h load.h lane.h dump.h \
26388 - ../../src/include/atm.h ../../src/include/stdint.h \
26389 - ../../src/include/atmsap.h mem.h timers.h connect.h
26390 -lane.o: lane.c ../../config.h units.h load.h lane.h dump.h \
26391 - ../../src/include/atm.h ../../src/include/stdint.h \
26392 - ../../src/include/atmsap.h mem.h connect.h timers.h events.h
26393 -lane_atm.o: lane_atm.c ../../config.h lane_atm.h units.h lane.h \
26394 - connect.h timers.h load.h events.h ../../src/include/atmsap.h \
26395 - ../../src/include/stdint.h dump.h ../../src/include/atm.h mem.h
26396 -ldb.o: ldb.c ../../config.h ../../src/include/atm.h \
26397 - ../../src/include/stdint.h lecs.h ldb.h mem_lecs.h
26398 -lecs.o: lecs.c ../../config.h ../../src/include/stdint.h \
26399 - ../../src/include/atm.h lecs_load.h ldb.h mem_lecs.h lecs.h \
26400 - atm_lecs.h
26401 -lecs_db.o: lecs_db.c ../../config.h lecs_load.h lecs_db.h
26402 -lecs_load.o: lecs_load.c ../../config.h lecs_load.h lecs_db.h ldb.h \
26403 - lecs.h
26404 -load.o: load.c ../../config.h load.h units.h lane.h dump.h \
26405 - ../../src/include/atm.h ../../src/include/stdint.h \
26406 - ../../src/include/atmsap.h mem.h load_lex.h
26407 -load_lex.o: load_lex.c ../../config.h ../../src/include/stdint.h \
26408 - load_lex.h lane.h units.h load.h mem.h
26409 -mem.o: mem.c ../../config.h mem.h units.h dump.h ../../src/include/atm.h \
26410 - ../../src/include/stdint.h ../../src/include/atmsap.h lane.h \
26411 - load.h
26412 -mem_lecs.o: mem_lecs.c ../../config.h mem_lecs.h
26413 -packet.o: packet.c ../../config.h ../../src/include/stdint.h mem.h \
26414 - units.h lane.h dump.h ../../src/include/atm.h \
26415 - ../../src/include/atmsap.h load.h connect.h timers.h events.h \
26416 - db.h packet.h
26417 -timers.o: timers.c ../../config.h timers.h units.h load.h lane.h dump.h \
26418 - ../../src/include/atm.h ../../src/include/stdint.h \
26419 - ../../src/include/atmsap.h mem.h
26420 -units.o: units.c ../../config.h units.h mem.h lane.h load.h dump.h \
26421 - ../../src/include/atm.h ../../src/include/stdint.h \
26422 - ../../src/include/atmsap.h connect.h timers.h events.h \
26423 - lane_atm.h
26424
26425 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
26426 +
26427 +-include $(DEP_FILES)
26428 +
26429 +mostlyclean-depend:
26430 +
26431 +clean-depend:
26432 +
26433 +distclean-depend:
26434 + -rm -rf .deps
26435 +
26436 +maintainer-clean-depend:
26437 +
26438 +%.o: %.c
26439 + @echo '$(COMPILE) -c $<'; \
26440 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26441 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
26442 + tr ' ' '\012' < .deps/$(*F).pp \
26443 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26444 + >> .deps/$(*F).P; \
26445 + rm .deps/$(*F).pp
26446 +
26447 +%.lo: %.c
26448 + @echo '$(LTCOMPILE) -c $<'; \
26449 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26450 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
26451 + < .deps/$(*F).pp > .deps/$(*F).P; \
26452 + tr ' ' '\012' < .deps/$(*F).pp \
26453 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26454 + >> .deps/$(*F).P; \
26455 + rm -f .deps/$(*F).pp
26456 info-am:
26457 info: info-am
26458 dvi-am:
26459 @@ -422,29 +399,29 @@
26460 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
26461
26462 maintainer-clean-generic:
26463 - -test -z "lecs_dblload_lexl" || rm -f lecs_dbl load_lexl
26464 + -test -z "lecs_dbcload_lexc" || rm -f lecs_dbc load_lexc
26465 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
26466 - mostlyclean-libtool mostlyclean-tags \
26467 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
26468 mostlyclean-generic
26469
26470 mostlyclean: mostlyclean-am
26471
26472 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
26473 - clean-generic mostlyclean-am
26474 + clean-depend clean-generic mostlyclean-am
26475
26476 clean: clean-am
26477
26478 distclean-am: distclean-sbinPROGRAMS distclean-compile \
26479 - distclean-libtool distclean-tags distclean-generic \
26480 - clean-am
26481 + distclean-libtool distclean-tags distclean-depend \
26482 + distclean-generic clean-am
26483 -rm -f libtool
26484
26485 distclean: distclean-am
26486
26487 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
26488 maintainer-clean-compile maintainer-clean-libtool \
26489 - maintainer-clean-tags maintainer-clean-generic \
26490 - distclean-am
26491 + maintainer-clean-tags maintainer-clean-depend \
26492 + maintainer-clean-generic distclean-am
26493 @echo "This command is intended for maintainers to use;"
26494 @echo "it deletes files that may require special tools to rebuild."
26495
26496 @@ -456,12 +433,14 @@
26497 clean-compile maintainer-clean-compile mostlyclean-libtool \
26498 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
26499 uninstall-man8 install-man uninstall-man tags mostlyclean-tags \
26500 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
26501 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
26502 -install-exec install-data-am install-data install-am install \
26503 -uninstall-am uninstall all-redirect all-am all installdirs \
26504 -mostlyclean-generic distclean-generic clean-generic \
26505 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
26506 +distclean-tags clean-tags maintainer-clean-tags distdir \
26507 +mostlyclean-depend distclean-depend clean-depend \
26508 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
26509 +installcheck-am installcheck install-exec-am install-exec \
26510 +install-data-am install-data install-am install uninstall-am uninstall \
26511 +all-redirect all-am all installdirs mostlyclean-generic \
26512 +distclean-generic clean-generic maintainer-clean-generic clean \
26513 +mostlyclean distclean maintainer-clean
26514
26515
26516 # Tell versions [3.59,3.63) of GNU make to not export all variables.
26517 --- linux-atm-2.4.1.orig/src/mpoad/Makefile.in
26518 +++ linux-atm-2.4.1/src/mpoad/Makefile.in
26519 @@ -1,4 +1,4 @@
26520 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26521 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26522
26523 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26524 # This Makefile.in is free software; the Free Software Foundation
26525 @@ -89,9 +89,7 @@
26526
26527 LDADD = $(top_builddir)/src/lib/libatm.la
26528
26529 -mpcd_SOURCES = get_vars.c get_vars.h io.c io.h k_interf.c k_interf.h main.c \
26530 - p_factory.c p_recogn.c id_list.c tag_list.c \
26531 - poll2select.c poll2select.h lecs.c lecs.h packets.h
26532 +mpcd_SOURCES = get_vars.c get_vars.h io.c io.h k_interf.c k_interf.h main.c p_factory.c p_recogn.c id_list.c tag_list.c poll2select.c poll2select.h lecs.c lecs.h packets.h
26533
26534
26535 man_MANS = mpcd.8
26536 @@ -128,8 +126,11 @@
26537
26538 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26539
26540 -TAR = gtar
26541 +TAR = tar
26542 GZIP_ENV = --best
26543 +DEP_FILES = .deps/get_vars.P .deps/id_list.P .deps/io.P \
26544 +.deps/k_interf.P .deps/lecs.P .deps/main.P .deps/p_factory.P \
26545 +.deps/p_recogn.P .deps/poll2select.P .deps/tag_list.P
26546 SOURCES = $(mpcd_SOURCES)
26547 OBJECTS = $(mpcd_OBJECTS)
26548
26549 @@ -137,9 +138,9 @@
26550 .SUFFIXES:
26551 .SUFFIXES: .S .c .lo .o .obj .s
26552 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26553 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/mpoad/Makefile
26554 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/mpoad/Makefile
26555
26556 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26557 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26558 cd $(top_builddir) \
26559 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26560
26561 @@ -169,9 +170,6 @@
26562 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
26563 done
26564
26565 -.c.o:
26566 - $(COMPILE) -c $<
26567 -
26568 # FIXME: We should only use cygpath when building on Windows,
26569 # and only if it is available.
26570 .c.obj:
26571 @@ -194,9 +192,6 @@
26572
26573 maintainer-clean-compile:
26574
26575 -.c.lo:
26576 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26577 -
26578 .s.lo:
26579 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26580
26581 @@ -274,7 +269,7 @@
26582 awk ' { files[$$0] = 1; } \
26583 END { for (i in files) print i; }'`; \
26584 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
26585 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
26586 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
26587
26588 mostlyclean-tags:
26589
26590 @@ -290,6 +285,11 @@
26591 subdir = src/mpoad
26592
26593 distdir: $(DISTFILES)
26594 + here=`cd $(top_builddir) && pwd`; \
26595 + top_distdir=`cd $(top_distdir) && pwd`; \
26596 + distdir=`cd $(distdir) && pwd`; \
26597 + cd $(top_srcdir) \
26598 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/mpoad/Makefile
26599 @for file in $(DISTFILES); do \
26600 d=$(srcdir); \
26601 if test -d $$d/$$file; then \
26602 @@ -300,29 +300,38 @@
26603 || cp -p $$d/$$file $(distdir)/$$file || :; \
26604 fi; \
26605 done
26606 -get_vars.o: get_vars.c ../../config.h ../../src/include/stdint.h \
26607 - ../../src/include/atm.h packets.h get_vars.h io.h
26608 -id_list.o: id_list.c ../../config.h ../../src/include/atm.h \
26609 - ../../src/include/stdint.h packets.h
26610 -io.o: io.c ../../config.h ../../src/include/atm.h \
26611 - ../../src/include/stdint.h packets.h k_interf.h io.h get_vars.h \
26612 - poll2select.h
26613 -k_interf.o: k_interf.c ../../config.h ../../src/include/stdint.h \
26614 - ../../src/include/atm.h k_interf.h packets.h io.h get_vars.h
26615 -lecs.o: lecs.c ../../config.h ../../src/include/stdint.h \
26616 - ../../src/include/atm.h ../../src/include/atmsap.h lecs.h \
26617 - k_interf.h
26618 -main.o: main.c ../../config.h ../../src/include/atm.h \
26619 - ../../src/include/stdint.h packets.h io.h k_interf.h get_vars.h \
26620 - lecs.h
26621 -p_factory.o: p_factory.c ../../config.h ../../src/include/stdint.h \
26622 - ../../src/include/atm.h packets.h get_vars.h io.h
26623 -p_recogn.o: p_recogn.c ../../config.h ../../src/include/atm.h \
26624 - ../../src/include/stdint.h io.h k_interf.h packets.h
26625 -poll2select.o: poll2select.c ../../config.h
26626 -tag_list.o: tag_list.c ../../config.h packets.h ../../src/include/atm.h \
26627 - ../../src/include/stdint.h
26628
26629 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
26630 +
26631 +-include $(DEP_FILES)
26632 +
26633 +mostlyclean-depend:
26634 +
26635 +clean-depend:
26636 +
26637 +distclean-depend:
26638 + -rm -rf .deps
26639 +
26640 +maintainer-clean-depend:
26641 +
26642 +%.o: %.c
26643 + @echo '$(COMPILE) -c $<'; \
26644 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26645 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
26646 + tr ' ' '\012' < .deps/$(*F).pp \
26647 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26648 + >> .deps/$(*F).P; \
26649 + rm .deps/$(*F).pp
26650 +
26651 +%.lo: %.c
26652 + @echo '$(LTCOMPILE) -c $<'; \
26653 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26654 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
26655 + < .deps/$(*F).pp > .deps/$(*F).P; \
26656 + tr ' ' '\012' < .deps/$(*F).pp \
26657 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26658 + >> .deps/$(*F).P; \
26659 + rm -f .deps/$(*F).pp
26660 info-am:
26661 info: info-am
26662 dvi-am:
26663 @@ -360,27 +369,27 @@
26664
26665 maintainer-clean-generic:
26666 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
26667 - mostlyclean-libtool mostlyclean-tags \
26668 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
26669 mostlyclean-generic
26670
26671 mostlyclean: mostlyclean-am
26672
26673 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
26674 - clean-generic mostlyclean-am
26675 + clean-depend clean-generic mostlyclean-am
26676
26677 clean: clean-am
26678
26679 distclean-am: distclean-sbinPROGRAMS distclean-compile \
26680 - distclean-libtool distclean-tags distclean-generic \
26681 - clean-am
26682 + distclean-libtool distclean-tags distclean-depend \
26683 + distclean-generic clean-am
26684 -rm -f libtool
26685
26686 distclean: distclean-am
26687
26688 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
26689 maintainer-clean-compile maintainer-clean-libtool \
26690 - maintainer-clean-tags maintainer-clean-generic \
26691 - distclean-am
26692 + maintainer-clean-tags maintainer-clean-depend \
26693 + maintainer-clean-generic distclean-am
26694 @echo "This command is intended for maintainers to use;"
26695 @echo "it deletes files that may require special tools to rebuild."
26696
26697 @@ -392,12 +401,14 @@
26698 clean-compile maintainer-clean-compile mostlyclean-libtool \
26699 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
26700 uninstall-man8 install-man uninstall-man tags mostlyclean-tags \
26701 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
26702 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
26703 -install-exec install-data-am install-data install-am install \
26704 -uninstall-am uninstall all-redirect all-am all installdirs \
26705 -mostlyclean-generic distclean-generic clean-generic \
26706 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
26707 +distclean-tags clean-tags maintainer-clean-tags distdir \
26708 +mostlyclean-depend distclean-depend clean-depend \
26709 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
26710 +installcheck-am installcheck install-exec-am install-exec \
26711 +install-data-am install-data install-am install uninstall-am uninstall \
26712 +all-redirect all-am all installdirs mostlyclean-generic \
26713 +distclean-generic clean-generic maintainer-clean-generic clean \
26714 +mostlyclean distclean maintainer-clean
26715
26716
26717 # Tell versions [3.59,3.63) of GNU make to not export all variables.
26718 --- linux-atm-2.4.1.orig/src/mpoad/p_factory.c
26719 +++ linux-atm-2.4.1/src/mpoad/p_factory.c
26720 @@ -34,7 +34,7 @@
26721
26722 while( count > 1 ) {
26723 /* This is the inner loop */
26724 - sum += * ((uint16_t *) addr)++;
26725 + sum += * ((uint16_t *) addr); addr += sizeof(uint16_t);
26726 count -= 2;
26727 }
26728
26729 --- linux-atm-2.4.1.orig/src/switch/Makefile.in
26730 +++ linux-atm-2.4.1/src/switch/Makefile.in
26731 @@ -1,4 +1,4 @@
26732 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26733 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26734
26735 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26736 # This Makefile.in is free software; the Free Software Foundation
26737 @@ -92,11 +92,9 @@
26738
26739 swc_SOURCES = swc.c swc.h
26740 swc_LDADD = $(top_builddir)/src/lib/libatm.la
26741 -swc_DEPENDENCIES = $(swc_LDADD) $(top_builddir)/src/include/atm.h \
26742 - $(top_builddir)/src/include/atmd.h
26743 +swc_DEPENDENCIES = $(swc_LDADD) $(top_builddir)/src/include/atm.h $(top_builddir)/src/include/atmd.h
26744
26745 -libsw_a_SOURCES = control.c dispatch.c dispatch.h proto.c proto.h relay.c \
26746 - route.c route.h sig.c sig.h cfg_y.y cfg_l.l fab.h
26747 +libsw_a_SOURCES = control.c dispatch.c dispatch.h proto.c proto.h relay.c route.c route.h sig.c sig.h cfg_y.y cfg_l.l fab.h
26748
26749
26750 EXTRA_DIST = cfg_y.h README
26751 @@ -132,8 +130,11 @@
26752
26753 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26754
26755 -TAR = gtar
26756 +TAR = tar
26757 GZIP_ENV = --best
26758 +DEP_FILES = .deps/cfg_l.P .deps/cfg_y.P .deps/control.P \
26759 +.deps/dispatch.P .deps/proto.P .deps/relay.P .deps/route.P .deps/sig.P \
26760 +.deps/swc.P
26761 SOURCES = $(libsw_a_SOURCES) $(swc_SOURCES)
26762 OBJECTS = $(libsw_a_OBJECTS) $(swc_OBJECTS)
26763
26764 @@ -141,9 +142,9 @@
26765 .SUFFIXES:
26766 .SUFFIXES: .S .c .l .lo .o .obj .s .y
26767 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26768 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/switch/Makefile
26769 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/switch/Makefile
26770
26771 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26772 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26773 cd $(top_builddir) \
26774 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26775
26776 @@ -157,9 +158,6 @@
26777
26778 maintainer-clean-noinstLIBRARIES:
26779
26780 -.c.o:
26781 - $(COMPILE) -c $<
26782 -
26783 # FIXME: We should only use cygpath when building on Windows,
26784 # and only if it is available.
26785 .c.obj:
26786 @@ -182,9 +180,6 @@
26787
26788 maintainer-clean-compile:
26789
26790 -.c.lo:
26791 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26792 -
26793 .s.lo:
26794 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26795
26796 @@ -306,7 +301,7 @@
26797 awk ' { files[$$0] = 1; } \
26798 END { for (i in files) print i; }'`; \
26799 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
26800 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
26801 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
26802
26803 mostlyclean-tags:
26804
26805 @@ -322,6 +317,11 @@
26806 subdir = src/switch
26807
26808 distdir: $(DISTFILES)
26809 + here=`cd $(top_builddir) && pwd`; \
26810 + top_distdir=`cd $(top_distdir) && pwd`; \
26811 + distdir=`cd $(distdir) && pwd`; \
26812 + cd $(top_srcdir) \
26813 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/switch/Makefile
26814 @for file in $(DISTFILES); do \
26815 d=$(srcdir); \
26816 if test -d $$d/$$file; then \
26817 @@ -342,32 +342,38 @@
26818 || exit 1; \
26819 fi; \
26820 done
26821 -cfg_l.o: cfg_l.c ../../config.h ../../src/include/atm.h \
26822 - ../../src/include/stdint.h cfg_y.h
26823 -cfg_y.o: cfg_y.c ../../config.h ../../src/include/atm.h \
26824 - ../../src/include/stdint.h fab.h proto.h \
26825 - ../../src/include/atmsap.h ../../src/include/atmd.h sig.h \
26826 - route.h swc.h
26827 -control.o: control.c ../../config.h ../../src/include/atm.h \
26828 - ../../src/include/stdint.h ../../src/include/atmd.h fab.h \
26829 - proto.h ../../src/include/atmsap.h sig.h dispatch.h swc.h
26830 -dispatch.o: dispatch.c ../../config.h ../../src/include/atmd.h \
26831 - ../../src/include/stdint.h ../../src/include/atm.h dispatch.h
26832 -proto.o: proto.c ../../config.h ../../src/include/atm.h \
26833 - ../../src/include/stdint.h ../../src/include/atmd.h sig.h fab.h \
26834 - proto.h ../../src/include/atmsap.h
26835 -relay.o: relay.c ../../config.h ../../src/include/atm.h \
26836 - ../../src/include/stdint.h ../../src/include/atmd.h fab.h \
26837 - proto.h ../../src/include/atmsap.h sig.h dispatch.h route.h
26838 -route.o: route.c ../../config.h ../../src/include/atm.h \
26839 - ../../src/include/stdint.h ../../src/include/atmd.h route.h \
26840 - sig.h
26841 -sig.o: sig.c ../../config.h ../../src/include/stdint.h \
26842 - ../../src/include/atmd.h ../../src/include/atm.h dispatch.h \
26843 - proto.h ../../src/include/atmsap.h sig.h route.h fab.h
26844 -swc.o: swc.c ../../config.h ../../src/include/atm.h \
26845 - ../../src/include/stdint.h ../../src/include/atmd.h swc.h
26846
26847 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
26848 +
26849 +-include $(DEP_FILES)
26850 +
26851 +mostlyclean-depend:
26852 +
26853 +clean-depend:
26854 +
26855 +distclean-depend:
26856 + -rm -rf .deps
26857 +
26858 +maintainer-clean-depend:
26859 +
26860 +%.o: %.c
26861 + @echo '$(COMPILE) -c $<'; \
26862 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26863 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
26864 + tr ' ' '\012' < .deps/$(*F).pp \
26865 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26866 + >> .deps/$(*F).P; \
26867 + rm .deps/$(*F).pp
26868 +
26869 +%.lo: %.c
26870 + @echo '$(LTCOMPILE) -c $<'; \
26871 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26872 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
26873 + < .deps/$(*F).pp > .deps/$(*F).P; \
26874 + tr ' ' '\012' < .deps/$(*F).pp \
26875 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26876 + >> .deps/$(*F).P; \
26877 + rm -f .deps/$(*F).pp
26878 info-am:
26879 info: info-recursive
26880 dvi-am:
26881 @@ -404,22 +410,23 @@
26882 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
26883
26884 maintainer-clean-generic:
26885 - -test -z "cfg_llcfg_yhcfg_yc" || rm -f cfg_ll cfg_yh cfg_yc
26886 + -test -z "cfg_lccfg_yhcfg_yc" || rm -f cfg_lc cfg_yh cfg_yc
26887 mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
26888 mostlyclean-libtool mostlyclean-noinstPROGRAMS \
26889 - mostlyclean-tags mostlyclean-generic
26890 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
26891
26892 mostlyclean: mostlyclean-recursive
26893
26894 clean-am: clean-noinstLIBRARIES clean-compile clean-libtool \
26895 - clean-noinstPROGRAMS clean-tags clean-generic \
26896 - mostlyclean-am
26897 + clean-noinstPROGRAMS clean-tags clean-depend \
26898 + clean-generic mostlyclean-am
26899
26900 clean: clean-recursive
26901
26902 distclean-am: distclean-noinstLIBRARIES distclean-compile \
26903 distclean-libtool distclean-noinstPROGRAMS \
26904 - distclean-tags distclean-generic clean-am
26905 + distclean-tags distclean-depend distclean-generic \
26906 + clean-am
26907 -rm -f libtool
26908
26909 distclean: distclean-recursive
26910 @@ -427,7 +434,8 @@
26911 maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
26912 maintainer-clean-compile maintainer-clean-libtool \
26913 maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
26914 - maintainer-clean-generic distclean-am
26915 + maintainer-clean-depend maintainer-clean-generic \
26916 + distclean-am
26917 @echo "This command is intended for maintainers to use;"
26918 @echo "it deletes files that may require special tools to rebuild."
26919
26920 @@ -445,12 +453,14 @@
26921 all-recursive check-recursive installcheck-recursive info-recursive \
26922 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
26923 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
26924 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
26925 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
26926 -install-exec install-data-am install-data install-am install \
26927 -uninstall-am uninstall all-redirect all-am all installdirs-am \
26928 -installdirs mostlyclean-generic distclean-generic clean-generic \
26929 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
26930 +distclean-tags clean-tags maintainer-clean-tags distdir \
26931 +mostlyclean-depend distclean-depend clean-depend \
26932 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
26933 +installcheck-am installcheck install-exec-am install-exec \
26934 +install-data-am install-data install-am install uninstall-am uninstall \
26935 +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
26936 +distclean-generic clean-generic maintainer-clean-generic clean \
26937 +mostlyclean distclean maintainer-clean
26938
26939
26940 # Tell versions [3.59,3.63) of GNU make to not export all variables.
26941 --- linux-atm-2.4.1.orig/src/switch/cfg_y.c
26942 +++ linux-atm-2.4.1/src/switch/cfg_y.c
26943 @@ -1,21 +1,87 @@
26944 +/* A Bison parser, made by GNU Bison 1.875d. */
26945
26946 -/* A Bison parser, made from cfg_y.y
26947 - by GNU Bison version 1.28 */
26948 +/* Skeleton parser for Yacc-like parsing with Bison,
26949 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
26950
26951 -#define YYBISON 1 /* Identify Bison output. */
26952 + This program is free software; you can redistribute it and/or modify
26953 + it under the terms of the GNU General Public License as published by
26954 + the Free Software Foundation; either version 2, or (at your option)
26955 + any later version.
26956 +
26957 + This program is distributed in the hope that it will be useful,
26958 + but WITHOUT ANY WARRANTY; without even the implied warranty of
26959 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
26960 + GNU General Public License for more details.
26961 +
26962 + You should have received a copy of the GNU General Public License
26963 + along with this program; if not, write to the Free Software
26964 + Foundation, Inc., 59 Temple Place - Suite 330,
26965 + Boston, MA 02111-1307, USA. */
26966 +
26967 +/* As a special exception, when this file is copied by Bison into a
26968 + Bison output file, you may use that output file without restriction.
26969 + This special exception was added by the Free Software Foundation
26970 + in version 1.24 of Bison. */
26971 +
26972 +/* Written by Richard Stallman by simplifying the original so called
26973 + ``semantic'' parser. */
26974 +
26975 +/* All symbols defined below should begin with yy or YY, to avoid
26976 + infringing on user name space. This should be done even for local
26977 + variables, as they might otherwise be expanded by user macros.
26978 + There are some unavoidable exceptions within include files to
26979 + define necessary library symbols; they are noted "INFRINGES ON
26980 + USER NAME SPACE" below. */
26981 +
26982 +/* Identify Bison output. */
26983 +#define YYBISON 1
26984 +
26985 +/* Skeleton name. */
26986 +#define YYSKELETON_NAME "yacc.c"
26987 +
26988 +/* Pure parsers. */
26989 +#define YYPURE 0
26990 +
26991 +/* Using locations. */
26992 +#define YYLSP_NEEDED 0
26993
26994 -#define TOK_COMMAND 257
26995 -#define TOK_VPCI 258
26996 -#define TOK_ITF 259
26997 -#define TOK_DEFAULT 260
26998 -#define TOK_ROUTE 261
26999 -#define TOK_STR 262
27000 -#define TOK_SOCKET 263
27001 -#define TOK_OPTION 264
27002 -#define TOK_CONTROL 265
27003 -#define TOK_NUM 266
27004 -#define TOK_PVC 267
27005
27006 +
27007 +/* Tokens. */
27008 +#ifndef YYTOKENTYPE
27009 +# define YYTOKENTYPE
27010 + /* Put the tokens into the symbol table, so that GDB and other debuggers
27011 + know about them. */
27012 + enum yytokentype {
27013 + TOK_COMMAND = 258,
27014 + TOK_VPCI = 259,
27015 + TOK_ITF = 260,
27016 + TOK_DEFAULT = 261,
27017 + TOK_ROUTE = 262,
27018 + TOK_STR = 263,
27019 + TOK_SOCKET = 264,
27020 + TOK_OPTION = 265,
27021 + TOK_CONTROL = 266,
27022 + TOK_NUM = 267,
27023 + TOK_PVC = 268
27024 + };
27025 +#endif
27026 +#define TOK_COMMAND 258
27027 +#define TOK_VPCI 259
27028 +#define TOK_ITF 260
27029 +#define TOK_DEFAULT 261
27030 +#define TOK_ROUTE 262
27031 +#define TOK_STR 263
27032 +#define TOK_SOCKET 264
27033 +#define TOK_OPTION 265
27034 +#define TOK_CONTROL 266
27035 +#define TOK_NUM 267
27036 +#define TOK_PVC 268
27037 +
27038 +
27039 +
27040 +
27041 +/* Copy the first part of user declarations. */
27042 #line 1 "cfg_y.y"
27043
27044 /* cfg.y - switch configuration language */
27045 @@ -29,6 +95,7 @@
27046 #include <string.h>
27047 #include <errno.h>
27048 #include <limits.h>
27049 +#include <stdlib.h>
27050
27051 #include "atm.h"
27052
27053 @@ -38,436 +105,743 @@
27054 #include "swc.h"
27055
27056
27057 +extern void yyerror(const char *s);
27058 +
27059 static int itf;
27060 static SIGNALING_ENTITY *sig;
27061
27062
27063 -#line 27 "cfg_y.y"
27064 -typedef union {
27065 +
27066 +/* Enabling traces. */
27067 +#ifndef YYDEBUG
27068 +# define YYDEBUG 0
27069 +#endif
27070 +
27071 +/* Enabling verbose error messages. */
27072 +#ifdef YYERROR_VERBOSE
27073 +# undef YYERROR_VERBOSE
27074 +# define YYERROR_VERBOSE 1
27075 +#else
27076 +# define YYERROR_VERBOSE 0
27077 +#endif
27078 +
27079 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
27080 +#line 30 "cfg_y.y"
27081 +typedef union YYSTYPE {
27082 int num;
27083 char *str;
27084 struct sockaddr_atmpvc pvc;
27085 } YYSTYPE;
27086 -#include <stdio.h>
27087 -
27088 -#ifndef __cplusplus
27089 -#ifndef __STDC__
27090 -#define const
27091 -#endif
27092 +/* Line 191 of yacc.c. */
27093 +#line 137 "y.tab.c"
27094 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
27095 +# define YYSTYPE_IS_DECLARED 1
27096 +# define YYSTYPE_IS_TRIVIAL 1
27097 #endif
27098
27099
27100
27101 -#define YYFINAL 31
27102 -#define YYFLAG -32768
27103 -#define YYNTBASE 16
27104 -
27105 -#define YYTRANSLATE(x) ((unsigned)(x) <= 267 ? yytranslate[x] : 27)
27106 -
27107 -static const char yytranslate[] = { 0,
27108 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27109 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27110 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27111 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27112 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27113 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27114 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27115 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27116 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27117 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27118 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27119 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27120 - 2, 2, 14, 2, 15, 2, 2, 2, 2, 2,
27121 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27122 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27123 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27124 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27125 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27126 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27127 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27128 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27129 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27130 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27131 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27132 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27133 - 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
27134 - 7, 8, 9, 10, 11, 12, 13
27135 -};
27136 -
27137 -#if YYDEBUG != 0
27138 -static const short yyprhs[] = { 0,
27139 - 0, 1, 4, 7, 10, 13, 14, 15, 25, 26,
27140 - 29, 30, 33, 34, 36, 37, 40, 41, 45
27141 -};
27142 +/* Copy the second part of user declarations. */
27143 +
27144 +
27145 +/* Line 214 of yacc.c. */
27146 +#line 149 "y.tab.c"
27147 +
27148 +#if ! defined (yyoverflow) || YYERROR_VERBOSE
27149 +
27150 +# ifndef YYFREE
27151 +# define YYFREE free
27152 +# endif
27153 +# ifndef YYMALLOC
27154 +# define YYMALLOC malloc
27155 +# endif
27156 +
27157 +/* The parser invokes alloca or malloc; define the necessary symbols. */
27158 +
27159 +# ifdef YYSTACK_USE_ALLOCA
27160 +# if YYSTACK_USE_ALLOCA
27161 +# define YYSTACK_ALLOC alloca
27162 +# endif
27163 +# else
27164 +# if defined (alloca) || defined (_ALLOCA_H)
27165 +# define YYSTACK_ALLOC alloca
27166 +# else
27167 +# ifdef __GNUC__
27168 +# define YYSTACK_ALLOC __builtin_alloca
27169 +# endif
27170 +# endif
27171 +# endif
27172 +
27173 +# ifdef YYSTACK_ALLOC
27174 + /* Pacify GCC's `empty if-body' warning. */
27175 +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
27176 +# else
27177 +# if defined (__STDC__) || defined (__cplusplus)
27178 +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
27179 +# define YYSIZE_T size_t
27180 +# endif
27181 +# define YYSTACK_ALLOC YYMALLOC
27182 +# define YYSTACK_FREE YYFREE
27183 +# endif
27184 +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
27185 +
27186 +
27187 +#if (! defined (yyoverflow) \
27188 + && (! defined (__cplusplus) \
27189 + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
27190
27191 -static const short yyrhs[] = { -1,
27192 - 17, 16, 0, 18, 16, 0, 11, 16, 0, 10,
27193 - 8, 0, 0, 0, 21, 9, 14, 19, 22, 20,
27194 - 23, 24, 15, 0, 0, 3, 8, 0, 0, 5,
27195 - 12, 0, 0, 13, 0, 0, 26, 24, 0, 0,
27196 - 6, 25, 24, 0, 7, 0
27197 -};
27198 +/* A type that is properly aligned for any stack member. */
27199 +union yyalloc
27200 +{
27201 + short int yyss;
27202 + YYSTYPE yyvs;
27203 + };
27204 +
27205 +/* The size of the maximum gap between one aligned stack and the next. */
27206 +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
27207 +
27208 +/* The size of an array large to enough to hold all stacks, each with
27209 + N elements. */
27210 +# define YYSTACK_BYTES(N) \
27211 + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
27212 + + YYSTACK_GAP_MAXIMUM)
27213 +
27214 +/* Copy COUNT objects from FROM to TO. The source and destination do
27215 + not overlap. */
27216 +# ifndef YYCOPY
27217 +# if defined (__GNUC__) && 1 < __GNUC__
27218 +# define YYCOPY(To, From, Count) \
27219 + __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
27220 +# else
27221 +# define YYCOPY(To, From, Count) \
27222 + do \
27223 + { \
27224 + register YYSIZE_T yyi; \
27225 + for (yyi = 0; yyi < (Count); yyi++) \
27226 + (To)[yyi] = (From)[yyi]; \
27227 + } \
27228 + while (0)
27229 +# endif
27230 +# endif
27231 +
27232 +/* Relocate STACK from its old location to the new one. The
27233 + local variables YYSIZE and YYSTACKSIZE give the old and new number of
27234 + elements in the stack, and YYPTR gives the new location of the
27235 + stack. Advance YYPTR to a properly aligned location for the next
27236 + stack. */
27237 +# define YYSTACK_RELOCATE(Stack) \
27238 + do \
27239 + { \
27240 + YYSIZE_T yynewbytes; \
27241 + YYCOPY (&yyptr->Stack, Stack, yysize); \
27242 + Stack = &yyptr->Stack; \
27243 + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
27244 + yyptr += yynewbytes / sizeof (*yyptr); \
27245 + } \
27246 + while (0)
27247
27248 #endif
27249
27250 -#if YYDEBUG != 0
27251 -static const short yyrline[] = { 0,
27252 - 43, 44, 45, 46, 52, 59, 65, 73, 76, 80,
27253 - 87, 88, 94, 95, 101, 102, 103, 108, 110
27254 -};
27255 +#if defined (__STDC__) || defined (__cplusplus)
27256 + typedef signed char yysigned_char;
27257 +#else
27258 + typedef short int yysigned_char;
27259 #endif
27260
27261 +/* YYFINAL -- State number of the termination state. */
27262 +#define YYFINAL 11
27263 +/* YYLAST -- Last index in YYTABLE. */
27264 +#define YYLAST 22
27265 +
27266 +/* YYNTOKENS -- Number of terminals. */
27267 +#define YYNTOKENS 16
27268 +/* YYNNTS -- Number of nonterminals. */
27269 +#define YYNNTS 12
27270 +/* YYNRULES -- Number of rules. */
27271 +#define YYNRULES 20
27272 +/* YYNRULES -- Number of states. */
27273 +#define YYNSTATES 31
27274 +
27275 +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
27276 +#define YYUNDEFTOK 2
27277 +#define YYMAXUTOK 268
27278
27279 -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
27280 +#define YYTRANSLATE(YYX) \
27281 + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
27282
27283 -static const char * const yytname[] = { "$","error","$undefined.","TOK_COMMAND",
27284 -"TOK_VPCI","TOK_ITF","TOK_DEFAULT","TOK_ROUTE","TOK_STR","TOK_SOCKET","TOK_OPTION",
27285 -"TOK_CONTROL","TOK_NUM","TOK_PVC","'{'","'}'","all","option","sig","@1","@2",
27286 -"opt_command","opt_itf","opt_via","routes","@3","route", NULL
27287 +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
27288 +static const unsigned char yytranslate[] =
27289 +{
27290 + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27291 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27292 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27293 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27294 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27295 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27296 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27297 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27298 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27299 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27300 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27301 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27302 + 2, 2, 2, 14, 2, 15, 2, 2, 2, 2,
27303 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27304 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27305 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27306 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27307 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27308 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27309 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27310 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27311 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27312 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27313 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27314 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27315 + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
27316 + 5, 6, 7, 8, 9, 10, 11, 12, 13
27317 };
27318 -#endif
27319
27320 -static const short yyr1[] = { 0,
27321 - 16, 16, 16, 16, 17, 19, 20, 18, 21, 21,
27322 - 22, 22, 23, 23, 24, 24, 25, 24, 26
27323 +#if YYDEBUG
27324 +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
27325 + YYRHS. */
27326 +static const unsigned char yyprhs[] =
27327 +{
27328 + 0, 0, 3, 4, 7, 10, 13, 16, 17, 18,
27329 + 28, 29, 32, 33, 36, 37, 39, 40, 43, 44,
27330 + 48
27331 };
27332
27333 -static const short yyr2[] = { 0,
27334 - 0, 2, 2, 2, 2, 0, 0, 9, 0, 2,
27335 - 0, 2, 0, 1, 0, 2, 0, 3, 1
27336 +/* YYRHS -- A `-1'-separated list of the rules' RHS. */
27337 +static const yysigned_char yyrhs[] =
27338 +{
27339 + 17, 0, -1, -1, 18, 17, -1, 19, 17, -1,
27340 + 11, 17, -1, 10, 8, -1, -1, -1, 22, 9,
27341 + 14, 20, 23, 21, 24, 25, 15, -1, -1, 3,
27342 + 8, -1, -1, 5, 12, -1, -1, 13, -1, -1,
27343 + 27, 25, -1, -1, 6, 26, 25, -1, 7, -1
27344 };
27345
27346 -static const short yydefact[] = { 1,
27347 - 0, 0, 1, 1, 1, 0, 10, 5, 4, 2,
27348 - 3, 0, 6, 11, 0, 7, 12, 13, 14, 15,
27349 - 17, 19, 0, 15, 15, 8, 16, 18, 0, 0,
27350 - 0
27351 +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
27352 +static const unsigned char yyrline[] =
27353 +{
27354 + 0, 46, 46, 47, 48, 49, 56, 64, 68, 63,
27355 + 80, 83, 90, 91, 97, 98, 104, 105, 107, 106,
27356 + 114
27357 };
27358 +#endif
27359
27360 -static const short yydefgoto[] = { 9,
27361 - 4, 5, 14, 18, 6, 16, 20, 23, 25, 24
27362 +#if YYDEBUG || YYERROR_VERBOSE
27363 +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
27364 + First, the terminals, then, starting at YYNTOKENS, nonterminals. */
27365 +static const char *const yytname[] =
27366 +{
27367 + "$end", "error", "$undefined", "TOK_COMMAND", "TOK_VPCI", "TOK_ITF",
27368 + "TOK_DEFAULT", "TOK_ROUTE", "TOK_STR", "TOK_SOCKET", "TOK_OPTION",
27369 + "TOK_CONTROL", "TOK_NUM", "TOK_PVC", "'{'", "'}'", "$accept", "all",
27370 + "option", "sig", "@1", "@2", "opt_command", "opt_itf", "opt_via",
27371 + "routes", "@3", "route", 0
27372 };
27373 +#endif
27374
27375 -static const short yypact[] = { -3,
27376 - 3, 4, -3, -3, -3, 6,-32768,-32768,-32768,-32768,
27377 --32768, -1,-32768, 9, 7,-32768,-32768, 8,-32768, -5,
27378 --32768,-32768, 1, -5, -5,-32768,-32768,-32768, 17, 18,
27379 --32768
27380 +# ifdef YYPRINT
27381 +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
27382 + token YYLEX-NUM. */
27383 +static const unsigned short int yytoknum[] =
27384 +{
27385 + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
27386 + 265, 266, 267, 268, 123, 125
27387 };
27388 +# endif
27389
27390 -static const short yypgoto[] = { 5,
27391 --32768,-32768,-32768,-32768,-32768,-32768,-32768, -21,-32768,-32768
27392 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
27393 +static const unsigned char yyr1[] =
27394 +{
27395 + 0, 16, 17, 17, 17, 17, 18, 20, 21, 19,
27396 + 22, 22, 23, 23, 24, 24, 25, 25, 26, 25,
27397 + 27
27398 };
27399
27400 -
27401 -#define YYLAST 21
27402 -
27403 -
27404 -static const short yytable[] = { 1,
27405 - 21, 22, 27, 28, 29, -9, 2, 3, 10, 11,
27406 - 7, 8, 13, 15, 12, 26, 30, 31, 17, 0,
27407 - 19
27408 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
27409 +static const unsigned char yyr2[] =
27410 +{
27411 + 0, 2, 0, 2, 2, 2, 2, 0, 0, 9,
27412 + 0, 2, 0, 2, 0, 1, 0, 2, 0, 3,
27413 + 1
27414 };
27415
27416 -static const short yycheck[] = { 3,
27417 - 6, 7, 24, 25, 0, 9, 10, 11, 4, 5,
27418 - 8, 8, 14, 5, 9, 15, 0, 0, 12, -1,
27419 - 13
27420 +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
27421 + STATE-NUM when YYTABLE doesn't specify something else to do. Zero
27422 + means the default is an error. */
27423 +static const unsigned char yydefact[] =
27424 +{
27425 + 2, 0, 0, 2, 0, 2, 2, 0, 11, 6,
27426 + 5, 1, 3, 4, 0, 7, 12, 0, 8, 13,
27427 + 14, 15, 16, 18, 20, 0, 16, 16, 9, 17,
27428 + 19
27429 };
27430 -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
27431 -#line 3 "/usr/lib/bison.simple"
27432 -/* This file comes from bison-1.28. */
27433
27434 -/* Skeleton output parser for bison,
27435 - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
27436 +/* YYDEFGOTO[NTERM-NUM]. */
27437 +static const yysigned_char yydefgoto[] =
27438 +{
27439 + -1, 4, 5, 6, 16, 20, 7, 18, 22, 25,
27440 + 27, 26
27441 +};
27442
27443 - This program is free software; you can redistribute it and/or modify
27444 - it under the terms of the GNU General Public License as published by
27445 - the Free Software Foundation; either version 2, or (at your option)
27446 - any later version.
27447 +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
27448 + STATE-NUM. */
27449 +#define YYPACT_NINF -16
27450 +static const yysigned_char yypact[] =
27451 +{
27452 + -3, -6, 5, -3, 14, -3, -3, -4, -16, -16,
27453 + -16, -16, -16, -16, 1, -16, 11, 6, -16, -16,
27454 + 4, -16, 3, -16, -16, 7, 3, 3, -16, -16,
27455 + -16
27456 +};
27457
27458 - This program is distributed in the hope that it will be useful,
27459 - but WITHOUT ANY WARRANTY; without even the implied warranty of
27460 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27461 - GNU General Public License for more details.
27462 +/* YYPGOTO[NTERM-NUM]. */
27463 +static const yysigned_char yypgoto[] =
27464 +{
27465 + -16, -2, -16, -16, -16, -16, -16, -16, -16, -15,
27466 + -16, -16
27467 +};
27468
27469 - You should have received a copy of the GNU General Public License
27470 - along with this program; if not, write to the Free Software
27471 - Foundation, Inc., 59 Temple Place - Suite 330,
27472 - Boston, MA 02111-1307, USA. */
27473 +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
27474 + positive, shift that token. If negative, reduce the rule which
27475 + number is the opposite. If zero, do what YYDEFACT says.
27476 + If YYTABLE_NINF, syntax error. */
27477 +#define YYTABLE_NINF -11
27478 +static const yysigned_char yytable[] =
27479 +{
27480 + 1, 10, 8, 12, 13, 14, -10, 2, 3, 23,
27481 + 24, 29, 30, 9, 11, 15, 17, 21, 19, 0,
27482 + 0, 0, 28
27483 +};
27484
27485 -/* As a special exception, when this file is copied by Bison into a
27486 - Bison output file, you may use that output file without restriction.
27487 - This special exception was added by the Free Software Foundation
27488 - in version 1.24 of Bison. */
27489 +static const yysigned_char yycheck[] =
27490 +{
27491 + 3, 3, 8, 5, 6, 9, 9, 10, 11, 6,
27492 + 7, 26, 27, 8, 0, 14, 5, 13, 12, -1,
27493 + -1, -1, 15
27494 +};
27495
27496 -/* This is the parser code that is written into each bison parser
27497 - when the %semantic_parser declaration is not specified in the grammar.
27498 - It was written by Richard Stallman by simplifying the hairy parser
27499 - used when %semantic_parser is specified. */
27500 -
27501 -#ifndef YYSTACK_USE_ALLOCA
27502 -#ifdef alloca
27503 -#define YYSTACK_USE_ALLOCA
27504 -#else /* alloca not defined */
27505 -#ifdef __GNUC__
27506 -#define YYSTACK_USE_ALLOCA
27507 -#define alloca __builtin_alloca
27508 -#else /* not GNU C. */
27509 -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
27510 -#define YYSTACK_USE_ALLOCA
27511 -#include <alloca.h>
27512 -#else /* not sparc */
27513 -/* We think this test detects Watcom and Microsoft C. */
27514 -/* This used to test MSDOS, but that is a bad idea
27515 - since that symbol is in the user namespace. */
27516 -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
27517 -#if 0 /* No need for malloc.h, which pollutes the namespace;
27518 - instead, just don't use alloca. */
27519 -#include <malloc.h>
27520 -#endif
27521 -#else /* not MSDOS, or __TURBOC__ */
27522 -#if defined(_AIX)
27523 -/* I don't know what this was needed for, but it pollutes the namespace.
27524 - So I turned it off. rms, 2 May 1997. */
27525 -/* #include <malloc.h> */
27526 - #pragma alloca
27527 -#define YYSTACK_USE_ALLOCA
27528 -#else /* not MSDOS, or __TURBOC__, or _AIX */
27529 -#if 0
27530 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
27531 - and on HPUX 10. Eventually we can turn this on. */
27532 -#define YYSTACK_USE_ALLOCA
27533 -#define alloca __builtin_alloca
27534 -#endif /* __hpux */
27535 -#endif
27536 -#endif /* not _AIX */
27537 -#endif /* not MSDOS, or __TURBOC__ */
27538 -#endif /* not sparc */
27539 -#endif /* not GNU C */
27540 -#endif /* alloca not defined */
27541 -#endif /* YYSTACK_USE_ALLOCA not defined */
27542 +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
27543 + symbol of state STATE-NUM. */
27544 +static const unsigned char yystos[] =
27545 +{
27546 + 0, 3, 10, 11, 17, 18, 19, 22, 8, 8,
27547 + 17, 0, 17, 17, 9, 14, 20, 5, 23, 12,
27548 + 21, 13, 24, 6, 7, 25, 27, 26, 15, 25,
27549 + 25
27550 +};
27551
27552 -#ifdef YYSTACK_USE_ALLOCA
27553 -#define YYSTACK_ALLOC alloca
27554 -#else
27555 -#define YYSTACK_ALLOC malloc
27556 +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
27557 +# define YYSIZE_T __SIZE_TYPE__
27558 +#endif
27559 +#if ! defined (YYSIZE_T) && defined (size_t)
27560 +# define YYSIZE_T size_t
27561 +#endif
27562 +#if ! defined (YYSIZE_T)
27563 +# if defined (__STDC__) || defined (__cplusplus)
27564 +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
27565 +# define YYSIZE_T size_t
27566 +# endif
27567 +#endif
27568 +#if ! defined (YYSIZE_T)
27569 +# define YYSIZE_T unsigned int
27570 #endif
27571 -
27572 -/* Note: there must be only one dollar sign in this file.
27573 - It is replaced by the list of actions, each action
27574 - as one case of the switch. */
27575
27576 #define yyerrok (yyerrstatus = 0)
27577 #define yyclearin (yychar = YYEMPTY)
27578 -#define YYEMPTY -2
27579 +#define YYEMPTY (-2)
27580 #define YYEOF 0
27581 +
27582 #define YYACCEPT goto yyacceptlab
27583 -#define YYABORT goto yyabortlab
27584 -#define YYERROR goto yyerrlab1
27585 -/* Like YYERROR except do call yyerror.
27586 - This remains here temporarily to ease the
27587 - transition to the new meaning of YYERROR, for GCC.
27588 +#define YYABORT goto yyabortlab
27589 +#define YYERROR goto yyerrorlab
27590 +
27591 +
27592 +/* Like YYERROR except do call yyerror. This remains here temporarily
27593 + to ease the transition to the new meaning of YYERROR, for GCC.
27594 Once GCC version 2 has supplanted version 1, this can go. */
27595 +
27596 #define YYFAIL goto yyerrlab
27597 +
27598 #define YYRECOVERING() (!!yyerrstatus)
27599 -#define YYBACKUP(token, value) \
27600 +
27601 +#define YYBACKUP(Token, Value) \
27602 do \
27603 if (yychar == YYEMPTY && yylen == 1) \
27604 - { yychar = (token), yylval = (value); \
27605 - yychar1 = YYTRANSLATE (yychar); \
27606 + { \
27607 + yychar = (Token); \
27608 + yylval = (Value); \
27609 + yytoken = YYTRANSLATE (yychar); \
27610 YYPOPSTACK; \
27611 goto yybackup; \
27612 } \
27613 else \
27614 - { yyerror ("syntax error: cannot back up"); YYERROR; } \
27615 + { \
27616 + yyerror ("syntax error: cannot back up");\
27617 + YYERROR; \
27618 + } \
27619 while (0)
27620
27621 #define YYTERROR 1
27622 #define YYERRCODE 256
27623
27624 -#ifndef YYPURE
27625 -#define YYLEX yylex()
27626 -#endif
27627 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions
27628 + are run). */
27629
27630 -#ifdef YYPURE
27631 -#ifdef YYLSP_NEEDED
27632 -#ifdef YYLEX_PARAM
27633 -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
27634 -#else
27635 -#define YYLEX yylex(&yylval, &yylloc)
27636 +#ifndef YYLLOC_DEFAULT
27637 +# define YYLLOC_DEFAULT(Current, Rhs, N) \
27638 + ((Current).first_line = (Rhs)[1].first_line, \
27639 + (Current).first_column = (Rhs)[1].first_column, \
27640 + (Current).last_line = (Rhs)[N].last_line, \
27641 + (Current).last_column = (Rhs)[N].last_column)
27642 #endif
27643 -#else /* not YYLSP_NEEDED */
27644 +
27645 +/* YYLEX -- calling `yylex' with the right arguments. */
27646 +
27647 #ifdef YYLEX_PARAM
27648 -#define YYLEX yylex(&yylval, YYLEX_PARAM)
27649 +# define YYLEX yylex (YYLEX_PARAM)
27650 #else
27651 -#define YYLEX yylex(&yylval)
27652 -#endif
27653 -#endif /* not YYLSP_NEEDED */
27654 +# define YYLEX yylex ()
27655 #endif
27656
27657 -/* If nonreentrant, generate the variables here */
27658 +/* Enable debugging if requested. */
27659 +#if YYDEBUG
27660
27661 -#ifndef YYPURE
27662 +# ifndef YYFPRINTF
27663 +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
27664 +# define YYFPRINTF fprintf
27665 +# endif
27666 +
27667 +# define YYDPRINTF(Args) \
27668 +do { \
27669 + if (yydebug) \
27670 + YYFPRINTF Args; \
27671 +} while (0)
27672 +
27673 +# define YYDSYMPRINT(Args) \
27674 +do { \
27675 + if (yydebug) \
27676 + yysymprint Args; \
27677 +} while (0)
27678 +
27679 +# define YYDSYMPRINTF(Title, Token, Value, Location) \
27680 +do { \
27681 + if (yydebug) \
27682 + { \
27683 + YYFPRINTF (stderr, "%s ", Title); \
27684 + yysymprint (stderr, \
27685 + Token, Value); \
27686 + YYFPRINTF (stderr, "\n"); \
27687 + } \
27688 +} while (0)
27689
27690 -int yychar; /* the lookahead symbol */
27691 -YYSTYPE yylval; /* the semantic value of the */
27692 - /* lookahead symbol */
27693 +/*------------------------------------------------------------------.
27694 +| yy_stack_print -- Print the state stack from its BOTTOM up to its |
27695 +| TOP (included). |
27696 +`------------------------------------------------------------------*/
27697
27698 -#ifdef YYLSP_NEEDED
27699 -YYLTYPE yylloc; /* location data for the lookahead */
27700 - /* symbol */
27701 +#if defined (__STDC__) || defined (__cplusplus)
27702 +static void
27703 +yy_stack_print (short int *bottom, short int *top)
27704 +#else
27705 +static void
27706 +yy_stack_print (bottom, top)
27707 + short int *bottom;
27708 + short int *top;
27709 #endif
27710 +{
27711 + YYFPRINTF (stderr, "Stack now");
27712 + for (/* Nothing. */; bottom <= top; ++bottom)
27713 + YYFPRINTF (stderr, " %d", *bottom);
27714 + YYFPRINTF (stderr, "\n");
27715 +}
27716
27717 -int yynerrs; /* number of parse errors so far */
27718 -#endif /* not YYPURE */
27719 +# define YY_STACK_PRINT(Bottom, Top) \
27720 +do { \
27721 + if (yydebug) \
27722 + yy_stack_print ((Bottom), (Top)); \
27723 +} while (0)
27724
27725 -#if YYDEBUG != 0
27726 -int yydebug; /* nonzero means print parse trace */
27727 -/* Since this is uninitialized, it does not stop multiple parsers
27728 - from coexisting. */
27729 +
27730 +/*------------------------------------------------.
27731 +| Report that the YYRULE is going to be reduced. |
27732 +`------------------------------------------------*/
27733 +
27734 +#if defined (__STDC__) || defined (__cplusplus)
27735 +static void
27736 +yy_reduce_print (int yyrule)
27737 +#else
27738 +static void
27739 +yy_reduce_print (yyrule)
27740 + int yyrule;
27741 #endif
27742 +{
27743 + int yyi;
27744 + unsigned int yylno = yyrline[yyrule];
27745 + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
27746 + yyrule - 1, yylno);
27747 + /* Print the symbols being reduced, and their result. */
27748 + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
27749 + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
27750 + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
27751 +}
27752 +
27753 +# define YY_REDUCE_PRINT(Rule) \
27754 +do { \
27755 + if (yydebug) \
27756 + yy_reduce_print (Rule); \
27757 +} while (0)
27758 +
27759 +/* Nonzero means print parse trace. It is left uninitialized so that
27760 + multiple parsers can coexist. */
27761 +int yydebug;
27762 +#else /* !YYDEBUG */
27763 +# define YYDPRINTF(Args)
27764 +# define YYDSYMPRINT(Args)
27765 +# define YYDSYMPRINTF(Title, Token, Value, Location)
27766 +# define YY_STACK_PRINT(Bottom, Top)
27767 +# define YY_REDUCE_PRINT(Rule)
27768 +#endif /* !YYDEBUG */
27769
27770 -/* YYINITDEPTH indicates the initial size of the parser's stacks */
27771
27772 +/* YYINITDEPTH -- initial size of the parser's stacks. */
27773 #ifndef YYINITDEPTH
27774 -#define YYINITDEPTH 200
27775 +# define YYINITDEPTH 200
27776 #endif
27777
27778 -/* YYMAXDEPTH is the maximum size the stacks can grow to
27779 - (effective only if the built-in stack extension method is used). */
27780 +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
27781 + if the built-in stack extension method is used).
27782
27783 -#if YYMAXDEPTH == 0
27784 -#undef YYMAXDEPTH
27785 + Do not make this value too large; the results are undefined if
27786 + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
27787 + evaluated with infinite-precision integer arithmetic. */
27788 +
27789 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
27790 +# undef YYMAXDEPTH
27791 #endif
27792
27793 #ifndef YYMAXDEPTH
27794 -#define YYMAXDEPTH 10000
27795 +# define YYMAXDEPTH 10000
27796 #endif
27797 +
27798 \f
27799 -/* Define __yy_memcpy. Note that the size argument
27800 - should be passed with type unsigned int, because that is what the non-GCC
27801 - definitions require. With GCC, __builtin_memcpy takes an arg
27802 - of type size_t, but it can handle unsigned int. */
27803 -
27804 -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
27805 -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
27806 -#else /* not GNU C or C++ */
27807 -#ifndef __cplusplus
27808
27809 -/* This is the most reliable way to avoid incompatibilities
27810 - in available built-in functions on various systems. */
27811 -static void
27812 -__yy_memcpy (to, from, count)
27813 - char *to;
27814 - char *from;
27815 - unsigned int count;
27816 -{
27817 - register char *f = from;
27818 - register char *t = to;
27819 - register int i = count;
27820 +#if YYERROR_VERBOSE
27821 +
27822 +# ifndef yystrlen
27823 +# if defined (__GLIBC__) && defined (_STRING_H)
27824 +# define yystrlen strlen
27825 +# else
27826 +/* Return the length of YYSTR. */
27827 +static YYSIZE_T
27828 +# if defined (__STDC__) || defined (__cplusplus)
27829 +yystrlen (const char *yystr)
27830 +# else
27831 +yystrlen (yystr)
27832 + const char *yystr;
27833 +# endif
27834 +{
27835 + register const char *yys = yystr;
27836 +
27837 + while (*yys++ != '\0')
27838 + continue;
27839 +
27840 + return yys - yystr - 1;
27841 +}
27842 +# endif
27843 +# endif
27844 +
27845 +# ifndef yystpcpy
27846 +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
27847 +# define yystpcpy stpcpy
27848 +# else
27849 +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
27850 + YYDEST. */
27851 +static char *
27852 +# if defined (__STDC__) || defined (__cplusplus)
27853 +yystpcpy (char *yydest, const char *yysrc)
27854 +# else
27855 +yystpcpy (yydest, yysrc)
27856 + char *yydest;
27857 + const char *yysrc;
27858 +# endif
27859 +{
27860 + register char *yyd = yydest;
27861 + register const char *yys = yysrc;
27862
27863 - while (i-- > 0)
27864 - *t++ = *f++;
27865 + while ((*yyd++ = *yys++) != '\0')
27866 + continue;
27867 +
27868 + return yyd - 1;
27869 }
27870 +# endif
27871 +# endif
27872 +
27873 +#endif /* !YYERROR_VERBOSE */
27874
27875 -#else /* __cplusplus */
27876 +\f
27877 +
27878 +#if YYDEBUG
27879 +/*--------------------------------.
27880 +| Print this symbol on YYOUTPUT. |
27881 +`--------------------------------*/
27882
27883 -/* This is the most reliable way to avoid incompatibilities
27884 - in available built-in functions on various systems. */
27885 +#if defined (__STDC__) || defined (__cplusplus)
27886 static void
27887 -__yy_memcpy (char *to, char *from, unsigned int count)
27888 +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
27889 +#else
27890 +static void
27891 +yysymprint (yyoutput, yytype, yyvaluep)
27892 + FILE *yyoutput;
27893 + int yytype;
27894 + YYSTYPE *yyvaluep;
27895 +#endif
27896 {
27897 - register char *t = to;
27898 - register char *f = from;
27899 - register int i = count;
27900 + /* Pacify ``unused variable'' warnings. */
27901 + (void) yyvaluep;
27902
27903 - while (i-- > 0)
27904 - *t++ = *f++;
27905 + if (yytype < YYNTOKENS)
27906 + {
27907 + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
27908 +# ifdef YYPRINT
27909 + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
27910 +# endif
27911 + }
27912 + else
27913 + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
27914 +
27915 + switch (yytype)
27916 + {
27917 + default:
27918 + break;
27919 + }
27920 + YYFPRINTF (yyoutput, ")");
27921 }
27922
27923 +#endif /* ! YYDEBUG */
27924 +/*-----------------------------------------------.
27925 +| Release the memory associated to this symbol. |
27926 +`-----------------------------------------------*/
27927 +
27928 +#if defined (__STDC__) || defined (__cplusplus)
27929 +static void
27930 +yydestruct (int yytype, YYSTYPE *yyvaluep)
27931 +#else
27932 +static void
27933 +yydestruct (yytype, yyvaluep)
27934 + int yytype;
27935 + YYSTYPE *yyvaluep;
27936 #endif
27937 -#endif
27938 +{
27939 + /* Pacify ``unused variable'' warnings. */
27940 + (void) yyvaluep;
27941 +
27942 + switch (yytype)
27943 + {
27944 +
27945 + default:
27946 + break;
27947 + }
27948 +}
27949 \f
27950 -#line 217 "/usr/lib/bison.simple"
27951
27952 -/* The user can define YYPARSE_PARAM as the name of an argument to be passed
27953 - into yyparse. The argument should have type void *.
27954 - It should actually point to an object.
27955 - Grammar actions can access the variable by casting it
27956 - to the proper pointer type. */
27957 +/* Prevent warnings from -Wmissing-prototypes. */
27958
27959 #ifdef YYPARSE_PARAM
27960 -#ifdef __cplusplus
27961 -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
27962 -#define YYPARSE_PARAM_DECL
27963 -#else /* not __cplusplus */
27964 -#define YYPARSE_PARAM_ARG YYPARSE_PARAM
27965 -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
27966 -#endif /* not __cplusplus */
27967 -#else /* not YYPARSE_PARAM */
27968 -#define YYPARSE_PARAM_ARG
27969 -#define YYPARSE_PARAM_DECL
27970 -#endif /* not YYPARSE_PARAM */
27971 +# if defined (__STDC__) || defined (__cplusplus)
27972 +int yyparse (void *YYPARSE_PARAM);
27973 +# else
27974 +int yyparse ();
27975 +# endif
27976 +#else /* ! YYPARSE_PARAM */
27977 +#if defined (__STDC__) || defined (__cplusplus)
27978 +int yyparse (void);
27979 +#else
27980 +int yyparse ();
27981 +#endif
27982 +#endif /* ! YYPARSE_PARAM */
27983 +
27984 +
27985 +
27986 +/* The lookahead symbol. */
27987 +int yychar;
27988 +
27989 +/* The semantic value of the lookahead symbol. */
27990 +YYSTYPE yylval;
27991 +
27992 +/* Number of syntax errors so far. */
27993 +int yynerrs;
27994 +
27995 +
27996 +
27997 +/*----------.
27998 +| yyparse. |
27999 +`----------*/
28000
28001 -/* Prevent warning if -Wstrict-prototypes. */
28002 -#ifdef __GNUC__
28003 #ifdef YYPARSE_PARAM
28004 -int yyparse (void *);
28005 +# if defined (__STDC__) || defined (__cplusplus)
28006 +int yyparse (void *YYPARSE_PARAM)
28007 +# else
28008 +int yyparse (YYPARSE_PARAM)
28009 + void *YYPARSE_PARAM;
28010 +# endif
28011 +#else /* ! YYPARSE_PARAM */
28012 +#if defined (__STDC__) || defined (__cplusplus)
28013 +int
28014 +yyparse (void)
28015 #else
28016 -int yyparse (void);
28017 +int
28018 +yyparse ()
28019 +
28020 #endif
28021 #endif
28022 -
28023 -int
28024 -yyparse(YYPARSE_PARAM_ARG)
28025 - YYPARSE_PARAM_DECL
28026 {
28027 +
28028 register int yystate;
28029 register int yyn;
28030 - register short *yyssp;
28031 + int yyresult;
28032 + /* Number of tokens to shift before error messages enabled. */
28033 + int yyerrstatus;
28034 + /* Lookahead token as an internal (translated) token number. */
28035 + int yytoken = 0;
28036 +
28037 + /* Three stacks and their tools:
28038 + `yyss': related to states,
28039 + `yyvs': related to semantic values,
28040 + `yyls': related to locations.
28041 +
28042 + Refer to the stacks thru separate pointers, to allow yyoverflow
28043 + to reallocate them elsewhere. */
28044 +
28045 + /* The state stack. */
28046 + short int yyssa[YYINITDEPTH];
28047 + short int *yyss = yyssa;
28048 + register short int *yyssp;
28049 +
28050 + /* The semantic value stack. */
28051 + YYSTYPE yyvsa[YYINITDEPTH];
28052 + YYSTYPE *yyvs = yyvsa;
28053 register YYSTYPE *yyvsp;
28054 - int yyerrstatus; /* number of tokens to shift before error messages enabled */
28055 - int yychar1 = 0; /* lookahead token as an internal (translated) token number */
28056 -
28057 - short yyssa[YYINITDEPTH]; /* the state stack */
28058 - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */
28059
28060 - short *yyss = yyssa; /* refer to the stacks thru separate pointers */
28061 - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */
28062
28063 -#ifdef YYLSP_NEEDED
28064 - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */
28065 - YYLTYPE *yyls = yylsa;
28066 - YYLTYPE *yylsp;
28067
28068 -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
28069 -#else
28070 #define YYPOPSTACK (yyvsp--, yyssp--)
28071 -#endif
28072
28073 - int yystacksize = YYINITDEPTH;
28074 - int yyfree_stacks = 0;
28075 + YYSIZE_T yystacksize = YYINITDEPTH;
28076
28077 -#ifdef YYPURE
28078 - int yychar;
28079 - YYSTYPE yylval;
28080 - int yynerrs;
28081 -#ifdef YYLSP_NEEDED
28082 - YYLTYPE yylloc;
28083 -#endif
28084 -#endif
28085 + /* The variables used to return semantic value and location from the
28086 + action routines. */
28087 + YYSTYPE yyval;
28088
28089 - YYSTYPE yyval; /* the variable used to return */
28090 - /* semantic values from the action */
28091 - /* routines */
28092
28093 + /* When reducing, the number of symbols on the RHS of the reduced
28094 + rule. */
28095 int yylen;
28096
28097 -#if YYDEBUG != 0
28098 - if (yydebug)
28099 - fprintf(stderr, "Starting parse\n");
28100 -#endif
28101 + YYDPRINTF ((stderr, "Starting parse\n"));
28102
28103 yystate = 0;
28104 yyerrstatus = 0;
28105 @@ -479,110 +853,97 @@
28106 so that they stay on the same level as the state stack.
28107 The wasted elements are never initialized. */
28108
28109 - yyssp = yyss - 1;
28110 + yyssp = yyss;
28111 yyvsp = yyvs;
28112 -#ifdef YYLSP_NEEDED
28113 - yylsp = yyls;
28114 -#endif
28115
28116 -/* Push a new state, which is found in yystate . */
28117 -/* In all cases, when you get here, the value and location stacks
28118 - have just been pushed. so pushing a state here evens the stacks. */
28119 -yynewstate:
28120
28121 - *++yyssp = yystate;
28122 + goto yysetstate;
28123
28124 - if (yyssp >= yyss + yystacksize - 1)
28125 - {
28126 - /* Give user a chance to reallocate the stack */
28127 - /* Use copies of these so that the &'s don't force the real ones into memory. */
28128 - YYSTYPE *yyvs1 = yyvs;
28129 - short *yyss1 = yyss;
28130 -#ifdef YYLSP_NEEDED
28131 - YYLTYPE *yyls1 = yyls;
28132 -#endif
28133 +/*------------------------------------------------------------.
28134 +| yynewstate -- Push a new state, which is found in yystate. |
28135 +`------------------------------------------------------------*/
28136 + yynewstate:
28137 + /* In all cases, when you get here, the value and location stacks
28138 + have just been pushed. so pushing a state here evens the stacks.
28139 + */
28140 + yyssp++;
28141
28142 + yysetstate:
28143 + *yyssp = yystate;
28144 +
28145 + if (yyss + yystacksize - 1 <= yyssp)
28146 + {
28147 /* Get the current used size of the three stacks, in elements. */
28148 - int size = yyssp - yyss + 1;
28149 + YYSIZE_T yysize = yyssp - yyss + 1;
28150
28151 #ifdef yyoverflow
28152 - /* Each stack pointer address is followed by the size of
28153 - the data in use in that stack, in bytes. */
28154 -#ifdef YYLSP_NEEDED
28155 - /* This used to be a conditional around just the two extra args,
28156 - but that might be undefined if yyoverflow is a macro. */
28157 - yyoverflow("parser stack overflow",
28158 - &yyss1, size * sizeof (*yyssp),
28159 - &yyvs1, size * sizeof (*yyvsp),
28160 - &yyls1, size * sizeof (*yylsp),
28161 - &yystacksize);
28162 -#else
28163 - yyoverflow("parser stack overflow",
28164 - &yyss1, size * sizeof (*yyssp),
28165 - &yyvs1, size * sizeof (*yyvsp),
28166 - &yystacksize);
28167 -#endif
28168 -
28169 - yyss = yyss1; yyvs = yyvs1;
28170 -#ifdef YYLSP_NEEDED
28171 - yyls = yyls1;
28172 -#endif
28173 + {
28174 + /* Give user a chance to reallocate the stack. Use copies of
28175 + these so that the &'s don't force the real ones into
28176 + memory. */
28177 + YYSTYPE *yyvs1 = yyvs;
28178 + short int *yyss1 = yyss;
28179 +
28180 +
28181 + /* Each stack pointer address is followed by the size of the
28182 + data in use in that stack, in bytes. This used to be a
28183 + conditional around just the two extra args, but that might
28184 + be undefined if yyoverflow is a macro. */
28185 + yyoverflow ("parser stack overflow",
28186 + &yyss1, yysize * sizeof (*yyssp),
28187 + &yyvs1, yysize * sizeof (*yyvsp),
28188 +
28189 + &yystacksize);
28190 +
28191 + yyss = yyss1;
28192 + yyvs = yyvs1;
28193 + }
28194 #else /* no yyoverflow */
28195 +# ifndef YYSTACK_RELOCATE
28196 + goto yyoverflowlab;
28197 +# else
28198 /* Extend the stack our own way. */
28199 - if (yystacksize >= YYMAXDEPTH)
28200 - {
28201 - yyerror("parser stack overflow");
28202 - if (yyfree_stacks)
28203 - {
28204 - free (yyss);
28205 - free (yyvs);
28206 -#ifdef YYLSP_NEEDED
28207 - free (yyls);
28208 -#endif
28209 - }
28210 - return 2;
28211 - }
28212 + if (YYMAXDEPTH <= yystacksize)
28213 + goto yyoverflowlab;
28214 yystacksize *= 2;
28215 - if (yystacksize > YYMAXDEPTH)
28216 + if (YYMAXDEPTH < yystacksize)
28217 yystacksize = YYMAXDEPTH;
28218 -#ifndef YYSTACK_USE_ALLOCA
28219 - yyfree_stacks = 1;
28220 -#endif
28221 - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
28222 - __yy_memcpy ((char *)yyss, (char *)yyss1,
28223 - size * (unsigned int) sizeof (*yyssp));
28224 - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
28225 - __yy_memcpy ((char *)yyvs, (char *)yyvs1,
28226 - size * (unsigned int) sizeof (*yyvsp));
28227 -#ifdef YYLSP_NEEDED
28228 - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
28229 - __yy_memcpy ((char *)yyls, (char *)yyls1,
28230 - size * (unsigned int) sizeof (*yylsp));
28231 -#endif
28232 +
28233 + {
28234 + short int *yyss1 = yyss;
28235 + union yyalloc *yyptr =
28236 + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
28237 + if (! yyptr)
28238 + goto yyoverflowlab;
28239 + YYSTACK_RELOCATE (yyss);
28240 + YYSTACK_RELOCATE (yyvs);
28241 +
28242 +# undef YYSTACK_RELOCATE
28243 + if (yyss1 != yyssa)
28244 + YYSTACK_FREE (yyss1);
28245 + }
28246 +# endif
28247 #endif /* no yyoverflow */
28248
28249 - yyssp = yyss + size - 1;
28250 - yyvsp = yyvs + size - 1;
28251 -#ifdef YYLSP_NEEDED
28252 - yylsp = yyls + size - 1;
28253 -#endif
28254 + yyssp = yyss + yysize - 1;
28255 + yyvsp = yyvs + yysize - 1;
28256
28257 -#if YYDEBUG != 0
28258 - if (yydebug)
28259 - fprintf(stderr, "Stack size increased to %d\n", yystacksize);
28260 -#endif
28261
28262 - if (yyssp >= yyss + yystacksize - 1)
28263 + YYDPRINTF ((stderr, "Stack size increased to %lu\n",
28264 + (unsigned long int) yystacksize));
28265 +
28266 + if (yyss + yystacksize - 1 <= yyssp)
28267 YYABORT;
28268 }
28269
28270 -#if YYDEBUG != 0
28271 - if (yydebug)
28272 - fprintf(stderr, "Entering state %d\n", yystate);
28273 -#endif
28274 + YYDPRINTF ((stderr, "Entering state %d\n", yystate));
28275
28276 goto yybackup;
28277 - yybackup:
28278 +
28279 +/*-----------.
28280 +| yybackup. |
28281 +`-----------*/
28282 +yybackup:
28283
28284 /* Do appropriate processing given the current state. */
28285 /* Read a lookahead token if we need one and don't already have one. */
28286 @@ -591,194 +952,167 @@
28287 /* First try to decide what to do without reference to lookahead token. */
28288
28289 yyn = yypact[yystate];
28290 - if (yyn == YYFLAG)
28291 + if (yyn == YYPACT_NINF)
28292 goto yydefault;
28293
28294 /* Not known => get a lookahead token if don't already have one. */
28295
28296 - /* yychar is either YYEMPTY or YYEOF
28297 - or a valid token in external form. */
28298 -
28299 + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
28300 if (yychar == YYEMPTY)
28301 {
28302 -#if YYDEBUG != 0
28303 - if (yydebug)
28304 - fprintf(stderr, "Reading a token: ");
28305 -#endif
28306 + YYDPRINTF ((stderr, "Reading a token: "));
28307 yychar = YYLEX;
28308 }
28309
28310 - /* Convert token to internal form (in yychar1) for indexing tables with */
28311 -
28312 - if (yychar <= 0) /* This means end of input. */
28313 + if (yychar <= YYEOF)
28314 {
28315 - yychar1 = 0;
28316 - yychar = YYEOF; /* Don't call YYLEX any more */
28317 -
28318 -#if YYDEBUG != 0
28319 - if (yydebug)
28320 - fprintf(stderr, "Now at end of input.\n");
28321 -#endif
28322 + yychar = yytoken = YYEOF;
28323 + YYDPRINTF ((stderr, "Now at end of input.\n"));
28324 }
28325 else
28326 {
28327 - yychar1 = YYTRANSLATE(yychar);
28328 -
28329 -#if YYDEBUG != 0
28330 - if (yydebug)
28331 - {
28332 - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
28333 - /* Give the individual parser a way to print the precise meaning
28334 - of a token, for further debugging info. */
28335 -#ifdef YYPRINT
28336 - YYPRINT (stderr, yychar, yylval);
28337 -#endif
28338 - fprintf (stderr, ")\n");
28339 - }
28340 -#endif
28341 + yytoken = YYTRANSLATE (yychar);
28342 + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
28343 }
28344
28345 - yyn += yychar1;
28346 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
28347 + /* If the proper action on seeing token YYTOKEN is to reduce or to
28348 + detect an error, take that action. */
28349 + yyn += yytoken;
28350 + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
28351 goto yydefault;
28352 -
28353 yyn = yytable[yyn];
28354 -
28355 - /* yyn is what to do for this token type in this state.
28356 - Negative => reduce, -yyn is rule number.
28357 - Positive => shift, yyn is new state.
28358 - New state is final state => don't bother to shift,
28359 - just return success.
28360 - 0, or most negative number => error. */
28361 -
28362 - if (yyn < 0)
28363 + if (yyn <= 0)
28364 {
28365 - if (yyn == YYFLAG)
28366 + if (yyn == 0 || yyn == YYTABLE_NINF)
28367 goto yyerrlab;
28368 yyn = -yyn;
28369 goto yyreduce;
28370 }
28371 - else if (yyn == 0)
28372 - goto yyerrlab;
28373
28374 if (yyn == YYFINAL)
28375 YYACCEPT;
28376
28377 /* Shift the lookahead token. */
28378 -
28379 -#if YYDEBUG != 0
28380 - if (yydebug)
28381 - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
28382 -#endif
28383 + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
28384
28385 /* Discard the token being shifted unless it is eof. */
28386 if (yychar != YYEOF)
28387 yychar = YYEMPTY;
28388
28389 *++yyvsp = yylval;
28390 -#ifdef YYLSP_NEEDED
28391 - *++yylsp = yylloc;
28392 -#endif
28393
28394 - /* count tokens shifted since error; after three, turn off error status. */
28395 - if (yyerrstatus) yyerrstatus--;
28396 +
28397 + /* Count tokens shifted since error; after three, turn off error
28398 + status. */
28399 + if (yyerrstatus)
28400 + yyerrstatus--;
28401
28402 yystate = yyn;
28403 goto yynewstate;
28404
28405 -/* Do the default action for the current state. */
28406 -yydefault:
28407
28408 +/*-----------------------------------------------------------.
28409 +| yydefault -- do the default action for the current state. |
28410 +`-----------------------------------------------------------*/
28411 +yydefault:
28412 yyn = yydefact[yystate];
28413 if (yyn == 0)
28414 goto yyerrlab;
28415 + goto yyreduce;
28416 +
28417
28418 -/* Do a reduction. yyn is the number of a rule to reduce with. */
28419 +/*-----------------------------.
28420 +| yyreduce -- Do a reduction. |
28421 +`-----------------------------*/
28422 yyreduce:
28423 + /* yyn is the number of a rule to reduce with. */
28424 yylen = yyr2[yyn];
28425 - if (yylen > 0)
28426 - yyval = yyvsp[1-yylen]; /* implement default value of the action */
28427
28428 -#if YYDEBUG != 0
28429 - if (yydebug)
28430 - {
28431 - int i;
28432 + /* If YYLEN is nonzero, implement the default value of the action:
28433 + `$$ = $1'.
28434
28435 - fprintf (stderr, "Reducing via rule %d (line %d), ",
28436 - yyn, yyrline[yyn]);
28437 + Otherwise, the following line sets YYVAL to garbage.
28438 + This behavior is undocumented and Bison
28439 + users should not rely upon it. Assigning to YYVAL
28440 + unconditionally makes the parser a bit smaller, and it avoids a
28441 + GCC warning that YYVAL may be used uninitialized. */
28442 + yyval = yyvsp[1-yylen];
28443
28444 - /* Print the symbols being reduced, and their result. */
28445 - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
28446 - fprintf (stderr, "%s ", yytname[yyrhs[i]]);
28447 - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
28448 - }
28449 -#endif
28450
28451 -
28452 - switch (yyn) {
28453 -
28454 -case 4:
28455 -#line 47 "cfg_y.y"
28456 -{
28457 + YY_REDUCE_PRINT (yyn);
28458 + switch (yyn)
28459 + {
28460 + case 5:
28461 +#line 50 "cfg_y.y"
28462 + {
28463 control_init(yyvsp[-1].str);
28464 - ;
28465 - break;}
28466 -case 5:
28467 -#line 54 "cfg_y.y"
28468 -{
28469 + }
28470 + break;
28471 +
28472 + case 6:
28473 +#line 57 "cfg_y.y"
28474 + {
28475 fab_option(yyvsp[-1].str,yyvsp[0].str);
28476 - ;
28477 - break;}
28478 -case 6:
28479 -#line 61 "cfg_y.y"
28480 -{
28481 + }
28482 + break;
28483 +
28484 + case 7:
28485 +#line 64 "cfg_y.y"
28486 + {
28487 itf = 0;
28488 - ;
28489 - break;}
28490 -case 7:
28491 -#line 65 "cfg_y.y"
28492 -{
28493 + }
28494 + break;
28495 +
28496 + case 8:
28497 +#line 68 "cfg_y.y"
28498 + {
28499 char *tmp;
28500
28501 tmp = strdup(yyvsp[-3].str);
28502 if (!tmp) yyerror(strerror(errno));
28503 sig = sig_vc(yyvsp[-4].str,tmp,itf);
28504 - ;
28505 - break;}
28506 -case 9:
28507 -#line 77 "cfg_y.y"
28508 -{
28509 + }
28510 + break;
28511 +
28512 + case 10:
28513 +#line 80 "cfg_y.y"
28514 + {
28515 yyval.str = NULL;
28516 - ;
28517 - break;}
28518 -case 10:
28519 -#line 81 "cfg_y.y"
28520 -{
28521 + }
28522 + break;
28523 +
28524 + case 11:
28525 +#line 84 "cfg_y.y"
28526 + {
28527 yyval.str = strdup(yyvsp[0].str);
28528 if (!yyval.str) yyerror(strerror(errno));
28529 - ;
28530 - break;}
28531 -case 12:
28532 -#line 89 "cfg_y.y"
28533 -{
28534 + }
28535 + break;
28536 +
28537 + case 13:
28538 +#line 92 "cfg_y.y"
28539 + {
28540 itf = yyvsp[0].num;
28541 - ;
28542 - break;}
28543 -case 14:
28544 -#line 96 "cfg_y.y"
28545 -{
28546 + }
28547 + break;
28548 +
28549 + case 15:
28550 +#line 99 "cfg_y.y"
28551 + {
28552 sig->pvc = yyvsp[0].pvc;
28553 - ;
28554 - break;}
28555 -case 17:
28556 -#line 104 "cfg_y.y"
28557 -{
28558 + }
28559 + break;
28560 +
28561 + case 18:
28562 +#line 107 "cfg_y.y"
28563 + {
28564 put_route(NULL,0,sig);
28565 - ;
28566 - break;}
28567 -case 19:
28568 -#line 112 "cfg_y.y"
28569 -{
28570 + }
28571 + break;
28572 +
28573 + case 20:
28574 +#line 115 "cfg_y.y"
28575 + {
28576 struct sockaddr_atmsvc addr;
28577 char *mask;
28578
28579 @@ -790,228 +1124,236 @@
28580 return;
28581 }
28582 put_route(&addr,mask ? strtol(mask,NULL,10) : INT_MAX,sig);
28583 - ;
28584 - break;}
28585 -}
28586 - /* the action file gets copied in in place of this dollarsign */
28587 -#line 543 "/usr/lib/bison.simple"
28588 + }
28589 + break;
28590 +
28591 +
28592 + }
28593 +
28594 +/* Line 1010 of yacc.c. */
28595 +#line 1135 "y.tab.c"
28596 \f
28597 yyvsp -= yylen;
28598 yyssp -= yylen;
28599 -#ifdef YYLSP_NEEDED
28600 - yylsp -= yylen;
28601 -#endif
28602
28603 -#if YYDEBUG != 0
28604 - if (yydebug)
28605 - {
28606 - short *ssp1 = yyss - 1;
28607 - fprintf (stderr, "state stack now");
28608 - while (ssp1 != yyssp)
28609 - fprintf (stderr, " %d", *++ssp1);
28610 - fprintf (stderr, "\n");
28611 - }
28612 -#endif
28613 +
28614 + YY_STACK_PRINT (yyss, yyssp);
28615
28616 *++yyvsp = yyval;
28617
28618 -#ifdef YYLSP_NEEDED
28619 - yylsp++;
28620 - if (yylen == 0)
28621 - {
28622 - yylsp->first_line = yylloc.first_line;
28623 - yylsp->first_column = yylloc.first_column;
28624 - yylsp->last_line = (yylsp-1)->last_line;
28625 - yylsp->last_column = (yylsp-1)->last_column;
28626 - yylsp->text = 0;
28627 - }
28628 - else
28629 - {
28630 - yylsp->last_line = (yylsp+yylen-1)->last_line;
28631 - yylsp->last_column = (yylsp+yylen-1)->last_column;
28632 - }
28633 -#endif
28634
28635 - /* Now "shift" the result of the reduction.
28636 - Determine what state that goes to,
28637 - based on the state we popped back to
28638 - and the rule number reduced by. */
28639 + /* Now `shift' the result of the reduction. Determine what state
28640 + that goes to, based on the state we popped back to and the rule
28641 + number reduced by. */
28642
28643 yyn = yyr1[yyn];
28644
28645 - yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
28646 - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
28647 + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
28648 + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
28649 yystate = yytable[yystate];
28650 else
28651 - yystate = yydefgoto[yyn - YYNTBASE];
28652 + yystate = yydefgoto[yyn - YYNTOKENS];
28653
28654 goto yynewstate;
28655
28656 -yyerrlab: /* here on detecting error */
28657
28658 - if (! yyerrstatus)
28659 - /* If not already recovering from an error, report this error. */
28660 +/*------------------------------------.
28661 +| yyerrlab -- here on detecting error |
28662 +`------------------------------------*/
28663 +yyerrlab:
28664 + /* If not already recovering from an error, report this error. */
28665 + if (!yyerrstatus)
28666 {
28667 ++yynerrs;
28668 -
28669 -#ifdef YYERROR_VERBOSE
28670 +#if YYERROR_VERBOSE
28671 yyn = yypact[yystate];
28672
28673 - if (yyn > YYFLAG && yyn < YYLAST)
28674 + if (YYPACT_NINF < yyn && yyn < YYLAST)
28675 {
28676 - int size = 0;
28677 - char *msg;
28678 - int x, count;
28679 -
28680 - count = 0;
28681 - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
28682 - for (x = (yyn < 0 ? -yyn : 0);
28683 - x < (sizeof(yytname) / sizeof(char *)); x++)
28684 - if (yycheck[x + yyn] == x)
28685 - size += strlen(yytname[x]) + 15, count++;
28686 - msg = (char *) malloc(size + 15);
28687 - if (msg != 0)
28688 + YYSIZE_T yysize = 0;
28689 + int yytype = YYTRANSLATE (yychar);
28690 + const char* yyprefix;
28691 + char *yymsg;
28692 + int yyx;
28693 +
28694 + /* Start YYX at -YYN if negative to avoid negative indexes in
28695 + YYCHECK. */
28696 + int yyxbegin = yyn < 0 ? -yyn : 0;
28697 +
28698 + /* Stay within bounds of both yycheck and yytname. */
28699 + int yychecklim = YYLAST - yyn;
28700 + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
28701 + int yycount = 0;
28702 +
28703 + yyprefix = ", expecting ";
28704 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
28705 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
28706 + {
28707 + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
28708 + yycount += 1;
28709 + if (yycount == 5)
28710 + {
28711 + yysize = 0;
28712 + break;
28713 + }
28714 + }
28715 + yysize += (sizeof ("syntax error, unexpected ")
28716 + + yystrlen (yytname[yytype]));
28717 + yymsg = (char *) YYSTACK_ALLOC (yysize);
28718 + if (yymsg != 0)
28719 {
28720 - strcpy(msg, "parse error");
28721 + char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
28722 + yyp = yystpcpy (yyp, yytname[yytype]);
28723
28724 - if (count < 5)
28725 + if (yycount < 5)
28726 {
28727 - count = 0;
28728 - for (x = (yyn < 0 ? -yyn : 0);
28729 - x < (sizeof(yytname) / sizeof(char *)); x++)
28730 - if (yycheck[x + yyn] == x)
28731 + yyprefix = ", expecting ";
28732 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
28733 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
28734 {
28735 - strcat(msg, count == 0 ? ", expecting `" : " or `");
28736 - strcat(msg, yytname[x]);
28737 - strcat(msg, "'");
28738 - count++;
28739 + yyp = yystpcpy (yyp, yyprefix);
28740 + yyp = yystpcpy (yyp, yytname[yyx]);
28741 + yyprefix = " or ";
28742 }
28743 }
28744 - yyerror(msg);
28745 - free(msg);
28746 + yyerror (yymsg);
28747 + YYSTACK_FREE (yymsg);
28748 }
28749 else
28750 - yyerror ("parse error; also virtual memory exceeded");
28751 + yyerror ("syntax error; also virtual memory exhausted");
28752 }
28753 else
28754 #endif /* YYERROR_VERBOSE */
28755 - yyerror("parse error");
28756 + yyerror ("syntax error");
28757 }
28758
28759 - goto yyerrlab1;
28760 -yyerrlab1: /* here on error raised explicitly by an action */
28761 +
28762
28763 if (yyerrstatus == 3)
28764 {
28765 - /* if just tried and failed to reuse lookahead token after an error, discard it. */
28766 + /* If just tried and failed to reuse lookahead token after an
28767 + error, discard it. */
28768
28769 - /* return failure if at end of input */
28770 - if (yychar == YYEOF)
28771 - YYABORT;
28772 -
28773 -#if YYDEBUG != 0
28774 - if (yydebug)
28775 - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
28776 -#endif
28777 + if (yychar <= YYEOF)
28778 + {
28779 + /* If at end of input, pop the error token,
28780 + then the rest of the stack, then return failure. */
28781 + if (yychar == YYEOF)
28782 + for (;;)
28783 + {
28784 + YYPOPSTACK;
28785 + if (yyssp == yyss)
28786 + YYABORT;
28787 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
28788 + yydestruct (yystos[*yyssp], yyvsp);
28789 + }
28790 + }
28791 + else
28792 + {
28793 + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
28794 + yydestruct (yytoken, &yylval);
28795 + yychar = YYEMPTY;
28796
28797 - yychar = YYEMPTY;
28798 + }
28799 }
28800
28801 - /* Else will try to reuse lookahead token
28802 - after shifting the error token. */
28803 -
28804 - yyerrstatus = 3; /* Each real token shifted decrements this */
28805 + /* Else will try to reuse lookahead token after shifting the error
28806 + token. */
28807 + goto yyerrlab1;
28808
28809 - goto yyerrhandle;
28810
28811 -yyerrdefault: /* current state does not do anything special for the error token. */
28812 +/*---------------------------------------------------.
28813 +| yyerrorlab -- error raised explicitly by YYERROR. |
28814 +`---------------------------------------------------*/
28815 +yyerrorlab:
28816
28817 -#if 0
28818 - /* This is wrong; only states that explicitly want error tokens
28819 - should shift them. */
28820 - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/
28821 - if (yyn) goto yydefault;
28822 +#ifdef __GNUC__
28823 + /* Pacify GCC when the user code never invokes YYERROR and the label
28824 + yyerrorlab therefore never appears in user code. */
28825 + if (0)
28826 + goto yyerrorlab;
28827 #endif
28828
28829 -yyerrpop: /* pop the current state because it cannot handle the error token */
28830 -
28831 - if (yyssp == yyss) YYABORT;
28832 - yyvsp--;
28833 - yystate = *--yyssp;
28834 -#ifdef YYLSP_NEEDED
28835 - yylsp--;
28836 -#endif
28837 + yyvsp -= yylen;
28838 + yyssp -= yylen;
28839 + yystate = *yyssp;
28840 + goto yyerrlab1;
28841
28842 -#if YYDEBUG != 0
28843 - if (yydebug)
28844 - {
28845 - short *ssp1 = yyss - 1;
28846 - fprintf (stderr, "Error: state stack now");
28847 - while (ssp1 != yyssp)
28848 - fprintf (stderr, " %d", *++ssp1);
28849 - fprintf (stderr, "\n");
28850 - }
28851 -#endif
28852
28853 -yyerrhandle:
28854 +/*-------------------------------------------------------------.
28855 +| yyerrlab1 -- common code for both syntax error and YYERROR. |
28856 +`-------------------------------------------------------------*/
28857 +yyerrlab1:
28858 + yyerrstatus = 3; /* Each real token shifted decrements this. */
28859
28860 - yyn = yypact[yystate];
28861 - if (yyn == YYFLAG)
28862 - goto yyerrdefault;
28863 + for (;;)
28864 + {
28865 + yyn = yypact[yystate];
28866 + if (yyn != YYPACT_NINF)
28867 + {
28868 + yyn += YYTERROR;
28869 + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
28870 + {
28871 + yyn = yytable[yyn];
28872 + if (0 < yyn)
28873 + break;
28874 + }
28875 + }
28876
28877 - yyn += YYTERROR;
28878 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
28879 - goto yyerrdefault;
28880 + /* Pop the current state because it cannot handle the error token. */
28881 + if (yyssp == yyss)
28882 + YYABORT;
28883
28884 - yyn = yytable[yyn];
28885 - if (yyn < 0)
28886 - {
28887 - if (yyn == YYFLAG)
28888 - goto yyerrpop;
28889 - yyn = -yyn;
28890 - goto yyreduce;
28891 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
28892 + yydestruct (yystos[yystate], yyvsp);
28893 + YYPOPSTACK;
28894 + yystate = *yyssp;
28895 + YY_STACK_PRINT (yyss, yyssp);
28896 }
28897 - else if (yyn == 0)
28898 - goto yyerrpop;
28899
28900 if (yyn == YYFINAL)
28901 YYACCEPT;
28902
28903 -#if YYDEBUG != 0
28904 - if (yydebug)
28905 - fprintf(stderr, "Shifting error token, ");
28906 -#endif
28907 + YYDPRINTF ((stderr, "Shifting error token, "));
28908
28909 *++yyvsp = yylval;
28910 -#ifdef YYLSP_NEEDED
28911 - *++yylsp = yylloc;
28912 -#endif
28913 +
28914
28915 yystate = yyn;
28916 goto yynewstate;
28917
28918 - yyacceptlab:
28919 - /* YYACCEPT comes here. */
28920 - if (yyfree_stacks)
28921 - {
28922 - free (yyss);
28923 - free (yyvs);
28924 -#ifdef YYLSP_NEEDED
28925 - free (yyls);
28926 -#endif
28927 - }
28928 - return 0;
28929
28930 - yyabortlab:
28931 - /* YYABORT comes here. */
28932 - if (yyfree_stacks)
28933 - {
28934 - free (yyss);
28935 - free (yyvs);
28936 -#ifdef YYLSP_NEEDED
28937 - free (yyls);
28938 +/*-------------------------------------.
28939 +| yyacceptlab -- YYACCEPT comes here. |
28940 +`-------------------------------------*/
28941 +yyacceptlab:
28942 + yyresult = 0;
28943 + goto yyreturn;
28944 +
28945 +/*-----------------------------------.
28946 +| yyabortlab -- YYABORT comes here. |
28947 +`-----------------------------------*/
28948 +yyabortlab:
28949 + yyresult = 1;
28950 + goto yyreturn;
28951 +
28952 +#ifndef yyoverflow
28953 +/*----------------------------------------------.
28954 +| yyoverflowlab -- parser overflow comes here. |
28955 +`----------------------------------------------*/
28956 +yyoverflowlab:
28957 + yyerror ("parser stack overflow");
28958 + yyresult = 2;
28959 + /* Fall through. */
28960 +#endif
28961 +
28962 +yyreturn:
28963 +#ifndef yyoverflow
28964 + if (yyss != yyssa)
28965 + YYSTACK_FREE (yyss);
28966 #endif
28967 - }
28968 - return 1;
28969 + return yyresult;
28970 }
28971 -#line 126 "cfg_y.y"
28972 +
28973 +
28974 +
28975 --- linux-atm-2.4.1.orig/src/switch/cfg_y.y
28976 +++ linux-atm-2.4.1/src/switch/cfg_y.y
28977 @@ -10,6 +10,7 @@
28978 #include <string.h>
28979 #include <errno.h>
28980 #include <limits.h>
28981 +#include <stdlib.h>
28982
28983 #include "atm.h"
28984
28985 @@ -19,6 +20,8 @@
28986 #include "swc.h"
28987
28988
28989 +extern void yyerror(const char *s);
28990 +
28991 static int itf;
28992 static SIGNALING_ENTITY *sig;
28993
28994 --- linux-atm-2.4.1.orig/src/switch/cfg_y.h
28995 +++ linux-atm-2.4.1/src/switch/cfg_y.h
28996 @@ -1,19 +1,77 @@
28997 -typedef union {
28998 +/* A Bison parser, made by GNU Bison 1.875d. */
28999 +
29000 +/* Skeleton parser for Yacc-like parsing with Bison,
29001 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
29002 +
29003 + This program is free software; you can redistribute it and/or modify
29004 + it under the terms of the GNU General Public License as published by
29005 + the Free Software Foundation; either version 2, or (at your option)
29006 + any later version.
29007 +
29008 + This program is distributed in the hope that it will be useful,
29009 + but WITHOUT ANY WARRANTY; without even the implied warranty of
29010 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
29011 + GNU General Public License for more details.
29012 +
29013 + You should have received a copy of the GNU General Public License
29014 + along with this program; if not, write to the Free Software
29015 + Foundation, Inc., 59 Temple Place - Suite 330,
29016 + Boston, MA 02111-1307, USA. */
29017 +
29018 +/* As a special exception, when this file is copied by Bison into a
29019 + Bison output file, you may use that output file without restriction.
29020 + This special exception was added by the Free Software Foundation
29021 + in version 1.24 of Bison. */
29022 +
29023 +/* Tokens. */
29024 +#ifndef YYTOKENTYPE
29025 +# define YYTOKENTYPE
29026 + /* Put the tokens into the symbol table, so that GDB and other debuggers
29027 + know about them. */
29028 + enum yytokentype {
29029 + TOK_COMMAND = 258,
29030 + TOK_VPCI = 259,
29031 + TOK_ITF = 260,
29032 + TOK_DEFAULT = 261,
29033 + TOK_ROUTE = 262,
29034 + TOK_STR = 263,
29035 + TOK_SOCKET = 264,
29036 + TOK_OPTION = 265,
29037 + TOK_CONTROL = 266,
29038 + TOK_NUM = 267,
29039 + TOK_PVC = 268
29040 + };
29041 +#endif
29042 +#define TOK_COMMAND 258
29043 +#define TOK_VPCI 259
29044 +#define TOK_ITF 260
29045 +#define TOK_DEFAULT 261
29046 +#define TOK_ROUTE 262
29047 +#define TOK_STR 263
29048 +#define TOK_SOCKET 264
29049 +#define TOK_OPTION 265
29050 +#define TOK_CONTROL 266
29051 +#define TOK_NUM 267
29052 +#define TOK_PVC 268
29053 +
29054 +
29055 +
29056 +
29057 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
29058 +#line 30 "cfg_y.y"
29059 +typedef union YYSTYPE {
29060 int num;
29061 char *str;
29062 struct sockaddr_atmpvc pvc;
29063 } YYSTYPE;
29064 -#define TOK_COMMAND 257
29065 -#define TOK_VPCI 258
29066 -#define TOK_ITF 259
29067 -#define TOK_DEFAULT 260
29068 -#define TOK_ROUTE 261
29069 -#define TOK_STR 262
29070 -#define TOK_SOCKET 263
29071 -#define TOK_OPTION 264
29072 -#define TOK_CONTROL 265
29073 -#define TOK_NUM 266
29074 -#define TOK_PVC 267
29075 -
29076 +/* Line 1285 of yacc.c. */
29077 +#line 69 "y.tab.h"
29078 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
29079 +# define YYSTYPE_IS_DECLARED 1
29080 +# define YYSTYPE_IS_TRIVIAL 1
29081 +#endif
29082
29083 extern YYSTYPE yylval;
29084 +
29085 +
29086 +
29087 --- linux-atm-2.4.1.orig/src/switch/debug/Makefile.in
29088 +++ linux-atm-2.4.1/src/switch/debug/Makefile.in
29089 @@ -1,4 +1,4 @@
29090 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29091 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29092
29093 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29094 # This Makefile.in is free software; the Free Software Foundation
29095 @@ -90,8 +90,7 @@
29096 INCLUDES = -I$(top_builddir)/src/qgen
29097
29098 sw_debug_SOURCES = debug.c
29099 -sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
29100 - $(top_builddir)/src/lib/libatm.la
29101 +sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a $(top_builddir)/src/lib/libatm.la
29102
29103 sw_debug_LDADD = $(sw_debug_XTRAS) -lfl
29104
29105 @@ -121,8 +120,9 @@
29106
29107 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29108
29109 -TAR = gtar
29110 +TAR = tar
29111 GZIP_ENV = --best
29112 +DEP_FILES = .deps/debug.P
29113 SOURCES = $(sw_debug_SOURCES)
29114 OBJECTS = $(sw_debug_OBJECTS)
29115
29116 @@ -130,9 +130,9 @@
29117 .SUFFIXES:
29118 .SUFFIXES: .S .c .lo .o .obj .s
29119 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29120 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/switch/debug/Makefile
29121 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/switch/debug/Makefile
29122
29123 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29124 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29125 cd $(top_builddir) \
29126 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29127
29128 @@ -146,9 +146,6 @@
29129
29130 maintainer-clean-noinstPROGRAMS:
29131
29132 -.c.o:
29133 - $(COMPILE) -c $<
29134 -
29135 # FIXME: We should only use cygpath when building on Windows,
29136 # and only if it is available.
29137 .c.obj:
29138 @@ -171,9 +168,6 @@
29139
29140 maintainer-clean-compile:
29141
29142 -.c.lo:
29143 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29144 -
29145 .s.lo:
29146 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29147
29148 @@ -212,7 +206,7 @@
29149 awk ' { files[$$0] = 1; } \
29150 END { for (i in files) print i; }'`; \
29151 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
29152 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
29153 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
29154
29155 mostlyclean-tags:
29156
29157 @@ -228,6 +222,11 @@
29158 subdir = src/switch/debug
29159
29160 distdir: $(DISTFILES)
29161 + here=`cd $(top_builddir) && pwd`; \
29162 + top_distdir=`cd $(top_distdir) && pwd`; \
29163 + distdir=`cd $(distdir) && pwd`; \
29164 + cd $(top_srcdir) \
29165 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/switch/debug/Makefile
29166 @for file in $(DISTFILES); do \
29167 d=$(srcdir); \
29168 if test -d $$d/$$file; then \
29169 @@ -238,11 +237,38 @@
29170 || cp -p $$d/$$file $(distdir)/$$file || :; \
29171 fi; \
29172 done
29173 -debug.o: debug.c ../../../config.h ../../../src/include/atm.h \
29174 - ../../../src/include/stdint.h ../../../src/include/atmd.h \
29175 - ../../../src/qgen/uni.h ../fab.h ../proto.h \
29176 - ../../../src/include/atmsap.h ../sig.h
29177
29178 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
29179 +
29180 +-include $(DEP_FILES)
29181 +
29182 +mostlyclean-depend:
29183 +
29184 +clean-depend:
29185 +
29186 +distclean-depend:
29187 + -rm -rf .deps
29188 +
29189 +maintainer-clean-depend:
29190 +
29191 +%.o: %.c
29192 + @echo '$(COMPILE) -c $<'; \
29193 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
29194 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
29195 + tr ' ' '\012' < .deps/$(*F).pp \
29196 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
29197 + >> .deps/$(*F).P; \
29198 + rm .deps/$(*F).pp
29199 +
29200 +%.lo: %.c
29201 + @echo '$(LTCOMPILE) -c $<'; \
29202 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
29203 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
29204 + < .deps/$(*F).pp > .deps/$(*F).P; \
29205 + tr ' ' '\012' < .deps/$(*F).pp \
29206 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
29207 + >> .deps/$(*F).P; \
29208 + rm -f .deps/$(*F).pp
29209 info-am:
29210 info: info-am
29211 dvi-am:
29212 @@ -279,27 +305,27 @@
29213
29214 maintainer-clean-generic:
29215 mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \
29216 - mostlyclean-libtool mostlyclean-tags \
29217 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
29218 mostlyclean-generic
29219
29220 mostlyclean: mostlyclean-am
29221
29222 clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
29223 - clean-generic mostlyclean-am
29224 + clean-depend clean-generic mostlyclean-am
29225
29226 clean: clean-am
29227
29228 distclean-am: distclean-noinstPROGRAMS distclean-compile \
29229 - distclean-libtool distclean-tags distclean-generic \
29230 - clean-am
29231 + distclean-libtool distclean-tags distclean-depend \
29232 + distclean-generic clean-am
29233 -rm -f libtool
29234
29235 distclean: distclean-am
29236
29237 maintainer-clean-am: maintainer-clean-noinstPROGRAMS \
29238 maintainer-clean-compile maintainer-clean-libtool \
29239 - maintainer-clean-tags maintainer-clean-generic \
29240 - distclean-am
29241 + maintainer-clean-tags maintainer-clean-depend \
29242 + maintainer-clean-generic distclean-am
29243 @echo "This command is intended for maintainers to use;"
29244 @echo "it deletes files that may require special tools to rebuild."
29245
29246 @@ -310,12 +336,14 @@
29247 mostlyclean-compile distclean-compile clean-compile \
29248 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
29249 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
29250 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
29251 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
29252 -install-exec install-data-am install-data install-am install \
29253 -uninstall-am uninstall all-redirect all-am all installdirs \
29254 -mostlyclean-generic distclean-generic clean-generic \
29255 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
29256 +distclean-tags clean-tags maintainer-clean-tags distdir \
29257 +mostlyclean-depend distclean-depend clean-depend \
29258 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
29259 +installcheck-am installcheck install-exec-am install-exec \
29260 +install-data-am install-data install-am install uninstall-am uninstall \
29261 +all-redirect all-am all installdirs mostlyclean-generic \
29262 +distclean-generic clean-generic maintainer-clean-generic clean \
29263 +mostlyclean distclean maintainer-clean
29264
29265
29266 # Tell versions [3.59,3.63) of GNU make to not export all variables.
29267 --- linux-atm-2.4.1.orig/src/switch/debug/debug.c
29268 +++ linux-atm-2.4.1/src/switch/debug/debug.c
29269 @@ -43,7 +43,7 @@
29270
29271 void fab_init(CALL *call)
29272 {
29273 - PRV(call) = alloc_t(FAB);
29274 + call->fab = alloc_t(FAB);
29275 PRV(call)->next = calls;
29276 calls = call;
29277 }
29278 @@ -59,7 +59,7 @@
29279 diag(COMPONENT,DIAG_FATAL,"fab_destroy: call %p not found",call);
29280 *walk = PRV(call)->next;
29281 free(PRV(call));
29282 - PRV(call) = NULL;
29283 + call->fab = NULL;
29284 }
29285
29286
29287 --- linux-atm-2.4.1.orig/src/switch/tcp/Makefile.in
29288 +++ linux-atm-2.4.1/src/switch/tcp/Makefile.in
29289 @@ -1,4 +1,4 @@
29290 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29291 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29292
29293 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29294 # This Makefile.in is free software; the Free Software Foundation
29295 @@ -90,8 +90,7 @@
29296 INCLUDES = -I$(top_builddir)/src/qgen
29297
29298 sw_tcp_SOURCES = tcpsw.c
29299 -sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
29300 - $(top_builddir)/src/lib/libatm.la
29301 +sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a $(top_builddir)/src/lib/libatm.la
29302
29303 sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
29304 sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
29305 @@ -120,8 +119,9 @@
29306
29307 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29308
29309 -TAR = gtar
29310 +TAR = tar
29311 GZIP_ENV = --best
29312 +DEP_FILES = .deps/tcpsw.P
29313 SOURCES = $(sw_tcp_SOURCES)
29314 OBJECTS = $(sw_tcp_OBJECTS)
29315
29316 @@ -129,9 +129,9 @@
29317 .SUFFIXES:
29318 .SUFFIXES: .S .c .lo .o .obj .s
29319 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29320 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/switch/tcp/Makefile
29321 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/switch/tcp/Makefile
29322
29323 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29324 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29325 cd $(top_builddir) \
29326 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29327
29328 @@ -145,9 +145,6 @@
29329
29330 maintainer-clean-noinstPROGRAMS:
29331
29332 -.c.o:
29333 - $(COMPILE) -c $<
29334 -
29335 # FIXME: We should only use cygpath when building on Windows,
29336 # and only if it is available.
29337 .c.obj:
29338 @@ -170,9 +167,6 @@
29339
29340 maintainer-clean-compile:
29341
29342 -.c.lo:
29343 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29344 -
29345 .s.lo:
29346 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29347
29348 @@ -211,7 +205,7 @@
29349 awk ' { files[$$0] = 1; } \
29350 END { for (i in files) print i; }'`; \
29351 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
29352 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
29353 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
29354
29355 mostlyclean-tags:
29356
29357 @@ -227,6 +221,11 @@
29358 subdir = src/switch/tcp
29359
29360 distdir: $(DISTFILES)
29361 + here=`cd $(top_builddir) && pwd`; \
29362 + top_distdir=`cd $(top_distdir) && pwd`; \
29363 + distdir=`cd $(distdir) && pwd`; \
29364 + cd $(top_srcdir) \
29365 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/switch/tcp/Makefile
29366 @for file in $(DISTFILES); do \
29367 d=$(srcdir); \
29368 if test -d $$d/$$file; then \
29369 @@ -237,11 +236,38 @@
29370 || cp -p $$d/$$file $(distdir)/$$file || :; \
29371 fi; \
29372 done
29373 -tcpsw.o: tcpsw.c ../../../config.h ../../../src/include/stdint.h \
29374 - ../../../src/include/atm.h ../../../src/include/atmd.h \
29375 - ../../../src/qgen/uni.h ../fab.h ../proto.h \
29376 - ../../../src/include/atmsap.h ../sig.h ../dispatch.h ../swc.h
29377
29378 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
29379 +
29380 +-include $(DEP_FILES)
29381 +
29382 +mostlyclean-depend:
29383 +
29384 +clean-depend:
29385 +
29386 +distclean-depend:
29387 + -rm -rf .deps
29388 +
29389 +maintainer-clean-depend:
29390 +
29391 +%.o: %.c
29392 + @echo '$(COMPILE) -c $<'; \
29393 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
29394 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
29395 + tr ' ' '\012' < .deps/$(*F).pp \
29396 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
29397 + >> .deps/$(*F).P; \
29398 + rm .deps/$(*F).pp
29399 +
29400 +%.lo: %.c
29401 + @echo '$(LTCOMPILE) -c $<'; \
29402 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
29403 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
29404 + < .deps/$(*F).pp > .deps/$(*F).P; \
29405 + tr ' ' '\012' < .deps/$(*F).pp \
29406 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
29407 + >> .deps/$(*F).P; \
29408 + rm -f .deps/$(*F).pp
29409 info-am:
29410 info: info-am
29411 dvi-am:
29412 @@ -278,27 +304,27 @@
29413
29414 maintainer-clean-generic:
29415 mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \
29416 - mostlyclean-libtool mostlyclean-tags \
29417 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
29418 mostlyclean-generic
29419
29420 mostlyclean: mostlyclean-am
29421
29422 clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
29423 - clean-generic mostlyclean-am
29424 + clean-depend clean-generic mostlyclean-am
29425
29426 clean: clean-am
29427
29428 distclean-am: distclean-noinstPROGRAMS distclean-compile \
29429 - distclean-libtool distclean-tags distclean-generic \
29430 - clean-am
29431 + distclean-libtool distclean-tags distclean-depend \
29432 + distclean-generic clean-am
29433 -rm -f libtool
29434
29435 distclean: distclean-am
29436
29437 maintainer-clean-am: maintainer-clean-noinstPROGRAMS \
29438 maintainer-clean-compile maintainer-clean-libtool \
29439 - maintainer-clean-tags maintainer-clean-generic \
29440 - distclean-am
29441 + maintainer-clean-tags maintainer-clean-depend \
29442 + maintainer-clean-generic distclean-am
29443 @echo "This command is intended for maintainers to use;"
29444 @echo "it deletes files that may require special tools to rebuild."
29445
29446 @@ -309,12 +335,14 @@
29447 mostlyclean-compile distclean-compile clean-compile \
29448 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
29449 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
29450 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
29451 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
29452 -install-exec install-data-am install-data install-am install \
29453 -uninstall-am uninstall all-redirect all-am all installdirs \
29454 -mostlyclean-generic distclean-generic clean-generic \
29455 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
29456 +distclean-tags clean-tags maintainer-clean-tags distdir \
29457 +mostlyclean-depend distclean-depend clean-depend \
29458 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
29459 +installcheck-am installcheck install-exec-am install-exec \
29460 +install-data-am install-data install-am install uninstall-am uninstall \
29461 +all-redirect all-am all installdirs mostlyclean-generic \
29462 +distclean-generic clean-generic maintainer-clean-generic clean \
29463 +mostlyclean distclean maintainer-clean
29464
29465
29466 # Tell versions [3.59,3.63) of GNU make to not export all variables.
29467 --- linux-atm-2.4.1.orig/src/switch/tcp/tcpsw.c
29468 +++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c
29469 @@ -345,7 +345,7 @@
29470
29471 void fab_init(CALL *call)
29472 {
29473 - PRV(call) = alloc_t(FAB);
29474 + call->fab = alloc_t(FAB);
29475 PRV(call)->active = 0;
29476 PRV(call)->next = calls;
29477 calls = call;
29478 @@ -362,7 +362,7 @@
29479 diag(COMPONENT,DIAG_FATAL,"fab_destroy: call %p not found",call);
29480 *walk = PRV(call)->next;
29481 free(PRV(call));
29482 - PRV(call) = NULL;
29483 + call->fab = NULL;
29484 }
29485
29486
29487 --- linux-atm-2.4.1.orig/src/config/Makefile.in
29488 +++ linux-atm-2.4.1/src/config/Makefile.in
29489 @@ -1,4 +1,4 @@
29490 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29491 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29492
29493 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29494 # This Makefile.in is free software; the Free Software Foundation
29495 @@ -96,14 +96,14 @@
29496
29497 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29498
29499 -TAR = gtar
29500 +TAR = tar
29501 GZIP_ENV = --best
29502 all: all-redirect
29503 .SUFFIXES:
29504 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29505 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/config/Makefile
29506 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/config/Makefile
29507
29508 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29509 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29510 cd $(top_builddir) \
29511 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29512
29513 @@ -186,7 +186,7 @@
29514 awk ' { files[$$0] = 1; } \
29515 END { for (i in files) print i; }'`; \
29516 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
29517 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
29518 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
29519
29520 mostlyclean-tags:
29521
29522 @@ -202,6 +202,11 @@
29523 subdir = src/config
29524
29525 distdir: $(DISTFILES)
29526 + here=`cd $(top_builddir) && pwd`; \
29527 + top_distdir=`cd $(top_distdir) && pwd`; \
29528 + distdir=`cd $(distdir) && pwd`; \
29529 + cd $(top_srcdir) \
29530 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/config/Makefile
29531 @for file in $(DISTFILES); do \
29532 d=$(srcdir); \
29533 if test -d $$d/$$file; then \
29534 --- linux-atm-2.4.1.orig/src/config/init-redhat/Makefile.in
29535 +++ linux-atm-2.4.1/src/config/init-redhat/Makefile.in
29536 @@ -1,4 +1,4 @@
29537 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29538 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29539
29540 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29541 # This Makefile.in is free software; the Free Software Foundation
29542 @@ -94,14 +94,14 @@
29543
29544 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29545
29546 -TAR = gtar
29547 +TAR = tar
29548 GZIP_ENV = --best
29549 all: all-redirect
29550 .SUFFIXES:
29551 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29552 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/config/init-redhat/Makefile
29553 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/config/init-redhat/Makefile
29554
29555 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29556 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29557 cd $(top_builddir) \
29558 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29559
29560 @@ -114,6 +114,11 @@
29561 subdir = src/config/init-redhat
29562
29563 distdir: $(DISTFILES)
29564 + here=`cd $(top_builddir) && pwd`; \
29565 + top_distdir=`cd $(top_distdir) && pwd`; \
29566 + distdir=`cd $(distdir) && pwd`; \
29567 + cd $(top_srcdir) \
29568 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/config/init-redhat/Makefile
29569 @for file in $(DISTFILES); do \
29570 d=$(srcdir); \
29571 if test -d $$d/$$file; then \
29572 --- linux-atm-2.4.1.orig/src/extra/Makefile.in
29573 +++ linux-atm-2.4.1/src/extra/Makefile.in
29574 @@ -1,4 +1,4 @@
29575 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29576 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29577
29578 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29579 # This Makefile.in is free software; the Free Software Foundation
29580 @@ -96,14 +96,14 @@
29581
29582 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29583
29584 -TAR = gtar
29585 +TAR = tar
29586 GZIP_ENV = --best
29587 all: all-redirect
29588 .SUFFIXES:
29589 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29590 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/extra/Makefile
29591 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/extra/Makefile
29592
29593 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29594 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29595 cd $(top_builddir) \
29596 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29597
29598 @@ -188,7 +188,7 @@
29599 awk ' { files[$$0] = 1; } \
29600 END { for (i in files) print i; }'`; \
29601 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
29602 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
29603 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
29604
29605 mostlyclean-tags:
29606
29607 @@ -204,6 +204,11 @@
29608 subdir = src/extra
29609
29610 distdir: $(DISTFILES)
29611 + here=`cd $(top_builddir) && pwd`; \
29612 + top_distdir=`cd $(top_distdir) && pwd`; \
29613 + distdir=`cd $(distdir) && pwd`; \
29614 + cd $(top_srcdir) \
29615 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/extra/Makefile
29616 @for file in $(DISTFILES); do \
29617 d=$(srcdir); \
29618 if test -d $$d/$$file; then \
29619 --- linux-atm-2.4.1.orig/src/extra/ANS/Makefile.in
29620 +++ linux-atm-2.4.1/src/extra/ANS/Makefile.in
29621 @@ -1,4 +1,4 @@
29622 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29623 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29624
29625 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29626 # This Makefile.in is free software; the Free Software Foundation
29627 @@ -94,14 +94,14 @@
29628
29629 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29630
29631 -TAR = gtar
29632 +TAR = tar
29633 GZIP_ENV = --best
29634 all: all-redirect
29635 .SUFFIXES:
29636 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29637 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/extra/ANS/Makefile
29638 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/extra/ANS/Makefile
29639
29640 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29641 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29642 cd $(top_builddir) \
29643 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29644
29645 @@ -114,6 +114,11 @@
29646 subdir = src/extra/ANS
29647
29648 distdir: $(DISTFILES)
29649 + here=`cd $(top_builddir) && pwd`; \
29650 + top_distdir=`cd $(top_distdir) && pwd`; \
29651 + distdir=`cd $(distdir) && pwd`; \
29652 + cd $(top_srcdir) \
29653 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/extra/ANS/Makefile
29654 @for file in $(DISTFILES); do \
29655 d=$(srcdir); \
29656 if test -d $$d/$$file; then \
29657 --- linux-atm-2.4.1.orig/src/br2684/Makefile.am
29658 +++ linux-atm-2.4.1/src/br2684/Makefile.am
29659 @@ -0,0 +1,10 @@
29660 +sbin_PROGRAMS = br2684ctl
29661 +
29662 +LDADD = $(top_builddir)/src/lib/libatm.la
29663 +
29664 +br2684ctl_SOURCES = br2684ctl.c
29665 +
29666 +man_MANS = br2684ctl.8
29667 +
29668 +EXTRA_DIST = $(man_MANS) USAGE.br2684
29669 +
29670 --- linux-atm-2.4.1.orig/src/br2684/Makefile.in
29671 +++ linux-atm-2.4.1/src/br2684/Makefile.in
29672 @@ -0,0 +1,418 @@
29673 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29674 +
29675 +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29676 +# This Makefile.in is free software; the Free Software Foundation
29677 +# gives unlimited permission to copy and/or distribute it,
29678 +# with or without modifications, as long as this notice is preserved.
29679 +
29680 +# This program is distributed in the hope that it will be useful,
29681 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
29682 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
29683 +# PARTICULAR PURPOSE.
29684 +
29685 +
29686 +SHELL = @SHELL@
29687 +
29688 +srcdir = @srcdir@
29689 +top_srcdir = @top_srcdir@
29690 +VPATH = @srcdir@
29691 +prefix = @prefix@
29692 +exec_prefix = @exec_prefix@
29693 +
29694 +bindir = @bindir@
29695 +sbindir = @sbindir@
29696 +libexecdir = @libexecdir@
29697 +datadir = @datadir@
29698 +sysconfdir = @sysconfdir@
29699 +sharedstatedir = @sharedstatedir@
29700 +localstatedir = @localstatedir@
29701 +libdir = @libdir@
29702 +infodir = @infodir@
29703 +mandir = @mandir@
29704 +includedir = @includedir@
29705 +oldincludedir = /usr/include
29706 +
29707 +DESTDIR =
29708 +
29709 +pkgdatadir = $(datadir)/@PACKAGE@
29710 +pkglibdir = $(libdir)/@PACKAGE@
29711 +pkgincludedir = $(includedir)/@PACKAGE@
29712 +
29713 +top_builddir = ../..
29714 +
29715 +ACLOCAL = @ACLOCAL@
29716 +AUTOCONF = @AUTOCONF@
29717 +AUTOMAKE = @AUTOMAKE@
29718 +AUTOHEADER = @AUTOHEADER@
29719 +
29720 +INSTALL = @INSTALL@
29721 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
29722 +INSTALL_DATA = @INSTALL_DATA@
29723 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
29724 +transform = @program_transform_name@
29725 +
29726 +NORMAL_INSTALL = :
29727 +PRE_INSTALL = :
29728 +POST_INSTALL = :
29729 +NORMAL_UNINSTALL = :
29730 +PRE_UNINSTALL = :
29731 +POST_UNINSTALL = :
29732 +host_alias = @host_alias@
29733 +host_triplet = @host@
29734 +AR = @AR@
29735 +AS = @AS@
29736 +CC = /usr/src/openwrt/staging_dir_mipsel/bin/mipsel-linux-gcc
29737 +CXX = @CXX@
29738 +CXXCPP = @CXXCPP@
29739 +DLLTOOL = @DLLTOOL@
29740 +ECHO = @ECHO@
29741 +EGREP = @EGREP@
29742 +EXEEXT = @EXEEXT@
29743 +F77 = @F77@
29744 +GCJ = @GCJ@
29745 +GCJFLAGS = @GCJFLAGS@
29746 +HAVE_LIB = @HAVE_LIB@
29747 +LEX = @LEX@
29748 +LIB = @LIB@
29749 +LIBTOOL = @LIBTOOL@
29750 +LIBTOOL_DEPS = @LIBTOOL_DEPS@
29751 +LIBVER_AGE = @LIBVER_AGE@
29752 +LIBVER_CURRENT = @LIBVER_CURRENT@
29753 +LIBVER_REVISION = @LIBVER_REVISION@
29754 +LN_S = @LN_S@
29755 +LTLIB = @LTLIB@
29756 +MAKEINFO = @MAKEINFO@
29757 +OBJDUMP = @OBJDUMP@
29758 +OBJEXT = @OBJEXT@
29759 +PACKAGE = @PACKAGE@
29760 +PERL = @PERL@
29761 +RANLIB = @RANLIB@
29762 +RC = @RC@
29763 +STRIP = @STRIP@
29764 +VERSION = @VERSION@
29765 +YACC = @YACC@
29766 +
29767 +sbin_PROGRAMS = br2684ctl
29768 +
29769 +LDADD = $(top_builddir)/src/lib/libatm.la
29770 +
29771 +br2684ctl_SOURCES = br2684ctl.c
29772 +
29773 +man_MANS = br2684ctl.8
29774 +
29775 +EXTRA_DIST = $(man_MANS) USAGE.br2684
29776 +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
29777 +CONFIG_HEADER = ../../config.h
29778 +CONFIG_CLEAN_FILES =
29779 +sbin_PROGRAMS = br2684ctl$(EXEEXT)
29780 +PROGRAMS = $(sbin_PROGRAMS)
29781 +
29782 +
29783 +DEFS = @DEFS@ -I. -I$(srcdir) -I../..
29784 +CPPFLAGS = @CPPFLAGS@
29785 +LDFLAGS = @LDFLAGS@
29786 +LIBS = @LIBS@
29787 +br2684ctl_OBJECTS = br2684ctl.$(OBJEXT)
29788 +br2684ctl_LDADD = $(LDADD)
29789 +br2684ctl_DEPENDENCIES = $(top_builddir)/src/lib/libatm.la
29790 +br2684ctl_LDFLAGS =
29791 +CFLAGS = @CFLAGS@
29792 +COMPILE = $(TARGET_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
29793 +LTCOMPILE = $(LIBTOOL) --mode=compile $(TARGET_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
29794 +CCLD = $(TARGET_CC)
29795 +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
29796 +man8dir = $(mandir)/man8
29797 +MANS = $(man_MANS)
29798 +
29799 +NROFF = nroff
29800 +DIST_COMMON = Makefile.am Makefile.in
29801 +
29802 +
29803 +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29804 +
29805 +TAR = tar
29806 +GZIP_ENV = --best
29807 +DEP_FILES = .deps/br2684ctl.P
29808 +SOURCES = $(br2684ctl_SOURCES)
29809 +OBJECTS = $(br2684ctl_OBJECTS)
29810 +
29811 +all: all-redirect
29812 +.SUFFIXES:
29813 +.SUFFIXES: .S .c .lo .o .obj .s
29814 +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29815 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/br2684/Makefile
29816 +
29817 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29818 + cd $(top_builddir) \
29819 + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29820 +
29821 +
29822 +mostlyclean-sbinPROGRAMS:
29823 +
29824 +clean-sbinPROGRAMS:
29825 + -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
29826 +
29827 +distclean-sbinPROGRAMS:
29828 +
29829 +maintainer-clean-sbinPROGRAMS:
29830 +
29831 +install-sbinPROGRAMS: $(sbin_PROGRAMS)
29832 + @$(NORMAL_INSTALL)
29833 + $(mkinstalldirs) $(DESTDIR)$(sbindir)
29834 + @list='$(sbin_PROGRAMS)'; for p in $$list; do \
29835 + if test -f $$p; then \
29836 + echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
29837 + $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
29838 + else :; fi; \
29839 + done
29840 +
29841 +uninstall-sbinPROGRAMS:
29842 + @$(NORMAL_UNINSTALL)
29843 + list='$(sbin_PROGRAMS)'; for p in $$list; do \
29844 + rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
29845 + done
29846 +
29847 +# FIXME: We should only use cygpath when building on Windows,
29848 +# and only if it is available.
29849 +.c.obj:
29850 + $(COMPILE) -c `cygpath -w $<`
29851 +
29852 +.s.o:
29853 + $(COMPILE) -c $<
29854 +
29855 +.S.o:
29856 + $(COMPILE) -c $<
29857 +
29858 +mostlyclean-compile:
29859 + -rm -f *.o core *.core
29860 + -rm -f *.$(OBJEXT)
29861 +
29862 +clean-compile:
29863 +
29864 +distclean-compile:
29865 + -rm -f *.tab.c
29866 +
29867 +maintainer-clean-compile:
29868 +
29869 +.s.lo:
29870 + $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29871 +
29872 +.S.lo:
29873 + $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29874 +
29875 +mostlyclean-libtool:
29876 + -rm -f *.lo
29877 +
29878 +clean-libtool:
29879 + -rm -rf .libs _libs
29880 +
29881 +distclean-libtool:
29882 +
29883 +maintainer-clean-libtool:
29884 +
29885 +br2684ctl$(EXEEXT): $(br2684ctl_OBJECTS) $(br2684ctl_DEPENDENCIES)
29886 + @rm -f br2684ctl$(EXEEXT)
29887 + $(LINK) $(br2684ctl_LDFLAGS) $(br2684ctl_OBJECTS) $(br2684ctl_LDADD) $(LIBS)
29888 +
29889 +install-man8:
29890 + $(mkinstalldirs) $(DESTDIR)$(man8dir)
29891 + @list='$(man8_MANS)'; \
29892 + l2='$(man_MANS)'; for i in $$l2; do \
29893 + case "$$i" in \
29894 + *.8*) list="$$list $$i" ;; \
29895 + esac; \
29896 + done; \
29897 + for i in $$list; do \
29898 + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
29899 + else file=$$i; fi; \
29900 + ext=`echo $$i | sed -e 's/^.*\\.//'`; \
29901 + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
29902 + inst=`echo $$inst | sed '$(transform)'`.$$ext; \
29903 + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
29904 + $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
29905 + done
29906 +
29907 +uninstall-man8:
29908 + @list='$(man8_MANS)'; \
29909 + l2='$(man_MANS)'; for i in $$l2; do \
29910 + case "$$i" in \
29911 + *.8*) list="$$list $$i" ;; \
29912 + esac; \
29913 + done; \
29914 + for i in $$list; do \
29915 + ext=`echo $$i | sed -e 's/^.*\\.//'`; \
29916 + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
29917 + inst=`echo $$inst | sed '$(transform)'`.$$ext; \
29918 + echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
29919 + rm -f $(DESTDIR)$(man8dir)/$$inst; \
29920 + done
29921 +install-man: $(MANS)
29922 + @$(NORMAL_INSTALL)
29923 + $(MAKE) $(AM_MAKEFLAGS) install-man8
29924 +uninstall-man:
29925 + @$(NORMAL_UNINSTALL)
29926 + $(MAKE) $(AM_MAKEFLAGS) uninstall-man8
29927 +
29928 +tags: TAGS
29929 +
29930 +ID: $(HEADERS) $(SOURCES) $(LISP)
29931 + list='$(SOURCES) $(HEADERS)'; \
29932 + unique=`for i in $$list; do echo $$i; done | \
29933 + awk ' { files[$$0] = 1; } \
29934 + END { for (i in files) print i; }'`; \
29935 + here=`pwd` && cd $(srcdir) \
29936 + && mkid -f$$here/ID $$unique $(LISP)
29937 +
29938 +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
29939 + tags=; \
29940 + here=`pwd`; \
29941 + list='$(SOURCES) $(HEADERS)'; \
29942 + unique=`for i in $$list; do echo $$i; done | \
29943 + awk ' { files[$$0] = 1; } \
29944 + END { for (i in files) print i; }'`; \
29945 + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
29946 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
29947 +
29948 +mostlyclean-tags:
29949 +
29950 +clean-tags:
29951 +
29952 +distclean-tags:
29953 + -rm -f TAGS ID
29954 +
29955 +maintainer-clean-tags:
29956 +
29957 +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
29958 +
29959 +subdir = src/br2684
29960 +
29961 +distdir: $(DISTFILES)
29962 + here=`cd $(top_builddir) && pwd`; \
29963 + top_distdir=`cd $(top_distdir) && pwd`; \
29964 + distdir=`cd $(distdir) && pwd`; \
29965 + cd $(top_srcdir) \
29966 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/br2684/Makefile
29967 + @for file in $(DISTFILES); do \
29968 + d=$(srcdir); \
29969 + if test -d $$d/$$file; then \
29970 + cp -pr $$d/$$file $(distdir)/$$file; \
29971 + else \
29972 + test -f $(distdir)/$$file \
29973 + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
29974 + || cp -p $$d/$$file $(distdir)/$$file || :; \
29975 + fi; \
29976 + done
29977 +
29978 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
29979 +
29980 +-include $(DEP_FILES)
29981 +
29982 +mostlyclean-depend:
29983 +
29984 +clean-depend:
29985 +
29986 +distclean-depend:
29987 + -rm -rf .deps
29988 +
29989 +maintainer-clean-depend:
29990 +
29991 +%.o: %.c
29992 + @echo '$(COMPILE) -c $<'; \
29993 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
29994 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
29995 + tr ' ' '\012' < .deps/$(*F).pp \
29996 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
29997 + >> .deps/$(*F).P; \
29998 + rm .deps/$(*F).pp
29999 +
30000 +%.lo: %.c
30001 + @echo '$(LTCOMPILE) -c $<'; \
30002 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
30003 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
30004 + < .deps/$(*F).pp > .deps/$(*F).P; \
30005 + tr ' ' '\012' < .deps/$(*F).pp \
30006 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
30007 + >> .deps/$(*F).P; \
30008 + rm -f .deps/$(*F).pp
30009 +info-am:
30010 +info: info-am
30011 +dvi-am:
30012 +dvi: dvi-am
30013 +check-am: all-am
30014 +check: check-am
30015 +installcheck-am:
30016 +installcheck: installcheck-am
30017 +install-exec-am: install-sbinPROGRAMS
30018 +install-exec: install-exec-am
30019 +
30020 +install-data-am: install-man
30021 +install-data: install-data-am
30022 +
30023 +install-am: all-am
30024 + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
30025 +install: install-am
30026 +uninstall-am: uninstall-sbinPROGRAMS uninstall-man
30027 +uninstall: uninstall-am
30028 +all-am: Makefile $(PROGRAMS) $(MANS)
30029 +all-redirect: all-am
30030 +install-strip:
30031 + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
30032 +installdirs:
30033 + $(mkinstalldirs) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
30034 +
30035 +
30036 +mostlyclean-generic:
30037 +
30038 +clean-generic:
30039 +
30040 +distclean-generic:
30041 + -rm -f Makefile $(CONFIG_CLEAN_FILES)
30042 + -rm -f config.cache config.log stamp-h stamp-h[0-9]*
30043 +
30044 +maintainer-clean-generic:
30045 +mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
30046 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
30047 + mostlyclean-generic
30048 +
30049 +mostlyclean: mostlyclean-am
30050 +
30051 +clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
30052 + clean-depend clean-generic mostlyclean-am
30053 +
30054 +clean: clean-am
30055 +
30056 +distclean-am: distclean-sbinPROGRAMS distclean-compile \
30057 + distclean-libtool distclean-tags distclean-depend \
30058 + distclean-generic clean-am
30059 + -rm -f libtool
30060 +
30061 +distclean: distclean-am
30062 +
30063 +maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
30064 + maintainer-clean-compile maintainer-clean-libtool \
30065 + maintainer-clean-tags maintainer-clean-depend \
30066 + maintainer-clean-generic distclean-am
30067 + @echo "This command is intended for maintainers to use;"
30068 + @echo "it deletes files that may require special tools to rebuild."
30069 +
30070 +maintainer-clean: maintainer-clean-am
30071 +
30072 +.PHONY: mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \
30073 +clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
30074 +install-sbinPROGRAMS mostlyclean-compile distclean-compile \
30075 +clean-compile maintainer-clean-compile mostlyclean-libtool \
30076 +distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
30077 +uninstall-man8 install-man uninstall-man tags mostlyclean-tags \
30078 +distclean-tags clean-tags maintainer-clean-tags distdir \
30079 +mostlyclean-depend distclean-depend clean-depend \
30080 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
30081 +installcheck-am installcheck install-exec-am install-exec \
30082 +install-data-am install-data install-am install uninstall-am uninstall \
30083 +all-redirect all-am all installdirs mostlyclean-generic \
30084 +distclean-generic clean-generic maintainer-clean-generic clean \
30085 +mostlyclean distclean maintainer-clean
30086 +
30087 +
30088 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
30089 +# Otherwise a system limit (for SysV at least) may be exceeded.
30090 +.NOEXPORT:
30091 --- linux-atm-2.4.1.orig/src/br2684/br2684ctl.8
30092 +++ linux-atm-2.4.1/src/br2684/br2684ctl.8
30093 @@ -0,0 +1,74 @@
30094 +.\"
30095 +.TH br2684ctl 1 "7 Jul 2003"
30096 +.SH NAME
30097 +br2684ctl \- RFC1483/2684 Bridge Daemon
30098 +.SH SYNOPSIS
30099 +.B br2684ctl
30100 +[
30101 +.BI \-b
30102 +] [[
30103 +.BI \-c\ n
30104 +] [
30105 +.BI \-e\ 0|1
30106 +] [
30107 +.BI \-s\ sndbuf
30108 +] [
30109 +.BI \-a\ [itf].vpi.vci
30110 +]] ...
30111 +.SH PARAMETERS
30112 +.TP 15
30113 +.BI \-a\ [itf].vpi.vci
30114 +ATM PVC number, VPI and VCI. (Required)
30115 +.BI \-b
30116 +Puts the process in the background.
30117 +.TP 15
30118 +.BI \-c\ n
30119 +br2684 interface number such as 0, 1, ... (Required)
30120 +.TP 15
30121 +.BI \-e\ 0|1
30122 +Encapsulation method: 0=LLC, 1=VC mux (the default is 0 or LLC)
30123 +.TP 15
30124 +.TP 15
30125 +.BI \-s\ sndbuf
30126 +Send buffer size. Default is 8192.
30127 +.SH DESCRIPTION
30128 +br2684ctl handles RFC1483/2684 bridged PDUs.
30129 +This is most often used in ADSL scenarios where
30130 +.I usually
30131 +the subscribers'
30132 +ethernet traffic is encapsulated in ATM AAL5 (by bridging ADSL modems)
30133 +according to RFC2684.
30134 +The subscriber-side ADSL modem can be external with an ethernet connector
30135 +or an internal ADSL card in a PC.
30136 +RFC1483 has been obsoleted by RFC2684.
30137 +
30138 +For example it is possible to set up your Linux box to handle several
30139 +ATM PVC's with bridged-1483 (sometimes referred as SNAP) encapsulation.
30140 +The Linux network stack might provide DHCP, IP masquerading, IP firewall services or
30141 +bridge the Ethernet frames just like it had several ethernet interfaces.
30142 +In fact it can have several (logical) ethernet interfaces, where
30143 +ATM is just used as a carrier.
30144 +.SH USAGE
30145 +br2684ctl creates a new network interface named nas[n]
30146 +which is bound to an specific ATM PVC. It requires two mandatory
30147 +arguments: -c, the interface number, and -a, the ATM PVC. It should be
30148 +noted that the order of the command arguments matter; -c should be
30149 +followed by -a. You can create as many interfaces as necessary
30150 +in one go, just make a long command line ;)
30151 +
30152 +For example, following command will create a nas0 interface which uses
30153 +the ATM PVC with VPI=0 and VCI=401. You need to configure the PVC connection
30154 +0.401 on the ATM switch manually.
30155 +
30156 +% br2684ctl -c 0 -a 0.401
30157 +
30158 +The command will only create a new interface nas0.
30159 +Next step is to assign an IP address and netmask to
30160 +the interface nas0 using the ifconfig command. Using ifconfig, you can
30161 +also assign a Ethernet MAC address to the interface nas0, if necessary.
30162 +
30163 +% ifconfig nas0 192.168.2.1 netmask 255.255.255.0
30164 +.SH NOTES
30165 +This man page is based on a tutorial by by Joonbum Byun <jbyun@megaxess.com>
30166 +.SH SEE ALSO
30167 +.BR qos (7)
30168 --- linux-atm-2.4.1.orig/doc/Makefile.in
30169 +++ linux-atm-2.4.1/doc/Makefile.in
30170 @@ -1,4 +1,4 @@
30171 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
30172 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
30173
30174 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
30175 # This Makefile.in is free software; the Free Software Foundation
30176 @@ -96,14 +96,14 @@
30177
30178 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
30179
30180 -TAR = gtar
30181 +TAR = tar
30182 GZIP_ENV = --best
30183 all: all-redirect
30184 .SUFFIXES:
30185 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
30186 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
30187 + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
30188
30189 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
30190 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
30191 cd $(top_builddir) \
30192 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
30193
30194 @@ -116,6 +116,11 @@
30195 subdir = doc
30196
30197 distdir: $(DISTFILES)
30198 + here=`cd $(top_builddir) && pwd`; \
30199 + top_distdir=`cd $(top_distdir) && pwd`; \
30200 + distdir=`cd $(distdir) && pwd`; \
30201 + cd $(top_srcdir) \
30202 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
30203 @for file in $(DISTFILES); do \
30204 d=$(srcdir); \
30205 if test -d $$d/$$file; then \
30206 --- linux-atm-2.4.1.orig/debian/patches/00list
30207 +++ linux-atm-2.4.1/debian/patches/00list
30208 @@ -0,0 +1 @@
30209 +10_atmbr2684.h
30210 --- linux-atm-2.4.1.orig/debian/patches/10_atmbr2684.h.dpatch
30211 +++ linux-atm-2.4.1/debian/patches/10_atmbr2684.h.dpatch
30212 @@ -0,0 +1,598 @@
30213 +#! /bin/sh -e
30214 +## 01_kernel-header.dpatch by <bengen+debian@hilluzination.de>
30215 +##
30216 +## All lines beginning with ## DP:' are a description of the patch.
30217 +## DP: add header file atmbr2684.h
30218 +
30219 +if [ -e /usr/include/linux/atmbr2684.h ]; then exit 0; fi
30220 +
30221 +if [ $# -ne 1 ]; then
30222 + echo "basename $0: script expects -patch|-unpatch as argument" >&2
30223 + exit 1
30224 +fi
30225 +case "$1" in
30226 + -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
30227 + -unpatch) patch -f --no-backup-if-mismatch -E -R -p1 < $0;;
30228 + *)
30229 + echo "basename $0: script expects -patch|-unpatch as argument" >&2
30230 + exit 1;;
30231 +esac
30232 +
30233 +exit 0
30234 +@DPATCH@
30235 +
30236 +--- linux-atm.orig/src/include/linux/atmbr2684.h
30237 ++++ linux-atm/src/include/linux/atmbr2684.h
30238 +@@ -0,0 +1,101 @@
30239 ++#ifndef _LINUX_ATMBR2684_H
30240 ++#define _LINUX_ATMBR2684_H
30241 ++
30242 ++#include <linux/atm.h>
30243 ++#include <linux/if.h> /* For IFNAMSIZ */
30244 ++
30245 ++/*
30246 ++ * Type of media we're bridging (ethernet, token ring, etc) Currently only
30247 ++ * ethernet is supported
30248 ++ */
30249 ++#define BR2684_MEDIA_ETHERNET (0) /* 802.3 */
30250 ++#define BR2684_MEDIA_802_4 (1) /* 802.4 */
30251 ++#define BR2684_MEDIA_TR (2) /* 802.5 - token ring */
30252 ++#define BR2684_MEDIA_FDDI (3)
30253 ++#define BR2684_MEDIA_802_6 (4) /* 802.6 */
30254 ++
30255 ++/*
30256 ++ * Is there FCS inbound on this VC? This currently isn't supported.
30257 ++ */
30258 ++#define BR2684_FCSIN_NO (0)
30259 ++#define BR2684_FCSIN_IGNORE (1)
30260 ++#define BR2684_FCSIN_VERIFY (2)
30261 ++
30262 ++/*
30263 ++ * Is there FCS outbound on this VC? This currently isn't supported.
30264 ++ */
30265 ++#define BR2684_FCSOUT_NO (0)
30266 ++#define BR2684_FCSOUT_SENDZERO (1)
30267 ++#define BR2684_FCSOUT_GENERATE (2)
30268 ++
30269 ++/*
30270 ++ * Does this VC include LLC encapsulation?
30271 ++ */
30272 ++#define BR2684_ENCAPS_VC (0) /* VC-mux */
30273 ++#define BR2684_ENCAPS_LLC (1)
30274 ++#define BR2684_ENCAPS_AUTODETECT (2) /* Unsuported */
30275 ++
30276 ++/*
30277 ++ * This is for the ATM_NEWBACKENDIF call - these are like socket families:
30278 ++ * the first element of the structure is the backend number and the rest
30279 ++ * is per-backend specific
30280 ++ */
30281 ++struct atm_newif_br2684 {
30282 ++ atm_backend_t backend_num; /* ATM_BACKEND_BR2684 */
30283 ++ int media; /* BR2684_MEDIA_* */
30284 ++ char ifname[IFNAMSIZ];
30285 ++ int mtu;
30286 ++};
30287 ++
30288 ++/*
30289 ++ * This structure is used to specify a br2684 interface - either by a
30290 ++ * positive integer (returned by ATM_NEWBACKENDIF) or the interfaces name
30291 ++ */
30292 ++#define BR2684_FIND_BYNOTHING (0)
30293 ++#define BR2684_FIND_BYNUM (1)
30294 ++#define BR2684_FIND_BYIFNAME (2)
30295 ++struct br2684_if_spec {
30296 ++ int method; /* BR2684_FIND_* */
30297 ++ union {
30298 ++ char ifname[IFNAMSIZ];
30299 ++ int devnum;
30300 ++ } spec;
30301 ++};
30302 ++
30303 ++/*
30304 ++ * This is for the ATM_SETBACKEND call - these are like socket families:
30305 ++ * the first element of the structure is the backend number and the rest
30306 ++ * is per-backend specific
30307 ++ */
30308 ++struct atm_backend_br2684 {
30309 ++ atm_backend_t backend_num; /* ATM_BACKEND_BR2684 */
30310 ++ struct br2684_if_spec ifspec;
30311 ++ int fcs_in; /* BR2684_FCSIN_* */
30312 ++ int fcs_out; /* BR2684_FCSOUT_* */
30313 ++ int fcs_auto; /* 1: fcs_{in,out} disabled if no FCS rx'ed */
30314 ++ int encaps; /* BR2684_ENCAPS_* */
30315 ++ int has_vpiid; /* 1: use vpn_id - Unsupported */
30316 ++ __u8 vpn_id[7];
30317 ++ int send_padding; /* unsupported */
30318 ++ int min_size; /* we will pad smaller packets than this */
30319 ++};
30320 ++
30321 ++/*
30322 ++ * The BR2684_SETFILT ioctl is an experimental mechanism for folks
30323 ++ * terminating a large number of IP-only vcc's. When netfilter allows
30324 ++ * efficient per-if in/out filters, this support will be removed
30325 ++ */
30326 ++struct br2684_filter {
30327 ++ __u32 prefix; /* network byte order */
30328 ++ __u32 netmask; /* 0 = disable filter */
30329 ++};
30330 ++
30331 ++struct br2684_filter_set {
30332 ++ struct br2684_if_spec ifspec;
30333 ++ struct br2684_filter filter;
30334 ++};
30335 ++
30336 ++#define BR2684_SETFILT _IOW( 'a', ATMIOC_BACKEND + 0, \
30337 ++ struct br2684_filter_set)
30338 ++
30339 ++#endif /* _LINUX_ATMBR2684_H */
30340 +--- linux-atm.orig/src/include/linux/atmdev.h
30341 ++++ linux-atm/src/include/linux/atmdev.h
30342 +@@ -0,0 +1,468 @@
30343 ++/* atmdev.h - ATM device driver declarations and various related items */
30344 ++
30345 ++/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
30346 ++
30347 ++
30348 ++#ifndef LINUX_ATMDEV_H
30349 ++#define LINUX_ATMDEV_H
30350 ++
30351 ++
30352 ++#include <linux/config.h>
30353 ++#include <linux/atmapi.h>
30354 ++#include <linux/atm.h>
30355 ++#include <linux/atmioc.h>
30356 ++
30357 ++
30358 ++#define ESI_LEN 6
30359 ++
30360 ++#define ATM_OC3_PCR (155520000/270*260/8/53)
30361 ++ /* OC3 link rate: 155520000 bps
30362 ++ SONET overhead: /270*260 (9 section, 1 path)
30363 ++ bits per cell: /8/53
30364 ++ max cell rate: 353207.547 cells/sec */
30365 ++#define ATM_25_PCR ((25600000/8-8000)/54)
30366 ++ /* 25 Mbps ATM cell rate (59111) */
30367 ++#define ATM_OC12_PCR (622080000/1080*1040/8/53)
30368 ++ /* OC12 link rate: 622080000 bps
30369 ++ SONET overhead: /1080*1040
30370 ++ bits per cell: /8/53
30371 ++ max cell rate: 1412830.188 cells/sec */
30372 ++#define ATM_DS3_PCR (8000*12)
30373 ++ /* DS3: 12 cells in a 125 usec time slot */
30374 ++
30375 ++#define ATM_SD(s) ((s)->sk->protinfo.af_atm)
30376 ++
30377 ++
30378 ++#define __AAL_STAT_ITEMS \
30379 ++ __HANDLE_ITEM(tx); /* TX okay */ \
30380 ++ __HANDLE_ITEM(tx_err); /* TX errors */ \
30381 ++ __HANDLE_ITEM(rx); /* RX okay */ \
30382 ++ __HANDLE_ITEM(rx_err); /* RX errors */ \
30383 ++ __HANDLE_ITEM(rx_drop); /* RX out of memory */
30384 ++
30385 ++struct atm_aal_stats {
30386 ++#define __HANDLE_ITEM(i) int i
30387 ++ __AAL_STAT_ITEMS
30388 ++#undef __HANDLE_ITEM
30389 ++};
30390 ++
30391 ++
30392 ++struct atm_dev_stats {
30393 ++ struct atm_aal_stats aal0;
30394 ++ struct atm_aal_stats aal34;
30395 ++ struct atm_aal_stats aal5;
30396 ++} __ATM_API_ALIGN;
30397 ++
30398 ++
30399 ++#define ATM_GETLINKRATE _IOW('a',ATMIOC_ITF+1,struct atmif_sioc)
30400 ++ /* get link rate */
30401 ++#define ATM_GETNAMES _IOW('a',ATMIOC_ITF+3,struct atm_iobuf)
30402 ++ /* get interface names (numbers) */
30403 ++#define ATM_GETTYPE _IOW('a',ATMIOC_ITF+4,struct atmif_sioc)
30404 ++ /* get interface type name */
30405 ++#define ATM_GETESI _IOW('a',ATMIOC_ITF+5,struct atmif_sioc)
30406 ++ /* get interface ESI */
30407 ++#define ATM_GETADDR _IOW('a',ATMIOC_ITF+6,struct atmif_sioc)
30408 ++ /* get itf's local ATM addr. list */
30409 ++#define ATM_RSTADDR _IOW('a',ATMIOC_ITF+7,struct atmif_sioc)
30410 ++ /* reset itf's ATM address list */
30411 ++#define ATM_ADDADDR _IOW('a',ATMIOC_ITF+8,struct atmif_sioc)
30412 ++ /* add a local ATM address */
30413 ++#define ATM_DELADDR _IOW('a',ATMIOC_ITF+9,struct atmif_sioc)
30414 ++ /* remove a local ATM address */
30415 ++#define ATM_GETCIRANGE _IOW('a',ATMIOC_ITF+10,struct atmif_sioc)
30416 ++ /* get connection identifier range */
30417 ++#define ATM_SETCIRANGE _IOW('a',ATMIOC_ITF+11,struct atmif_sioc)
30418 ++ /* set connection identifier range */
30419 ++#define ATM_SETESI _IOW('a',ATMIOC_ITF+12,struct atmif_sioc)
30420 ++ /* set interface ESI */
30421 ++#define ATM_SETESIF _IOW('a',ATMIOC_ITF+13,struct atmif_sioc)
30422 ++ /* force interface ESI */
30423 ++#define ATM_GETSTAT _IOW('a',ATMIOC_SARCOM+0,struct atmif_sioc)
30424 ++ /* get AAL layer statistics */
30425 ++#define ATM_GETSTATZ _IOW('a',ATMIOC_SARCOM+1,struct atmif_sioc)
30426 ++ /* get AAL layer statistics and zero */
30427 ++#define ATM_GETLOOP _IOW('a',ATMIOC_SARCOM+2,struct atmif_sioc)
30428 ++ /* get loopback mode */
30429 ++#define ATM_SETLOOP _IOW('a',ATMIOC_SARCOM+3,struct atmif_sioc)
30430 ++ /* set loopback mode */
30431 ++#define ATM_QUERYLOOP _IOW('a',ATMIOC_SARCOM+4,struct atmif_sioc)
30432 ++ /* query supported loopback modes */
30433 ++#define ATM_SETSC _IOW('a',ATMIOC_SPECIAL+1,int)
30434 ++ /* enable or disable single-copy */
30435 ++#define ATM_SETBACKEND _IOW('a',ATMIOC_SPECIAL+2,atm_backend_t)
30436 ++ /* set backend handler */
30437 ++#define ATM_NEWBACKENDIF _IOW('a',ATMIOC_SPECIAL+3,atm_backend_t)
30438 ++ /* use backend to make new if */
30439 ++
30440 ++/*
30441 ++ * These are backend handkers that can be set via the ATM_SETBACKEND call
30442 ++ * above. In the future we may support dynamic loading of these - for now,
30443 ++ * they're just being used to share the ATMIOC_BACKEND ioctls
30444 ++ */
30445 ++#define ATM_BACKEND_RAW 0
30446 ++#define ATM_BACKEND_PPP 1 /* PPPoATM - RFC2364 */
30447 ++#define ATM_BACKEND_BR2684 2 /* Bridged RFC1483/2684 */
30448 ++
30449 ++/* for ATM_GETTYPE */
30450 ++#define ATM_ITFTYP_LEN 8 /* maximum length of interface type name */
30451 ++
30452 ++/*
30453 ++ * Loopback modes for ATM_{PHY,SAR}_{GET,SET}LOOP
30454 ++ */
30455 ++
30456 ++/* Point of loopback CPU-->SAR-->PHY-->line--> ... */
30457 ++#define __ATM_LM_NONE 0 /* no loop back ^ ^ ^ ^ */
30458 ++#define __ATM_LM_AAL 1 /* loop back PDUs --' | | | */
30459 ++#define __ATM_LM_ATM 2 /* loop back ATM cells ---' | | */
30460 ++/* RESERVED 4 loop back on PHY side ---' */
30461 ++#define __ATM_LM_PHY 8 /* loop back bits (digital) ----' | */
30462 ++#define __ATM_LM_ANALOG 16 /* loop back the analog signal --------' */
30463 ++
30464 ++/* Direction of loopback */
30465 ++#define __ATM_LM_MKLOC(n) ((n)) /* Local (i.e. loop TX to RX) */
30466 ++#define __ATM_LM_MKRMT(n) ((n) << 8) /* Remote (i.e. loop RX to TX) */
30467 ++
30468 ++#define __ATM_LM_XTLOC(n) ((n) & 0xff)
30469 ++#define __ATM_LM_XTRMT(n) (((n) >> 8) & 0xff)
30470 ++
30471 ++#define ATM_LM_NONE 0 /* no loopback */
30472 ++
30473 ++#define ATM_LM_LOC_AAL __ATM_LM_MKLOC(__ATM_LM_AAL)
30474 ++#define ATM_LM_LOC_ATM __ATM_LM_MKLOC(__ATM_LM_ATM)
30475 ++#define ATM_LM_LOC_PHY __ATM_LM_MKLOC(__ATM_LM_PHY)
30476 ++#define ATM_LM_LOC_ANALOG __ATM_LM_MKLOC(__ATM_LM_ANALOG)
30477 ++
30478 ++#define ATM_LM_RMT_AAL __ATM_LM_MKRMT(__ATM_LM_AAL)
30479 ++#define ATM_LM_RMT_ATM __ATM_LM_MKRMT(__ATM_LM_ATM)
30480 ++#define ATM_LM_RMT_PHY __ATM_LM_MKRMT(__ATM_LM_PHY)
30481 ++#define ATM_LM_RMT_ANALOG __ATM_LM_MKRMT(__ATM_LM_ANALOG)
30482 ++
30483 ++/*
30484 ++ * Note: ATM_LM_LOC_* and ATM_LM_RMT_* can be combined, provided that
30485 ++ * __ATM_LM_XTLOC(x) <= __ATM_LM_XTRMT(x)
30486 ++ */
30487 ++
30488 ++
30489 ++struct atm_iobuf {
30490 ++ int length;
30491 ++ void *buffer;
30492 ++};
30493 ++
30494 ++/* for ATM_GETCIRANGE / ATM_SETCIRANGE */
30495 ++
30496 ++#define ATM_CI_MAX -1 /* use maximum range of VPI/VCI */
30497 ++
30498 ++struct atm_cirange {
30499 ++ char vpi_bits; /* 1..8, ATM_CI_MAX (-1) for maximum */
30500 ++ char vci_bits; /* 1..16, ATM_CI_MAX (-1) for maximum */
30501 ++};
30502 ++
30503 ++/* for ATM_SETSC; actually taken from the ATM_VF number space */
30504 ++
30505 ++#define ATM_SC_RX 1024 /* enable RX single-copy */
30506 ++#define ATM_SC_TX 2048 /* enable TX single-copy */
30507 ++
30508 ++#define ATM_BACKLOG_DEFAULT 32 /* if we get more, we're likely to time out
30509 ++ anyway */
30510 ++
30511 ++/* MF: change_qos (Modify) flags */
30512 ++
30513 ++#define ATM_MF_IMMED 1 /* Block until change is effective */
30514 ++#define ATM_MF_INC_RSV 2 /* Change reservation on increase */
30515 ++#define ATM_MF_INC_SHP 4 /* Change shaping on increase */
30516 ++#define ATM_MF_DEC_RSV 8 /* Change reservation on decrease */
30517 ++#define ATM_MF_DEC_SHP 16 /* Change shaping on decrease */
30518 ++#define ATM_MF_BWD 32 /* Set the backward direction parameters */
30519 ++
30520 ++#define ATM_MF_SET (ATM_MF_INC_RSV | ATM_MF_INC_SHP | ATM_MF_DEC_RSV | \
30521 ++ ATM_MF_DEC_SHP | ATM_MF_BWD)
30522 ++
30523 ++/*
30524 ++ * ATM_VS_* are used to express VC state in a human-friendly way.
30525 ++ */
30526 ++
30527 ++#define ATM_VS_IDLE 0 /* VC is not used */
30528 ++#define ATM_VS_CONNECTED 1 /* VC is connected */
30529 ++#define ATM_VS_CLOSING 2 /* VC is closing */
30530 ++#define ATM_VS_LISTEN 3 /* VC is listening for incoming setups */
30531 ++#define ATM_VS_INUSE 4 /* VC is in use (registered with atmsigd) */
30532 ++#define ATM_VS_BOUND 5 /* VC is bound */
30533 ++
30534 ++#define ATM_VS2TXT_MAP \
30535 ++ "IDLE", "CONNECTED", "CLOSING", "LISTEN", "INUSE", "BOUND"
30536 ++
30537 ++#define ATM_VF2TXT_MAP \
30538 ++ "ADDR", "READY", "PARTIAL", "REGIS", \
30539 ++ "RELEASED", "HASQOS", "LISTEN", "META", \
30540 ++ "256", "512", "1024", "2048", \
30541 ++ "SESSION", "HASSAP", "BOUND", "CLOSE"
30542 ++
30543 ++
30544 ++#ifndef __KERNEL__
30545 ++#undef __AAL_STAT_ITEMS
30546 ++#else
30547 ++
30548 ++#include <linux/sched.h> /* wait_queue_head_t */
30549 ++#include <linux/time.h> /* struct timeval */
30550 ++#include <linux/net.h>
30551 ++#include <linux/skbuff.h> /* struct sk_buff */
30552 ++#include <linux/uio.h>
30553 ++#include <net/sock.h>
30554 ++#include <asm/atomic.h>
30555 ++
30556 ++#ifdef CONFIG_PROC_FS
30557 ++#include <linux/proc_fs.h>
30558 ++#endif
30559 ++
30560 ++
30561 ++struct k_atm_aal_stats {
30562 ++#define __HANDLE_ITEM(i) atomic_t i
30563 ++ __AAL_STAT_ITEMS
30564 ++#undef __HANDLE_ITEM
30565 ++};
30566 ++
30567 ++
30568 ++struct k_atm_dev_stats {
30569 ++ struct k_atm_aal_stats aal0;
30570 ++ struct k_atm_aal_stats aal34;
30571 ++ struct k_atm_aal_stats aal5;
30572 ++};
30573 ++
30574 ++
30575 ++enum {
30576 ++ ATM_VF_ADDR, /* Address is in use. Set by anybody, cleared
30577 ++ by device driver. */
30578 ++ ATM_VF_READY, /* VC is ready to transfer data. Set by device
30579 ++ driver, cleared by anybody. */
30580 ++ ATM_VF_PARTIAL, /* resources are bound to PVC (partial PVC
30581 ++ setup), controlled by socket layer */
30582 ++ ATM_VF_REGIS, /* registered with demon, controlled by SVC
30583 ++ socket layer */
30584 ++ ATM_VF_BOUND, /* local SAP is set, controlled by SVC socket
30585 ++ layer */
30586 ++ ATM_VF_RELEASED, /* demon has indicated/requested release,
30587 ++ controlled by SVC socket layer */
30588 ++ ATM_VF_HASQOS, /* QOS parameters have been set */
30589 ++ ATM_VF_LISTEN, /* socket is used for listening */
30590 ++ ATM_VF_META, /* SVC socket isn't used for normal data
30591 ++ traffic and doesn't depend on signaling
30592 ++ to be available */
30593 ++ ATM_VF_SESSION, /* VCC is p2mp session control descriptor */
30594 ++ ATM_VF_HASSAP, /* SAP has been set */
30595 ++ ATM_VF_CLOSE, /* asynchronous close - treat like VF_RELEASED*/
30596 ++};
30597 ++
30598 ++
30599 ++#define ATM_VF2VS(flags) \
30600 ++ (test_bit(ATM_VF_READY,&(flags)) ? ATM_VS_CONNECTED : \
30601 ++ test_bit(ATM_VF_RELEASED,&(flags)) ? ATM_VS_CLOSING : \
30602 ++ test_bit(ATM_VF_LISTEN,&(flags)) ? ATM_VS_LISTEN : \
30603 ++ test_bit(ATM_VF_REGIS,&(flags)) ? ATM_VS_INUSE : \
30604 ++ test_bit(ATM_VF_BOUND,&(flags)) ? ATM_VS_BOUND : ATM_VS_IDLE)
30605 ++
30606 ++
30607 ++enum {
30608 ++ ATM_DF_CLOSE, /* close device when last VCC is closed */
30609 ++};
30610 ++
30611 ++
30612 ++#define ATM_PHY_SIG_LOST 0 /* no carrier/light */
30613 ++#define ATM_PHY_SIG_UNKNOWN 1 /* carrier/light status is unknown */
30614 ++#define ATM_PHY_SIG_FOUND 2 /* carrier/light okay */
30615 ++
30616 ++#define ATM_ATMOPT_CLP 1 /* set CLP bit */
30617 ++
30618 ++
30619 ++typedef struct { unsigned long bits; } atm_vcc_flags_t;
30620 ++
30621 ++
30622 ++struct atm_vcc {
30623 ++ atm_vcc_flags_t flags; /* VCC flags (ATM_VF_*) */
30624 ++ short vpi; /* VPI and VCI (types must be equal */
30625 ++ /* with sockaddr) */
30626 ++ int vci;
30627 ++ unsigned long aal_options; /* AAL layer options */
30628 ++ unsigned long atm_options; /* ATM layer options */
30629 ++ struct atm_dev *dev; /* device back pointer */
30630 ++ struct atm_qos qos; /* QOS */
30631 ++ struct atm_sap sap; /* SAP */
30632 ++ void (*push)(struct atm_vcc *vcc,struct sk_buff *skb);
30633 ++ void (*pop)(struct atm_vcc *vcc,struct sk_buff *skb); /* optional */
30634 ++ int (*push_oam)(struct atm_vcc *vcc,void *cell);
30635 ++ int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
30636 ++ void *dev_data; /* per-device data */
30637 ++ void *proto_data; /* per-protocol data */
30638 ++ struct k_atm_aal_stats *stats; /* pointer to AAL stats group */
30639 ++ wait_queue_head_t sleep; /* if socket is busy */
30640 ++ struct sock *sk; /* socket backpointer */
30641 ++ struct atm_vcc *prev,*next;
30642 ++ /* SVC part --- may move later ------------------------------------- */
30643 ++ short itf; /* interface number */
30644 ++ struct sockaddr_atmsvc local;
30645 ++ struct sockaddr_atmsvc remote;
30646 ++ void (*callback)(struct atm_vcc *vcc);
30647 ++ struct sk_buff_head listenq;
30648 ++ int backlog_quota; /* number of connection requests we */
30649 ++ /* can still accept */
30650 ++ int reply; /* also used by ATMTCP */
30651 ++ /* Multipoint part ------------------------------------------------- */
30652 ++ struct atm_vcc *session; /* session VCC descriptor */
30653 ++ /* Other stuff ----------------------------------------------------- */
30654 ++ void *user_back; /* user backlink - not touched by */
30655 ++ /* native ATM stack. Currently used */
30656 ++ /* by CLIP and sch_atm. */
30657 ++};
30658 ++
30659 ++
30660 ++struct atm_dev_addr {
30661 ++ struct sockaddr_atmsvc addr; /* ATM address */
30662 ++ struct atm_dev_addr *next; /* next address */
30663 ++};
30664 ++
30665 ++
30666 ++typedef struct { unsigned int bits; } atm_dev_flags_t;
30667 ++
30668 ++
30669 ++struct atm_dev {
30670 ++ const struct atmdev_ops *ops; /* device operations; NULL if unused */
30671 ++ const struct atmphy_ops *phy; /* PHY operations, may be undefined */
30672 ++ /* (NULL) */
30673 ++ const char *type; /* device type name */
30674 ++ int number; /* device index */
30675 ++ struct atm_vcc *vccs; /* VCC table (or NULL) */
30676 ++ struct atm_vcc *last; /* last VCC (or undefined) */
30677 ++ void *dev_data; /* per-device data */
30678 ++ void *phy_data; /* private PHY date */
30679 ++ atm_dev_flags_t flags; /* device flags (ATM_DF_*) */
30680 ++ struct atm_dev_addr *local; /* local ATM addresses */
30681 ++ unsigned char esi[ESI_LEN]; /* ESI ("MAC" addr) */
30682 ++ struct atm_cirange ci_range; /* VPI/VCI range */
30683 ++ struct k_atm_dev_stats stats; /* statistics */
30684 ++ char signal; /* signal status (ATM_PHY_SIG_*) */
30685 ++ int link_rate; /* link rate (default: OC3) */
30686 ++ atomic_t refcnt; /* reference count */
30687 ++ spinlock_t lock; /* protect internal members */
30688 ++#ifdef CONFIG_PROC_FS
30689 ++ struct proc_dir_entry *proc_entry; /* proc entry */
30690 ++ char *proc_name; /* proc entry name */
30691 ++#endif
30692 ++ struct list_head dev_list; /* linkage */
30693 ++};
30694 ++
30695 ++
30696 ++/*
30697 ++ * ioctl, getsockopt, setsockopt, and sg_send are optional and can be set to
30698 ++ * NULL. */
30699 ++
30700 ++/* OF: send_Oam Flags */
30701 ++
30702 ++#define ATM_OF_IMMED 1 /* Attempt immediate delivery */
30703 ++#define ATM_OF_INRATE 2 /* Attempt in-rate delivery */
30704 ++
30705 ++struct atmdev_ops { /* only send is required */
30706 ++ void (*dev_close)(struct atm_dev *dev);
30707 ++ int (*open)(struct atm_vcc *vcc,short vpi,int vci);
30708 ++ void (*close)(struct atm_vcc *vcc);
30709 ++ int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void *arg);
30710 ++ int (*getsockopt)(struct atm_vcc *vcc,int level,int optname,
30711 ++ void *optval,int optlen);
30712 ++ int (*setsockopt)(struct atm_vcc *vcc,int level,int optname,
30713 ++ void *optval,int optlen);
30714 ++ int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
30715 ++ int (*sg_send)(struct atm_vcc *vcc,unsigned long start,
30716 ++ unsigned long size);
30717 ++#if 0 /* keep the current hack for now */
30718 ++ int (*send_iovec)(struct atm_vcc *vcc,struct iovec *iov,int size,
30719 ++ void (*discard)(struct atm_vcc *vcc,void *user),void *user);
30720 ++#endif
30721 ++ int (*send_oam)(struct atm_vcc *vcc,void *cell,int flags);
30722 ++ void (*phy_put)(struct atm_dev *dev,unsigned char value,
30723 ++ unsigned long addr);
30724 ++ unsigned char (*phy_get)(struct atm_dev *dev,unsigned long addr);
30725 ++ void (*feedback)(struct atm_vcc *vcc,struct sk_buff *skb,
30726 ++ unsigned long start,unsigned long dest,int len);
30727 ++ int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
30728 ++ int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
30729 ++ struct module *owner;
30730 ++};
30731 ++
30732 ++
30733 ++struct atmphy_ops {
30734 ++ int (*start)(struct atm_dev *dev);
30735 ++ int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void *arg);
30736 ++ void (*interrupt)(struct atm_dev *dev);
30737 ++ int (*stop)(struct atm_dev *dev);
30738 ++};
30739 ++
30740 ++struct atm_skb_data {
30741 ++ struct atm_vcc *vcc; /* ATM VCC */
30742 ++ unsigned long atm_options; /* ATM layer options */
30743 ++};
30744 ++
30745 ++#define ATM_SKB(skb) (((struct atm_skb_data *) (skb)->cb))
30746 ++
30747 ++struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
30748 ++ int number,atm_dev_flags_t *flags); /* number == -1: pick first available */
30749 ++struct atm_dev *atm_dev_lookup(int number);
30750 ++void atm_dev_deregister(struct atm_dev *dev);
30751 ++void shutdown_atm_dev(struct atm_dev *dev);
30752 ++void bind_vcc(struct atm_vcc *vcc,struct atm_dev *dev);
30753 ++
30754 ++
30755 ++/*
30756 ++ * This is approximately the algorithm used by alloc_skb.
30757 ++ *
30758 ++ */
30759 ++
30760 ++static inline int atm_guess_pdu2truesize(int pdu_size)
30761 ++{
30762 ++ return ((pdu_size+15) & ~15) + sizeof(struct sk_buff);
30763 ++}
30764 ++
30765 ++
30766 ++static inline void atm_force_charge(struct atm_vcc *vcc,int truesize)
30767 ++{
30768 ++ atomic_add(truesize, &vcc->sk->rmem_alloc);
30769 ++}
30770 ++
30771 ++
30772 ++static inline void atm_return(struct atm_vcc *vcc,int truesize)
30773 ++{
30774 ++ atomic_sub(truesize, &vcc->sk->rmem_alloc);
30775 ++}
30776 ++
30777 ++
30778 ++static inline int atm_may_send(struct atm_vcc *vcc,unsigned int size)
30779 ++{
30780 ++ return (size + atomic_read(&vcc->sk->wmem_alloc)) < vcc->sk->sndbuf;
30781 ++}
30782 ++
30783 ++
30784 ++static inline void atm_dev_hold(struct atm_dev *dev)
30785 ++{
30786 ++ atomic_inc(&dev->refcnt);
30787 ++}
30788 ++
30789 ++
30790 ++static inline void atm_dev_release(struct atm_dev *dev)
30791 ++{
30792 ++ atomic_dec(&dev->refcnt);
30793 ++
30794 ++ if ((atomic_read(&dev->refcnt) == 1) &&
30795 ++ test_bit(ATM_DF_CLOSE,&dev->flags))
30796 ++ shutdown_atm_dev(dev);
30797 ++}
30798 ++
30799 ++
30800 ++int atm_charge(struct atm_vcc *vcc,int truesize);
30801 ++struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
30802 ++ int gfp_flags);
30803 ++int atm_find_ci(struct atm_vcc *vcc,short *vpi,int *vci);
30804 ++int atm_pcr_goal(struct atm_trafprm *tp);
30805 ++
30806 ++void atm_async_release_vcc(struct atm_vcc *vcc,int reply);
30807 ++
30808 ++#endif /* __KERNEL__ */
30809 ++
30810 ++#endif
30811 --- linux-atm-2.4.1.orig/debian/README.br2684
30812 +++ linux-atm-2.4.1/debian/README.br2684
30813 @@ -0,0 +1,79 @@
30814 +README.br2684
30815 +~~~~~~~~~~~~~
30816 +
30817 +The linux-atm CVS includes a program called br2684 which can be used
30818 +to configure br2684 ATM bridging. On request (#216663), the Debian
30819 +maintainer included br2684 in the source package.
30820 +
30821 +This was done in a way that separates the - unreleased CVS snapshot -
30822 +br2684 program into its own binary package so avoid shipping
30823 +released and unreleased software in the same binary package.
30824 +
30825 +The modified source package (2.4.1-10) was rejected by Debian
30826 +ftpmaster because he found the package too small to warrant its own
30827 +.deb.
30828 +
30829 +Hence, atm-tools-br2684 is not built any more.
30830 +
30831 +You can, however, build your own atm-tools-br2684 package from the
30832 +official Debian source package by following this "script".
30833 +
30834 +(0)
30835 +Install all build dependencies plus autoconf, libtool, automake. If
30836 +#219936 is still unfixed, copy /usr/bin/autoreconf to a local
30837 +directory and apply the following patch after changing "+@@" to "@@"
30838 +in the first line (this was inserted to be able to feed this readme to
30839 +patch to apply the patch given in (1).
30840 +
30841 +--- /usr/bin/autoreconf
30842 ++++ autoreconf
30843 ++@@ -183,7 +183,7 @@
30844 + {
30845 + $autoconf .= ' --force';
30846 + $autoheader .= ' --force';
30847 +- $automake .= ' --force-missing';
30848 ++ $automake .= '';
30849 + $autopoint .= ' --force';
30850 + $libtoolize .= ' --force';
30851 + }
30852 +
30853 +(1) Apply the following patch
30854 +--- configure.in.orig
30855 ++++ configure.in
30856 +@@ -152,6 +152,7 @@
30857 + m4/Makefile \
30858 + src/Makefile \
30859 + src/include/Makefile \
30860 ++ src/br2684/Makefile \
30861 + src/lib/Makefile \
30862 + src/test/Makefile \
30863 + src/debug/Makefile \
30864 +--- debian/rules.orig
30865 ++++ debian/rules
30866 +@@ -11,7 +11,7 @@
30867 + export PACKAGE=linux-atm
30868 +
30869 + buildindeppackages=atm-dev
30870 +-buildarchpackages=atm-tools libatm1 libatm1-dev
30871 ++buildarchpackages=atm-tools atm-tools-br2684 libatm1 libatm1-dev
30872 +
30873 + # generate -ppackage1 -ppackage2 ... commandline for debhelper
30874 + dhbuildarchpackages=$(addprefix -p,$(buildarchpackages))
30875 +--- src/Makefile.am.orig
30876 ++++ src/Makefile.am
30877 +@@ -1,3 +1,3 @@
30878 + SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \
30879 +- mpoad switch config extra
30880 ++ mpoad switch config extra br2684
30881 +
30882 +
30883 +(2)
30884 +Invoke autoreconf -f -i
30885 +
30886 +(3)
30887 +create your own changelog entry and your own local version number
30888 +
30889 +(4)
30890 +Build the package as usual
30891 +
30892 +Marc Haber, 2003-11-05
30893 --- linux-atm-2.4.1.orig/debian/control
30894 +++ linux-atm-2.4.1/debian/control
30895 @@ -0,0 +1,57 @@
30896 +Source: linux-atm
30897 +Section: net
30898 +Priority: optional
30899 +Maintainer: Peter De Schrijver (p2) <p2@mind.be>
30900 +Build-Depends: debhelper (>> 4.0.0), bison, flex, perl, dpatch, automake1.4
30901 +Standards-Version: 3.6.1
30902 +
30903 +Package: atm-tools
30904 +Architecture: any
30905 +Depends: ${shlibs:Depends}
30906 +Description: Base programs for ATM in Linux, the net-tools for ATM
30907 + This package provides all the basic programs needed for setting up,
30908 + monitoring and tuning ATM networks. Such as:
30909 + * atmsigd, an ATM signal daemon that implements the ATM UNI protocol.
30910 + * atmtcp, a tool to setup ATM over TCP connections.
30911 + * atmarpd, an implementation of the ATMARP protocol (RFC1577, RFC1755)
30912 + * zeppelin, an ATM LAN Emulation client daemon
30913 + * les and bus, ATM LAN Emulation service daemons
30914 + .
30915 + Notice that upstream still flags these tools as experimental software and
30916 + says that there is still a number of known bugs and issues. The
30917 + software is, however, in productive use at a number of sites and is
30918 + working reliably.
30919 + .
30920 + Homepage: http://linux-atm.sourceforge.net/
30921 +
30922 +Package: atm-dev
30923 +Depends: libatm1-dev
30924 +Architecture: all
30925 +Section: oldlibs
30926 +Description: Development files for compiling ATM programs (dummy package)
30927 + This dummy package provides a transition from the previous atm packages.
30928 + It is provided for backwards compatibility only and may be removedafter
30929 + the upgrade has completed or when when no other package depend on it.
30930 +
30931 +Package: libatm1
30932 +Section: libs
30933 +Architecture: any
30934 +Depends: ${shlibs:Depends}
30935 +Conflicts: atm-tools (<< 2.4.1-6)
30936 +Description: shared library for ATM (Asynchronous Transfer Mode)
30937 + Shared libraries needed by ATM (Asynchronous Transfer Mode) related programs
30938 + .
30939 + Homepage: http://linux-atm.sourceforge.net/
30940 +
30941 +Package: libatm1-dev
30942 +Section: libdevel
30943 +Architecture: any
30944 +Depends: libc6-dev, libatm1
30945 +Replaces: atm-dev (<< 2.4.1-7)
30946 +Conflicts: atm-dev (<< 2.4.1-7)
30947 +Provides: libatm-dev
30948 +Description: Development files for compiling ATM programs
30949 + Header files and development libraries for compiling ATM (Asynchronous
30950 + Transfer Mode) related programs.
30951 + .
30952 + Homepage: http://linux-atm.sourceforge.net/
30953 --- linux-atm-2.4.1.orig/debian/atm-tools-br2684.dirs
30954 +++ linux-atm-2.4.1/debian/atm-tools-br2684.dirs
30955 @@ -0,0 +1,2 @@
30956 +usr/sbin
30957 +usr/share/man/man8
30958 --- linux-atm-2.4.1.orig/debian/rules
30959 +++ linux-atm-2.4.1/debian/rules
30960 @@ -0,0 +1,136 @@
30961 +#!/usr/bin/make -f
30962 +# Sample debian/rules that uses debhelper.
30963 +# GNU copyright 1997 to 1999 by Joey Hess.
30964 +
30965 +# Uncomment this to turn on verbose mode.
30966 +#export DH_VERBOSE=1
30967 +
30968 +# This is the debhelper compatability version to use.
30969 +export DH_COMPAT=4
30970 +
30971 +export PACKAGE=linux-atm
30972 +
30973 +buildindeppackages=atm-dev
30974 +buildarchpackages=atm-tools libatm1 libatm1-dev
30975 +
30976 +# generate -ppackage1 -ppackage2 ... commandline for debhelper
30977 +dhbuildarchpackages=$(addprefix -p,$(buildarchpackages))
30978 +dhbuildindeppackages=$(addprefix -p,$(buildindeppackages))
30979 +
30980 +include /usr/share/dpatch/dpatch.make
30981 +
30982 +configure: configure-stamp
30983 +configure-stamp:
30984 + dh_testdir
30985 + ./configure --prefix /usr --mandir /usr/share/man --sysconfdir /etc
30986 + touch configure-stamp
30987 +
30988 +build: configure-stamp build-stamp
30989 +build-stamp: patch-stamp
30990 + dh_testdir
30991 +
30992 + # Add here commands to compile the package.
30993 + $(MAKE) $(EXTRA_VARS)
30994 + cat debian/copyright.header COPYING > debian/copyright
30995 +
30996 + touch build-stamp
30997 +
30998 +clean: clean1 unpatch
30999 +clean1:
31000 + dh_testdir
31001 + dh_testroot
31002 + rm -f build-stamp configure-stamp
31003 +
31004 + # Add here commands to clean up after the build process.
31005 + -$(MAKE) distclean
31006 +
31007 + dh_clean
31008 + rm -rf debian/atm-tools.8 debian/copyright
31009 +
31010 +install: build
31011 + dh_testdir
31012 + dh_testroot
31013 + dh_clean -k
31014 + dh_installdirs
31015 +
31016 + # Add here commands to install the package into debian/atm-tools
31017 + $(MAKE) DESTDIR=`pwd`/debian/tmp install
31018 +
31019 + # manpages
31020 + /usr/bin/pod2man --section=8 --release="atm-tools $(PKG_VER)" --lax \
31021 + --center="Debian GNU/Linux" debian/atm-tools.pod > debian/atm-tools.8
31022 +
31023 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/aread.8
31024 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/awrite.8
31025 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/enitune.8
31026 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/ilmid.8
31027 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/saaldump.8
31028 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/sonetdiag.8
31029 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/ttcp_atm.8
31030 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/zntune.8
31031 +
31032 +# Build architecture-independent files here.
31033 +binary-indep: build install
31034 + dh_testdir $(dhbuildindeppackages)
31035 + dh_testroot $(dhbuildindeppackages)
31036 + dh_install $(dhbuildindeppackages)
31037 +
31038 +# dh_installdebconf $(dhbuildindeppackages)
31039 + dh_installdocs $(dhbuildindeppackages)
31040 + dh_installmenu $(dhbuildindeppackages)
31041 +# dh_installlogrotate $(dhbuildindeppackages)
31042 +# dh_installemacsen $(dhbuildindeppackages)
31043 +# dh_installpam $(dhbuildindeppackages)
31044 +# dh_installmime $(dhbuildindeppackages)
31045 + dh_installinit $(dhbuildindeppackages) --init-script=atm -- start 34 0 6 . start 39 S .
31046 + dh_installcron $(dhbuildindeppackages)
31047 + dh_installman $(dhbuildindeppackages)
31048 + dh_installinfo $(dhbuildindeppackages)
31049 +# dh_undocumented $(dhbuildindeppackages)
31050 + dh_installchangelogs -i ChangeLog $(dhbuildpackages)
31051 + dh_link $(dhbuildindeppackages)
31052 + dh_strip $(dhbuildindeppackages)
31053 + dh_compress $(dhbuildindeppackages)
31054 + dh_fixperms $(dhbuildindeppackages)
31055 + dh_makeshlibs $(dhbuildindeppackages)
31056 + dh_installdeb $(dhbuildindeppackages)
31057 +# dh_perl $(dhbuildindeppackages)
31058 + dh_shlibdeps $(dhbuildindeppackages)
31059 + dh_gencontrol $(dhbuildindeppackages)
31060 + dh_md5sums $(dhbuildindeppackages)
31061 + dh_builddeb $(dhbuildindeppackages)
31062 +
31063 +# Build architecture-dependent files here.
31064 +binary-arch: build install
31065 + dh_testdir $(dhbuildarchpackages)
31066 + dh_testroot $(dhbuildarchpackages)
31067 + dh_install $(dhbuildarchpackages)
31068 +
31069 +# dh_installdebconf $(dhbuildarchpackages)
31070 + dh_installdocs $(dhbuildarchpackages)
31071 + dh_installmenu $(dhbuildarchpackages)
31072 +# dh_installlogrotate $(dhbuildarchpackages)
31073 +# dh_installemacsen $(dhbuildarchpackages)
31074 +# dh_installpam $(dhbuildarchpackages)
31075 +# dh_installmime $(dhbuildarchpackages)
31076 + dh_installinit $(dhbuildarchpackages) --init-script=atm -- start 34 0 6 . start 39 S .
31077 + dh_installcron $(dhbuildarchpackages)
31078 + dh_installman $(dhbuildarchpackages)
31079 + dh_installinfo $(dhbuildarchpackages)
31080 +# dh_undocumented $(dhbuildarchpackages)
31081 + dh_installchangelogs -a ChangeLog $(dhbuildarchpackages)
31082 + dh_link $(dhbuildarchpackages)
31083 + dh_strip $(dhbuildarchpackages)
31084 + dh_compress $(dhbuildarchpackages)
31085 + dh_fixperms $(dhbuildarchpackages)
31086 + dh_makeshlibs $(dhbuildarchpackages)
31087 + dh_installdeb $(dhbuildarchpackages)
31088 +# dh_perl $(dhbuildarchpackages)
31089 + dh_shlibdeps -a -L libatm1 -l debian/libatm1/lib $(dhbuildarchpackages)
31090 + dh_gencontrol $(dhbuildarchpackages)
31091 + dh_md5sums $(dhbuildarchpackages)
31092 + dh_builddeb $(dhbuildarchpackages)
31093 +
31094 +binary: binary-indep binary-arch
31095 +.PHONY: build binary-indep binary-arch binary install configure
31096 + get-2684 patch unpatch clean1
31097 --- linux-atm-2.4.1.orig/debian/atm-tools-br2684.install
31098 +++ linux-atm-2.4.1/debian/atm-tools-br2684.install
31099 @@ -0,0 +1 @@
31100 +debian/tmp/usr/sbin/br2684ctl usr/sbin
31101 --- linux-atm-2.4.1.orig/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog.Debian
31102 +++ linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog.Debian
31103 @@ -0,0 +1,206 @@
31104 +linux-atm (2.4.1-16) unstable; urgency=low
31105 +
31106 + * Fix build problem with gcc 3.4 (Closes: #259422)
31107 +
31108 + -- Peter De Schrijver (p2) <p2@mind.be> Thu, 15 Jul 2004 14:28:10 +0200
31109 +
31110 +linux-atm (2.4.1-15) unstable; urgency=low
31111 +
31112 + * Updated descriptions (Closes: #239161)
31113 +
31114 + -- Peter De Schrijver (p2) <p2@mind.be> Sun, 4 Apr 2004 21:10:20 +0200
31115 +
31116 +linux-atm (2.4.1-14) unstable; urgency=low
31117 +
31118 + * Fix symlink for /usr/lib/libatm.so (Closes: #221011)
31119 +
31120 + -- Peter De Schrijver (p2) <p2@mind.be> Sun, 7 Dec 2003 21:53:19 +0100
31121 +
31122 +linux-atm (2.4.1-13) unstable; urgency=low
31123 +
31124 + * Previous version fixed #217259, but no changelog entry (Closes: #217259)
31125 + * Previous version fixed #216662, but no changelog entry (Closes: #216662)
31126 + * Added missing build dependency on automake1.4 (Closes: #221120, #221284)
31127 + * New Maintainer (Closes: #206982)
31128 +
31129 + -- Peter De Schrijver (p2) <p2@mind.be> Mon, 17 Nov 2003 23:03:58 +0100
31130 +
31131 +linux-atm (2.4.1-12) unstable; urgency=low
31132 +
31133 + * don't build atm-tools-br2684 by default. Thanks to ftpmaster for
31134 + not allowing the package to be in Debian.
31135 + * Since we don't build atm-tools-br2684 any more, revert back to
31136 + autotools output from 2.4.1-9
31137 + * Add README.br2684 documenting a way to build the package locally.
31138 +
31139 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 5 Nov 2003 21:31:42 +0000
31140 +
31141 +linux-atm (2.4.1-11) experimental; urgency=low
31142 +
31143 + * Build-Depend on dpatch
31144 + * dpatch br2684 header files from later libc for old libc (woody)
31145 +
31146 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 29 Oct 2003 19:05:07 +0000
31147 +
31148 +linux-atm (2.4.1-10) experimental; urgency=low
31149 +
31150 + * add br2684 to package (closes: #216663)
31151 + * autoreconf to actually build br2684
31152 + * have libatm1-dev provide libatm-dev (closes: #216662)
31153 + * move lib symlink to libatm1-dev as well (closes: #217259)
31154 +
31155 + -- Marc Haber <mh+debian-packages@zugschlus.de> Thu, 23 Oct 2003 17:55:43 +0000
31156 +
31157 +linux-atm (2.4.1-9) unstable; urgency=low
31158 +
31159 + * put libatm1-dev in libdevel (closes: #213170)
31160 + * make sure that new descriptions actually make it into the package
31161 +
31162 + -- Marc Haber <mh+debian-packages@zugschlus.de> Thu, 9 Oct 2003 17:08:10 +0000
31163 +
31164 +linux-atm (2.4.1-8) unstable; urgency=low
31165 +
31166 + * build arch-indep package as targets of binary-indep (closes: #212124)
31167 + * use dh_installdocs to install files to libatm1-dev/docs
31168 + * symlink shared lib to usr/bin (closes: #213146)
31169 + * Use better long descriptions. Thanks to Javier (closes: #209427)
31170 + Fernandez-Sanguino (closes: #209612)
31171 +
31172 + -- Marc Haber <mh+debian-packages@zugschlus.de> Sun, 28 Sep 2003 19:29:08 +0000
31173 +
31174 +linux-atm (2.4.1-7) unstable; urgency=low
31175 +
31176 + * libatm1 now conflicts with atm-tools (<< 2.4.1-6) (closes: #208170)
31177 + * armarp now writes output to stdout.
31178 + * add atm-dev as empty transitional package to help upgrades
31179 +
31180 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 2 Sep 2003 09:20:33 +0000
31181 +
31182 +linux-atm (2.4.1-6) unstable; urgency=low
31183 +
31184 + * split off shared libraries to libatm1
31185 + * rename atm-dev to libatm1-dev
31186 + * Standards-Version: 3.6.1
31187 +
31188 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 26 Aug 2003 15:46:27 +0000
31189 +
31190 +linux-atm (2.4.1-5) unstable; urgency=low
31191 +
31192 + * move *.a and *.la to usr/lib (closes: #199506).
31193 + * let atm-dev depend on atm-tools to avoid dangling /lib/libatm.so
31194 + symlink.
31195 + * Standards-Version: 3.5.6
31196 +
31197 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 30 Jul 2003 11:46:19 +0000
31198 +
31199 +linux-atm (2.4.1-4) unstable; urgency=low
31200 +
31201 + * add Build-Depends: on automake1.4
31202 +
31203 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 11 Jun 2003 16:58:21 +0000
31204 +
31205 +linux-atm (2.4.1-3) unstable; urgency=low
31206 +
31207 + * rebuilding libtool broke src/test/Makefile.in. Applied fix to
31208 + Makefile.am and re-built again.
31209 +
31210 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 11 Jun 2003 11:05:26 +0000
31211 +
31212 +linux-atm (2.4.1-2) unstable; urgency=low
31213 +
31214 + * rebuild configure script with new libtool (closes: #196909)
31215 +
31216 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 10 Jun 2003 21:01:50 +0000
31217 +
31218 +linux-atm (2.4.1-1) unstable; urgency=low
31219 +
31220 + * new upstream source
31221 + * remove atmarp and atmarpd from /usr/sbin as they are already in
31222 + /sbin (closes: #196216)
31223 + * lintian fixes
31224 +
31225 + -- Marc Haber <mh+debian-packages@zugschlus.de> Mon, 9 Jun 2003 16:03:45 +0000
31226 +
31227 +linux-atm (2.4.0-5) unstable; urgency=low
31228 +
31229 + * Fix for src/test/Makefile.in to allow building on hppa and ia64
31230 + which the fix introduced to 2.4.0-4 broke. Thanks to Goswin
31231 + Brederlow.
31232 + * Move init.d priority to that atmarpd is started before network
31233 + interfaces are started.
31234 + * Move atmarpd and libatm to /sbin and /lib to allow atmarpd to be
31235 + started before /usr is mounted.
31236 + * use dh_install instead of dh_movefiles.
31237 +
31238 + -- Marc Haber <mh+debian-packages@zugschlus.de> Sat, 24 Aug 2002 15:13:48 +0000
31239 +
31240 +linux-atm (2.4.0-4) unstable; urgency=low
31241 +
31242 + * new maintainer
31243 + * Fix for src/test/Makefile.in to allow building on sparc.
31244 + Thanks to Patrick Mauritz. (closes: #144225).
31245 + * added pseudo-manpage for manpage-less binaries.
31246 + * removed rpath by changing configure and make install paramaters
31247 +
31248 + -- Marc Haber <mh+debian-packages@zugschlus.de> Fri, 16 Aug 2002 20:39:05 +0000
31249 +
31250 +linux-atm (2.4.0-3) unstable; urgency=HIGH
31251 +
31252 + * Re-ran libtoolize.
31253 + Closes: #143522
31254 +
31255 + * Previous version Closes: #135328
31256 +
31257 + -- Russell Coker <russell@coker.com.au> Fri, 19 Apr 2002 01:55:00 +0200
31258 +
31259 +linux-atm (2.4.0-2) unstable; urgency=HIGH
31260 +
31261 + * Put a "grep -v EMAXERRNO" into the build process to deal with mipsel and
31262 + the "#ifdef __KERNEL__" it has in it's /usr/include/asm/errno.h .
31263 +
31264 + -- Russell Coker <russell@coker.com.au> Thu, 18 Apr 2002 19:56:00 +0200
31265 +
31266 +linux-atm (2.4.0-1) unstable; urgency=HIGH
31267 +
31268 + * New upstream version which changes source package name.
31269 + Closes: #138911
31270 +
31271 + -- Russell Coker <russell@coker.com.au> Mon, 18 Mar 2002 17:42:00 +0100
31272 +
31273 +atm (0.79-4) unstable; urgency=low
31274 +
31275 + * Added build-depends on flex.
31276 + Closes: #111072
31277 +
31278 + * Made the atm tools use a shared object to save space.
31279 +
31280 + * Fixed the copyright file and put all copyright details in both packages.
31281 +
31282 + * Added support for easy building with different kernel headers.
31283 + Closes: #110249
31284 +
31285 + -- Russell Coker <russell@coker.com.au> Sun, 7 Oct 2001 14:11:33 +0200
31286 +
31287 +atm (0.79-3) unstable; urgency=low
31288 +
31289 + * Created /etc/init.d/atm to start and stop atmarpd.
31290 + Closes: #110252
31291 +
31292 + * Added build-depends on bison.
31293 + Closes: #110576
31294 +
31295 + -- Russell Coker <russell@coker.com.au> Fri, 31 Aug 2001 15:21:44 +0200
31296 +
31297 +atm (0.79-2) unstable; urgency=low
31298 +
31299 + * Changed the main package name to atm-tools to indicate that it doesn't
31300 + provide ATM (gotta have the kernel support), it just has the daemons and
31301 + utilities.
31302 +
31303 + -- Russell Coker <russell@coker.com.au> Sat, 25 Aug 2001 17:55:00 +0200
31304 +
31305 +atm (0.79-1) unstable; urgency=low
31306 +
31307 + * Initial Release.
31308 +
31309 + -- Russell Coker <russell@coker.com.au> Fri, 24 Aug 2001 17:31:00 +0200
31310 --- linux-atm-2.4.1.orig/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog
31311 +++ linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog
31312 @@ -0,0 +1,3299 @@
31313 +Version 2.4.0 to 2.4.1 (25-APR-2003)
31314 +=====================
31315 +
31316 +Bug fixes
31317 +---------
31318 +
31319 + - vsprintf's changed to vsnprintf's to prevent possible stack overflows
31320 +
31321 +
31322 +Version 0.79 to 2.4.0 (18-OCT-2001)
31323 +=====================
31324 +
31325 +Bug fixes
31326 +---------
31327 +
31328 + - defined 'now' in src/lib/timer.c
31329 + - ia64 build fix for ASN (Chas Williams)
31330 +
31331 +Other changes
31332 +-------------
31333 +
31334 + - In general, the source tree was rearranged and the old cruft was removed
31335 + - Old ad hoc build system replaced in favor of a standardized autoconfiscation
31336 + - Build configuration options are now controlled by 'configure' script instead
31337 + of changes to the previous 'Rules.make' file
31338 + - libatm and libatmd merged into one lib: libatm
31339 + - Both static and shared libraries are built by default. Binaries now built
31340 + with shared library by default.
31341 + - Sample atmsigd.conf and hosts.atm are now installed when doing 'make install'
31342 + - RPM spec file is now available in src/extra/
31343 + - New RedHat init scripts available in src/config/init-redhat/ (John Strange)
31344 + (old RedHat 4.0 scripts removed)
31345 + - ATM on Linux HOWTO now included in doc/ (much derived from usage.tex). We
31346 + will publish this on the home page as well as linuxdoc.org
31347 + - tcpdump and libpcap ATM patches/build removed (they have been integrated into
31348 + their respective packages; see www.tcpdump.org)
31349 + - ATM Name Service (ANS) files coalesced into src/extra/ANS
31350 + - ANS bind patch upgraded to bind-4.9.8 (untested)
31351 + - rtf2e164_cc.pl removed in favor of src/extra/ANS/pdf2e164_cc.pl. The ITU no
31352 + longer provides E.164 country codes in RTF format. PDF used instead.
31353 +
31354 +
31355 +Version 0.78 to 0.79 (15-AUG-2001)
31356 +====================
31357 +
31358 +Bug fixes
31359 +---------
31360 +
31361 +- uni.c fix for newer versions of gcc
31362 +- mpoad/io.c quick fix for undefined OPEN_MAX
31363 +
31364 +
31365 +Version 0.77 to 0.78 (7-JUL-2000)
31366 +====================
31367 +
31368 +Bug fixes
31369 +---------
31370 +
31371 + - skb_migrate wasn't protected against functions accessing the list via
31372 + skb->list
31373 + - removal of MOD_xxx races in FORE 200E and atmtcp (by Jeff Garzik)
31374 + - CONFIG_ATM_NICSTAR_USE_IDT77105 set NEED_SUNI_MX instead of
31375 + NEED_IDT77105_MX (fix from mainstream)
31376 + - ambassador.c: changed string concatenation and offset calculation breaking
31377 + compilation with gcc 2.96 (by Jakub Jelinek)
31378 + - nicstar.c: various locking fixes for SMP (by Rui Prior)
31379 + - LANE vs. bridging build conflict solved (from mainstream)
31380 + - %%u instead of %u in mpc.c
31381 + - fixed formatting of /proc/net/atm/svc
31382 + - /proc/net/atm/clip always added + after public address, not only if followed
31383 + by private address
31384 + - atmsigd now returns EINVAL if attempting to change max_sdu
31385 + - atm_change_qos now calls adjust_to for additional parameter checking
31386 + - sendmsg now returns error if size > max_sdu (reported by Alan Kennington)
31387 + - removed explicit defaults in Config.in (by Christoph Hellwig)
31388 + - Fore200E: removed #ifdef MODULE
31389 + - ipcommon.c didn't export skb_migrate to modules (by Mitchell Blank)
31390 + - ENI: /proc/net/atm/eni:* claimed backlog was in bytes instead of packets
31391 + - br, bw, window: changed variables receiving possibly negative return values
31392 + from size_t to ssize_t (reported by Alan Kennington)
31393 + - LANE: fixed stray errors on lack of ATM address, ATM address change, or ESI
31394 + change (by Heikki Vatiainen)
31395 + - LANE: could loop forwever when trying to connect to LECS (by Heikki
31396 + Vatiainen)
31397 +
31398 +New features
31399 +------------
31400 +
31401 + - upgraded to the 2.4.0-test3-pre4 kernel
31402 +
31403 +Other changes
31404 +-------------
31405 +
31406 + - as_reject now returns the errno value in msg->reply
31407 + - removed save_qos hack in svc_change_qos
31408 + - atmsigd: sap_encode now always includes both max_sdu fields, even if one
31409 + contains the null value for some reason (by Mohsen Souissi)
31410 + - PCI updates for Ambassador, FORE 200E, Horizon, Iphase, nicstar, ENI, and
31411 + ZATM (by Jeff Garzik)
31412 + - removal of unnecessary #ifdef MODULE for nicstar, idt77105, and FORE 200E
31413 + (by Jeff Garzik)
31414 + - generalized skb_migrate to append to an arbitrary sk_buff list
31415 + - iphase.c: timer initialization cleanup (from mainstream)
31416 + - clip: dev->name initialization change (from mainstream)
31417 + - idt77105: cleaned up timer initialization
31418 + - clip.c: some general cleanup
31419 + - removed redundant return in clip.c (by Heikki Vatiainen)
31420 + - changed atm_change_qos to static
31421 + - fore200e.c: re-enabled anti-unloading code
31422 + - lec.c: now drops packets on overrun instead of growing infinite queue (by
31423 + Heikki Vatiainen)
31424 + - COPYING still mentioned the old led code with partial DEC copyright
31425 + (reported by Chris Pimlott)
31426 + - Horizon: removed const warning by casting to (hrz_flags *)
31427 + - Iphase: tried to print unsigned long with %x when errors are enabled
31428 + - ENI: eni_send tries to use do_tx instead of tasklet_schedule to reduce delay
31429 + - ENI: removed eni_dev->backlog_len (information is already in backlog->qlen)
31430 + - changed the kernel source tree references from .gz to .bz2 compression
31431 + - changed mkdiff to allow more flexible selection of additional patch
31432 +
31433 +
31434 +Version 0.76 to 0.77 (29-APR-2000)
31435 +====================
31436 +
31437 +Bug fixes
31438 +---------
31439 +
31440 + - atmaddr.8, atmarp.8, atmdump.8, atmloop.8, esi.8 didn't print all options
31441 + in bold
31442 + - atmsigd crashed if an interface had more than one local ATM address
31443 + - atmarpd continued to use VCs after closing if they were closed because
31444 + ATMARP_SETENTRY failed (reported by Joseph Gooch)
31445 +
31446 +New features
31447 +------------
31448 +
31449 + - upgraded to the 2.3.99-pre6 kernel
31450 +
31451 +Other changes
31452 +-------------
31453 +
31454 + - CLIP now uses NETDEV_GOING_DOWN instead of NETDEV_DOWN; also avoids
31455 + "clip_device_event: unknown event 9" warning
31456 + - added ubr:pcr example to qos(7)
31457 + - added -V option to atmaddr, atmarp, atmarpd, atmloop, atmsigd, atmtcp, esi,
31458 + ilmid
31459 + - sock->sk->sleep now points to vcc->sleep (by Alexander Viro)
31460 + - CLIP: ATMARP server now reponds to query for local IP address (suggested by
31461 + Joseph Gooch)
31462 + - updated t2a.pl
31463 +
31464 +
31465 +Version 0.75 to 0.76 (13-APR-2000)
31466 +====================
31467 +
31468 +Bug fixes
31469 +---------
31470 +
31471 + - ttcp_atm declared port as "short" instead of "unsigned short", yielding
31472 + confusing diagnostic output
31473 +
31474 +New features
31475 +------------
31476 +
31477 + - upgraded to the 2.3.99-pre5 kernel
31478 +
31479 +Other changes
31480 +-------------
31481 +
31482 + - eliminated eni_send-tasklet synchronization
31483 + - PCA200: merged unconditional #inclusion of linux/pci.h from pre5
31484 +
31485 +
31486 +Version 0.74 to 0.75 (7-APR-2000)
31487 +====================
31488 +
31489 +Bug fixes
31490 +---------
31491 +
31492 + - ENI: moved send operation into tasklet to correct synchronization (reported
31493 + by Heikki Vatiainen)
31494 + - MPOA: possible deadlock fix (by Heikki Vatiainen)
31495 + - atm_vcc_flags_t was too small on PPC, causing an overlap with vcc->family
31496 + (fixed by Chas Williams)
31497 + - CLIP: needs spin_lock_irqsave instead of only spin_lock (by Rui Prior)
31498 + - CLIP: clip_push may be called from an interrupt, so the kfree_skb has to
31499 + become dev_kfree_skb_any (by Heikki Vatiainen)
31500 +
31501 +Other changes
31502 +-------------
31503 +
31504 + - removed INCLUDES from atm/ilmid/asn1/Makefile (suggested by Jean Marc
31505 + Lacroix)
31506 + - atm/maint/Makefile no longer special-cases atmdiag.c (suggested by Jean Marc
31507 + Lacroix)
31508 +
31509 +
31510 +Version 0.73 to 0.74 (2-APR-2000)
31511 +====================
31512 +
31513 +Bug fixes
31514 +---------
31515 +
31516 + - atm_poll tried to sleep on two wait queues, which is no longer possible.
31517 + Removed vcc->wsleep to solve this. (Reported by Joseph Gooch)
31518 + - lec.c:lec_arp_clear_vccs changed the VCC flags of the wrong VCC, fortunately
31519 + only in commented-out code
31520 + - major revision of MPOA ingress and egress cache locking (Heikki Vatiainen)
31521 +
31522 +Other changes
31523 +-------------
31524 +
31525 + - removed last remnants of bogus bridging lock from lane_mpoa_init.c
31526 + (reported by Heikki Vatiainen)
31527 + - removed last traces of TNET1570A driver
31528 + - atmdev_init still knew about ENI, but ENI now uses new-style initialization
31529 + - improved Fore 200E configuration to catch useless settings already at
31530 + configuration time (by Christophe Lizzi)
31531 +
31532 +
31533 +Version 0.72 to 0.73 (29-MAR-2000)
31534 +====================
31535 +
31536 +Bug fixes
31537 +---------
31538 +
31539 + - ambassador.c and horizon.c had module loading races (fixed by Giuliano
31540 + Procida)
31541 + - fore200e: one set_bit was accidently converted to clear_bit, preventing VCs
31542 + from being opened (fixed by Christophe Lizzi)
31543 +
31544 +Other changes
31545 +-------------
31546 +
31547 + - fore200e: moved interrupt handler work to tasklet (by Christophe Lizzi)
31548 + - fore200e: fixed SBUS DMA direction flags (by Christophe Lizzi)
31549 + - fore200e: the compile no longer fails when the driver is compiled without
31550 + any hardware support (and displays a warning; by Christophe Lizzi)
31551 + - oops, atm/README was lagging behind a few versions
31552 +
31553 +
31554 +Version 0.71 to 0.72 (25-MAR-2000)
31555 +====================
31556 +
31557 +Bug fixes
31558 +---------
31559 +
31560 + - fore200e.h and lec.h didn't #include <linux/config.h> (fixed by David S.
31561 + Miller ?)
31562 + - atmloop.c always assumed -q to be present
31563 +
31564 +New features
31565 +------------
31566 +
31567 + - upgraded to the 2.3.99-pre3 kernel
31568 +
31569 +Other changes
31570 +-------------
31571 +
31572 + - kernel patch still included wd.c hack (reported by David S. Miller)
31573 + - removed bogus initialization of skb->rx_dev (spotted by Alexey Kuznetsov)
31574 + - removed bogus lane_bridge_hook_lock (by Heikki Vatiainen)
31575 + - added sparc64 support for ATM_QUERYLOOP (by Christophe Lizzi)
31576 + - minor Fore driver cleanup (by Christophe Lizzi)
31577 + - eni.c: moved interrupt handler work to tasklet
31578 +
31579 +
31580 +Version 0.70 to 0.71 (21-MAR-2000)
31581 +====================
31582 +
31583 +Bug fixes
31584 +---------
31585 +
31586 + - eni.c: fixed potential SMP deadlock on tx_wait
31587 + - clip.c and lec.c didn't initialize skb->rx_dev
31588 + - net/atm/svc.c:svc_connect left wait entry in queue on return in some cases
31589 + - idiot bug in skb_migrate caused weird crashes
31590 + - atmloop usage erroneously claimed -s was optional
31591 +
31592 +New features
31593 +------------
31594 +
31595 + - upgraded to the 2.3.99-pre2 kernel
31596 + - added atmloop.8 man page
31597 + - added enqueuing result NET_XMIT_BYPASS for qdiscs that send packets on a
31598 + path without dequeue (e.g. sch_atm)
31599 +
31600 +Other changes
31601 +-------------
31602 +
31603 + - ambassador.c: removed warnings when compiling with CONFIG_SMP (by Giuliano
31604 + Procida)
31605 + - changed drivers/atm target from atm.a to atm.o, to make initcalls work
31606 + - converted eni.c to use pci_register_driver and initcall
31607 + - cleaned up #ifdef hell in net/atm/signaling.c:sigd_put_skb
31608 +
31609 +
31610 +Version 0.69 to 0.70 (20-MAR-2000)
31611 +====================
31612 +
31613 +Bug fixes
31614 +---------
31615 +
31616 + - LEC compilation as a module still left it in the kernel
31617 +
31618 +Other changes
31619 +-------------
31620 +
31621 + - moved LANE-bridging interface code from lec.c to lane_mpoa_init.c (by
31622 + Heikki Vatiainen)
31623 + - made SONET and ATM statistics counters atomic to avoid cli() when reading
31624 + (not updated: similar mechanism in idt77105.c and private shadow statistics
31625 + of ambassador.c)
31626 + - changed access to VCC and device flags (ATM_VF_* and ATM_DF_*) to bit set
31627 + operations
31628 + - changed flag types to structs to fail compilation of old code
31629 + - changed last argument of atm_dev_register to a pointer to a bit set for
31630 + easier migration
31631 + - net/atm/*.c: eliminated all sleep_on and cli (except in lec.c)
31632 + - ditto for eni.c and suni.c
31633 + - corrected indentation of some "permanent" debugging code in zatm.c
31634 + - made skb_migrate partially atomic, obsoleting yet another cli() in clip.c
31635 +
31636 +
31637 +Version 0.68 to 0.69 (19-MAR-2000)
31638 +====================
31639 +
31640 +Bug fixes
31641 +---------
31642 +
31643 + - ambassador.c: corrected location of initial PLX window for use on Alpha (by
31644 + Giuliano Procida)
31645 + - zeppelin: fixed address initialization (found by Christophe Lizzi)
31646 + - atmsigd.conf man page erroneously described the option "q.2963.1" as
31647 + "q2963_1"
31648 + - LANE didn't compile when bridging was enabled (fixed by Heikki Vatiainen;
31649 + note that bridging also needs an update which is being merged via the
31650 + mainstream kernel)
31651 +
31652 +New features
31653 +------------
31654 +
31655 + - atmsigd: added command-line option -u to set the UNI mode
31656 + - added ioctl ATM_QUERYLOOP to determine supported loopback modes
31657 + - added atmloop(8) option -q
31658 +
31659 +Other changes
31660 +-------------
31661 +
31662 + - added CREDITS entry of Giuliano Procida
31663 + - various cosmetic changes to horizon.c (by Giuliano Procida)
31664 + - ambassador.c: various bits of cleanup (by Giuliano Procida)
31665 + - added -S <tos> option to ttcp_atm to set the IPv4 TOS byte (this is not
31666 + really related to ATM)
31667 + - changed loopback mode values to a bit set
31668 + - idt77105_ioctl: returned sizeof(int) instead of 0 on ATM_GETLOOP
31669 + - added phy_ops->stop to suni.c and uPD98402_stop, cleaned up suni.c in the
31670 + process
31671 + - removed (very obsolete) mmuio.o from net/atm/Makefile
31672 +
31673 +
31674 +Version 0.67 to 0.68 (28-FEB-2000)
31675 +====================
31676 +
31677 +Bug fixes
31678 +---------
31679 +
31680 + - removed potential dev_kfree_skb(NULL) from *_send of eni.c, zatm.c, iphase.c
31681 + - eni.c, zatm.c, iphase.c sometimes returned PCI error codes instead of errno
31682 + codes
31683 + - arpd/io.c could try to de-reference entry->addr with addr == NULL (fixed by
31684 + Thomas Dietz)
31685 + - LANE copied more than dev->addr_len address bytes (fixed by Heikki
31686 + Vatiainen)
31687 + - sch_atm didn't remove filters on destroy
31688 + - fixed typo in esi.c error message
31689 + - esi.8 claimed to be the man page of atmarp, and it wasn't installed
31690 + - added checking for VPI/VCI when sending AAL0 cells (by Mitchell Blank)
31691 + - atmtcp allowed sending on receive-only VCs
31692 + - various ioctl permission checks were missing (fixed by Mitchell Blank)
31693 + - fore200e.c and horizon.c didn't always free skbs on send error (fixed by
31694 + Mitchell Blank)
31695 + - included an ugly hack to fix the wd.c driver that was broken around 2.3.47
31696 + (not related to ATM at all...)
31697 +
31698 +New features
31699 +------------
31700 +
31701 + - upgraded to the 2.3.48 kernel
31702 + - added device-independent SAR/PHY loopback setting interface (with many good
31703 + ideas from Greg Banks and Mitchell Blank), and removed old loopback ioctls
31704 + - new utility atmloop to set loopback mode
31705 + - added "stop" to atmphy_ops (requested by Mitchell Blank)
31706 +
31707 +Other changes
31708 +-------------
31709 +
31710 + - mkdiff can now also use pre-release kernels
31711 + - changed *kfree_skb to dev_kfree_skb_{irq,any} in eni.c, zatm.c, and raw.c,
31712 + where necessary (with help from Heikki Vatiainen)
31713 + - changed {dev_,}kfree_skb to dev_kfree_skb_any in ambassador.c, horizon.c,
31714 + iphase.c, and nicstar.c (needs further cleanup)
31715 + - softnet updates for LANE (by Heikki Vatiainen)
31716 + - fixed firmeware license of Fore 200E driver and general 0.46/0.47 updates
31717 + (Christophe Lizzi)
31718 + - more CREDITS file additions
31719 + - softnet updates for sch_atm
31720 + - softnet updates for CLIP (also cleaned up flow control for > 1 VCC/itf;
31721 + reported by Alexey Kuznetsov)
31722 + - updated documentation for iproute2-2.2.4-now-ss000225 and streamlined the
31723 + build procedure
31724 + - PCI DMA updates for ENI driver
31725 + - changed the default install location of executables and man pages from
31726 + /usr/local to /usr
31727 + - make install no longer installs align, aping, br, bw, delay, isp, svctor,
31728 + sw_debug, sw_tcp, swc, and window
31729 + - eni.c: made highly controversial aal5 = ... line more readable
31730 + - moved /proc/atm to /proc/net/atm
31731 + - added vcc->send function to allow for AAL-specific processing (may be set
31732 + to dev->ops->send)
31733 + - atm_do_connect_dev now calls bind_vcc before AAL initialization to make
31734 + vcc->dev available
31735 + - change_qos no longer allows changing of AAL or traffic class (by Mitchell
31736 + Blank)
31737 + - changes for new loopback support to fore200e driver and sparc64 code (by
31738 + Christophe Lizzi)
31739 +
31740 +
31741 +Version 0.66 to 0.67 (2-FEB-2000)
31742 +====================
31743 +
31744 +New features
31745 +------------
31746 +
31747 + - upgraded to 2.3.42
31748 + - added sunimode utility to set SUNI loopback mode (by Christophe Lizzi)
31749 +
31750 +Other changes
31751 +-------------
31752 +
31753 + - removed unused variable warning in net/sched/sch_atm.c
31754 + - changed ENI_SETMULT from ATMIOC_SARPRV+1 to ATMIOC_SARPRV+7
31755 + - changed atmarpd's complaint about VCC-less non-ATMARP-server entries from
31756 + DIAG_ERROR to DIAG_INFO (the condition is okay for an ATMARP server)
31757 +
31758 +
31759 +Version 0.65 to 0.66 (31-JAN-2000)
31760 +====================
31761 +
31762 +Bug fixes
31763 +---------
31764 +
31765 + - atmsigd crashed on reception of as_accept, etc., because of inverted NULL
31766 + pointer test (reported by Kevin Vargo, Rui Prior, fixed by Julian Cable)
31767 + - fixed various SPARC build problems (by Christophe Lizzi)
31768 + - atmsigd insisted that calling party number is local in switch mode
31769 + - debug switch didn't initialize any ports
31770 + - net/atm/signaling.c:sigd_enq didn't properly zero the message, yielding
31771 + kernel pointers partially containing junk
31772 + - accept(2) didn't copy local ATM address to VCC descriptor (reported by
31773 + Pedro Brandao)
31774 + - ilmid/io.c didn't compile on SPARC (reported by Christophe Lizzi)
31775 + - usage.txt didn't define the %: macro, leaving garbage in usage.txt
31776 +
31777 +New features
31778 +------------
31779 +
31780 + - upgraded to 2.3.41
31781 + - Fore 200E driver now also works for SBA-200E (by Christophe Lizzi)
31782 +
31783 +Other changes
31784 +-------------
31785 +
31786 + - added various CREDITS entries
31787 + - changed TIOC{IN,OUT}Q to SIOC{IN,OUT}Q (no user space rebuild required;
31788 + the values are identical)
31789 + - added script atm/switch/tcp/mkfiles for automatic extraction of
31790 + configuration files
31791 + - atmsigd called ATM_GETLINKRATE "ATM_GETLINERATE" in complaints
31792 + - atmsigd tried to obtain link speed in switch mode, although it's not used
31793 + - Ambassador NIC: various files still had the wrong copyright/licensing text
31794 + (patch by Giuliano Procida)
31795 +
31796 +
31797 +Version 0.64 to 0.65 (21-JAN-2000)
31798 +====================
31799 +
31800 +Bug fixes
31801 +---------
31802 +
31803 + - fixed 32/64 bit %p formatting problem in /proc/atm/vc
31804 + - atmtcp: fixed RX/TX statistics (by Jens Axboe)
31805 + - sparc64-specific ioctl 32/64 bit marshalling fixes (by Christophe Lizzi,
31806 + with further improvements by Jens Axboe)
31807 + - zeppelin -l option handling (reported by Mike Prudence, fixed by Heikki
31808 + Vatiainen)
31809 + - mkpatch didn't include drivers/atm/eni.h
31810 + - updated eni.h (tx->backlog_len was missing)
31811 + - fixed various uint32_t build problems of user space tools by including
31812 + atm.h before anything other ATM headers (first reported by Rashmi Dravid)
31813 + - "natmtcp virtual" didn't parse the command line properly
31814 + - natmtcp's TCP link changed VPI/VCI to 0.0 on close
31815 + - CLIP: fixed crash after sending ARP (reported by Rui Prior)
31816 +
31817 +New features
31818 +------------
31819 +
31820 + - upgraded to 2.3.40 (with help from Jens Axboe)
31821 + - added sparc64 changes for ENI driver (by Heikki Vatiainen)
31822 + - added the Fore PCA-200E(/SBA-200E) driver (by Uwe Dannowski and Christophe
31823 + Lizzi)
31824 + - added the Interphase ATM PCI (i)Chip (x575, x525, x531, etc.) driver (by
31825 + Monalisa Agrawal and Peter Wang)
31826 + - added ABR fields to struct atm_trafprm (by Peter Wang)
31827 + - nicstar driver now supports setting of the CLP bit (by Rui Prior)
31828 + - added ENI_SETMULT ioctl and enitune utility to change ENI buffer size
31829 + multipliers at run time
31830 +
31831 +Other changes
31832 +-------------
31833 +
31834 + - atmsigd: changed default UNI version from 3.0 to dynamic (which defaults
31835 + to 3.0)
31836 + - atmtcp: removed ugly ../../net/atm/protocols.h include
31837 + - ioctls now internally return -ENOIOCTLCMD if ioctl command number is not
31838 + recognized
31839 + - removed ATM_CREATE_LEAF ioctl (wasn't used and suggested the wrong design
31840 + approach anyway)
31841 + - updated README.DRIVERS
31842 + - natmtcp now uses port 2812 (assigned by IANA)
31843 + - moved Documentation/atm.txt to Documentation/networking
31844 + - improved atm_kptr_int_t for non-Sparc architectures (by Christophe Lizzi)
31845 + - removed two compiler warnings from nicstar.c
31846 + - some minor nicstar cleanup (by Rui Prior)
31847 + - added "vbr" and "abr" to text2qos/qos2text ("vbr" not used for anything
31848 + right now)
31849 + - natmtcp: added commands "create", "remove", "switch", corresponding to
31850 + options -p, -r, and -s of atmtcp
31851 + - natmtcp: added link type "print" (write PDU content to stdout)
31852 + - natmtcp: now uses atm_kptr_int_t for VCC kernel pointer instead of unsigned
31853 + long
31854 + - added apologetic man page for natmtcp
31855 + - renamed natmtcp to atmtcp and removed the old atmtcp
31856 + - changed some user-space code to avoid patronizing "ambiguous `else'"
31857 + warnings from egcs, adding as few ugly redundant curly braces as possible
31858 + - fixed some other compiler warnings
31859 + - kernel part: trimmed operations structure initializers which consisted
31860 + mainly of NULL pointers
31861 + - kernel pointers sent as opaque references to user space are now of type
31862 + atm_kptr_t. Added support functions kptr_eq and kptr_print. (With help from
31863 + Richard Johnson and Mitchell Blank)
31864 + - removed various "overriding commands" warnings in user-space build process
31865 + - mkdist now creates arcvie in current directory if ~/l/arch doesn't exist
31866 + - make clean && make now works also if dependencies are present (make clean
31867 + used to remove sigd/q.out.h, which the dependencies required)
31868 + - atmtcp uses command bg instead of -b for backgrounding. Also, listen-bg
31869 + listens and backgrounds before calling accept.
31870 +
31871 +
31872 +Version 0.63 to 0.64 (1-DEC-1999)
31873 +====================
31874 +
31875 +Bug fixes
31876 +---------
31877 +
31878 + - atmapi.h logic was still wrong (fixed by Christophe Lizzi)
31879 + - LANE: fixed BUS filtering and net/atm/lec.c cleanup (by Heikki Vatiainen)
31880 + - arpd/io.c assumed that diag() preserves errno
31881 + - atmarpd didn't include QOS in output if getsockopt failed
31882 +
31883 +New features
31884 +------------
31885 +
31886 + - /proc/atm/eni:* now also shows transmit queue and backlog length
31887 + - added option "sndbuf" to atmarp
31888 + - added option "sndbuf" to tc ... atm ...
31889 + - /proc/atm/vc lists internal details for all VCs (flags, buffers, etc.);
31890 + added ATM_VF2TXT_MAP to atmdev.h to allow translation of flag values
31891 +
31892 +Other changes
31893 +-------------
31894 +
31895 + - ATM now uses sk->sndbuf/rvcbuf instead of atm_vcc->tx_quota/rx_quota
31896 + - removed rx_quota hack from zatm.c
31897 + - removed net/atm/tunable.h
31898 + - CLIP and sch_atm now only send packets if the VC's send queue allows them to
31899 + - implemented correct "requeue" function in sch_atm
31900 + - updated zeppelin(8) man page (Heikki Vatiainen)
31901 + - atmarp: atmarp -q qos_spec usage is obsolete; use atmarp -q qos qos_spec
31902 + instead
31903 + - /proc/atm/svc now prints "N/A@xxxxxxxx" instead of "Unassigned", with the
31904 + address of the descriptor in xxxxxxxx
31905 + - removed all traces of CONFIG_MMU_HACKS
31906 + - obsoleted ATM_SETSC (single-copy control)
31907 +
31908 +
31909 +Version 0.62 to 0.63 (22-NOV-1999)
31910 +====================
31911 +
31912 +Bug fixes
31913 +---------
31914 +
31915 + - horizon.c: cleared weird rate_lock/rates_lock patch conflict
31916 + - saaldump output formatting was completely wrecked; added option -q for
31917 + "quiet" output (no Q.2931 printing)
31918 + - fixed LANE Ethernet interface MTU mapping (patch by Rob Scott)
31919 + - atmsigd incorrectly rejected CONNECTION AVAILABLE (Q.2963.1)
31920 + - SVC address was wrong in /proc/atm/arp if using private and public part
31921 + - RESTART ACKNOWLEDGE was not sent with the correct global call reference
31922 + value (reported by Peter Ryan)
31923 + - zatm: usec timestamps need 64 division of x86, so this option must be
31924 + unavailable on other architectures (reported by Matti Aarnio)
31925 + - nicstar: added "fix3" and "fix4" (by Rui Prior)
31926 + - LANE: non-proxy didn't filter packets coming from BUS (fix by Marko Kiiskila
31927 + and Heikki Vatiainen)
31928 +
31929 +New features
31930 +------------
31931 +
31932 + - upgraded to kernel version 2.3.28
31933 + - atmtcp now reports VC open/close and generates timestamps (Note: the
31934 + protocol used between the kernel and the atmtcp utility has changed)
31935 + - new utility "natmtcp" which combines the ATMTCP protocol, ATMTCP ("virtual")
31936 + interfaces, "real" ATM interfaces, and log files (experimental)
31937 + - added ILMI 4.0 MIB variables atmfPortMyIdentifier and atmfMySystemIdentifier
31938 + (by Thomas Seidel)
31939 + - zeppelin: new command line option -I to select interface, allowing the use
31940 + of LANE with multiple physical interfaces (by Heikki Vatiainen)
31941 + - UltraSparc (sparc64) support (by Christophe Lizzi)
31942 + - nicstar: added IDT77105 PHY support (by Greg Banks)
31943 + - added utility loop25 to control ForeRunner LE loopback mode (by Greg Banks)
31944 + - added support for DNS lookup of NSAP addresses (by Rui Prior)
31945 + - added utility debug/dnstest (by Rui Prior)
31946 +
31947 +Other changes
31948 +-------------
31949 +
31950 + - net/atm/tunable.h cleanup
31951 + - removed SO_BCTXOPT, SO_BCRXOPT, and struct atm_buffconst
31952 + - removed obsolete field "next" from struct atm_blli
31953 + - changed potentially unaligned 32 bit accesses in SAAL to use read_netl
31954 + (spotted by Christophe Lizzi)
31955 + - added __attribute__ ((aligned(8))) to many structures containing structures
31956 + which are shared by kernel and user space to enfore uniform packing on
31957 + sparc64 (with help from Christophe Lizzi)
31958 + - changed unsigned long to unsigned int at API for compatibility with
31959 + architecture where sizeof(long) differs between user and kernel space
31960 + (e.g. sparc64; suggested by Christophe Lizzi)
31961 + - changed struct atmsvc_msg.{vcc,listen_vcc} from unsigned long to new type
31962 + atm_kptr_int_t; changed atmsigd accordingly (NB: debugging output may strip
31963 + upper bits)
31964 + - changed various casts pointer->int to pointer->long->int (where the pointer
31965 + does indeed only contain an int, e.g. in ioctl) for Alpha (reported by
31966 + Matti Aarnio)
31967 + - nicstar: changes card->membase from u32 to unsigned long
31968 + - added __attribute__ ((unused)) to mpc.c and mpoa_caches.c to remove
31969 + warnings about variables used only for debugging
31970 + - drivers/atm/Config.in: changed ! "$foo" = "x" to "$foo" != "x"
31971 +
31972 +
31973 +Version 0.61 to 0.62 (27-AUG-1999)
31974 +====================
31975 +
31976 +Bug fixes
31977 +---------
31978 +
31979 + - lib/diag.c:set_logfile didn't set log_to_initialized (reported by Lars
31980 + Burgstahler)
31981 + - sch_atm did not use classifiers attached to the x:0 class (reported by Lars
31982 + Burgstahler)
31983 + - net/atm/atm_misc.c EXPORT'ed atm_return, which is an inline function (fixed
31984 + by Mitchell Blank)
31985 + - work-around for SO_LEVEL range problems (by Mitchell Blank)
31986 + - nicstar oops fix (by Rui Prior and John Brosnan)
31987 + - nicstar should now work also as non-module (by Rui Prior)
31988 + - nicstar fix for chip bug showing up on 64-bit CPCI bus systems (by Jay
31989 + Talbott)
31990 + - cleared confusion about inclusion of suni.o when building both nicstar and
31991 + ENI
31992 + - suni.c now always exports suni_init
31993 + - various fixes and cleanups in the Madge drivers (by Giuliano Procida)
31994 + - fixed new set of atm_pdu2truesize problems by introducing atm_alloc_charge
31995 + which handles the allocation too (problem report and work-around by Alexey
31996 + Kuznetsov)
31997 + - getsockname on unbound PVC socket caused an oops
31998 + - LANE: Token Ring source route bridge support fix (by Heikki Vatiainen)
31999 +
32000 +New features
32001 +------------
32002 +
32003 + - upgraded to kernel version 2.3.15 (mainly by Alexey Kuznetsov and Mitchell
32004 + Blank)
32005 + - new socket option SO_ATMPVC to retrieve the "PVC" address (PVC & SVC) (based
32006 + on a patch by Jay Talbott)
32007 + - zeppelin -l now also accepts only the selector byte (by Robert Slaski)
32008 +
32009 +Other changes
32010 +-------------
32011 +
32012 + - removed obsolete drivers/atm/nicstar.c.old_skb
32013 + - removed all references to Arequipa (obsolete)
32014 + - SO_BCTXOPT/SO_BCRXOPT are now obsolete, given that the final verdict on page
32015 + flipping has been spoken in linux-kernel
32016 + - interface statistics are now counted in struct net_device_stats instead of
32017 + struct enet_statistics (by Mitchell Blank)
32018 + - added pointer to mailing list to Documentation/atm.txt
32019 + - Documentation/Configure.help now points to Documentation/atm.txt instead of
32020 + directly to the Web page.
32021 + - usage.tex: clarified the consequences of interrupting atmtcp
32022 + - changed the highly misleading "atmarpd:ITF: no such interface" message to
32023 + DIAG_DEBUG
32024 +
32025 +
32026 +Version 0.60 to 0.61 (11-JUN-1999)
32027 +====================
32028 +
32029 +Bug fixes
32030 +---------
32031 +
32032 + - nicstar: driver sometimes crashed when starting for 25 Mbps cards (Rui
32033 + Prior)
32034 + - Zeitnet driver: uPD98402.c wasn't compiled with -DEXPORT_SYMTAB when
32035 + building as a module
32036 + - net/atm/raw.c didn't export atm_init_aal5, so ATMTCP didn't load as a module
32037 + - atmtcp could still be accessed after loading and then unloading, yielding an
32038 + Oops
32039 +
32040 +Other changes
32041 +-------------
32042 +
32043 + - PPC configuration now also includes ATM (Jay Talbott)
32044 + - lots of cleanup in the Madge drivers (Giuliano Procida)
32045 + - tamed down a bit the tone in README
32046 +
32047 +
32048 +Version 0.59 to 0.60 (3-JUN-1999)
32049 +====================
32050 +
32051 +New features
32052 +------------
32053 +
32054 + - upgraded to kernel version 2.3.3 (main change is slightly different wait
32055 + queue handling; affects all drivers)
32056 +
32057 +Other changes
32058 +-------------
32059 +
32060 + - mkdiff script now takes .bz2 kernel if no .gz can be found
32061 + - made a few changes to the Madge drivers to reduce the number of warnings
32062 +
32063 +
32064 +Version 0.58 to 0.59 (3-JUN-1999)
32065 +====================
32066 +
32067 +New features
32068 +------------
32069 +
32070 + - upgrade to kernel version 2.2.9
32071 + - zeppelin now adjusts MTU when joining ELAN (Heikki Vatiainen)
32072 +
32073 +Other changes
32074 +-------------
32075 +
32076 + - adjusted tr interface name limit to 8 characters (down from a wasteful 9)
32077 +
32078 +
32079 +Version 0.57 to 0.58 (3-JUN-1999)
32080 +====================
32081 +
32082 +Bug fixes
32083 +---------
32084 +
32085 + - ENI drivers sometimes directly dereferenced pointers instead of using readl/
32086 + writel (fixed by Mitchell Blank)
32087 + - nicstar driver no longer uses floating point (fixed by Rui Prior)
32088 + - nicstar driver may have refused CBR VC in some cases even with enough
32089 + bandwidth available (fixed by Rui Prior)
32090 + - usage.tex failed to build (fixed by Bill Brooks)
32091 + - zeppelin got byte order in BLLI wrong (reported by Chas Williams; fixed by
32092 + Mitchell Blank and Heikki Vatiainen)
32093 + - zeppelin did not work when the host had multiple ATM addresses (reported by
32094 + Benoit Steiner; fixed by Heikki Vatiainen)
32095 + - zeppelin incorrectly parsed -i command line option (reported by Benoit
32096 + Steiner; fixed by Heikki Vatiainen)
32097 + - atm_connect_vcc and /proc/atm/pvc report AAL0 now properly (reported by Zhu
32098 + Qun Ying and Uwe Dannowski)
32099 +
32100 +New features
32101 +------------
32102 +
32103 + - nicstar driver now support SONET diagnostics (by Rui Prior)
32104 + - nicstar driver now works on PowerPC (by Jay Talbott)
32105 + - LANE now also supports Token Ring (Heikki Vatiainen, with testing by
32106 + Holger Smolinski)
32107 +
32108 +Other changes
32109 +-------------
32110 +
32111 + - major non-i386 architecture and other cleanup in ENI driver (by Mitchell
32112 + Blank)
32113 + - number of lec devices is 40+8 (lec0-lec39 are Ethernet and lec40-lec47 are
32114 + Token Ring; Heikki Vatiainen)
32115 + - lec.c and mpc.c now use atm_force_charge (Heikki Vatiainen)
32116 + - net/802/tr.c limited interface names to 4 characters (fixed by Heikki
32117 + Vatiainen)
32118 + - zeppelin man page updated (Heikki Vatiainen)
32119 + - "zeppelin.new" is now "zeppelin", the old "zeppelin" is gone
32120 + - set "atm_connect" printk to KERN_DEBUG
32121 + - removed ATM_SAAL from include/linux/atm.h (there never was any support for
32122 + SAAL in the kernel)
32123 +
32124 +
32125 +Version 0.56 to 0.57 (18-MAY-1999)
32126 +====================
32127 +
32128 +Bug fixes
32129 +---------
32130 +
32131 + - atmarpd complained "invalid control msg type" when changing interface
32132 + characteristics (reported by Soo-Khim Ho)
32133 + - sch_atm didn't compile without CLIP (reported by Zhu Qun Ying)
32134 + - LANE & MPOA: plugged a few memory leaks after failure to atm_charge (Heikki
32135 + Vatiainen)
32136 + - mpcd could not be killed if MPS's address was not known (fixed by Heikki
32137 + Vatiainen)
32138 + - nicstar: fixed the sleeping in interrupt issue (Rui Prior)
32139 +
32140 +New features
32141 +------------
32142 +
32143 + - drivers for the Madge "Ambassador" and "Horizon [Ultra]" NICs, also known
32144 + as Collage PCI 155 Server, 25, and 155 Client (by Giuliano Procida)
32145 +
32146 +Other changes
32147 +-------------
32148 +
32149 + - MPOA code cleanup and debugging printks are now conditional (Heikki
32150 + Vatiainen)
32151 + - removed both led/USAGE files
32152 + - removed the old atmsigd (was in atm/sig.old/)
32153 + - nicstar driver now works around TSQ bug on older chips (77201) (by Rui
32154 + Prior, with the detective work by Jay Talbott)
32155 +
32156 +
32157 +Version 0.55 to 0.56 (22-APR-1999)
32158 +====================
32159 +
32160 +Bug fixes
32161 +---------
32162 +
32163 + - atm/doc/Makefile assumed . to be included in PATH when invoking rlatex
32164 + (fix by Heikki Vatiainen)
32165 + - usage.txt leaked Arequipa configuration examples (fix by Heikki Vatiainen)
32166 + - plugged a small memory leak in led.new which occurred when using the LANE
32167 + client as a proxy (Heikki Vatiainen)
32168 + - atmarpd crashed when printing ATMARP table entries with flag 0x8000 set
32169 + (reported by Vinay Kulkarni)
32170 + - CLIP interfaces now follow netmask changes
32171 + - Nicstar: 25.6 Mbps cell rate corrected (by Rui Prior)
32172 + - atm_equal could loop forever when comparing NSAP-encoded E.164 addresses
32173 + (reported by Valley Zhizhkun)
32174 + - [AP]F_ATM[PS]VC definitions in lib/atm.h conflicted with glibc 2.1
32175 + (reported by Heikki Vatiainen and Jens Vagelpohl)
32176 + - changed a few non-int main to int main (reported by Heikki Vatiainen)
32177 + - changed lib/diag.c work with glibc 2.1, where stderr is no longer a constant
32178 + (based on a patch by Heikki Vatiainen, also reported by Giuliano Procida)
32179 + - make clean didn't remove qgen/q.test.c, qgen/qd.out.h, qgen/qd.test.c,
32180 + sigd/q.out.h and sigd.old/q.out.h (reported by Giuliano Procida)
32181 + - optional headers were installed even with system headers present if
32182 + INSTROOT was different from / (reported by Giuliano Procida)
32183 + - lib/stdint.h was used even on systems that had a "real" stdlib.h (based on a
32184 + patch by Heikki Vatiainen, also reported by Giuliano Procida)
32185 + - renamed net/atm/misc.c to atm_misc.c to avoid name clash with
32186 + drivers/char/misc.c on include/linux/modules/misc.* (reported by Borek
32187 + Lupomesky)
32188 +
32189 +New features
32190 +------------
32191 +
32192 + - new ioctl ATM_GETLINKRATE to query link rate of an interface (suggested by
32193 + Vitaly Lavrov)
32194 + - new atmsigd.conf option io max_rate to specify rate to signal if
32195 + application requests the "maximum"
32196 + - added decription of CONFIG_ATM_LANE and CONFIG_ATM_MPOA to the kernel
32197 + configuration help (Heikki Vatiainen)
32198 + - added description of LANE to usage.tex (Heikki Vatiainen)
32199 + - new function atm_force_charge to unconditionally add data to a receive
32200 + buffer
32201 +
32202 +Other changes
32203 +-------------
32204 +
32205 + - atmsigd now determines maximum link rate by querying interfaces (suggested
32206 + by Vitaly Lavrov)
32207 + - moved local address registry from a global table to VPCI structures
32208 + - changed unknown net device notification severity from KERN_ERR to
32209 + KERN_WARNING
32210 + - atmarpd now overwrites old atmarpd.table on startup (it used to keep it
32211 + until the first configuration change)
32212 + - shutdown(2) of native ATM VCs now returns 0 instead of -EOPNOTSUPP
32213 + (suggested by Mitchell Blank)
32214 + - Nicstar: IRQ sharing is now allowed (by Rui Prior)
32215 + - Nicstar: default maximum number of cards is now 4 (by Rui Prior)
32216 + - Nicstar: when compiled as a module, the driver may no longer be removed
32217 + while in use (by Rui Prior)
32218 + - Nicstar: loss of cells is no longer reported as a plain CRC error (by Rui
32219 + Prior)
32220 + - atmsigd now always clears the endpoint reference flag if in UNI 3.0 mode
32221 + (based on a patch by Heikki Vatiainen)
32222 +
32223 +
32224 +Version 0.54 to 0.55 (1-MAR-1999)
32225 +====================
32226 +
32227 +Bug fixes
32228 +---------
32229 +
32230 + - SELECT_TOP_PCR didn't take intro account the "pcr" field, causing SVC with
32231 + QoS pcr=xxx to be set up at link speed
32232 + - qos_equal didn't detect differences in the "pcr" fields
32233 + - sch_atm only accepted parent == root or absent (reported by John Loughney)
32234 + - sch_atm:atm_tc_put accessed flow structure after kfree'ing it
32235 + - sch_atm:atm_tc_change didn't put excess traffic class if class creation
32236 + failed
32237 + - sch_atm:atm_tc_dump_class didn't return class ID in tcm->tcm_handle
32238 + - sch_atm:atm_tc_delete refused to delete classes because it expected
32239 + ref == 1, but ref == 2 (reported by John Loughney)
32240 +
32241 +
32242 +Version 0.53 to 0.54 (19-FEB-1999)
32243 +====================
32244 +
32245 +Bug fixes
32246 +---------
32247 +
32248 + - led.new: fixed build problem and warning (Heikki Vatiainen)
32249 + - fixed LANE arp cache timeouts (Heikki Vatiainen)
32250 + - ilmid -i option fell through into -l, causing logging to go into a file
32251 + named after the local address
32252 + - flipping the highest bit of ep_ref made it negative which was erroneously
32253 + interpreted to mean "absent" (reported by Giuliano Procida and Chas
32254 + Williams)
32255 + - ilmid used the result of AsnOidCompare inconsistently, causing network
32256 + prefix registration to fail with some switches (based on a patch by Giuliano
32257 + Procida)
32258 +
32259 +New features
32260 +------------
32261 +
32262 + - tc:q_atm: new option "clip" to select Classical IP processing of inbound
32263 + traffic
32264 + - new sch_atm class attribute TCA_ATM_STATE to retrieve VC state
32265 +
32266 +Other changes
32267 +-------------
32268 +
32269 + - led.new: improved handling of LANE flush protocol (Heikki Vatiainen)
32270 + - copied USAGE from led/ to led.new/
32271 + - added description of ilmid options -i and -u to USAGE (Heikki Vatiainen)
32272 + - ilmid -u now also works without -DDYNAMIC_UNI (all values but the default
32273 + are refused)
32274 + - tcpdump patch updated to tcpdump version 3.4 (Heikki Vatiainen)
32275 + - updated "tc" patch to iproute2 version 2.1.99-now-ss990203
32276 +
32277 +
32278 +Version 0.52 to 0.53 (9-FEB-1999)
32279 +====================
32280 +
32281 +Bug fixes
32282 +---------
32283 +
32284 + - atmsigd: selecting the UNI version via compile-time options didn't yield
32285 + the desired result in some cases (reported by Vinay Kulkarni and others)
32286 + - ATM VCCs now use struct sock, as required by protocol-independent layer
32287 + starting with recent 2.1 kernels (by Mitchell Blank)
32288 + - led fixes: htons/htonl bugs in LANEv2 code, one duplicate close() removed
32289 + (by Heikki Vatiainen)
32290 +
32291 +New features
32292 +------------
32293 +
32294 + - upgraded to the 2.2.1 kernel (by Mitchell Blank)
32295 + - LANE: added bridging support (by Heikki Vatiainen)
32296 + - complete rewrite of led (in led.new), which is now leaner and no longer
32297 + contains code (c) Digital (by Heikki Vatiainen)
32298 + - added macros for local AESA format and group addresses, and support in
32299 + atm2text (by Heikki Vatiainen)
32300 +
32301 +Other changes
32302 +-------------
32303 +
32304 + - ENI: buffer sizes are now limited to MID_MAX_BUF_SIZE even if max_sdu >
32305 + MID_MAX_BUF_SIZE/3 (reported by Andrew Lunn)
32306 + - plenty of NICStAR changes (Rui Prior and Mitchell Blank)
32307 + - LANE interface to upper layer looks more like Ethernet, so adding bridge and
32308 + 802.1Q support is easier, and tcpdump does not need any extra patches (by
32309 + Heikki Vatiainen)
32310 +
32311 +
32312 +Version 0.51 to 0.52 (5-DEC-1998)
32313 +====================
32314 +
32315 +Bug fixes
32316 +---------
32317 +
32318 + - atmsigd crashed when receiving STATUS ENQUIRY for call in Null state
32319 + (reported by Heikki Vatiainen)
32320 + - outbound endpoint reference didin't have the 16th bit toggled (fixed by
32321 + Andrew Lunn)
32322 + - lec.c: fixed a bug in kernel which could cause kernel part to deadlock when
32323 + signalling was not started successfully (by Heikki Vatiainen)
32324 + - MPOA: bug fixes and other changes, see atm/mpoa/CHANGELOG (by Heikki
32325 + Vatiainen)
32326 +
32327 +New features
32328 +------------
32329 +
32330 + - LANE: both kernel & daemon: support for ELANs which have MTUs greater than
32331 + 1516 (by Eric H. Kinzie)
32332 + - MPOA: can now ask LECS for configuratino information (by Heikki Vatiainen)
32333 +
32334 +Other changes
32335 +-------------
32336 +
32337 + - zeppelin.8: updated (Heikki Vatiainen)
32338 +
32339 +
32340 +Version 0.50 to 0.51 (6-NOV-1998)
32341 +====================
32342 +
32343 +Bug fixes
32344 +---------
32345 +
32346 + - atmsigd: typo prevented kernel.c from compiling with UNI30 disabled (fix by
32347 + Andrew Lunn and Uwe Dannowski)
32348 + - option -u crashed ilmid (reported by Michael Wolf)
32349 +
32350 +Other changes
32351 +-------------
32352 +
32353 + - bearer capability is now set to "CBR" for CBR (suggested by Heikki
32354 + Vatiainen)
32355 +
32356 +
32357 +Version 0.49 to 0.50 (3-NOV-1998)
32358 +====================
32359 +
32360 +Bug fixes
32361 +---------
32362 +
32363 + - atmsigd didn't compile for -DUNI31 -DALLOW_UNI30 (fixed by Richard Gooch)
32364 + - atmsigd crashed on as_bind and also had problems with as_connect after
32365 + as_bind (reported by Heiko Krupp, Heikki Vatiainen, and many others)
32366 +
32367 +Other changes
32368 +-------------
32369 +
32370 + - atmsigd now enables tracing by default (use -t 0 to turn it off)
32371 + - added "terminate" message to test/isp
32372 + - mpoad defaults to UBR if service category is absent (by Heikki Vatiainen)
32373 + - LANE now avoids blocking intact connections when other connections have
32374 + problems by queuing packets independently per destination while waiting for
32375 + a connection (by Heikki Vatiainen)
32376 +
32377 +
32378 +Version 0.48 to 0.49 (1-NOV-1998)
32379 +====================
32380 +
32381 +Bug fixes
32382 +---------
32383 +
32384 + - q_atm.c passed TCA_ATM_EXCESS even if zero, while the kernel expected it
32385 + to be absent in this case (changed q_atm.c)
32386 + - q_atm: tc class show didn't separate fields properly with blanks
32387 + - removed double inclusion of atm/config from mkdist
32388 +
32389 +New features
32390 +------------
32391 +
32392 + - upgraded to the 2.1.126 kernel
32393 +
32394 +Other changes
32395 +-------------
32396 +
32397 + - "new" atmsigd is now the default (atm/sigd got renamed to atm/sigd.old,
32398 + atm/sigd.new to atm/sigd)
32399 + - updated extra/tc/README
32400 +
32401 +
32402 +Version 0.47 to 0.48 (30-OCT-1998)
32403 +====================
32404 +
32405 +Bug fixes
32406 +---------
32407 +
32408 + - ilmid didn't recognize the -u option
32409 + - ATM_GETCIRANGE copied wrong amount of data (fix by Heikki Vatiainen)
32410 + - sch_atm didn't compile without policing enabled (reported by Calin Poenaru)
32411 + - BHLI octets: qgen/msg.fmt allowed nine instead of eight bytes for ISO and
32412 + user specified, include/linux/atmsap.h:ATM_MAX_HLI was 7 instead of 8 (by
32413 + Damian Gilmurray and Paisit Thamsakorn)
32414 + - MPOA: bug fixes and other changes, see atm/mpoa/CHANGELOG (by Heikki
32415 + Vatiainen)
32416 +
32417 +New features
32418 +------------
32419 +
32420 + - ilmid: new option -i to set local IP address (suggested by Andrew May)
32421 + - ilmid now also supports the MIB variables atmfAtmLayerMaxVpiBits and
32422 + atmfAtmLayerMaxVciBits (based on a patch by Uwe Dannowski)
32423 +
32424 +Other changes
32425 +-------------
32426 +
32427 + - ilmid: search for local IP address didn't consider LANE interfaces (lec*)
32428 + - consolidated most of the various calls to gethostbyname and friends into
32429 + text2ip (libatmd)
32430 + - corrected some glitches in net/sched/sch_atm.c (untested)
32431 + - removed debug/encopy, debug/endump, and debug/zndump from the distribution.
32432 + They were almost useless and caused problems with make depend
32433 + - SYMFILES in qgen/Makefile now determines location of atmsap.h at run time to
32434 + avoid problems when kernel headers are not in /usr/include/linux (reported
32435 + by Uwe Dannowski)
32436 +
32437 +
32438 +Version 0.46 to 0.47 (6-OCT-1998)
32439 +====================
32440 +
32441 +Bug fixes
32442 +---------
32443 +
32444 + - qgen didn't build for all UNI versions (fixed by Richard Gooch)
32445 +
32446 +New features
32447 +------------
32448 +
32449 + - ilmid: new option -u to set UNI version (3.0, 3.1, or 4.0). Only available
32450 + if compiled with -DDYNAMIC_UNI.
32451 +
32452 +Other changes
32453 +-------------
32454 +
32455 + - ilmid: getIpAddr: improved robustness and added debugging output
32456 +
32457 +
32458 +Version 0.45 to 0.46 (5-OCT-1998)
32459 +====================
32460 +
32461 +Bug fixes
32462 +---------
32463 +
32464 + - ENI and ZATM driver used to read IRQ directly from PCI configuration,
32465 + bypassing any fixups (reported by Richard Gooch)
32466 + - atmsigd.new: removed "Known bug" memory leak (when tracing)
32467 + - led/lec_ctrl.c: signalling bug fixed, max_sdu now has correct value instead
32468 + of 1 (by Heikki Vatiainen, reported by Josh Baratz <jbaratz@lucentctc.com>
32469 + and Wolfgang Platzer <wplatzer@iaik.tu-graz.ac.at>)
32470 + - lots of MPOA bug fixes and other changes, see atm/mpoa/CHANGELOG (by Heikki
32471 + Vatiainen)
32472 + - atmsigd reported "Q.2931.1" when configured to support Q.2963.1
32473 +
32474 +New features
32475 +------------
32476 +
32477 + - atmsigd.new now supports run-time configuration of the signaling protocol
32478 + version (via atmsigd.conf)
32479 +
32480 +Other changes
32481 +-------------
32482 +
32483 + - added 16W bursts to ENI burst size configuration (NB: 16W may actually be
32484 + *slower* than 8W)
32485 + - lec_ctrl.c: zeppelin now uses LE_REGISTER protocol when TLVs are associated
32486 + with client's MAC address (by Heikki Vatiainen)
32487 +
32488 +
32489 +Version 0.44 to 0.45 (1-OCT-1998)
32490 +====================
32491 +
32492 +Bug fixes
32493 +---------
32494 +
32495 + - ENI driver didn't do four-word bursts on RX for sizes < 8 words
32496 + - arequipad, atmarpd, bus, lecs, les, mpcd, sw_*, and zeppelin silently
32497 + ignored extra command-line arguments instead of complaining
32498 +
32499 +New features
32500 +------------
32501 +
32502 + - ENI: added configuration options to fine-tune burst sizes (in reponse to
32503 + incompatibility found by Dave Airlie)
32504 +
32505 +Other changes
32506 +-------------
32507 +
32508 + - changed the way how ATM-specific data is stored in skbs. Tentatively updated
32509 + the the stack, including drivers. Use CONFIG_ATM_SKB to enable the new-style
32510 + skbs.
32511 + - Rules.make no longer discards the previous value of LDLIBS
32512 + - sw_tcp now only establishes bi-directional VCs if both directions are really
32513 + requested in the QoS structure
32514 + - moved manual switch control from sw_tcp to the generic switch code; "tcpswc"
32515 + is now called "swc", the corresponding switch.conf clause is now
32516 + 'control <path>' instead of 'option control "<path>"'
32517 +
32518 +
32519 +Version 0.43 to 0.44 (24-SEP-1998)
32520 +====================
32521 +
32522 +Bug fixes
32523 +---------
32524 +
32525 + - CONNECT messages no longer contain the AAL type IE if EP ref is present and
32526 + non-zero (reported by Heikki Vatiainen)
32527 + - SSCOP: added mode for partial compatibility with Q.SAAL1 (to get rid of
32528 + warnings reported by Heikki Vatiainen and of interoperability problems with
32529 + Virata switches reported by Damian Gilmurray)
32530 + - ilmid now returns a valid response for atmfMyIpNmAddress (by Uwe Dannowski)
32531 + - configuration on-line help for CLIP didn't work because tag was different
32532 + from configuration variable
32533 + - atmsigd crashed when adding multiple local addresses on an interface
32534 + (reported by Heiko Krupp)
32535 + - atmaddr.8 said "ATMARP" in the header (reported by Hans Einsiedler)
32536 + - net/atm/misc.c didn't include linux/config.h and linux/module.h, causing
32537 + symbols to be missing when rebuilding the kernel after enabling modules
32538 + (reported by Thomas Parvais)
32539 +
32540 +New features
32541 +------------
32542 +
32543 + - new maintenance utility tcpswc to control sw_tcp "switches" (description at
32544 + the end of switch/tcp/README)
32545 + - added support for setting the CLP bit (untested; see doc/README.CLP)
32546 + - added support for policing to the ATM qdisc (untested; see extra/tc/README)
32547 + - ilmid: added support for atmfAtmLayerUniVersion (by Uwe Dannowski)
32548 +
32549 +Other changes
32550 +-------------
32551 +
32552 + - updated the NICStAR driver to version 008b (by Rui Prior)
32553 + - new switch fabric function fab_option to pass configuration options
32554 + - atm2text now also supports unspecified and wildcard components in PVC
32555 + addresses
32556 + - added configuration option CONFIG_ATM_CLIP_NO_ICMP to discard packets for
32557 + which no ATMARP entry exists silently instead of sending an ICMP (this is an
32558 + ugly hack-around for the revalidation problem reported by Gerald Hanusch)
32559 + - various minor documentation updates
32560 + - atmarpd now sends InARP requests when active VC setup completes in order to
32561 + tell the peer our IP address(es)
32562 +
32563 +
32564 +Version 0.42 to 0.43 (21-AUG-1998)
32565 +====================
32566 +
32567 +Bug fixes
32568 +---------
32569 +
32570 + - trying to use atmtcp when compiled as a module with the module not loaded
32571 + crashed the kernel
32572 +
32573 +New features
32574 +------------
32575 +
32576 + - upgraded to the 2.1.117 kernel
32577 + - included NICStAR driver by Rui Prior at INESC (this driver also includes
32578 + parts of an earlier driver written by Matt Welsh, then enhanced by R. D.
32579 + Rechenmacher and Jawaid Bazyar)
32580 + - new atmsigd with support for multiple signaling entities (experimental)
32581 +
32582 +Other changes
32583 +-------------
32584 +
32585 + - removed register dumping code from suni.c (leaked out into the distribution)
32586 +
32587 +
32588 +Version 0.41 to 0.42 (19-AUG-1998)
32589 +====================
32590 +
32591 +Bug fixes
32592 +---------
32593 +
32594 + - atm.patch was out of sync again :-(
32595 +
32596 +
32597 +Version 0.40 to 0.41 (19-AUG-1998)
32598 +====================
32599 +
32600 +Bug fixes
32601 +---------
32602 +
32603 + - 0.40 contained an older atm.patch than the one that was supposed to go with
32604 + it (some changes to sch_atm and MPOA were missing)
32605 + - kernel didn't build with LANE enabled and MPOA disabled (fix by Mitchell
32606 + Blank Jr)
32607 +
32608 +New features
32609 +------------
32610 +
32611 + - MPOA now also supports CBR SVCs (by Heikki Vatiainen and Sampo Saaristo)
32612 +
32613 +Other changes
32614 +-------------
32615 +
32616 + - atmtcp may work as a module (untested)
32617 + - kernel code now uses capabilities instead of suser()
32618 + - removed obsolete recycle_buffer code
32619 + - distribution now also includes mkpatch, the script that's used to create
32620 + atm.patch
32621 +
32622 +
32623 +Version 0.39 to 0.40 (13-AUG-1998)
32624 +====================
32625 +
32626 +Bug fixes
32627 +---------
32628 +
32629 + - ilmid defined the value of "invalid" as 0 instead of 2 (fix by Timo
32630 + Parnanen)
32631 + - bash-2 doesn't like for n in $(SUBDIR); ... if SUBDIR is undefined (fix
32632 + by Heikki Vatiainen)
32633 + - LANE still cleared ATM_VF_RELEASED instead of calling atm_async_release_vcc,
32634 + which apparently led to stray kernel crashes in signaling (found with a lot
32635 + of help from John McPherson)
32636 + - ATM qdisc now properly re-allocates skb memory to grow headers, if necessary
32637 + - atm/switch/Makefile didn't build SUBDIRS
32638 + - atmarpd sent garbage ATM addresses in InARP responses over PVCs (reported by
32639 + Stefan Keller-Tuberg)
32640 +
32641 +New features
32642 +------------
32643 +
32644 + - MPOA (Multi-Protocol Over ATM) client support written by Heikki Vatiainen
32645 + and Sampo Saaristo
32646 + - LANE client (zeppelin) now also supports LANE2 (by Heikki Vatiainen)
32647 +
32648 +Other changes
32649 +-------------
32650 +
32651 + - accept() now also returns on ATM_VF_CLOSE
32652 + - ATM qdisc now uses the same data format on rtnetlink as other qdiscs; new
32653 + option for user-provided headers
32654 + - atm/switch can now use "external" routing (e.g. provided by the fab control)
32655 +
32656 +
32657 +Version 0.38 to 0.39 (4-AUG-1998)
32658 +====================
32659 +
32660 +Bug fixes
32661 +---------
32662 +
32663 + - added missing #include <atm.h> in tcpsw.c (fixed by Heikki Vatiainen)
32664 + - atmsigd allowed both sides to initiate PCR modification; Q.2963.1 only
32665 + allows the connection owner (i.e. the caller) to do this
32666 + - atmarpd no longer tries to use incoming SVCs with zero backward bandwidth
32667 + for ATMARP
32668 + - ENI and ZATM drivers didn't invoke vcc->pop on dev->ops->send failure
32669 + - make install didn't probe correctly for presence of /usr/include/stdint.h
32670 + (needed on GLIBC 1 systems)
32671 + - net/atm/resources.c didn't export bind_vcc to modules (fix by Oliver
32672 + Frommel)
32673 + - net/arpd/atmarp didn't build without make depend (reported by Stefano
32674 + Giacometti)
32675 + - clip_mkip zeroed vcc->rx_inuse and didn't take into account that clip_push
32676 + calls atm_return, which subtracts from vcc->rx_inuse too
32677 + - fixed typos in qgen/uni.h (and msg.fmt) for causes 38, 41, and 43
32678 + - atmsigd wrote exit trace to stderr when it had a dump directory and vice
32679 + versa
32680 + - documentation still claimed that atmtcp yields messages at boot time
32681 +
32682 +New features
32683 +------------
32684 +
32685 + - added flow to ATM VCC mapping queuing discipline (experimental)
32686 + - module for setting up ATM PVC/SVC mappings with "tc" in extra/tc (see
32687 + extra/tc/README)
32688 + - atmarpd: new request type art_query to request resolution without VC setup
32689 + - atmarp: new undocumented option -Q to test art_query
32690 + - added ATMTCP interfaces that survive disconnects (persistent; new atmtcp(8)
32691 + options -p and -r; new ioctls ATMTCP_CREATE and ATMTCP_REMOVE)
32692 +
32693 +Other changes
32694 +-------------
32695 +
32696 + - zeppelin didn't explicitly set the AAL type for outbound connections (by
32697 + Heikki Vatiainen)
32698 + - CLIP also allows SVCs to have no idle timeout at all (timeout = 0)
32699 + - moved SUNI private ioctls (SUNI_GETLOOP and SUNI_SETLOOP) from
32700 + drivers/atm/suni.h to include/linux/atm_suni.h
32701 + - atmarpd now shows QoS information for VCs where it differs from the default
32702 + or where no default is applicable
32703 + - removed the file atm/WARNING, which gave an overly pessimistic perspective
32704 + of the state of things
32705 + - switch: fab_op now returns the cause value plus (optionally) a pointer to
32706 + diagnostics in the callback instead of a simple okay/not okay indication
32707 + - updated and corrected the atmtcp man page
32708 + - further cleanup of the build procedure
32709 + - README now mainly refers to http://lrcwww.epfl.ch/linux-atm/info.html
32710 + - updated and trimmed BUGS
32711 + - added a note to CREDITS indicating its obsolescence
32712 +
32713 +
32714 +Version 0.37 to 0.38 (25-JUN-1998)
32715 +====================
32716 +
32717 +Bug fixes
32718 +---------
32719 +
32720 + - fixed the remaining few #include <linux/atm.h>
32721 + - invoking fcntl() or socketpair() on an ATM socket caused an "Oops" (reported
32722 + by Jonathan Chan)
32723 + - CLIP PVCs caused an "Oops" when cat'ing /proc/atm/pvc (reported by Marko
32724 + Kiiskila and Robert Olsson)
32725 + - atm/qgen/default.nl wasn't removed after build failure
32726 + - debugging switch (sw_debug) did not stop operations after the first error
32727 + - svc_accept returned apparent success instead of -EAGAIN, usually leading to
32728 + a later -ENOTCONN
32729 + - ttcp.c didn't initialize port_name, leading to erratic behaviour when making
32730 + slight changes to the build process
32731 + - atm_pdu2truesize diverged from alloc_skb, leading to sudden failure of VCs
32732 + or of ATMARP (reported by Robert Olsson)
32733 + - corrected use of '~' when applied to unsigned longs representing memory
32734 + addresses in aread, ENI, and ZATM (reported by Wai-Sun Chia)
32735 + - atmtcp and LANE didn't use bind_vcc when setting up control VCs
32736 + - atmtcp got ENOMEM/EBUSY wrong when failing to create an interface
32737 + - sig level <level> in atmsigd.conf didn't affect UNI diagnostics
32738 +
32739 +New features
32740 +------------
32741 +
32742 + - upgraded to the 2.1.105 kernel
32743 + - added ATMTCP "switch" in atm/switch/tcp
32744 + - atmtcp: new mode -s to connect to an ATMTCP "switch"
32745 + - atmtcp: new option -d for debugging output
32746 + - added -b option (the usual "background") to switch/relay.c
32747 +
32748 +Other changes
32749 +-------------
32750 +
32751 + - changed "PDU" to "SDU" in the atmtcp(8) man page
32752 + - atmarpd now includes the interface netmask in ATMARP table dumps
32753 + - added ATM devices also to the Alpha architecture, because at least ATMTCP
32754 + works (by Wai-Sun Chia)
32755 + - added the removal of -Wmissing-prototypes to the 0.37 changes
32756 + - removed -Wcast-align from Rules.make because of a conflict with
32757 + /usr/include/socketbits.h of glibc 2 on Alphas (reported by Wai-Sun Chia)
32758 + - atmsigd.conf.4: documented that debug log stderr works too
32759 + - sap_equal now also allows wildcard matches for BHLI (with SXE_COMPATIBLE)
32760 + - atmsigd now uses -m <mode> instead of -N and -A
32761 + - atmsigd.conf now uses sig mode <mode> instead of sig net
32762 +
32763 +
32764 +Version 0.36 to 0.37 (6-JUN-1998)
32765 +====================
32766 +
32767 +Bug fixes
32768 +---------
32769 +
32770 + - lib/atm.h defined AF_ATMPVC to 20, but the correct value is 8. Likewise,
32771 + AF_ATMSVC should be 20, not 21. (Reported by Luke Diamand)
32772 + - fixed bad ASN encoding in ilmid (by Vesa-Matti Puro)
32773 + - make install and make instdirs didn't stop on error
32774 +
32775 +New features
32776 +------------
32777 +
32778 + - upgraded to the 2.1.104 kernel
32779 + - included a script to demonstrate the debug switch (see switch/debug/README)
32780 +
32781 +Other changes
32782 +-------------
32783 +
32784 + - moved definitions not used by the kernel from linux/atmarp.h to atmarp.h
32785 + - removed linux/atm_stdint.h (linux/types.h has now caught up)
32786 + - changed ENI and ZATM driver to use new PCI interface
32787 + - net/atm/clip.c no longer uses ether_setup (suggested by Alexey Kuznetsov)
32788 + - more header file cleanup (main change: applications should now
32789 + #include <atm.h> instead of #include <linux/atm.h>)
32790 + - removed -Wmissing-prototypes from Rules.make because of a conflict with
32791 + include/linux/byteorder/swab.h
32792 +
32793 +
32794 +Version 0.35 to 0.36 (23-APR-1998)
32795 +====================
32796 +
32797 +Bug fixes
32798 +---------
32799 +
32800 + - changed the numeric values of PF/AF_ATMPVC/SVC and SOL_ATM/AAL to avoid
32801 + conflicts with other allocations. This breaks binary compatibility with
32802 + ATM programs compiled under older kernels
32803 + - RESTART ACK was sent with the wrong class when acknowledging the restart of
32804 + the indicated virtual channel (fix by Mohsen Souissi)
32805 + - RELEASE was retransmitted forever (to avoid having to perform a RESTART),
32806 + although it's sufficient to retransmit once and then drop the connection
32807 + - esi.c checked the kernel version code without including linux/version.h
32808 + - CLIP changes magically fixed hangs on SICGIFCONF (reported by Wayne Salamon)
32809 + - atmsigd usually didn't set pvc.sap_family in ISP messages
32810 +
32811 +New features
32812 +------------
32813 +
32814 + - added build-time option -DTHOMFLEX to send RESTART when SAAL comes up, which
32815 + works around a bug in some Thomson Thomflex 5000 switches (by Mohsen
32816 + Souissi)
32817 + - atmtcp: new option "-i itf" to request a specific interface number
32818 + - the "debug switch" (switch/debug/sw_debug) is now capable of successfully
32819 + signaling a UNI 3.x call (see switch/debug/README for details)
32820 +
32821 +Other changes
32822 +-------------
32823 +
32824 + - atm_equal can now also compare PVC addresses. The argument type has
32825 + therefore been changed from struct sockaddr_atmsvc * to struct sockaddr *
32826 + - moved driver-private data from skb->atm.* into skb->cb
32827 + - complete redesign of communication between atmarp(8) and atmarpd(8) (now
32828 + uses a UNIX domain socket; suggested by Alexey Kuznetsov)
32829 + - atmarp -a now also produces correct output if atmarpd is running with -d
32830 + - removed clip(8)
32831 + - moved atmarp(8) from atm/ip into atm/arpd, removed atm/ip
32832 + - /proc/atm/svc shows listening sockets again
32833 + - cleaned up a few cases where diag(...,DIAG_FATAL,...) was followed by an
32834 + "else" or a "return".
32835 + - atmsigd now uses Unix domain sockets (instead of named pipes) to communicate
32836 + with non-kernel ISP users (updated test/isp too)
32837 + - net/atm/resources.c:atm_dev_register can now be asked to assign a specific
32838 + interface number (-1 yields the old behaviour)
32839 +
32840 +
32841 +Version 0.34 to 0.35 (27-MAR-1998)
32842 +====================
32843 +
32844 +Bug fixes
32845 +---------
32846 +
32847 + - ilmid compared memcmp results with -1,1, which fails under optimization
32848 + (fixed by Damian Gilmurray)
32849 + - various fixes and cleanup in how CLIP interacts with the neighbour cache
32850 + (spotted by Alexey Kuznetsov)
32851 + - Rules.make complained about missing "optprocess" command on some occasions
32852 +
32853 +New features
32854 +------------
32855 +
32856 + - upgraded to the 2.1.90 kernel
32857 + - added some components for ATM switch control (not properly integrated yet,
32858 + so they don't do anything useful at the moment; written by Roman Pletka)
32859 +
32860 +Other changes
32861 +-------------
32862 +
32863 + - eliminated various compiler warnings when compiling with glibc2
32864 + - removed clip_hard_header (suggested by Alexey Kuznetsov)
32865 +
32866 +
32867 +Version 0.33 to 0.34 (13-MAR-1998)
32868 +====================
32869 +
32870 +Bug fixes
32871 +---------
32872 +
32873 + - eni.c didn't include config.h (fix by Pete Wyckoff)
32874 + - (yet another) VCC list handling bug (fixed by Heikki Vatiainen)
32875 + - kernel also applied idle timeout to CLIP PVCs
32876 + - make clean didn't remove test/errnos.inc
32877 + - atmsigd errored as_connect and as_accept with as_close instead of as_error
32878 + - eni: bandwidth was sometimes reserved for UBR VCs
32879 + - eni: checking of bandwidth changes was broken
32880 + - eni: error handling after failed bw change checks destroyed the free list
32881 + - test/errnos.inc sometimes wasn't generated because of mtime granularity (fix
32882 + by Brian Armstrong and Corinne Rosier)
32883 + - fixed use of return code of get/put_user and copy_from/to_user
32884 + - kernel: fixed a few minor race conditions
32885 + - ATM_GETADDR left address list locked on fault
32886 + - maximum length of high layer information was 7 bytes instead of 8 for ISO
32887 + and User Specific high layer information (reported by Damian Gilmurray)
32888 + - some tools didn't include errno.h although they use errno or Exxx
32889 + - atmsigd usually accessed deallocated memory when writing traces, which
32890 + sometimes led to crashes (reported by Heikki Vatiainen)
32891 + - indentation of the first two lines of UNI signaling messages in traces was
32892 + missing
32893 + - LANE: duplicate data direct connections to entities where we already
32894 + have a connection are now forbidden. LES and BUS can now co-reside.
32895 + (Reported by Jean-Francois Moine, fixed by Heikki Vatiainen)
32896 + - LANE: plugged a file descriptor leak (by Heikki Vatiainen)
32897 + - atmsigd.conf.4 incorrectly stated that diagnostics must have a higher
32898 + priority than the specified level to get printed (they're also printed if
32899 + their priority is equal to that level)
32900 + - zatm driver didn't virt_to_bus the back pointer of TX rings, leading to
32901 + crash after sending the 32nd PDU of a VCC (reported by Ajay Bakre)
32902 + - zatm_feedback sometimes returned with interrupts disabled
32903 + - ENI driver didn't treat requests for UBR at link speed as "unlimited" and
32904 + allocated one shaper for each such VCC
32905 + - atm_async_release_vcc now has its own flag ATM_VF_CLOSE. Overloading
32906 + ATM_VF_RELEASED caused hung SVCs under some conditions.
32907 + - atmsigd sometimes released listening sockets before kernel completed its
32908 + cleanup, yielding warnings and zombies
32909 + - atmsigd accessed already deallocated data structures when handling
32910 + unparseable signaling messages
32911 +
32912 +
32913 +New features
32914 +------------
32915 +
32916 + - upgraded to the 2.1.79 kernel
32917 + - CLIP now handles NETDEV_CHANGE (proposed by Pete Wyckoff; untested)
32918 + - various minor signaling changes for operation as switch control
32919 + - new device operation proc_read: device drivers can now register in /proc
32920 + (e.g. /proc/atm/eni:0)
32921 + - added some more BHLI definitions to include/atmsap.h, including draft
32922 + mapping of well-known TCP/UDP port numbers
32923 + - added support for TIOCOUTQ/TIOCINQ on native ATM
32924 + - new library function sap_equal
32925 + - added convenience function atmpvc_addr_in_use to linux/atm.h
32926 + - major overhaul of "isp", which is now a good tool for signaling regression
32927 + tests. See atm/test/README.isp
32928 + - LANE can now be compiled as a kernel module (by Heikki Vatiainen)
32929 + - new tool debug/svctor.c to torture signaling by setting up and releasing
32930 + lots of SVCs (see the source for details)
32931 +
32932 +Other changes
32933 +-------------
32934 +
32935 + - cleaned up the copying terms: libraries are now covered by LGPL instead of
32936 + GPL and qgen doesn't "taint" the code it generates
32937 + - atmarpd: IP addresses are now __u32 instead of unsigned long
32938 + - atmarpd: changed printf("... %08x ...",(unsigned long) ptr) to %p ...",ptr
32939 + - /proc support now allocates inode numbers dynamically
32940 + - added comment to clarify motivation for useless buffer alignment in aread.c
32941 + (reported by Jeon Jong Hwan)
32942 + - suni.c and uPD98402.c: SONET_GETSTATZ no longer clears the statistics if the
32943 + copy faults
32944 + - ilmid should now work on any interface (patch by Heikki Vatiainen)
32945 + - changed all __uNN of tools to uintNN_t for glibc2-compatibility
32946 + - added stdint.h to lib for compatibility with future versions of glibc2
32947 + - various other evil hacks in tools to make things compile with glibc2
32948 + - the NIC debugging programs ed, encopy, endump, zndump, and znth are no
32949 + longer built and installed by default
32950 + - for compatibility with POSIX 1003.1g, accept now returns ECONNABORTED
32951 + instead of ECONNREFUSED if connection is already gone (proposed by Heikki
32952 + Vatiainen)
32953 + - listening sockets now return instantly if the signaling demon dies
32954 + - various minor LANE updates to track API changes (by Heikki Vatiainen)
32955 + - SUNI now also warns if signal is missing at initialization time
32956 + - zatm: added work-around for unfair buffer space accounting
32957 + - clarified some of atmarpd's diagnostics
32958 + - documentation updates
32959 +
32960 +
32961 +Version 0.32 to 0.33 (19-NOV-1997)
32962 +====================
32963 +
32964 +Bug fixes
32965 +---------
32966 +
32967 + - SSCOP did poll sequence number comparisons in the (data) sequence number
32968 + space, typically leading to periodic SSCOP restarts (reported by Heikki
32969 + Vatiainen)
32970 + - atmsigd now releases calls on receipt of STATUS with call state 0 (reported
32971 + by Heikki Vatiainen)
32972 + - qgen tried to print the names of unnamed groups (fix by Simon Leinen)
32973 + - make clean in qgen left all the .c and .h files produced by qgen
32974 + - minor fixes to signaling message format description (qgen/msg.fmt,
32975 + previously qgen/uni*)
32976 + - /usr/include/atm.h was calling itself "atmlib" (found by Leena Chandran)
32977 + - atmsigd: the address format of the calling party number was used to
32978 + determine the format of the called party number in a SETUP message
32979 + - added some semicolons to Rules.make for bash 2.0 compatibility (by Tan Chang
32980 + Hu and Rolf Kunisch)
32981 + - select/poll indicated an exception when a non-blocking connect terminated.
32982 + Now it indicates writability, and an error only if the connect failed.
32983 + - LES/BUS can now co-exist at the same address (by Heikki Vatiainen)
32984 + - fixed race condition between asynchronous release (e.g. on ATMARP idle timer
32985 + expiration) and signaling demon response
32986 + - fixed a typo "[itf]." instead of "[itf.]" in atmsigd.conf.8
32987 + - "ATM drivers" kernel configuration section is no longer a top-level menu
32988 + item but it's now under "Network devices"
32989 + - sigd_close forgot to purge VCs not connected to devices (e.g. closing ones),
32990 + so they hung
32991 + - the list of unconnected VCs was sometimes garbled
32992 + - atmsigd printed null string for as_itf_notify message name when debugging
32993 + - Arequipa: check_aq_vcc also accepted VCs that were already released by
32994 + signaling
32995 + - ATM_VF_PARTIAL and ATM_VF_BOUND had the same value
32996 + - atmaddr still used old calling convention of ATM_GETNAMES
32997 + - the atmarpd man page referred to atmarpd as "atmsigd"
32998 + - various atmtcp bug fixes
32999 + - atm_recvmsg sometimes returned with interrupts disabled (reported by Pete
33000 + Wyckoff)
33001 + - fixed ttcp_atm dependencies (.depend contains dependencies for "ttcp.o")
33002 + - UNI message format: "more" was missing for def_pck_size
33003 + - eni/suni didn't compile as modules (fixed by Pete Wyckoff and Ladislav
33004 + Lhotka)
33005 + - further net/atm/Makefile cleanup
33006 + - arequipa_close always left the socket with arequipa_expect enabled. Now it
33007 + returns it to the previous state.
33008 + - ENI driver was leaking buffer memory on failure of set_tx
33009 + - atmarpd didn't print symbolic names of "new" flags (ATF_ARPSRV, etc.)
33010 + - ATM ARP server didn't make client entries public (reported by Tom Mahieu)
33011 + - drivers/atm/Config.in had extra "endmenu" (fixed by Ladislav Lhotka)
33012 + - atmarpd got confused when receiving InARP reply without source ATM address
33013 + - atmsigd sometimes didn't stop timers if Q.2963.1 wasn't enabled
33014 + - when rejecting a call, the kernel freed the VCC twice
33015 +
33016 +New features
33017 +------------
33018 +
33019 + - merged source tree (except Arequipa, single-copy, and various NIC drivers)
33020 + with 2.1.65-Linus tree
33021 + - qgen can now handle repeated information elements
33022 + - added ATM_SETESI[F] ioctl and esi utility (boards without a real ESI in ROM
33023 + should now set the default ESI to 0x000000000000)
33024 + - new socket option SO_ATMSAP along with struct atm_sap (using a fixed-size
33025 + BLLI array instead of the linked list in struct sockaddr_atmsvc)
33026 + - added Q.2963.1 PCR modification in signaling and the ENI driver
33027 + - aread: new option -c to print received data as characters (similar to od -c)
33028 + - new tool test/align to test handling of mis-alignment in NIC drivers
33029 + - atmsigd now supports policy restrictions for incoming/outgoing calls (see
33030 + atmsigd.conf.4, "policy")
33031 + - atmsigd can now also use a pair of named pipes (or, actually, any named
33032 + object in the file system) for communicating with the user of signaling
33033 + (normally the kernel)
33034 + - new tool called "isp" (for "Internal Signaling Protocol") to talk ISP with
33035 + atmsigd over named pipes
33036 + - new functions sap2text and text2sap to converts SAPs to/from textual
33037 + representation, and a sap(7) man page
33038 + - new traffic parameter field "pcr" to indicate the desired PCR. min_pcr and
33039 + max_pcr can the be used to indicate the acceptable range.
33040 + - new function atm_pcr_goal to help drivers to interpret traffic parameters
33041 +
33042 +Other changes
33043 +-------------
33044 +
33045 + - removed some more obsolete CLIP-related ioctls
33046 + - qgen: simplified generation of engines with a prefix other than "q" or "qd"
33047 + - ENI and ZATM drivers now use shareable interrupts
33048 + - cleaned up some 32bit-isms in ENI driver
33049 + - cleaned up several 32bit-isms in SSCOP (reported by Tan Chang Hu)
33050 + - SSCOP: work-arounds for buggy ntohl prototype in some early versions of
33051 + glibc (reported by Tan Chang Hu, further explored by David S. Miller and
33052 + Richard Henderson)
33053 + - started updating the ZATM driver for 2.1 (still crashes under load)
33054 + - added missing 2.1 pieces in ENI's SUNI driver
33055 + - added __initfunc and __initdata where appropriate
33056 + - tools tree now compiles under 0.31 (2.0.25 kernel) and 0.33 (2.1.55 kernel)
33057 + - gratuitous improvement of identifier tree allocation in qgen
33058 + - the interface number is now optional for sonetdiag (like for atmdiag)
33059 + - started implementing the kernel side of point-to-multipoint signaling
33060 + support
33061 + - /proc/atm/arp now displays "resolving" or "expired" (with the number of
33062 + times the entry is referenced) instead of "incomplete".
33063 + - moved ATM_MAX_BLLI from linux/atm.h to linux/atmsap.h
33064 + - changed ttcp_atm to use SO_ATMSAP (if available) to set BHLI
33065 + Note: ttcp_atm previously didn't use a BHLI, so old and new versions of
33066 + ttcp_atm don't interoperate.
33067 + - updated all other programs using SAPs too, except for LANE
33068 + - ENI: failure to allocate a traffic shaper now yields EBUSY instead of EAGAIN
33069 + - instead of just complaining, the ENI driver now handles all kinds of
33070 + mis-alignment in the TX path properly
33071 + - re-implemented send and receive side of Arequipa
33072 + - merged qgen/uni3x and qgen/uni40 into msg.fmt
33073 + - added missing Q.2931/UNI 4.0 items to qgen/q2931.h and msg.fmt
33074 + - also added BLLI L3 H.310 codepoint with related encodings
33075 + - various file name and identifier changes to give a more appropriate name
33076 + (e.g. "uni" or "call") to something that's never been Q.2931
33077 + - added library dependencies
33078 + - atmsigd produces more readable and usually more comprehensive debugging
33079 + output
33080 + - atmsigd.conf.4 now mentions that -d is the debugging output addict's choice
33081 + - all programs accepting -l syslog now also accept -l stderr. (This is useful
33082 + for atmsigd if atmsigd.conf sets logging to something else.)
33083 + - atmsigd now issues ATM_GETADDR ioctls on the signaling socket, not on the
33084 + kernel socket
33085 + - WARNING: text2qos: "pcr" is no longer a synonym for "max_pcr" !
33086 + - text2qos now refuses min_pcr=max
33087 + - device driver interface: removed vcc->peek; device drivers now choose their
33088 + own allocation strategy (change motivated by bug report from Furquan Ansari)
33089 + - drive driver interface: new helper functions atm_charge/atm_return to handle
33090 + buffer space allocation
33091 + - device driver interface: vcc->push no longer allocates buffer space. This is
33092 + now done by the driver, via atm_charge
33093 + - updated eni, zatm, and atmtcp to use the new mechanism
33094 + - zero padding in eni driver failed due to mis-alignment on some systems
33095 + (fixed by Pete Wyckoff)
33096 + - various compiler warnings removed (by Pete Wyckoff)
33097 + - removed support for pre-AREQUIPA_WORK mechanism
33098 + - arequipa close mechanism cleanup
33099 + - further cleaned up QOS parameter checking
33100 + - new ISP message as_identify for parallel call processing (not supported yet)
33101 + - zatm: renamed struct zatm_thist to struct zatm_t_hist after wondering
33102 + myself what on earth "this t" could be ...
33103 + - doc/Makefile now invokes dvips with -o
33104 +
33105 +
33106 +Version 0.31 to 0.32 (10-JUL-1997)
33107 +====================
33108 +
33109 +Bug fixes
33110 +---------
33111 +
33112 + - manipulation of local ATM addresses didn't check for permission
33113 +
33114 +New features
33115 +------------
33116 +
33117 + - ilmid now supports the system group and a couple of ILMI MIB objects (by
33118 + Scott Shumate)
33119 + - device and VCC allocation is now dynamic
33120 + - E.164 addressing support and corrections to address coding in uni3x/uni40
33121 + (by S. A. Wright, T. C. Jepsen, and Z. Zhang)
33122 + - support for device de-allocation via per-device operation dev_close
33123 +
33124 +Other changes
33125 +-------------
33126 +
33127 + - upgrade to kernel version 2.1.37
33128 + - ENI driver cleanup (uses readl/writel, skb_put, etc.)
33129 + - socket option handling has changed: optval is now void * (to improve
33130 + compile-time type checking) and optlen is int (not int *) in getsockopt
33131 + - socket option "names" now encode the level and the size (based on an idea of
33132 + Elwyn Davies)
33133 + - cleaned up some of the #includes in net/atm/proc.c
33134 + - total rewrite of ATMTCP (now the data forwarding is done in user space,
33135 + which makes things slower but a lot more flexible)
33136 + - separated PDU parsing and printing from SSCOP state machine
33137 + - new per-device operation dev_close to shut down devices
33138 + - changed a few DIAG_WARNs to DIAG_INFO in ilmid
33139 +
33140 +Removed features
33141 +----------------
33142 +
33143 + - polled ATM devices are no longer supported
33144 + - CLIP is gone (use ATMARP instead)
33145 + - Arequipa and LANE don't work yet (will come back later)
33146 +
33147 +
33148 +Version 0.30 to 0.31 (22-APR-1997)
33149 +====================
33150 +
33151 +Bug fixes
33152 +---------
33153 +
33154 + - atmarpd even refused IP address changes by the ATMARP server, which
33155 + typically led to the creation of one extra SVC
33156 + - ATMARP timeouts were computed at the wrong place (found by Gerald Hanusch)
33157 + - aqtest's usage didn't mention the -v option
33158 + - some tools used 0x%p instead of %p (which is fine in the kernel, by the way)
33159 + - skb_migrate didn't update skb->list
33160 + - zeppelin: incurred spurious core dumps on unsuccessful attempts to connect
33161 + to LANE servers, ESI parsing from command line seg faulted, obtaining ESI
33162 + from NIC left an ATM socket hanging, man page didn't describe all options
33163 + (by Marko Kiiskila and Heikki Vatiainen)
33164 +
33165 +Other changes
33166 +-------------
33167 +
33168 + - arequipa_close now only returns after the Arequipa connection has been
33169 + successfully closed. This allows applications to reliably close and
33170 + re-create Arequipa SVCs, e.g. to change the traffic parameters.
33171 + - the arequipad operations 3rd party close and synchronization are now handled
33172 + inside the kernel and survive arequipad restarts
33173 +
33174 +
33175 +Version 0.29 to 0.30 (10-APR-1997)
33176 +====================
33177 +
33178 +Bug fixes
33179 +---------
33180 +
33181 + - atmtcp didn't use vcc->push and therefore got the buffer usage accounting
33182 + wrong (fix by Gerald Hanusch)
33183 + - when closing a VC, the ENI driver didn't wait until all TX data has really
33184 + left the board, which created a close/open race (found by Richard Jones)
33185 + - SSCOP sometimes omitted the last element in a STAT PDU (fix - even with
33186 + optimization vs. Q.2110 - by Ngo Bach Long)
33187 + - atmarpd allowed ARP information to change permanent entries (found by Gerald
33188 + Hanusch)
33189 + - atmsigd's get_pvc used the maximum SDU size, thereby wasting buffer space
33190 + very quickly, which led to signaling problems (reported by Richard Jones and
33191 + Rik Wade)
33192 + - oops, the BUGS file was always one version number ahead
33193 + - ATMARP had a race between packets sent by the remote station and the
33194 + ATMARP_MKIP ioctl. This caused the dreaded "unknown hw protocol 0xaaaa"
33195 + error. (Finally fixed thanks to a dump provided by Patrick Flynn)
33196 + - Arequipa had the same race for AREQUIPA_INCOMING. This probably caused the
33197 + occasional "loss" (they were actually kept in vcc->recvq until the
33198 + connection was closed) of the first packet(s).
33199 +
33200 +
33201 +Version 0.28 to 0.29 (4-APR-1997)
33202 +====================
33203 +
33204 +Bug fixes
33205 +---------
33206 +
33207 + - saal/sscop.c: NORMALIZE macro was weird and broken (fix by Ngo Bach Long)
33208 + - InARP queries didn't contain the target ATM address, even if it is known,
33209 + which stretches the allowances RFC1577 makes for violating RFC1293 (found
33210 + by Juha Heinanen)
33211 + - tcp_conn_request: Arequipa modification to MTU size calculation used wrong
33212 + socket (fix by Gerald Hanusch)
33213 + - kernel ATMARP table handling had some obscure races
33214 + - temporary work-around: added A2T_LOCAL when using A2T_NAME in atmsigd and
33215 + atmarpd. Before, systems using ANS where the name server is reached via (IP
33216 + over) ATM exhibited truly bizarre failure patterns when refreshing ATMARP
33217 + entries. (With a lot of help from Juha Heinanen)
33218 + - ditto for arequipad, although the effects were less dramatic
33219 + - atmarpd: if not using -m, incoming connections for which a valid entry
33220 + already existed (e.g. due to manual configuration) were not entered in the
33221 + kernel ATMARP table until after the entry timed out for the first time (by
33222 + Gerald Hanusch)
33223 + - skb data areas are now aligned using skb_reserve instead of directly
33224 + tampering with skb->data (and forgetting skb->tail in the process ...)
33225 + (found by Uwe Dannowski)
33226 +
33227 +New features
33228 +------------
33229 +
33230 + - atmarpd is now automatically notified of IP over ATM interfaces already
33231 + existing at startup. This greatly simplifies the atmarpd restart ritual.
33232 + (All ATMARP table entries and the default QoS are still lost, though.)
33233 +
33234 +Other changes
33235 +-------------
33236 +
33237 + - cleaned up some weird and partially dead code in arpd/arp.c (found by
33238 + Gerald Hanusch)
33239 + - removed superfluous continue in arp.c:atmarp_setentry
33240 + - device-driver specific declarations now reside in
33241 + /usr/include/linux/atm_<drv_name>.h, so that disgusting hacks like
33242 + #include "/usr/src/linux/..." can be avoided (based on proposal by Uwe
33243 + Dannowski)
33244 + - updated the list of supported NICs in README and the on-line help
33245 + - arpd/atmarpd.8: documented that atmarpd -m may violate RFC1577 in subtle
33246 + ways (pointed out by Gerald Hanusch)
33247 + - updated MPR usage description to version 1.5 and removed mpr.patch
33248 + - removed MEM_DEBUG from the build process (MPR 1.5 initializes itself
33249 + automatically)
33250 +
33251 +
33252 +Version 0.27 to 0.28 (27-MAR-1997)
33253 +====================
33254 +
33255 +Bug fixes
33256 +---------
33257 +
33258 + - atmarpd restarted timers on as_valid -> as_valid transitions, illegally
33259 + delayed necessary refreshes (reported by Juha Heinanen)
33260 + - SSCOP cleared POLL timer on IDLE timer expiry (fix by Ngo Bach Long)
33261 + - atmsigd didn't initialize "now" soon enough, causing an unnecessary
33262 + retransmission of the first BGN PDU (by Ngo Bach Long)
33263 + - atmsigd responded to RELEASE COMPLETE in ss_rel_ind with a STATUS instead of
33264 + entering ss_wait_close (by Steve Pope)
33265 +
33266 +New features
33267 +------------
33268 +
33269 + - new tool aqpvc to declare incoming Arequipa traffic on a PVC to the system
33270 + (caveat: removing such a PVC can turn out to be surprisingly difficult)
33271 +
33272 +Other changes
33273 +-------------
33274 +
33275 + - removed some useless code in atmarpd's handling of VC disconnects
33276 + - removed unused signaling state ss_hold (equivalent to ss_wait_rel)
33277 +
33278 +
33279 +Version 0.26 to 0.27 (11-MAR-1997)
33280 +====================
33281 +
33282 +Bug fixes
33283 +---------
33284 +
33285 + - oops, forgot to include atm/lib/rtf2e164_cc.pl in the distribution
33286 + - atmsigd's VCI allocation in -N mode was too simplistic and failed after some
33287 + signaling activity (reported by Richard Jones)
33288 + - atm_connect was rejecting ATM_{VPI,VCI}_ANY
33289 + - aq_prev in the list of Arequipa connections wasn't set properly, leading to
33290 + random crashes when using Arequipa (found and fixed by Richard Jones, after
33291 + weeks of tearing his hair out)
33292 + - arequipa_close didn't remove the Arequipa route, which kept the upper layer
33293 + protocol connection alive for a rather long time (reported by Richard Jones)
33294 +
33295 +New features
33296 +------------
33297 +
33298 + - ilmid enhancements: vastly improved retry mechanism, workaround for a bug in
33299 + the ATML Virata switch, -v option for very detailed debug output (Scott
33300 + Shumate)
33301 + - atmsigd now also accepts the signaling VC as a command line argument
33302 + - qos2text appended colon to traffic type even if nothing else followed
33303 + - new program debug/aqtest to test Arequipa (based on work by Mehdi Tazi)
33304 +
33305 +Other changes
33306 +-------------
33307 +
33308 + - added a few missing NULLs to struct atmdev_ops initialization in various
33309 + drivers (this change does not alter any semantics)
33310 + - changed printk ...%lx... (unsigned long) ptr to ...%p... ptr at many
33311 + places
33312 + - removed atm/lib/rtf2cc.pl and atm/lib/cc.inc (they were only used by an
33313 + interim version of cc_len)
33314 + - atmarp's usage no longer contains lines longer than 80 characters
33315 + - added get_logfile() and get_verbosity() to libatm (for ilmid, by Scott
33316 + Shumate)
33317 + - select() consumed CPU time unnecessarily if testing for one direction while
33318 + there's a lot of activity in the other direction (e.g. atmarpd wasted cycles
33319 + in select() for each outbound packet while waiting for ARP messages)
33320 + - the value of ATM_AAL0 has changed (from zero to 13), so all programs using
33321 + AAL0 need to be recompiled
33322 + - MAX_ATM_QOS_LEN has changed, so most programs using qos2text need to be
33323 + recompiled
33324 + - the AAL can now also be set along with the QoS parameters. This approach
33325 + should be used instead of specifying it in the socket() call.
33326 + - if no AAL is specified, the kernel now defaults to AAL5 (was AAL0)
33327 + - updated most demons, tools, and library functions to set the AAL along with
33328 + the QoS parameters
33329 +
33330 +
33331 +Version 0.25 to 0.26 (29-JAN-1997)
33332 +====================
33333 +
33334 +Bug fixes
33335 +---------
33336 +
33337 + - ATMARP VCCs could stay around forever even after timing out, because the
33338 + process was not woken up.
33339 + - the ATMARP "fix" in 0.25 introduced an infinite loop. Fixed that one too.
33340 + - bit 8 in octets 6 and 7 of BLLI ("ext") were set to 1 instead of 0 when
33341 + using ATM_L2_USER/ATM_L3_USER (reported by ukl2@rz.uni-karlsruhe.de)
33342 + - qlib added silly offset (which fortunately happened to be zero most of the
33343 + time) to dumps of large fields (fixed by Jean-Francois Moine)
33344 + - IP over ATM restricted MTU changes to valid Ethernet MTU sizes
33345 + - LANE: fixed two bugs that crashed zeppelin when the connection to the
33346 + servers failed (by Marko Kiiskila)
33347 +
33348 +New features
33349 +------------
33350 +
33351 + - lib/ans.c now properly computes the length of the country prefix of E.164
33352 + addresses for reverse lookups (needs file /etc/e164_cc, see USAGE)
33353 + - if the new -m option is set, atmarpd now merges incoming calls into the
33354 + ATMARP table if the ATM address is known (see atmarpd.8 for details)
33355 + - included an RPM spec file (this is still very experimental)
33356 + - NICStAR driver now also works with IP over ATM (by Stuart Daniel)
33357 + - usage.txt: added description of how to run ATM NICs back-to-back (by Richard
33358 + Jones)
33359 +
33360 +Other changes
33361 +-------------
33362 +
33363 + - signaling traces now also include SAAL up/down transitions
33364 + - qgen no longer (unnecessarily) depends on libatm.a
33365 + - started work on letting qgen handle items that appear at more than one
33366 + place, e.g. repeated IEs (after an idea by Jean-Francois Moine)
33367 + - did some cleanup and added comments to qlib.[ch]
33368 + - added -m option to atmarp in config/redhat-4.0/atm.init
33369 + - added new make target "filenames" to generate a list of all the files which
33370 + are installed
33371 + - config/redhat-4.0 now contains an example hosts.atm file and also a Makefile
33372 + for more convenient installation
33373 + - atmsigd now reads atmsigd.conf before parsing the command-line options,
33374 + thereby allowing values set in the file to be superseeded
33375 + - atmsigd now also logs the internal reference and the caller's address on
33376 + calls establishment
33377 + - ilmid: very dirty hack to give switches some time to process ILMI cold start
33378 + (by Joseph Evans)
33379 +
33380 +
33381 +Version 0.24 to 0.25 (20-DEC-1996)
33382 +====================
33383 +
33384 +Bug fixes
33385 +---------
33386 +
33387 + - net/atm/atmarp.c:idle_timer_check only expired every other entry (reported
33388 + by Marko Kiiskila)
33389 +
33390 +New features
33391 +------------
33392 +
33393 + - LANE now also supports IPX (SNAP and 802.3; by Marko Kiiskila)
33394 + - NICStAR driver now supports VPI != 0 and has configurable settings in
33395 + nicstar.h (by Stuart Daniel)
33396 +
33397 +Other changes
33398 +-------------
33399 +
33400 + - ENI: TX DMA scratch are is now stored per device. This should allow multiple
33401 + NICs to coexist.
33402 +
33403 +
33404 +Version 0.23 to 0.24 (29-NOV-1996)
33405 +====================
33406 +
33407 +Bug fixes
33408 +---------
33409 +
33410 + - atm/test/window.c was missing in 0.23
33411 + - atm/debug/delay didn't build unless atm/lib headers were already installed
33412 + in /usr/include
33413 + - atm/debug/znth had undefined return value
33414 + - SSCOP: fixed typo (that could probably kill the SSCOP connection in case of
33415 + a retransmission); fix by Olivier Bonaventure
33416 + - corrected unnecessarily large buffer allocation in zatm.c:pool_index (by
33417 + Jonathan Larmour)
33418 + - hosts2ans.pl generated reverse addresses for the domain "ATM.INT" instead of
33419 + "ATMA.INT"
33420 + - atmarpd "forgot" any pre-set QOS when receiving new ARP information for the
33421 + respective entry (reported by Gerald Hanusch)
33422 + - window scale didn't scale the window sent in the SYNACK packet (reported by
33423 + Juan-Antonio Ibanez)
33424 + - LANE: better connection failure handling in zeppelin (by Marko Kiiskila)
33425 + - LEC kernel timer wasn't restarted when restarting zeppelin (found by Gerald
33426 + Hanusch, fixed by Marko Kiiskila)
33427 + - LANE: le_flush_request was sent too early when establishing connection (by
33428 + Marko Kiiskila)
33429 + - zeppelin stopped operation (unwantedly) in random cases when LANE servers
33430 + were down (by Marko Kiiskila)
33431 + - LANE: non-blocking connections, VCC and LE ARP timeouts, and TLV fields in
33432 + LE_CONFIG_RESPONSE fixed (by Marko Kiiskila)
33433 +
33434 +New features
33435 +------------
33436 +
33437 + - atm2text now also uses ANS
33438 + - signaling traces now also contain error reports from qgen
33439 + - added new build-time configuration option "CISCO" (in atm/Rules.make) to
33440 + work around a bug in Cisco's point-to-multipoint signaling
33441 + - included example configuration files for RedHat 4.0 (see
33442 + atm/config/redhat-4.0/README)
33443 +
33444 +Other changes
33445 +-------------
33446 +
33447 + - local variable "link" in atm/debug/delay.c:loop was shadowing "link" system
33448 + call
33449 + - cleaned up various Makefiles
33450 + - qgen: bytes left in qet_space are now more meaningful
33451 + - named (ANS) now also starts even if atmsigd is not running and retries to
33452 + create the ATM socket in 15 minute intervals until is succeeds (by Marko
33453 + Kiiskila)
33454 + - LANE: (too) short le_flush_responses (Cisco 7010, sw ??.??) are now handled
33455 + (by Marko Kiiskila)
33456 +
33457 +
33458 +Version 0.22 to 0.23 (16-NOV-1996)
33459 +====================
33460 +
33461 +Bug fixes
33462 +---------
33463 +
33464 + - fixed stupid typos in atm/lib/atmres.h and an unnecessary dependency on
33465 + libresolv.a in atm/lib/Makefile (reported by Gerald Hanusch)
33466 + - fixed warning about implicit declaration of function bigphysarea_init in
33467 + init/main.c
33468 + - I think I fixed the SSCOP VR(MR) problems that were first reported by
33469 + Edouard Lamboray in '95, then by Heinz Schuerch, and that finally led to a
33470 + total SSCOP breakdown (in 0.22) reported by Gerald Hanusch
33471 +
33472 +New features
33473 +------------
33474 +
33475 + - integrated the IDT 77201 (NICStAR) driver by Matt Welsh and Stuart Daniel
33476 + <stuartd@eecs.umich.edu>. Note that this driver currently only supports
33477 + native ATM.
33478 + - new throughput and latency benchmark test/window (by Matt Welsh)
33479 +
33480 +Other changes
33481 +-------------
33482 +
33483 + - upgrade to kernel version 2.0.25
33484 + - changed drivers/atm/eni.c:do_tx:dma to static in order to reduce kernel
33485 + stack use (by 480 bytes). Note that this hack may crash systems with more
33486 + than one ENI adapter.
33487 + - qlib now also complains if changing a field without a fixed list of values
33488 + - made a few changes to the native ATM data delivery path to handle some
33489 + strangeness required by the IDT driver
33490 +
33491 +
33492 +Version 0.21 to 0.22 (13-NOV-1996)
33493 +====================
33494 +
33495 +Bug fixes
33496 +---------
33497 +
33498 + - (dummy) depend target was missing in atm/man (reported by Bernd Wolf)
33499 + - net/atm/arequipa.c:make_aq_vcc didn't set ATM_VF_AQINUSE, thereby allowing
33500 + race conditions to slip through
33501 + - fixed a few potential race conditions when activating Arequipa
33502 + - text2qos didn't complain if unit was omitted after multiplier, allowing
33503 + misleading settings like pcr=50M (that's 19.2 Gbps)
33504 + - SSCOP: took wrong branch if POLL_AFTER_RETRANSMISSION was enabled (fix by
33505 + Jonathan Larmour)
33506 + - SSCOP: rel_ind for ENDAK and BGREJ PDU in sscop_inconn was sent with "user"
33507 + = 1 (must be 0 for "Source := SSCOP")
33508 + - initialize_vr_mr now initializes vr_mr to a constant value (instead of
33509 + garbage plus constant value)
33510 + - atm_recvmsg now ignores msg->msg_name, as it should by POSIX 1003.1g (fix by
33511 + Mike Wooten)
33512 + - atm_sendmsg now fails with EISCONN instead of with EINVAL if msg->msg_name
33513 + is set, as it should by POSIX 1003.1g (reported by Mike Wooten)
33514 + - atm_recvmsg and atm_sendmsg now return ENOTCONN if not connected and
33515 + EOPNOTSUP if flags are passed, as they should by POSIX 1003.1g
33516 + - the QOS zeppelin uses for its connections can now be set with the option -q
33517 + - atmarpd didn't include the QOS in PVC entries, so atmarp -a complained about
33518 + them
33519 +
33520 +New features
33521 +------------
33522 +
33523 + - kernel changes to support tcpdump with LANE (by Marko Kiiskila)
33524 + - patch for tcpdump 3.0.4 (installed as tcpdump_atm) to support Classical IP
33525 + and LANE (by Marko Kiiskila)
33526 + - patch for BIND 4.9.5 to support ANS (ATM Name Service) functionality (by
33527 + Marko Kiiskila)
33528 + - added hierarchy extra/ for packages for which only patches are contained in
33529 + the ATM on Linux distribution
33530 + - enhanced text2atm to use ANS if local lookups fail (atm2text will be updated
33531 + later)
33532 + - wrote script extra/hosts2ans.pl to convert hosts.atm file to ANS zone files
33533 +
33534 +Other changes
33535 +-------------
33536 +
33537 + - changed ATM_VF_AQINUSE to ATM_VF_AQDANG and changed aq_list membership to
33538 + be for dangling VCs only
33539 + - added the new command-line options to ttcp_atm's online help (finally !)
33540 + - atm_sendmsg now returns error codes from the driver's send function
33541 + (suggested by Jonathan Larmour)
33542 + - text2qos now performs a syntax check if NULL is passed in the qos argument
33543 + - various minor LANE cleanup (Marko Kiiskila)
33544 + - upgraded to the latest version of t2a.pl
33545 + - {A2T,T2A}_REMOTE is obsolete; instead, {A2T,T2A}_LOCAL should be used if
33546 + ANS lookups are _not_ desired
33547 +
33548 +
33549 +Version 0.20 to 0.21 (18-OCT-1996)
33550 +====================
33551 +
33552 +Bug fixes
33553 +---------
33554 +
33555 + - net/atm/common.c:atm_connect didn't refuse traffic_class == ATM_NONE in both
33556 + directions
33557 + - include/linux/atmsvc.h:SELECT_TOP_PCR didn't default to ATM_MAX_PCR if
33558 + min_pcr == 0 && max_pcr == 0
33559 + - debug/delay swallowed one-byte packets
33560 + - oops, forgot man/Makefile, so qos.7 wasn't installed
33561 + - atmarpd left max_sdu at zero for automatically generated entries
33562 + - atmarpd now only uses the default QOS if the traffic type is set in neither
33563 + direction
33564 + - signaling: if the listen queue was full, new connections were rejected with
33565 + as_close instead of as_reject, thereby upsetting atmsigd
33566 + - svc_accept didn't adjust the listen queue quota when rejecting incoming
33567 + connection requests
33568 + - fixed a few bad font selections in atmsigd(8)
33569 +
33570 +New features
33571 +------------
33572 +
33573 + - included the window scale patch by Randy Scott <scottr@belle.bork.com> and
33574 + Robert Hill <rhill@tisl.ukans.edu>
33575 + - -q option for ilmid to set the QOS (like in atmsigd)
33576 + - new script mkbindist to install the utilities into a tar.gz file
33577 +
33578 +Other changes
33579 +-------------
33580 +
33581 + - debug/delay now prints the usage if invoked without arguments
33582 + - removed the pretentious usec resolution for delays in debug/delay
33583 + - removed the UBR semantics change warning
33584 + - qos.7: clarified that bps are the user data rate
33585 + - arequipa_attach_unchecked now also adjusts the upper layer MTU (which can
33586 + violate RFC1122, but I'll tackle that later)
33587 + - text2qos now also accepts fractional values, e.g. 9.6kbps
33588 +
33589 +
33590 +Version 0.19 to 0.20 (14-OCT-1996)
33591 +====================
33592 +
33593 +Bug fixes
33594 +---------
33595 +
33596 + - fixed a few typos and errors in the 0.18 to 0.19 change log
33597 + - signaling traces only included hl_type bytes instead of hl_length
33598 + bytes
33599 + - TNET1570 driver: various fixes (DMA allocation, seg ring overflow,
33600 + timeouts, etc.) (Christian Paetz)
33601 + - TNET1570 driver: removed most compiler warnings (Christian Paetz)
33602 + - listen() on an arequipa_preset() socket and arequipa_preset() on a listening
33603 + socket now both return EPROTO
33604 + - oops, forgot to enable the "rm" in make uninstall
33605 + - kernel didn't set interface number field in act_create messages to atmarpd
33606 +
33607 +New features
33608 +------------
33609 +
33610 + - added ioctl ATM_SETSC to enable or disable RX and TX single-copy per VC
33611 + - new device driver operation change_qos (not yet implemented)
33612 + - TNET1570 driver supports DEC Alphas and 64 bit PCI transfer (for CIA PCI
33613 + chipsets) (Christian Paetz)
33614 + - TNET1570 driver also supports the UniNET1570 board (Christian Paetz)
33615 + - new functions text2qos and qos2text to convert between textual and binary
33616 + QOS specifications (the format is described in man qos)
33617 + - atmarp -q ip_addr qos sets the default QOS to use for all VCs created for
33618 + that IP interface
33619 + - new utility debug/delay to use machine as AAL5-level delay line
33620 +
33621 +Other changes
33622 +-------------
33623 +
33624 + - NLPIDs and vendor-specific application identifiers are now collected in
33625 + the new file /usr/include/atmsap.h
33626 + - SO_ATMQOS now attempts to change the QOS settings when invoked on an active
33627 + connection
33628 + - included Matt Welsh's bigphysarea patch (this isn't related to ATM, but it
33629 + keeps my development source tree simpler)
33630 + - arequipa_preset now initializes max_sdu to RFC1626_MTU+RFC1483LLC_LEN if
33631 + zero
33632 + - atmarp: new option qos <spec> to set the QOS parameters (uses text2qos)
33633 + Use of pcr <pcr> is deprecated.
33634 + - ttcp_atm's -P option now also accepts a QOS specification string. (use of
33635 + -P <number> is deprecated.
33636 + - atmsigd: new option -q <qos> and configuration clause io qos <qos> to
33637 + set the QOS of the signaling VC. Use of -P <pcr> or io pcr <pcr> is
33638 + deprecated.
33639 + - removed the backward compatibility #define class traffic_class in
33640 + linux/atm.h
33641 + - removed obsolete keywords from atmsigd.conf language
33642 + - atmarp -a now also includes QOS parameters
33643 + - UBR now respects txtp.max_pcr if set
33644 + - new rules for the use of [rt]xtp.traffic_class: both fields must be either
33645 + equal or zero, e.g. ATM_CBR in TX and ATM_UBR in RX no longer works
33646 + - doc/usage.tex now points to the man pages instead of repeating their content
33647 +
33648 +
33649 +Version 0.18 to 0.19 (27-SEP-1996)
33650 +====================
33651 +
33652 +Bug fixes
33653 +---------
33654 +
33655 + - sscop.c:data_sd had a comparison inversed, so generation of USTAT PDUs was
33656 + wrong in some cases (by Juhana Rasanen)
33657 + - sigd_enq: accessed vcc->qos without checking for vcc == NULL, causing an
33658 + "Oops" in atmaddr
33659 + - svc_accept: generated a general protection fault when atmsigd was killed
33660 + while a process was waiting for new incoming connections
33661 + - atmaddr didn't zero the address structure before calling text2atm
33662 + - LANE: fixed usage of kernel timers and LE_ARP_REQUESTs should now get sent
33663 + until the entry expires or a response is received (by Marko Kiiskila)
33664 + - less compiler warnings from LANE servers (Marko Kiiskila)
33665 + - SSCOP: fixed SDU size in AA-RETRIEVE.indication (reported by Heinz Schuerch)
33666 + - NULL encapsulation for ATMARP works now (reported by Gerald Hanusch)
33667 + - fixed stray EINVAL from get{sock,peer}name on PVCs (reported by Gerald
33668 + Hanusch)
33669 + - clip now sets max_sdu to RFC1626_MTU+RFC1483LLC_LEN when using LLC/SNAP
33670 + encapsulation
33671 + - if parsing of a Q.2931 message fails, atmsigd now aborts the call instead of
33672 + (stupidly) trying to process the incomplete and probably inconsistent data
33673 + - SUNI driver didn't properly mask out unused highest bits of some statistics
33674 + counters, thereby yielding absurdly high values
33675 + - zatm: changed timing of RX channel closing, so the dreaded "can't close RX
33676 + channel" message should be history
33677 + - fixed race between Arequipa attachment due to packet reception and closing
33678 + of the Arequipa VC
33679 + - local address validity check (for ATM_???ADDR) was all wrong (reported by
33680 + David Simpson)
33681 + - message dumper ignored fatal errors if debugging was not enabled
33682 +
33683 +New features
33684 +------------
33685 +
33686 + - man pages for lecs, les, bus, and zeppelin (Marko Kiiskila)
33687 + - configuration file name for les and bus can be defined (Marko Kiiskila)
33688 + - zatm: new kernel configuration option CONFIG_ATM_ZATM_EXACT_TS now supports
33689 + reception timestamps with microsecond resolution (the accuracy is only in
33690 + the ms range, though)
33691 + - new utility znth (ZeitNet Timer History) to monitor timer synchronization
33692 + - LANE now supports up to 4 LEC network interfaces (Marko Kiiskila)
33693 + - the Q.2931 message parser now recovers nicely from IE errors, logs the
33694 + event, and continues parsing. The higher layers of the signaling stack
33695 + don't use this information yet, though.
33696 +
33697 +Other changes
33698 +-------------
33699 +
33700 + - Arequipa's BHLI now uses a "vendor-specific application identifier" under
33701 + the EPFL OUI
33702 + - moved buffer/queue handling from lib/libatmd to saal/, because it is rather
33703 + SSCOP-specific anyway
33704 + - atm_release_vcc now complains if rx_inuse != 0 when closing (if this ever
33705 + happens, it may point out dangerous races with upper layer protocols)
33706 + - SO_ATMQOS now issues a warning when using UBR with {min,max}_pcr != 0
33707 + - max_sdu is now set by atmarpd to MTU+RFC1483LLC_LEN (atmarp could still
33708 + override this, if necessary)
33709 + - atmdump: new option -i to display the arrival interval instead of the
33710 + absolute time. Also changed the time format to be more readable.
33711 + - updated the kernel configuration documentation to indicate that the SMC
33712 + ATM Power155 adapters are compatible with the Efficient ENI-155
33713 + - atmarpd now deletes the old table file (containing stale information) if
33714 + invoked with -d (debug)
33715 +
33716 +
33717 +Version 0.17 to 0.18 (9-SEP-1996)
33718 +====================
33719 +
33720 +Bug fixes
33721 +---------
33722 +
33723 + - atmsigd didn't respond to SETUP followed by RELEASE with a RELEASE COMPLETE
33724 + - atmsigd now implements incoming call rejection (as_indicate -> as_close)
33725 + - kernel now opens the VC before sending the as_accept. This a) allows to
33726 + check if the parameters are acceptable, and b) avoids a race condition
33727 + between the sender and the local VC open procedure, which frequently led to
33728 + loss of the beginning of the first PDU sent on a new connection.
33729 + - qdump: _q_parse used the wrong length when dumping variable-length fields,
33730 + yielding a fatal internal error
33731 + - clip didn't set rxtp.max_sdu
33732 + - svc_accept didn't set ATM_VF_HASQOS, so getsockopt SO_ATMQOS didn't work
33733 + (by Marko Kiiskila)
33734 + - ttcp_atm calculated Mbps as 2^20 bits/sec instead of 10^6, thereby making
33735 + all results come out approximately 5% too low (by Fraz Ahmad)
33736 + - added $(LDLIBS) to linking of lane/lecs (by Lawrence MacIntyre)
33737 + - interface number allocation in clip and atmarp did not check for collision
33738 + with the respective other name space
33739 + - atmarp's -c option didn't work when omitting the "atm" in the interface name
33740 +
33741 +New features
33742 +------------
33743 +
33744 + - new man page: arequipad.8
33745 +
33746 +Other changes
33747 +-------------
33748 +
33749 + - simplified the internal signaling protocol by adding the as_reject message
33750 + (sent by kernel in response to as_indicate; not acknowledged by demon)
33751 + - packets received from Arequipa are no longer forwarded to other hosts
33752 + - further ilmid improvements to use RSTADDR less frequently (by Gerald
33753 + Hanusch; with a slight modification)
33754 +
33755 +
33756 +Version 0.16 to 0.17 (2-SEP-1996)
33757 +====================
33758 +
33759 +Bug fixes
33760 +---------
33761 +
33762 + - lib/diag.c didn't fflush when logging to a file
33763 + - arequipad didn't accept the -l option
33764 + - qgen: possible weird crashes because second.c:find_required accessed
33765 + value->tag even if vt_id
33766 + - qgen: fixed wrong PC indication in one error message in _q_parse
33767 + - make spotless didn't know about new $(*PGMS) targets
33768 + - atmsigd: fixed memory leak when sending messages to the kernel
33769 + - atmarpd: fixed memory leak when sending messages to the network
33770 + - atmsigd: didn't send final as_close when kernel closed connection
33771 + immediately after requesting it (as_connect)
33772 + - several minor corrections
33773 +
33774 +New features
33775 +------------
33776 +
33777 + - added make target "uninstall" to remove all files installed by
33778 + make install
33779 + - atmsigd has two new options: -D dump_dir to set the dump directory and
33780 + -t trace_length to set the length of the trace buffer
33781 + - wrote a few man pages: atmarp.8, atmarpd.8, atmsigd.8, atmsigd.conf.4
33782 + - added automatic support for memory debugging if MPR is installed (and
33783 + included a patch to make MPR 1.1 work with ELF). atmarpd and atmsigd
33784 + currently use this feature.
33785 +
33786 +Other changes
33787 +-------------
33788 +
33789 + - changed "class" to "traffic_class" everywhere
33790 + - make install is now implemented in a more elegant way
33791 + - q.dump is now much better at finding symbolic names for numbers
33792 + - q.dump no longer prints zero-length fields
33793 + - qgen no longer includes constructor "microcode" in dumper
33794 + - atmarp now gives more informative error messages on ioctl failure
33795 + - removed obsolete ioctls SIOCGIFATMADDR and SIOCSIFATMADDR
33796 + - added hack to allow ilmid to be less hostile to locally configured addresses
33797 + (by Gerald Hanusch; with slight modifications)
33798 + - atmarpd now automatically sets ATF_PERM of PVC entries with NULL
33799 + encapsulation
33800 +
33801 +
33802 +Version 0.15 to 0.16 (29-AUG-1996)
33803 +====================
33804 +
33805 +Bug fixes
33806 +---------
33807 +
33808 + - fixed an "unterminated character constant" warning by CPP in qgen/uni3x
33809 + - atm/sigd/q2931.c always tried to read the Cause IE of RELEASE COMPLETE
33810 + messages even if it wasn't included
33811 + - LANE: fixed buffer allocation and VCC timeouts (Marko Kiiskila)
33812 + - LANE: when connecting directly to LES, name of the ELAN was not set
33813 + properly (discoverd by Gerald Hanusch; fixed by Marko Kiiskila)
33814 + - LANE, ATMARP, signaling: control sockets didn't account for messages sent
33815 + back from demons (fixed by Marko Kiiskila)
33816 + - permanent ATMARP entries for SVCs were ignored if no ATMARP server was
33817 + configured (reported by Gerald Hanusch)
33818 + - atmarp option "temp" mis-spelled as "term" (fixed by Gerald Hanusch)
33819 + - forgot to undo experimental rcvbuf/sndbuf change to unsigned long
33820 + - make modules didn't generate ATM modules
33821 + - atmtcp_attach_hook wasn't defined when compiling ATMTCP as a module
33822 + - ATM patch set dev->ip_atm to ether_arp in net/ppp.c and net/eql.c, so they
33823 + failed to work as modules
33824 +
33825 +New features
33826 +------------
33827 +
33828 + - added LANE servers (LECS, LES, and BUS) by Marko Kiiskila
33829 + - Rules.make: new variable INSTROOT for easier cross-installation
33830 + - atmsigd: added option -P to set the maximum PCR used on the signaling VC
33831 + - atmarp: added option "pcr <value>" (proposed by Gerald Hanusch)
33832 + - added the usual -l <logfile> option to arequipad
33833 +
33834 +Other changes
33835 +-------------
33836 +
33837 + - upgrade to kernel version 2.0.14
33838 + - SVCs can now be bound with any SEL value
33839 + - messages of size > quota can be sent if the send buffer is empty
33840 + - ilmid no longer empties the address list when refreshing the NSAP address
33841 + (by Gerald Hanusch)
33842 + - LANE client should now survive network reset (e.g. restart) gracefully
33843 + (Marko Kiiskila)
33844 + - LANE: major cleanup of zeppelin code (Marko Kiiskila)
33845 + - improved loadable module support for eni and zatm (i.e. loading works now)
33846 + - the message dumper can now be linked to programs that also use the
33847 + compilation/parsing functions
33848 +
33849 +
33850 +Version 0.14 to 0.15 (31-JUL-1996)
33851 +====================
33852 +
33853 +Bug fixes
33854 +---------
33855 +
33856 + - zatm: fixed traffic shaper settings for UBR (with a little help from Joern
33857 + Wohlrab)
33858 + - atmsigd compilation didn't use the same UNI version configuration as qgen
33859 + - field "class" in struct atm_traform broke compilation of ATM applications
33860 + written in C++, so it has been renamed to "traffic_class" (reported by
33861 + Furquan Ansari)
33862 + - AAL parameters IE wasn't included in CONNECT, which violated RFC1755
33863 + (discovered by Robert Olsson)
33864 + - zatm: removed broken sanity check for in-sequence skb delivery on RX
33865 + - clip didn't have clip_open function, so SIOCSIFFLAGS on the interface failed
33866 + with ENODEV
33867 + - single-copy compiles again
33868 + - zatm: driver doesn't pretend any longer to support single-copy (but
33869 + single-copy will come back later)
33870 + - QOS IE was sent with the wrong coding standard when using UNI 3.1 (with help
33871 + from Fraz Ahmad)
33872 + - zatm: forgot to remove some debugging code (around ZATM_TUNE)
33873 + - qlib.c didn't zero the length array, leading to (rare) "not enough space"
33874 + errors from QMSG (actually, the "break" mechanism seems to be flaky - will
33875 + have to check)
33876 + - fixed Arequipa race condition when the upper layer protocol and signaling
33877 + decided to close the SVC at the same time
33878 + - alloc_tx used to return NULL in out of memory conditions, thereby possibly
33879 + hanging atm_sendmsg
33880 +
33881 +New features
33882 +------------
33883 +
33884 + - ttcp_atm now also accepts names with -p
33885 + - (finally !) added send/receive buffer limits and cleaned up the use of
33886 + vcc->[rt]x_{inuse,quota}
33887 + - added mkdiff script for automatic generation of diffs
33888 + - Arequipa now works for PVCs too (but arequipad is now required for any
33889 + use of Arequipa, not only for incoming connections)
33890 +
33891 +Other changes
33892 +-------------
33893 +
33894 + - atm/atm-<version>.patch is now called atm/atm.patch (to make the diffs more
33895 + useful)
33896 + - the maximum SDU size is now checked in net/atm/common.c:adjust_tp
33897 + - text2atm/atm2text now accepts/generates E.164 addresses with a leading +
33898 + sign, as required by ANS (atm95-1532)
33899 + - internal signaling protocol: added message as_error to un-overload as_close
33900 + - internal signaling protocol: split as_establish into as_connect and
33901 + as_accept
33902 + - internal signaling prococol: as_close.reply no longer contains positive
33903 + numbers
33904 + - internal signaling prococol: as_bind now also carries the AAL type
33905 + - atmsigd: now also checks the AAL type in as_bind messages
33906 + - kernel signaling: a few minor changes
33907 + - STANDARDS (i.e. UNI version) configuration option has been moved from
33908 + atm/qgen/Makefile to atm/Rules.make
33909 + - atmsigd's startup message now gives more useful indication of which UNI
33910 + version(s) it supports
33911 + - signaling no longer uses sa[sp]_[rt]xtp, so ...
33912 + - sa[sp]_[rt]xtp is gone
33913 + - removed atm/sigd/svc.c from the distribution. We now have many other tools
33914 + for testing SVCs, so it's superfluous.
33915 + - atmarpd: revalidation is now less frequent (use -DFREQUENT_REVAL for
33916 + the faster timeout)
33917 + - ioctl CLIP_PVC now returns the number of the new interface and clip prints
33918 + its name to standard output (like atmarp -c)
33919 + - clip now issues the CLIP_PVC ioctl after binding, which avoids wasting
33920 + interface numbers on failed setup attempts
33921 + - atmsigd -d now sets the debug level for qgen and SSCOP to DIAG_INFO, and
33922 + doesn't set q_dump
33923 + - zatm: added protection against I > M
33924 + - atm_peek_aal5 now only aligns to page boundaries for pdu_size >= PAGE_SIZE
33925 + - eni driver now spits out CRC error messages at most every other second
33926 + - zatm driver now repeats RX error messages at most every other second
33927 + - ttcp_atm now sleeps for a second after setting up an SVC, because the
33928 + switch seems to lag behind (need to examine this further)
33929 + - moved SAAL from sigd/ to saal/ (for sharing with UNI 4.0 signaling)
33930 + - Arequipa sockets are now closed via arequipad instead of via atmsigd (new
33931 + ioctls AREQUIPA_CTRL and AREQUIPA_CLS3RD)
33932 + - various minor changes
33933 +
33934 +
33935 +Version 0.13 to 0.14 (19-JUL-1996)
33936 +====================
33937 +
33938 +Bug fixes
33939 +---------
33940 +
33941 + - LANE: reaction to LE_ARP_RESPONSE's wasn't always correct
33942 + - LANE: compiler warnings fixed
33943 + - LANE: comparing ATM addresses in checking whether connection is formed was
33944 + wrong
33945 + - zntune didn't divide by 1024 when displaying the "k"
33946 + - .depend wasn't deleted by make spotless
33947 + - ATM_GETSTAT and ATM_GETSTATZ used wrong argument type for coding ioctl
33948 + number. WARNING: programs using ATM_GETSTAT{,Z} need to be recompiled.
33949 + - requests to set up SVCs with ATM_NONE in both directions are now caught by
33950 + svc_connect (used to yield an invalid SETUP message)
33951 + - signaling: fixed connection identifier setting when acting as network side
33952 + (fix by Elwyn B Davies)
33953 + - ATMARP server ARP entries were undeletable
33954 + - atmarp showed wrong argument in error message when given an invalid ATM
33955 + address
33956 + - zatm: do_tx left interrupts turned off when returning with RING_BUSY
33957 + - LANE ARP hash table handling bugs fixed
33958 + - atmarp: act_create is now only sent on interface creation
33959 + - atmarp: act_down is now only sent once per transition
33960 + - demon control SVCs are no longer closed when atmsigd dies (new VCC flag
33961 + ATM_VF_META)
33962 + - netdevice notifier is now properly unregistered when atmarpd goes down
33963 + (not doing so caused endless loop in kernel on atmarpd restart)
33964 + - sigd_enq{_atomic} never calls schedule()
33965 + - atmsigd no longer "forgets" to bring up ARP server SVC before sending an
33966 + InARP
33967 + - atmarpd no longer dies with "timer in state 3" when the ARP server becomes
33968 + unreachable
33969 + - atm/atmarp.c: clip_create() now refuses creation of already existing
33970 + interface
33971 + - Documentation/Configure.help gave an obsolete URL for CONFIG_AREQUIPA
33972 + and doc/usage.tex also mentioned the old file name
33973 + - Arequipa didn't work in the outbound direction for TCP, because
33974 + net/ipv4/tcp.c was missing in the kernel patch
33975 + - drivers/atm/eni.c:foo raced with initialization of eni_boards if the
33976 + board lost the signal _immediately_ after being initialized
33977 + - atmarpd: fixed a few uninitialized entry->timer pointers (discovered by
33978 + Gerald Hanusch)
33979 + - atmarpd: arps entry should no longer get stuck in as_resolv
33980 +
33981 +New features
33982 +------------
33983 +
33984 + - compiles on SparcLinux too (but only atmtcp works)
33985 +
33986 +Other changes
33987 +-------------
33988 +
33989 + - upgrade to kernel version 2.0.0
33990 + - BHLI matching changed: SAPs without BHLI are now incompatible with calls
33991 + that specify a BHLI
33992 + - LANE: interface stays up when zeppelin dies -> possibility for
33993 + wrapper script around zeppelin
33994 + - LANE: LUNI interoperability test (ATM Forum/96-0805) is now followed
33995 + in setting ELAN name in LE_CONFIG_RESPONSE and LE_JOIN_RESPONSE,
33996 + there is also a delay of 1 second before sending LE_CONFIG_REQUEST and
33997 + LE_JOIN_REQUEST. This allows 'slow' LE servers to catch up.
33998 + - LANE: no longer uses sa[sp]_[rt]xtp
33999 + - LANE: now adjusts better to ATM address changes
34000 + - zeppelin: new option -m to select debugging output
34001 + - updated aping, aread, awrite, br, bw, atmdump, ilmid, atmarp, clip, atmarpd,
34002 + and zeppelin to use setsockopt SO_ATMQOS
34003 + - added option -x for ilmid to disable variable bindings (caused
34004 + interoperability problems with certain switches, e.g. the LS100)
34005 + - changed SO_CIRANGE into a pair of ioctls
34006 + - changed return value of fetch() (passed to atm_vcc->peek) from unsigned long
34007 + to __u32
34008 + - atmarp now accepts arpsrv option also for -d
34009 + - zatm driver can now also read ESIs of rev. 10 boards (with help from Nikos
34010 + Anerousis)
34011 + - awrite: fixed txtp.max_sdu calculation in awrite (was using uninitialized
34012 + variable "offset")
34013 + - atmarpd: IP interface removal now has the desired effect (used to do
34014 + nothing)
34015 + - atmarpd: now reports and ignores unexpected interface transitions
34016 + - added sigd_enq_atomic for atomic sigd_enq (so that non-Arequipa SVCs can
34017 + still use the "safe" but non-atomic version)
34018 + - made SIOCGIF* failures in atmarpd non-fatal (itf.c:itf_up was handling them
34019 + anyway)
34020 + - moved Arequipa-specific code from net/atm/clip.c to net/atm/arequipa.c, and
34021 + put code common to CLIP, Arequipa, and - to a lesser extent - ATMARP into
34022 + net/atm/ipcommon.[ch]
34023 + - Arequipa can now be complied without CLIP
34024 + - various minor documentation changes
34025 + - moved ATM device initialization from net/atm/pvc.c to drivers/block/genhd.c,
34026 + where most other devices are initialized too
34027 + - preparation for new binary locations: tools build process now knows about
34028 + four types of programs: for booting, for system use, for users, and for
34029 + internal use during build
34030 + - make install now hides the for loops
34031 + - non-user binaries are now installed in /usr/local/sbin
34032 + - struct atm_iobuf.buffer is now of type void * (was int*). Also,
34033 + ATM_GETNAMES now returns the length in bytes in that field.
34034 +
34035 +
34036 +Version 0.12 to 0.13 (7-JUN-1996)
34037 +====================
34038 +
34039 +Bug fixes
34040 +---------
34041 +
34042 + - BHLI type used the ATM_HL_* values (which are off by one) in qgen/uni3x
34043 + - atmarpd ended up in a tight select-accept loop if atmsigd went away
34044 + - removed sleep in ZATM's do_tx (so it works with IP over ATM again)
34045 +
34046 +New features
34047 +------------
34048 +
34049 + - added experimental support for Application requested IP over ATM (Arequipa),
34050 + prototyped by Jean-Michel Pittet
34051 + - new traffic class ATM_ANYCLASS to accept incoming SVCs without looking at
34052 + the traffic parameters
34053 + - added (untested) support for SO_BCTXOPT/SO_BCRXOPT
34054 +
34055 +Other changes
34056 +-------------
34057 +
34058 + - SVCs used to listen are now marked as "LISTEN" in /proc/atm/svc
34059 + - added option -Q <atm_addr> to ttcp_atm to support AREQUIPA
34060 + - cleaned up the FILE macro and removed atm_dir in net/atm/proc.c
34061 +
34062 +
34063 +Version 0.11 to 0.12 (3-JUN-1996)
34064 +====================
34065 +
34066 +Bug fixes
34067 +---------
34068 +
34069 + - atm/lib/Makefile: had to comment out PGMS=test
34070 + - distribution didn't include atm/doc/usage.txt
34071 + - patch didn't include arch/i386/config.in
34072 + - return 0; was missing at the end of net/atm/mmuio.c:mmu_step
34073 + - atm/ilmid didn't install into INSTBIN; also made some other Makefile
34074 + changes
34075 + - read() returned garbage instead of error when network drops connections
34076 + - POLL_AFTER_RETRANSMISSION in SSCOP didn't even compile
34077 + - SVCs: bind to wildcard addresses should now work even if no local address
34078 + is known yet
34079 + - make clean in atm/qgen left some dirt
34080 + - ATM drivers didn't free skbs when detecting an error in TX direction
34081 + - SIOCMKCLIP was in the wrong #ifdef, so CLIP had to be enabled to make
34082 + ATMARP usable
34083 + - signaling didn't respond properly to messages with non-existent call
34084 + reference
34085 +
34086 +New features
34087 +------------
34088 +
34089 + - merged in LAN Emulation client support written by Marko Kiiskila
34090 + - new socket option SO_ATMQOS at SOL_ATM to set/get QOS parameters
34091 +
34092 +Other changes
34093 +-------------
34094 +
34095 + - t2a.pl now also works with Perl 5.001
34096 + - changed the TX side of the ZATM driver to use a ring instead of a list in
34097 + order to improve stability and throughput (needs some more testing)
34098 +
34099 +
34100 +Version 0.10 to 0.11 (21-MAY-1996)
34101 +====================
34102 +
34103 +Bug fixes
34104 +---------
34105 +
34106 + - README.DRIVERS still referenced INSTALL (it's now in USAGE)
34107 + - sap_decode didn't clear BLLI part of address structure
34108 + - trying to connect to NULL address fails locally instead of yielding an
34109 + invalid SETUP message
34110 + - bind now properly sets the local address
34111 + - SVC getname now returns the traffic parameters
34112 + - oops, zatm open_tx didn't return PCR
34113 + - awrite printed errors for connect() as "bind: ..."
34114 + - atmsigd no longer generates dummy call references (0x7fffff)
34115 + - atmtcp: changed a few kfree_skb to dev_kfree_skb, which should make it
34116 + work better (does anybody care to try ?)
34117 + - some more dev_kfree_skb fixed for control messages from or to demons (led
34118 + to some minor memory leaks)
34119 + - various major fixes for CBR SVCs
34120 + - RELEASE was signaled for SVCs before all data was sent
34121 + - single copy tried to access mem_map with user space addresses, leading to
34122 + crashes or worse
34123 + - zatm: sleep_on was racing with TX completion in close_tx, leading to hangs
34124 + - zatm: now fails attempts to open AAL0 VCs (used to accept them and to
34125 + crash later)
34126 + - BHLI encoding/decoding was broken in several ways
34127 +
34128 +New features
34129 +------------
34130 +
34131 + - hacked in primitive leaf-only p2m support (based on an idea by Marko
34132 + Kiiskil{)
34133 + - the socket layer, and the zatm, eni, and atmtcp drivers now support
34134 + two-phase connect
34135 + - PVCs now respect max_pcr (SVCs can't for now)
34136 + - lib/diag.c can now also log to a file or to syslog, and atmarpd, atmsigd,
34137 + and ilmid now have a -l option to use that
34138 + - new option -c config_file for atmsigd
34139 + - zatm and atmtcp now also support timestamps (but zatm timestamps can be
34140 + improved a lot by using the timestamps the uPD98401 generates)
34141 + - Classical IP over ATM support is now configurable
34142 + - added on-line help texts for configuration
34143 + - added atm/test/aping, a round-trip tester for PVCs
34144 + - added "flags" field to struct atm_dev and to atm_dev_register, on request
34145 + by Bureau 13
34146 +
34147 +Other changes
34148 +-------------
34149 +
34150 + - past versions of the BUGS list aren't included in the distribution anymore
34151 + because I didn't update them anyway
34152 + - invalid connect() calls now return an error instead of panicing atmsigd
34153 + - text2atm no longer clobbers sas_addr.{blli,bhli}
34154 + - greatly simplified zatm traffic shaper settings calculation (and it's
34155 + better than before too)
34156 + - atmsigd: diagnostics class "sig" (in atmsigd.conf) now also includes "SAP"
34157 + - DPRINTK now uses GNU-specific #define foo(bar...)
34158 + - signaling: PCR is now also indicated (0) for directions in which ATM_NONE
34159 + is requested, which is probably "cleaner" (for CBR)
34160 + - added logging priorities to most printks
34161 + - the default location for atmsigd.conf changed from . to /etc
34162 + - ipv4/af_inet.c: atmtcp_attach_hook is now only included when using ATM over
34163 + TCP
34164 + - configuration options for extended driver debugging, (old) CLIP, and
34165 + ATM over TCP are turned off by default
34166 +
34167 +
34168 +Version 0.9 to 0.10 (21-MAR-1996)
34169 +===================
34170 +
34171 +Bug fixes
34172 +---------
34173 +
34174 + - zatm: deallocated UBR shaper when closing UBR VC, which the other UBR VCs
34175 + didn't really appreciate
34176 + - fixed nasty memory leak for native ATM (spotted by Rolf Fiedler)
34177 +
34178 +New features
34179 +------------
34180 +
34181 + - added Rolf Fiedler's driver for his adapter based on the TI TNETA1570
34182 + - single-copy is back again !
34183 +
34184 +Other changes
34185 +-------------
34186 +
34187 + - eni buffers are now slightly (50%) bigger, allowing for more effective
34188 + overlapped operations
34189 + - documented zntune
34190 +
34191 +
34192 +Version 0.8 to 0.9 (14-MAR-1996)
34193 +==================
34194 +
34195 +Bug fixes
34196 +---------
34197 +
34198 + - oops, accidently removed ZN1221 from drivers/pci/pci.c (so /proc/pci
34199 + reported it as "unknown")
34200 + - sigd didn't poll for the default interface on startup
34201 + - atmarpd didn't initialize timer field in newly allocated table entries,
34202 + which led to crashes
34203 + - removed a few stray debugging printks in net/atm/svc.c:svc_bind
34204 + - ATMARP tried to send queued packet before adding new table entry, so the
34205 + packet was always discarded
34206 + - sigd/sap.c: didn't allow to use different traffic classes for fwd and bwd
34207 + direction
34208 + - atm2text accepted SVC addresses of all zeroes
34209 + - atmsigd didn't refresh its local address list properly after ilmid restart
34210 + - net/atm/common.c: returned positive error codes (-vcc->reply) instead of
34211 + negative ones
34212 + - forgot to include maint/zntune.c in the distribution
34213 +
34214 +New features
34215 +------------
34216 +
34217 + - sigd/svc now accepts ATM addresses in all formats supported by text2atm
34218 +
34219 +Other changes
34220 +-------------
34221 +
34222 + - upgraded to kernel version 1.3.73
34223 + - the called party number must now match the local address (if bound)
34224 + - renamed ttcp.atm to ttcp_atm
34225 + - all executables are now explicitly linked (so make works even without
34226 + dependencies)
34227 +
34228 +
34229 +Version 0.7 to 0.8 (12-MAR-1996)
34230 +==================
34231 +
34232 +Bug fixes
34233 +---------
34234 +
34235 + - fixed stray segmentation violation in arpd/arp.c:learn
34236 + - fixed coding standard of the QoS IE if using UNI 3.0 (and made coding
34237 + standard variable)
34238 + - made coding standard variable for Cause IE
34239 + - SSCOP didn't properly set N(MR)
34240 + - list elements in STAT PDUs had host byte order
34241 + - SSCF didn't call sscop_estab_resp on restart (AA-EST.ind in 1/1)
34242 + - signaling didn't handle SAPs with >= 2 BLLI IEs properly
34243 + - uni3x: iso_hli and user_hli were confined to 7 bytes, but UNI allows up to 8
34244 + - q_read choked on non-variable-length fields
34245 + - qgen sometimes didn't read all IEs of a signaling message
34246 + - fixed usage line of test/bw
34247 + - qgen no longer complains about missing required fields after a break
34248 + - fixed compiler warning in zntune.c
34249 + - fixed ATMARP table additions (caused GPF when flushing ATMARP entry at
34250 + the end of the table and possibly other problems)
34251 + - qgen: q_put or'ed data instead of overwriting it, which caused problems
34252 + only on surprisingly few occasions
34253 +
34254 +New features
34255 +------------
34256 +
34257 + - atm2text and text2atm now also do name lookups via a /etc/hosts.atm file
34258 + - atmaddr, atmarpd, and atmsigd now pretty-print addresses using name
34259 + translation (unless invoked with -n)
34260 + - atmarpd now dumps its table into /var/run/atmarpd.table and atmarp -a
34261 + reads it from there
34262 + - started modularizing the ENI and ZATM drivers
34263 + - ilmid and atmsigd now support multiple interfaces (untested)
34264 +
34265 +Other changes
34266 +-------------
34267 +
34268 + - the documentation is now available in LaTeX and in ASCII
34269 + - rewrote most of the SAP handling code (now everything is in sigd/sap.c)
34270 + - proto.c:lookup_sap now picks wildcard SAP last
34271 + - signaling always includes SSCS type = 0 in SETUP messages (for LANE)
34272 + - changed the message format for the the kernel-demon signaling protocol
34273 + - qgen is now a bit more tolerant when being fed with bad data
34274 + - qgen now assumes that q_report(Q_FATAL,...) doesn't return
34275 + - marked sigd/test.c as obsolete
34276 + - svc_accept failing in atm_connect no longer returns success
34277 + - atmsigd -n is now atmsigd -N
34278 + - qgen now puts the PC in q.out.c and qd.out.c at the beginning of the code
34279 + line and not on a line by itself
34280 +
34281 +
34282 +Version 0.6 to 0.7 (2-FEB-1996)
34283 +==================
34284 +
34285 +Bug fixes
34286 +---------
34287 +
34288 + - removed TTL setting ioctl (1234) used for something entirely unrelated to
34289 + ATM, oops
34290 + - changed kfree_skb in atm_pop_raw to dev_kfree_skb (this fixes the socket
34291 + "leak")
34292 + - more unusual configurations (no PCI, no IP, no /proc) should compile now
34293 + - atm_equal didn't recognize wildcards in embedded E.164 addresses
34294 + - fixed net/atm/proc.c:svc_addr (too many bugs to mention)
34295 + - atmarpd didn't check for ARP traffic on inbound connections
34296 + - atmarpd didn't properly merge incoming connections with existing entries
34297 + - various other ATMARP fixes
34298 + - free list was too short in ENI driver for worst case fragmentation on
34299 + 2 MB boards
34300 + - signaling didn't set ISO/IEC TR9577 IPI and NLPID correctly in active open
34301 + - getname looked at *sockaddr_len, which is uninitialized (need to fix this
34302 + later in the common socket code)
34303 + - SSCOP generated incorrect error code ("1" instead of "B") for BGN PDU
34304 + problems
34305 +
34306 +New features
34307 +------------
34308 +
34309 + - new ioctls ATM_GETADDR, ATM_RSTADDR, ATM_ADDADDR, and ATM_DELADDR to
34310 + manage local ATM addresses
34311 + - signaling now handles incoming RESTART, SAAL failure, and SAAL
34312 + re-establishment
34313 + - ATMARP now times out idle connection; ATMARP_MKIP ioctl takes a timeout
34314 + argument
34315 + - ATMARP (kernel) now queues one skb per pending ARP request and limits the
34316 + rate of requests for the same address (default 2 req/min)
34317 + - atmsigd now prints cause values when receiving a RELEASE or a RELEASE
34318 + COMPLETE and returns more informative error codes
34319 + - atmarpd falls back to PVC-only operation if signaling is unavailable at
34320 + startup
34321 + - kernel can now assign next free number on IP interface creation (atmarp
34322 + prints the interface name)
34323 + - qgen -D generates a Q.2931 message dumper (see USAGE for details)
34324 + - qgen now checks for proper use of repetition indicator (but doesn't
34325 + support repeated IEs yet)
34326 + - protocols and device drivers can now use their own memory allocator in the
34327 + TX direction by changing vcc->alloc_tx
34328 +
34329 +Other changes
34330 +-------------
34331 +
34332 + - upgraded to kernel version 1.3.53
34333 + - build process now uses Perl
34334 + - ATM ioctls writing back data now always return the size of the data
34335 + structure written
34336 + - struct atmif_sioc now has a length field (recompile all atmarpd, ilmid,
34337 + debug/ed, and everything in maint)
34338 + - PHY driver no longer has to check validity (permissions and access) for
34339 + "standard" ioctls
34340 + - signaling should now also work on an interface > 0 (but there's still only
34341 + one interface using signaling per host)
34342 + - make install now adds /usr/include/atm.h and /usr/include/atmd.h
34343 + - atmarpd now also displays if SVC has been opened actively or passively
34344 + - atmaddr(8) now uses new ioctls and has different command-line syntax
34345 + and even has a man page
34346 + - example IP addresses in USAGE now conform to RFC1597
34347 + - diagnostics now also include the application name (optional)
34348 +
34349 +
34350 +Version 0.5 to 0.6 (21-DEC-1995)
34351 +==================
34352 +
34353 +Bug fixes
34354 +---------
34355 +
34356 + - ARP ioctls stopped working for most non-ATM devices, oops
34357 + - ATMTCP driver counted lack of memory as rx_err instead of rx_drop
34358 + - select on driver using polling may have hung
34359 + - atmarp man page and usage didn't indicate that the interface number is
34360 + optional
34361 + - restricted atmarpd and signaling control, and SIOCSIFATMADDR to the super
34362 + user
34363 + - atmtcp: fixed handling of VPI/VCI <= 0 for setsockopt(SO_CIRANGE)
34364 + - eni and zn driver had static UBR shaper pointer, making it difficult to have
34365 + more than one such device per system
34366 + - eni driver initialization didn't work properly in systems with ASIC Tonga
34367 + - suni.[ch]: confused MC (Master Config) and MCT (Master ConTrol) registers
34368 + - (SVC) accept now returns PVC -EAGAIN as -EBUSY because the operation cannot
34369 + be retried
34370 + - qgen: fixed several bugs in case handling (and made defaults work for
34371 + parsing)
34372 + - svc_dup passed PF_ATMSVC instead of AAL to svc_create
34373 + - plugged a few skb leaks in svc_accept
34374 + - text2atm didn't properly NUL-terminate E.164 addresses
34375 +
34376 +New features
34377 +------------
34378 +
34379 + - ZN1221 driver works partially for AAL5 (still hangs after a few dozen MB)
34380 + (also wrote maint/zntune to monitor/adjust free buffer pools)
34381 + - ENI driver now supports new Tonga ASIC boards
34382 + - added Scott Shumate's ILMI demon (for automatic address registration)
34383 + - text2atm: added wildcard support for SVCs (syntax: addr/bits)
34384 + - new library function atm_equal to compare SVC addresses
34385 + - new ioctl ATM_GETTYPE to obtain interface type name
34386 + - new ioctl ATM_GETESI to obtain ESI (parallels /proc/atm/devices)
34387 + - new ioctls SONET_SETFRAMING, SONET_GETFRAMING, and SONET_GETFRSENSE to
34388 + handle SONET vs. SDH framing
34389 + - added socket option SO_AALTYPE (SOL_AAL) to query AAL type (getsockopt
34390 + only)
34391 + - signaling demon is now notified on address changes (new message
34392 + as_itf_notify)
34393 +
34394 +Other changes
34395 +-------------
34396 +
34397 + - known bugs are now listed in a file called BUGS
34398 + - all utility programs (aread, awrite, atmdump, br, bw, clip, ttcp) now use
34399 + the notation [itf.]vpi.vci for PVCs (was itf vpi vci , except for ttcp,
34400 + where it was only vpi vci (no itf))
34401 + - all ioctl values have changed
34402 + Note: most programs have to be recompiled because of this
34403 + - sigd and arpd now register their control sockets via ioctls
34404 + - (old) clip now creates interfaces with an ioctl
34405 + - text2atm now returns the wildcard length, i.e. a non-zero return value
34406 + no longer implies failure
34407 + - push_oam now returns an int (was void)
34408 + - push_oam now has several flags (in a bit set) instead of the immed
34409 + argument
34410 + - the peek function must now update the statistics if it rejects a packet
34411 + - (ATM device) close is now only invoked after a successful open
34412 + - the SUNI_GETLOOP ioctl now has an int * argument (was unsigned long *)
34413 + - uPD98402 driver no longer tries to detect return of the signal (didn't
34414 + work anyway - would have to sample section errors)
34415 + - ATMARP no longer supports mixed PVC/SVC entries (I'm sure this will be
34416 + missed a lot :-)
34417 + - ATMARP no longer supports "IP address discovery" via InARP for PVCs
34418 + (maybe later)
34419 + - specifying an invalid AAL now yields EPROTOTYPE
34420 + - specifying an invalid address family (connect, bind) now yields EAFNOSUPPORT
34421 + - make install now also installs libraries (in /usr/lib)
34422 + - improved many header file comments
34423 + - re-arranged some comments to simplify automated document generation
34424 + - added copyright statement
34425 + - UNI 3.0 IE fields are now always recognized (but we shouldn't generate them)
34426 + - UNI 3.0 wants octet 5a when using BCOB-X, so we'll set it to twice "No
34427 + indication"
34428 + - aread, awrite, br, bw, ttcp, atmsigd, and atmdump now set max_sdu
34429 + - aread and awrite no longer print strerror(errno) on success
34430 +
34431 +
34432 +Version 0.4 to 0.5 (26-OCT-1995)
34433 +==================
34434 +
34435 +Bug fixes
34436 +---------
34437 +
34438 + - now only root can open a CLIP socket (thereby creating an IP interface)
34439 + - now only root can issue CLIP_NULENCAP and CLIP_LLCENCAP ioctls
34440 + - atmdump: forgot default in getopt switch
34441 + - eni driver: called misc_int on every interrupt
34442 + - Q.2931 message description: various fixes and improvements
34443 + - linux/atm.h: ATM_*_UNSPEC used the same value as ATM_*_ANY, oops !
34444 + - SSCOP is now more careful about not accessing the descriptor if it might
34445 + possibly have been deleted
34446 + - typo in SSCF leading to wrong response to AA-RECOVER.indication
34447 + - SSCOP now correctly copies N(PS) from POLL to STAT PDUs
34448 + - SSCF now discards data when not ready instead of issuing a fatal error
34449 + - AAL initialization failure no longer leaks memory
34450 + - closing an SVC without VCC no longer yields a GPF
34451 +
34452 +New features
34453 +------------
34454 +
34455 + - ZN1221 driver is starting to work
34456 + - new, ARP-based mechanism for IP over ATM (with atmarpd, atmarp, etc.)
34457 + - /proc/atm/pvc now displays more information for CLIP PVCs (after a patch
34458 + by Raghavan Menon)
34459 + - added max_pcr to struct atm_trafprm (also fixed a few comments in atm.h)
34460 + Note: all programs using sockaddr_atm* will have to be recompiled.
34461 + - qgen now handles value lists in named selections
34462 + - signaling now supports bhli/blli, plus various other minor extensions
34463 + - new ioctls to set/get local ATM address
34464 + - added library with address to/from text conversion functions
34465 + - finally implemented getname()
34466 +
34467 +Other changes
34468 +-------------
34469 +
34470 + - eni driver: avoided potential generation of superfluous code if extended
34471 + debugging is disabled
34472 + - eni driver: detects new boards using ASIC PCI chip (doesn't support them
34473 + yet, though)
34474 + - qgen: semicolon is now comment character and no longer used to terminate
34475 + clauses
34476 + - qgen: replaced term "item" with "field"
34477 + - linux/include/atmsap.h: removed obsolete comment "protocol cannot be fully
34478 + encoded in current structure". Also re-arranged some comments to simplify
34479 + automated document generation.
34480 + - saal,sscf,sscop: callbacks don't pass the pointer to the descriptor of the
34481 + calling protocol anymore
34482 + - SSCOP no longer prints a number for non-'V' errors
34483 + - improved handling of STATUS messages
34484 + - select now indicates ready for writing if max_sdu packet can be enqueued
34485 + without blocking
34486 + - select can now also be used to check status of non-blocking connect
34487 + - moved some common demon functions from sigd into a common demon library
34488 +
34489 +
34490 +Version 0.3 to 0.4 (27-SEP-1995)
34491 +==================
34492 +
34493 +Bug fixes
34494 +---------
34495 +
34496 + - various minor documentation fixes
34497 + - clip.c:atm_push_clip now updates statistics before forwarding the skb to
34498 + the upper layer (which may free and overwrite the skb)
34499 +
34500 +New features
34501 +------------
34502 +
34503 + - added partial UNI 3.x signaling
34504 + - added various adapter debugging programs to the distribution
34505 + - new config option CONFIG_ATM_ENI_DEBUG to enable extended debugging
34506 + in eni driver
34507 +
34508 +Other changes
34509 +-------------
34510 +
34511 + - upgraded to kernel version 1.3.24
34512 + - changed the distribution directory structure (programs are now in maint/,
34513 + test/, ip/, debug/, and sigd/, see INSTALL)
34514 + - ATM interfaces are no longer named, only numbered. This affects the
34515 + ATM_GETNAMES ioctl, all ioctls using struct atmif_sioc, the usage of atmdiag
34516 + and sonetdiag, and various diagnostic kernel messages.
34517 + - ATM socket state is now recorded in field "flags" (this also replaces the
34518 + SVC fields "released", "registered", and "state")
34519 + - added #ifdef __KERNEL__ to some header files
34520 + - added "int immed" argument to send_oam
34521 + - some minor modifications to the distribution process (mkdist)
34522 + - removed devmap.c
34523 + - SVC sockets no longer hang if the signaling demon dies
34524 +
34525 +
34526 +Version 0.2 to 0.3 (8-SEP-1995)
34527 +==================
34528 +
34529 +Bug fixes
34530 +---------
34531 +
34532 + - select(2) didn't work (was sleeping on sock->wait instead of
34533 + &ATM_SD(sock)->sleep)
34534 + - ENI driver did allow binding to VPI/VCI already in use
34535 + - ENI driver now properly handles PDUs with CRC errors
34536 + - ENI driver had race condition when discarding PDUs causing new PDUs to be
34537 + shifted in adapter memory by one word (which confused the driver quite a
34538 + bit)
34539 + - ENI driver now enables VC _after_ setting all pointers (caused crashes if
34540 + data was already coming in while opening VC)
34541 + - various bugs fixes related to SVC sockets
34542 + - fixed GPF (in kernel) when running atmdiag without arguments
34543 + - atmdiag now left-adjusts interface names
34544 + - fixed ttcp.atm crash when not specifying vpi.vci
34545 + - clip_xmit now checks for NULL vcc (e.g. after failure to connect)
34546 +
34547 +New features
34548 +------------
34549 +
34550 + - zatm driver now reads ESI correctly
34551 + - blocking svc_connect is now interruptible
34552 + - atmdump now also displays the numeric PTI value of incoming cells
34553 + - added RX/TX buffer quotas (default is 64 kB)
34554 + - added OAM hooks to device driver interface (but there's no OAM support yet)
34555 +
34556 +Other changes
34557 +-------------
34558 +
34559 + - ENI driver now checks ID field of reassembly buffer descriptors
34560 + - ENI driver now uses vremap
34561 + - ENI driver now prints more useful physical layer type information (e.g.
34562 + "MMF" and "UTP" instead of "UTOPIA")
34563 + - some redesign of the protocol used for signaling between kernel and demon
34564 + - disabled "Grr, servicing VCC twice" message in ENI driver
34565 + - device drivers now have to adapt AAL0 cell header byte order
34566 + - some cleanup in common.c:atm_getsockopt
34567 + - device drivers are now required to use the peek function; protocols now
34568 + must provide it
34569 +
34570 +
34571 +Version 0.1 to 0.2 (15-AUG-1995)
34572 +==================
34573 +
34574 +Bug fixes
34575 +---------
34576 +
34577 + - VCC family field is now correctly set to protocol family in
34578 + common.c:atm_create (was pvc.c:pvc_create). With protocol set to zero,
34579 + this created all types of strange problems, because the family field
34580 + is used to indicate whether an VCC slot is busy/free.
34581 + - fixed race condition in common.c:atm_read (reader might have blocked
34582 + even if data is ready)
34583 + - fixed dereferencing of uninitialized skb->dev pointer in
34584 + clip.c:atm_push_clip
34585 + - SIOCSIFATMTCP now refuses to attach the same socket twice
34586 + - zatm.c: fixed setting of the VPI/VCI mask
34587 + - USAGE said ttcp uses -B for the bandwidth, but it's -P
34588 + - mkdist didn't include man pages
34589 +
34590 +New features
34591 +------------
34592 +
34593 + - added some /proc/atm functionality
34594 + - added support for ATM_{VPI,VCI}_ANY
34595 + - SIOCSIFATMTCP now returns the interface number and atmtcp(8) prints it
34596 + - wrote atmtcp man page
34597 + - added kernel part of SVC support
34598 +
34599 +Other changes
34600 +-------------
34601 +
34602 + - common.c: only root is now allowed to bind to reserved VCIs
34603 + - Classical IP interfaces are now removed by downing by ifconfig; clip(8)
34604 + returns immediately
34605 + - PVC-connect for non-existing device now returns ENODEV instead of EINVAL
34606 + - new field (type) in struct atm_dev to indicate device type
34607 + - moved getsockopt(SO_CIRANGE) to common.c (removed atmtcp's own version)
34608 + - added ci_range to struct atm_dev (and removed it from atmtcp's private
34609 + structure)
34610 + - added code to read the ESI to zatm.c (but that code doesn't seem to work
34611 + yet)
34612 --- linux-atm-2.4.1.orig/debian/atm-tools-br2684.manpages
34613 +++ linux-atm-2.4.1/debian/atm-tools-br2684.manpages
34614 @@ -0,0 +1 @@
34615 +debian/tmp/usr/share/man/man8/br2684ctl.8
34616 --- linux-atm-2.4.1.orig/debian/atm-tools.atm
34617 +++ linux-atm-2.4.1/debian/atm-tools.atm
34618 @@ -0,0 +1,27 @@
34619 +#!/bin/sh
34620 +# Start/stop the atm daemon(s).
34621 +
34622 +DAEMON="/sbin/atmarpd"
34623 +
34624 +test -f $DAEMON || exit 0
34625 +
34626 +case "$1" in
34627 +start) echo -n "Starting ATM ARP Daemon: "
34628 + start-stop-daemon --start --quiet --exec $DAEMON -b
34629 + /bin/sleep 2
34630 + echo "atmarpd."
34631 + ;;
34632 +stop) echo -n "Stopping ATM ARP Daemon: "
34633 + start-stop-daemon --stop --quiet --exec $DAEMON
34634 + echo "atmarpd."
34635 + ;;
34636 +restart|force-reload) echo -n "Re-starting ATM ARP Daemon: "
34637 + start-stop-daemon --stop --quiet --exec $DAEMON
34638 + start-stop-daemon --start --quiet --exec $DAEMON -b
34639 + /bin/sleep 2
34640 + echo "atmarpd."
34641 + ;;
34642 +*) echo "Usage: /etc/init.d/atm start|stop|restart|force-reload"; exit 1
34643 + ;;
34644 +esac
34645 +exit 0
34646 --- linux-atm-2.4.1.orig/debian/atm-tools.docs
34647 +++ linux-atm-2.4.1/debian/atm-tools.docs
34648 @@ -0,0 +1,4 @@
34649 +BUGS
34650 +README
34651 +doc/README.tc
34652 +debian/README.br2684
34653 --- linux-atm-2.4.1.orig/debian/control.old
34654 +++ linux-atm-2.4.1/debian/control.old
34655 @@ -0,0 +1,72 @@
34656 +Source: linux-atm
34657 +Section: net
34658 +Priority: optional
34659 +Maintainer: Peter De Schrijver (p2) <p2@mind.be>
34660 +Build-Depends: debhelper (>> 4.0.0), bison, flex, perl, dpatch, automake1.4
34661 +Standards-Version: 3.6.1
34662 +
34663 +Package: atm-tools
34664 +Architecture: any
34665 +Depends: ${shlibs:Depends}
34666 +Description: Base programs for ATM in Linux, the net-tools for ATM
34667 + This package provides all the basic programs needed for setting up,
34668 + monitoring and tuning ATM networks. Such as:
34669 + * atmsigd, an ATM signal daemon that implements the ATM UNI protocol.
34670 + * atmtcp, a tool to setup ATM over TCP connections.
34671 + * atmarpd, an implementation of the ATMARP protocol (RFC1577, RFC1755)
34672 + * zeppelin, an ATM LAN Emulation client daemon
34673 + * les and bus, ATM LAN Emulation service daemons
34674 + .
34675 + Notice that upstream still flags these tools as experimental software and
34676 + says that there is still a number of known bugs and issues. The
34677 + software is, however, in productive use at a number of sites and is
34678 + working reliably.
34679 + .
34680 + Homepage: http://linux-atm.sourceforge.net/
34681 +
34682 +Package: atm-tools-br2684
34683 +Architecture: any
34684 +Depends: ${shlibs:Depends}
34685 +Description: br2864ctl - RFC1483/2864 Bridge Daemon for ATM Networks
34686 + br2684ctl handles RFC1483/2684 bridged PDUs. This is most often
34687 + used in ADSL scenarios where usually the subscribers' ethernet
34688 + traffic is encapsulated in ATM AAL5 (by bridging ADSL modems)
34689 + according to RFC2684
34690 + .
34691 + The sources for br2684ctl has been pulled from linux-atm's CVS
34692 + repository. Warning: This is unreleased software that can break any
34693 + time, any place. If it does, you get to keep the pieces. linux-atm's
34694 + upstream flags even the released software as experimental software.
34695 + There is still a number of known bugs and issues.
34696 +
34697 +Package: atm-dev
34698 +Depends: libatm1-dev
34699 +Architecture: all
34700 +Section: oldlibs
34701 +Description: Development files for compiling ATM programs (dummy package)
34702 + This dummy package provides a transition from the previous atm packages.
34703 + It is provided for backwards compatibility only and may be removedafter
34704 + the upgrade has completed or when when no other package depend on it.
34705 +
34706 +Package: libatm1
34707 +Section: libs
34708 +Architecture: any
34709 +Depends: ${shlibs:Depends}
34710 +Conflicts: atm-tools (<< 2.4.1-6)
34711 +Description: shared library for ATM (Asynchronous Transfer Mode)
34712 + Shared libraries needed by ATM (Asynchronous Transfer Mode) related programs
34713 + .
34714 + Homepage: http://linux-atm.sourceforge.net/
34715 +
34716 +Package: libatm1-dev
34717 +Section: libdevel
34718 +Architecture: any
34719 +Depends: libc6-dev, libatm1
34720 +Replaces: atm-dev (<< 2.4.1-7)
34721 +Conflicts: atm-dev (<< 2.4.1-7)
34722 +Provides: libatm-dev
34723 +Description: Development files for compiling ATM programs
34724 + Header files and development libraries for compiling ATM (Asynchronous
34725 + Transfer Mode) related programs.
34726 + .
34727 + Homepage: http://linux-atm.sourceforge.net/
34728 --- linux-atm-2.4.1.orig/debian/atm-tools.install
34729 +++ linux-atm-2.4.1/debian/atm-tools.install
34730 @@ -0,0 +1,18 @@
34731 +debian/tmp/usr/share/man/*
34732 +debian/tmp/usr/bin/*
34733 +debian/tmp/usr/sbin/atmsigd
34734 +debian/tmp/usr/sbin/atmaddr
34735 +debian/tmp/usr/sbin/esi
34736 +debian/tmp/usr/sbin/atmloop
34737 +debian/tmp/usr/sbin/atmtcp
34738 +debian/tmp/usr/sbin/enitune
34739 +debian/tmp/usr/sbin/zntune
34740 +debian/tmp/usr/sbin/atmarp sbin
34741 +debian/tmp/usr/sbin/atmarpd sbin
34742 +debian/tmp/usr/sbin/ilmid
34743 +debian/tmp/usr/sbin/zeppelin
34744 +debian/tmp/usr/sbin/les
34745 +debian/tmp/usr/sbin/bus
34746 +debian/tmp/usr/sbin/lecs
34747 +debian/tmp/usr/sbin/mpcd
34748 +debian/tmp/etc/atmsigd.conf
34749 --- linux-atm-2.4.1.orig/debian/atm-tools.manpages
34750 +++ linux-atm-2.4.1/debian/atm-tools.manpages
34751 @@ -0,0 +1 @@
34752 +debian/atm-tools.8
34753 --- linux-atm-2.4.1.orig/debian/atm-tools.pod
34754 +++ linux-atm-2.4.1/debian/atm-tools.pod
34755 @@ -0,0 +1,27 @@
34756 +=head1 NAME
34757 +
34758 +linux-atm - preliminary manpage
34759 +aread
34760 +awrite
34761 +enitune
34762 +ilmid
34763 +saaldump
34764 +sonetdiag
34765 +ttcp_atm
34766 +zntune
34767 +
34768 +=head1 DOCUMENTATION
34769 +
34770 +atm-tools is a package containing the basic tools that are needed for
34771 +setting up, monitoring, and tuning ATM networks. All available
34772 +documentation can be found in /usr/share/doc/atnm-tools in Debian
34773 +systems, and on the Web on: http://linux-atm.sourceforge.net.
34774 +
34775 +=head1 BUGS
34776 +
34777 +Many. Be prepared to debug.
34778 +
34779 +=head1 AUTHOR
34780 +
34781 +This manpage was written by Marc Haber for linux-atm packaging in
34782 +Debian/GNU Operating System.
34783 --- linux-atm-2.4.1.orig/debian/changelog
34784 +++ linux-atm-2.4.1/debian/changelog
34785 @@ -0,0 +1,212 @@
34786 +linux-atm (2.4.1-17) unstable; urgency=low
34787 +
34788 + * Fix build problem with gcc 4.0 (Closes: )
34789 +
34790 + -- Peter De Schrijver (p2) <p2@mind.be> Thu, 17 Mar 2005 23:02:03 +0100
34791 +
34792 +linux-atm (2.4.1-16) unstable; urgency=low
34793 +
34794 + * Fix build problem with gcc 3.4 (Closes: #259422)
34795 +
34796 + -- Peter De Schrijver (p2) <p2@mind.be> Thu, 15 Jul 2004 14:28:10 +0200
34797 +
34798 +linux-atm (2.4.1-15) unstable; urgency=low
34799 +
34800 + * Updated descriptions (Closes: #239161)
34801 +
34802 + -- Peter De Schrijver (p2) <p2@mind.be> Sun, 4 Apr 2004 21:10:20 +0200
34803 +
34804 +linux-atm (2.4.1-14) unstable; urgency=low
34805 +
34806 + * Fix symlink for /usr/lib/libatm.so (Closes: #221011)
34807 +
34808 + -- Peter De Schrijver (p2) <p2@mind.be> Sun, 7 Dec 2003 21:53:19 +0100
34809 +
34810 +linux-atm (2.4.1-13) unstable; urgency=low
34811 +
34812 + * Previous version fixed #217259, but no changelog entry (Closes: #217259)
34813 + * Previous version fixed #216662, but no changelog entry (Closes: #216662)
34814 + * Added missing build dependency on automake1.4 (Closes: #221120, #221284)
34815 + * New Maintainer (Closes: #206982)
34816 +
34817 + -- Peter De Schrijver (p2) <p2@mind.be> Mon, 17 Nov 2003 23:03:58 +0100
34818 +
34819 +linux-atm (2.4.1-12) unstable; urgency=low
34820 +
34821 + * don't build atm-tools-br2684 by default. Thanks to ftpmaster for
34822 + not allowing the package to be in Debian.
34823 + * Since we don't build atm-tools-br2684 any more, revert back to
34824 + autotools output from 2.4.1-9
34825 + * Add README.br2684 documenting a way to build the package locally.
34826 +
34827 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 5 Nov 2003 21:31:42 +0000
34828 +
34829 +linux-atm (2.4.1-11) experimental; urgency=low
34830 +
34831 + * Build-Depend on dpatch
34832 + * dpatch br2684 header files from later libc for old libc (woody)
34833 +
34834 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 29 Oct 2003 19:05:07 +0000
34835 +
34836 +linux-atm (2.4.1-10) experimental; urgency=low
34837 +
34838 + * add br2684 to package (closes: #216663)
34839 + * autoreconf to actually build br2684
34840 + * have libatm1-dev provide libatm-dev (closes: #216662)
34841 + * move lib symlink to libatm1-dev as well (closes: #217259)
34842 +
34843 + -- Marc Haber <mh+debian-packages@zugschlus.de> Thu, 23 Oct 2003 17:55:43 +0000
34844 +
34845 +linux-atm (2.4.1-9) unstable; urgency=low
34846 +
34847 + * put libatm1-dev in libdevel (closes: #213170)
34848 + * make sure that new descriptions actually make it into the package
34849 +
34850 + -- Marc Haber <mh+debian-packages@zugschlus.de> Thu, 9 Oct 2003 17:08:10 +0000
34851 +
34852 +linux-atm (2.4.1-8) unstable; urgency=low
34853 +
34854 + * build arch-indep package as targets of binary-indep (closes: #212124)
34855 + * use dh_installdocs to install files to libatm1-dev/docs
34856 + * symlink shared lib to usr/bin (closes: #213146)
34857 + * Use better long descriptions. Thanks to Javier (closes: #209427)
34858 + Fernandez-Sanguino (closes: #209612)
34859 +
34860 + -- Marc Haber <mh+debian-packages@zugschlus.de> Sun, 28 Sep 2003 19:29:08 +0000
34861 +
34862 +linux-atm (2.4.1-7) unstable; urgency=low
34863 +
34864 + * libatm1 now conflicts with atm-tools (<< 2.4.1-6) (closes: #208170)
34865 + * armarp now writes output to stdout.
34866 + * add atm-dev as empty transitional package to help upgrades
34867 +
34868 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 2 Sep 2003 09:20:33 +0000
34869 +
34870 +linux-atm (2.4.1-6) unstable; urgency=low
34871 +
34872 + * split off shared libraries to libatm1
34873 + * rename atm-dev to libatm1-dev
34874 + * Standards-Version: 3.6.1
34875 +
34876 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 26 Aug 2003 15:46:27 +0000
34877 +
34878 +linux-atm (2.4.1-5) unstable; urgency=low
34879 +
34880 + * move *.a and *.la to usr/lib (closes: #199506).
34881 + * let atm-dev depend on atm-tools to avoid dangling /lib/libatm.so
34882 + symlink.
34883 + * Standards-Version: 3.5.6
34884 +
34885 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 30 Jul 2003 11:46:19 +0000
34886 +
34887 +linux-atm (2.4.1-4) unstable; urgency=low
34888 +
34889 + * add Build-Depends: on automake1.4
34890 +
34891 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 11 Jun 2003 16:58:21 +0000
34892 +
34893 +linux-atm (2.4.1-3) unstable; urgency=low
34894 +
34895 + * rebuilding libtool broke src/test/Makefile.in. Applied fix to
34896 + Makefile.am and re-built again.
34897 +
34898 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 11 Jun 2003 11:05:26 +0000
34899 +
34900 +linux-atm (2.4.1-2) unstable; urgency=low
34901 +
34902 + * rebuild configure script with new libtool (closes: #196909)
34903 +
34904 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 10 Jun 2003 21:01:50 +0000
34905 +
34906 +linux-atm (2.4.1-1) unstable; urgency=low
34907 +
34908 + * new upstream source
34909 + * remove atmarp and atmarpd from /usr/sbin as they are already in
34910 + /sbin (closes: #196216)
34911 + * lintian fixes
34912 +
34913 + -- Marc Haber <mh+debian-packages@zugschlus.de> Mon, 9 Jun 2003 16:03:45 +0000
34914 +
34915 +linux-atm (2.4.0-5) unstable; urgency=low
34916 +
34917 + * Fix for src/test/Makefile.in to allow building on hppa and ia64
34918 + which the fix introduced to 2.4.0-4 broke. Thanks to Goswin
34919 + Brederlow.
34920 + * Move init.d priority to that atmarpd is started before network
34921 + interfaces are started.
34922 + * Move atmarpd and libatm to /sbin and /lib to allow atmarpd to be
34923 + started before /usr is mounted.
34924 + * use dh_install instead of dh_movefiles.
34925 +
34926 + -- Marc Haber <mh+debian-packages@zugschlus.de> Sat, 24 Aug 2002 15:13:48 +0000
34927 +
34928 +linux-atm (2.4.0-4) unstable; urgency=low
34929 +
34930 + * new maintainer
34931 + * Fix for src/test/Makefile.in to allow building on sparc.
34932 + Thanks to Patrick Mauritz. (closes: #144225).
34933 + * added pseudo-manpage for manpage-less binaries.
34934 + * removed rpath by changing configure and make install paramaters
34935 +
34936 + -- Marc Haber <mh+debian-packages@zugschlus.de> Fri, 16 Aug 2002 20:39:05 +0000
34937 +
34938 +linux-atm (2.4.0-3) unstable; urgency=HIGH
34939 +
34940 + * Re-ran libtoolize.
34941 + Closes: #143522
34942 +
34943 + * Previous version Closes: #135328
34944 +
34945 + -- Russell Coker <russell@coker.com.au> Fri, 19 Apr 2002 01:55:00 +0200
34946 +
34947 +linux-atm (2.4.0-2) unstable; urgency=HIGH
34948 +
34949 + * Put a "grep -v EMAXERRNO" into the build process to deal with mipsel and
34950 + the "#ifdef __KERNEL__" it has in it's /usr/include/asm/errno.h .
34951 +
34952 + -- Russell Coker <russell@coker.com.au> Thu, 18 Apr 2002 19:56:00 +0200
34953 +
34954 +linux-atm (2.4.0-1) unstable; urgency=HIGH
34955 +
34956 + * New upstream version which changes source package name.
34957 + Closes: #138911
34958 +
34959 + -- Russell Coker <russell@coker.com.au> Mon, 18 Mar 2002 17:42:00 +0100
34960 +
34961 +atm (0.79-4) unstable; urgency=low
34962 +
34963 + * Added build-depends on flex.
34964 + Closes: #111072
34965 +
34966 + * Made the atm tools use a shared object to save space.
34967 +
34968 + * Fixed the copyright file and put all copyright details in both packages.
34969 +
34970 + * Added support for easy building with different kernel headers.
34971 + Closes: #110249
34972 +
34973 + -- Russell Coker <russell@coker.com.au> Sun, 7 Oct 2001 14:11:33 +0200
34974 +
34975 +atm (0.79-3) unstable; urgency=low
34976 +
34977 + * Created /etc/init.d/atm to start and stop atmarpd.
34978 + Closes: #110252
34979 +
34980 + * Added build-depends on bison.
34981 + Closes: #110576
34982 +
34983 + -- Russell Coker <russell@coker.com.au> Fri, 31 Aug 2001 15:21:44 +0200
34984 +
34985 +atm (0.79-2) unstable; urgency=low
34986 +
34987 + * Changed the main package name to atm-tools to indicate that it doesn't
34988 + provide ATM (gotta have the kernel support), it just has the daemons and
34989 + utilities.
34990 +
34991 + -- Russell Coker <russell@coker.com.au> Sat, 25 Aug 2001 17:55:00 +0200
34992 +
34993 +atm (0.79-1) unstable; urgency=low
34994 +
34995 + * Initial Release.
34996 +
34997 + -- Russell Coker <russell@coker.com.au> Fri, 24 Aug 2001 17:31:00 +0200
34998 --- linux-atm-2.4.1.orig/debian/checkout-br2684
34999 +++ linux-atm-2.4.1/debian/checkout-br2684
35000 @@ -0,0 +1,25 @@
35001 +#!/bin/bash -x
35002 +
35003 +set -e
35004 +
35005 +# check out br2684 from upstream CVS. We need to jump through hoops if
35006 +# the local source package is under cvs control as well.
35007 +
35008 +CVSDIR=":pserver:anonymous:@cvs.linux-atm.sourceforge.net.:/cvsroot/linux-atm"
35009 +DIR="br2684"
35010 +TMPDIR="/tmp"
35011 +TARGETDIR="src"
35012 +
35013 +cvs -d${CVSDIR} login
35014 +
35015 +mkdir -p $TMPDIR
35016 +pushd $TMPDIR
35017 +cvs -z6 -d${CVSDIR} export -d $DIR -r V2_5_0 linux-atm/src/br2684
35018 +
35019 +popd
35020 +
35021 +mv $TMPDIR/$DIR/* $TARGETDIR/$DIR
35022 +rm -rf $TMPDIR/$DIR
35023 +
35024 +autoreconf -i -f
35025 +
35026 --- linux-atm-2.4.1.orig/debian/copyright.header
35027 +++ linux-atm-2.4.1/debian/copyright.header
35028 @@ -0,0 +1,18 @@
35029 +This package was debianized by Russell Coker <russell@coker.com.au> on
35030 +Fri, 24 Aug 2001 16:11:12 +0200 and is now maintained by Marc Haber
35031 +<mh+debian-packages@zugschlus.de>.
35032 +
35033 +It was downloaded from http://www.sourceforge.net/projects/linux-atm/
35034 +
35035 +See also http://linux-atm.sourceforge.net/dist.php
35036 +
35037 +Upstream Authors:
35038 +Werner Almesberger EPFL ICA <Werner.Almesberger@epfl.ch>
35039 +Mitchell Blank Jr. <mitch@sfgoth.com>
35040 +Paul B Schroeder <paulsch@us.ibm.com>
35041 +
35042 +Copyright:
35043 +
35044 +GPL 2.0
35045 +
35046 +See /usr/share/common-licenses/GPL-2
35047 --- linux-atm-2.4.1.orig/debian/libatm1-dev.dirs
35048 +++ linux-atm-2.4.1/debian/libatm1-dev.dirs
35049 @@ -0,0 +1,2 @@
35050 +usr/lib
35051 +usr/include
35052 --- linux-atm-2.4.1.orig/debian/libatm1-dev.docs
35053 +++ linux-atm-2.4.1/debian/libatm1-dev.docs
35054 @@ -0,0 +1,2 @@
35055 +doc/README.CLP
35056 +doc/atm-linux-howto.txt
35057 --- linux-atm-2.4.1.orig/debian/libatm1-dev.install
35058 +++ linux-atm-2.4.1/debian/libatm1-dev.install
35059 @@ -0,0 +1,2 @@
35060 +debian/tmp/usr/include/*
35061 +debian/tmp/usr/lib/*.a usr/lib
35062 --- linux-atm-2.4.1.orig/debian/libatm1-dev.links
35063 +++ linux-atm-2.4.1/debian/libatm1-dev.links
35064 @@ -0,0 +1 @@
35065 +lib/libatm.so.1 usr/lib/libatm.so
35066 --- linux-atm-2.4.1.orig/debian/libatm1.dirs
35067 +++ linux-atm-2.4.1/debian/libatm1.dirs
35068 @@ -0,0 +1 @@
35069 +/lib
35070 --- linux-atm-2.4.1.orig/debian/libatm1.install
35071 +++ linux-atm-2.4.1/debian/libatm1.install
35072 @@ -0,0 +1 @@
35073 +debian/tmp/usr/lib/libatm.so.* lib
Personal OpenWRT clone
This page took 1.407283 seconds and 5 git commands to generate.