projects / openwrt / svn-archive / archive.git / blob
? search:


de6434dc6a5ec52850a4ca6e7a88bf3eb5d1abc0
[openwrt/svn-archive/archive.git] / package / linux-atm / patches / 000-debian_16.patch
1 Index: linux-atm-2.4.1/Makefile.in
2 ===================================================================
3 --- linux-atm-2.4.1.orig/Makefile.in 2007-06-04 13:23:53.886541896 +0200
4 +++ linux-atm-2.4.1/Makefile.in 2007-06-04 13:23:54.459454800 +0200
5 @@ -1,4 +1,4 @@
6 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
7 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
8
9 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
10 # This Makefile.in is free software; the Free Software Foundation
11 @@ -100,14 +100,14 @@
12
13 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14
15 -TAR = gtar
16 +TAR = tar
17 GZIP_ENV = --best
18 all: all-redirect
19 .SUFFIXES:
20 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
21 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
22 + cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
23
24 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
25 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26 cd $(top_builddir) \
27 && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
28
29 @@ -225,7 +225,7 @@
30 awk ' { files[$$0] = 1; } \
31 END { for (i in files) print i; }'`; \
32 test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
33 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
34 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
35
36 mostlyclean-tags:
37
38 @@ -274,6 +274,11 @@
39 -rm -rf $(distdir)
40 mkdir $(distdir)
41 -chmod 777 $(distdir)
42 + here=`cd $(top_builddir) && pwd`; \
43 + top_distdir=`cd $(distdir) && pwd`; \
44 + distdir=`cd $(distdir) && pwd`; \
45 + cd $(top_srcdir) \
46 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
47 @for file in $(DISTFILES); do \
48 d=$(srcdir); \
49 if test -d $$d/$$file; then \
50 Index: linux-atm-2.4.1/aclocal.m4
51 ===================================================================
52 --- linux-atm-2.4.1.orig/aclocal.m4 2007-06-04 13:23:53.891541136 +0200
53 +++ linux-atm-2.4.1/aclocal.m4 2007-06-04 13:23:54.462454344 +0200
54 @@ -1,4 +1,4 @@
55 -dnl aclocal.m4 generated automatically by aclocal 1.4-p5
56 +dnl aclocal.m4 generated automatically by aclocal 1.4-p6
57
58 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
59 dnl This file is free software; the Free Software Foundation
60 @@ -43,7 +43,8 @@
61 dnl AM_INIT_AUTOMAKE(package,version, [no-define])
62
63 AC_DEFUN([AM_INIT_AUTOMAKE],
64 -[AC_REQUIRE([AC_PROG_INSTALL])
65 +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
66 +AC_REQUIRE([AC_PROG_INSTALL])
67 PACKAGE=[$1]
68 AC_SUBST(PACKAGE)
69 VERSION=[$2]
70 @@ -59,13 +60,42 @@
71 AC_REQUIRE([AC_ARG_PROGRAM])
72 dnl FIXME This is truly gross.
73 missing_dir=`cd $ac_aux_dir && pwd`
74 -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
75 +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
76 AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
77 -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
78 +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
79 AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
80 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
81 AC_REQUIRE([AC_PROG_MAKE_SET])])
82
83 +# Copyright 2002 Free Software Foundation, Inc.
84 +
85 +# This program is free software; you can redistribute it and/or modify
86 +# it under the terms of the GNU General Public License as published by
87 +# the Free Software Foundation; either version 2, or (at your option)
88 +# any later version.
89 +
90 +# This program is distributed in the hope that it will be useful,
91 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
92 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
93 +# GNU General Public License for more details.
94 +
95 +# You should have received a copy of the GNU General Public License
96 +# along with this program; if not, write to the Free Software
97 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
98 +
99 +# AM_AUTOMAKE_VERSION(VERSION)
100 +# ----------------------------
101 +# Automake X.Y traces this macro to ensure aclocal.m4 has been
102 +# generated from the m4 files accompanying Automake X.Y.
103 +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
104 +
105 +# AM_SET_CURRENT_AUTOMAKE_VERSION
106 +# -------------------------------
107 +# Call AM_AUTOMAKE_VERSION so it can be traced.
108 +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
109 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
110 + [AM_AUTOMAKE_VERSION([1.4-p6])])
111 +
112 #
113 # Check to make sure that the build environment is sane.
114 #
115 @@ -130,13 +160,14 @@
116 dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
117 AC_DEFUN([AM_PROG_LEX],
118 [missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
119 -AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
120 +AC_CHECK_PROGS(LEX, flex lex, $missing_dir/missing flex)
121 AC_PROG_LEX
122 AC_DECL_YYTEXT])
123
124 # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
125
126 # serial 46 AC_PROG_LIBTOOL
127 +
128 AC_DEFUN([AC_PROG_LIBTOOL],
129 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
130
131 @@ -162,6 +193,8 @@
132 AC_REQUIRE([AC_PROG_LD])dnl
133 AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
134 AC_REQUIRE([AC_PROG_NM])dnl
135 +AC_REQUIRE([LT_AC_PROG_SED])dnl
136 +
137 AC_REQUIRE([AC_PROG_LN_S])dnl
138 AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
139 AC_REQUIRE([AC_OBJEXT])dnl
140 @@ -262,9 +295,30 @@
141
142 ])
143
144 +# AC_LIBTOOL_HEADER_ASSERT
145 +# ------------------------
146 +AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
147 +[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
148 + [lt_cv_func_assert_works],
149 + [case $host in
150 + *-*-solaris*)
151 + if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
152 + case `$CC --version 2>/dev/null` in
153 + [[12]].*) lt_cv_func_assert_works=no ;;
154 + *) lt_cv_func_assert_works=yes ;;
155 + esac
156 + fi
157 + ;;
158 + esac])
159 +
160 +if test "x$lt_cv_func_assert_works" = xyes; then
161 + AC_CHECK_HEADERS(assert.h)
162 +fi
163 +])# AC_LIBTOOL_HEADER_ASSERT
164 +
165 # _LT_AC_CHECK_DLFCN
166 # --------------------
167 -AC_DEFUN(_LT_AC_CHECK_DLFCN,
168 +AC_DEFUN([_LT_AC_CHECK_DLFCN],
169 [AC_CHECK_HEADERS(dlfcn.h)
170 ])# _LT_AC_CHECK_DLFCN
171
172 @@ -282,10 +336,10 @@
173 # [They come from Ultrix. What could be older than Ultrix?!! ;)]
174
175 # Character class describing NM global symbol codes.
176 -[symcode='[BCDEGRST]']
177 +symcode='[[BCDEGRST]]'
178
179 # Regexp to match symbols that can be accessed directly from C.
180 -[sympat='\([_A-Za-z][_A-Za-z0-9]*\)']
181 +sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
182
183 # Transform the above into a raw symbol and a C symbol.
184 symxfrm='\1 \2\3 \3'
185 @@ -293,25 +347,32 @@
186 # Transform an extracted symbol line into a proper C declaration
187 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
188
189 +# Transform an extracted symbol line into symbol name and symbol address
190 +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'"
191 +
192 # Define system-specific variables.
193 case $host_os in
194 aix*)
195 - [symcode='[BCDT]']
196 + symcode='[[BCDT]]'
197 ;;
198 cygwin* | mingw* | pw32*)
199 - [symcode='[ABCDGISTW]']
200 + symcode='[[ABCDGISTW]]'
201 ;;
202 hpux*) # Its linker distinguishes data from code symbols
203 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
204 + 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'"
205 + ;;
206 +irix* | nonstopux*)
207 + symcode='[[BCDEGRST]]'
208 ;;
209 -irix*)
210 - [symcode='[BCDEGRST]']
211 +osf*)
212 + symcode='[[BCDEGQRST]]'
213 ;;
214 solaris* | sysv5*)
215 - [symcode='[BDT]']
216 + symcode='[[BDT]]'
217 ;;
218 sysv4)
219 - [symcode='[DFNSTU]']
220 + symcode='[[DFNSTU]]'
221 ;;
222 esac
223
224 @@ -325,14 +386,14 @@
225
226 # If we're using GNU nm, then use its standard symbol codes.
227 if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
228 - [symcode='[ABCDGISTW]']
229 + symcode='[[ABCDGISTW]]'
230 fi
231
232 # Try without a prefix undercore, then with it.
233 for ac_symprfx in "" "_"; do
234
235 # Write the raw and C identifiers.
236 -[lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"]
237 +lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
238
239 # Check to see that the pipe works correctly.
240 pipe_works=no
241 @@ -374,23 +435,23 @@
242
243 cat <<EOF >> conftest.$ac_ext
244 #if defined (__STDC__) && __STDC__
245 -# define lt_ptr_t void *
246 +# define lt_ptr void *
247 #else
248 -# define lt_ptr_t char *
249 +# define lt_ptr char *
250 # define const
251 #endif
252
253 /* The mapping between symbol names and symbols. */
254 const struct {
255 const char *name;
256 - lt_ptr_t address;
257 + lt_ptr address;
258 }
259 -[lt_preloaded_symbols[] =]
260 +lt_preloaded_symbols[[]] =
261 {
262 EOF
263 - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
264 + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
265 cat <<\EOF >> conftest.$ac_ext
266 - {0, (lt_ptr_t) 0}
267 + {0, (lt_ptr) 0}
268 };
269
270 #ifdef __cplusplus
271 @@ -403,7 +464,7 @@
272 save_CFLAGS="$CFLAGS"
273 LIBS="conftstm.$ac_objext"
274 CFLAGS="$CFLAGS$no_builtin_flag"
275 - if AC_TRY_EVAL(ac_link) && test -s conftest; then
276 + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
277 pipe_works=yes
278 fi
279 LIBS="$save_LIBS"
280 @@ -434,10 +495,13 @@
281 global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
282 if test -z "$lt_cv_sys_global_symbol_pipe"; then
283 global_symbol_to_cdecl=
284 + global_symbol_to_c_name_address=
285 else
286 global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
287 + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
288 fi
289 -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
290 +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
291 +then
292 AC_MSG_RESULT(failed)
293 else
294 AC_MSG_RESULT(ok)
295 @@ -455,16 +519,17 @@
296 *-DOS) lt_cv_sys_path_separator=';' ;;
297 *) lt_cv_sys_path_separator=':' ;;
298 esac
299 + PATH_SEPARATOR=$lt_cv_sys_path_separator
300 fi
301 ])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
302
303 # _LT_AC_PROG_ECHO_BACKSLASH
304 # --------------------------
305 # Add some code to the start of the generated configure script which
306 -# will find an echo command which doesn;t interpret backslashes.
307 +# will find an echo command which doesn't interpret backslashes.
308 AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
309 [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
310 - [AC_DIVERT_PUSH(NOTICE)])
311 + [AC_DIVERT_PUSH(NOTICE)])
312 _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
313
314 # Check that we are running under the correct shell.
315 @@ -530,7 +595,7 @@
316 #
317 # So, first we look for a working echo in the user's PATH.
318
319 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
320 + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
321 for dir in $PATH /usr/ucb; do
322 if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
323 test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
324 @@ -619,7 +684,7 @@
325 # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
326 # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
327 # ------------------------------------------------------------------
328 -AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF,
329 +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
330 [if test "$cross_compiling" = yes; then :
331 [$4]
332 else
333 @@ -706,7 +771,7 @@
334
335 # AC_LIBTOOL_DLOPEN_SELF
336 # -------------------
337 -AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF,
338 +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
339 [if test "x$enable_dlopen" != xyes; then
340 enable_dlopen=unknown
341 enable_dlopen_self=unknown
342 @@ -728,16 +793,22 @@
343 ;;
344
345 *)
346 - AC_CHECK_LIB(dl, dlopen, [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
347 - [AC_CHECK_FUNC(dlopen, lt_cv_dlopen="dlopen",
348 - [AC_CHECK_FUNC(shl_load, lt_cv_dlopen="shl_load",
349 - [AC_CHECK_LIB(svld, dlopen,
350 - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
351 - [AC_CHECK_LIB(dld, shl_load,
352 - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
353 + AC_CHECK_FUNC([shl_load],
354 + [lt_cv_dlopen="shl_load"],
355 + [AC_CHECK_LIB([dld], [shl_load],
356 + [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
357 + [AC_CHECK_FUNC([dlopen],
358 + [lt_cv_dlopen="dlopen"],
359 + [AC_CHECK_LIB([dl], [dlopen],
360 + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
361 + [AC_CHECK_LIB([svld], [dlopen],
362 + [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
363 + [AC_CHECK_LIB([dld], [dld_link],
364 + [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
365 + ])
366 ])
367 - ])
368 - ])
369 + ])
370 + ])
371 ])
372 ;;
373 esac
374 @@ -800,10 +871,10 @@
375 # Sed substitution that helps us do robust quoting. It backslashifies
376 # metacharacters that are still active within double-quoted strings.
377 Xsed='sed -e s/^X//'
378 -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
379 +sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
380
381 # Same as above, but do not quote variable references.
382 -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
383 +double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
384
385 # Sed substitution to delay expansion of an escaped shell variable in a
386 # double_quote_subst'ed string.
387 @@ -872,8 +943,15 @@
388 old_postuninstall_cmds=
389
390 if test -n "$RANLIB"; then
391 + case $host_os in
392 + openbsd*)
393 + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
394 + ;;
395 + *)
396 + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
397 + ;;
398 + esac
399 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
400 - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
401 fi
402
403 # Allow CC to be a program name with arguments.
404 @@ -893,7 +971,7 @@
405 AC_MSG_RESULT($objdir)
406
407
408 -AC_ARG_WITH(pic,
409 +AC_ARG_WITH(pic,
410 [ --with-pic try to use only PIC/non-PIC objects [default=use both]],
411 pic_mode="$withval", pic_mode=default)
412 test -z "$pic_mode" && pic_mode=default
413 @@ -921,7 +999,7 @@
414 # libC (AIX C++ library), which obviously doesn't included in libraries
415 # list by gcc. This cause undefined symbols with -static flags.
416 # This hack allows C programs to be linked with "-static -ldl", but
417 - # we not sure about C++ programs.
418 + # not sure about C++ programs.
419 lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
420 ;;
421 amigaos*)
422 @@ -930,7 +1008,7 @@
423 # like `-m68040'.
424 lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
425 ;;
426 - beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
427 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
428 # PIC is the default for these OSes.
429 ;;
430 darwin* | rhapsody*)
431 @@ -956,13 +1034,13 @@
432 # PORTME Check for PIC flags for the system compiler.
433 case $host_os in
434 aix3* | aix4* | aix5*)
435 + lt_cv_prog_cc_wl='-Wl,'
436 # All AIX code is PIC.
437 if test "$host_cpu" = ia64; then
438 - # AIX 5 now supports IA64 processor
439 - lt_cv_prog_cc_static='-Bstatic'
440 - lt_cv_prog_cc_wl='-Wl,'
441 + # AIX 5 now supports IA64 processor
442 + lt_cv_prog_cc_static='-Bstatic'
443 else
444 - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
445 + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
446 fi
447 ;;
448
449 @@ -973,7 +1051,7 @@
450 lt_cv_prog_cc_pic='+Z'
451 ;;
452
453 - irix5* | irix6*)
454 + irix5* | irix6* | nonstopux*)
455 lt_cv_prog_cc_wl='-Wl,'
456 lt_cv_prog_cc_static='-non_shared'
457 # PIC (with -KPIC) is the default.
458 @@ -1017,11 +1095,7 @@
459 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
460 lt_cv_prog_cc_pic='-KPIC'
461 lt_cv_prog_cc_static='-Bstatic'
462 - if test "x$host_vendor" = xsni; then
463 - lt_cv_prog_cc_wl='-LD'
464 - else
465 - lt_cv_prog_cc_wl='-Wl,'
466 - fi
467 + lt_cv_prog_cc_wl='-Wl,'
468 ;;
469
470 uts4*)
471 @@ -1087,7 +1161,7 @@
472 # Check for any special shared library compilation flags.
473 if test -n "$lt_cv_prog_cc_shlib"; then
474 AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
475 - if echo "$old_CC $old_CFLAGS " | [egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]"] >/dev/null; then :
476 + if echo "$old_CC $old_CFLAGS " | egrep -e "[[ ]]$lt_cv_prog_cc_shlib[[ ]]" >/dev/null; then :
477 else
478 AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
479 lt_cv_prog_cc_can_build_shared=no
480 @@ -1163,6 +1237,8 @@
481 lt_cv_compiler_o_lo=no
482 save_CFLAGS="$CFLAGS"
483 CFLAGS="$CFLAGS -c -o conftest.lo"
484 + save_objext="$ac_objext"
485 + ac_objext=lo
486 AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
487 # The compiler can only warn and ignore the option if not recognized
488 # So say no if there are warnings
489 @@ -1172,6 +1248,7 @@
490 lt_cv_compiler_o_lo=yes
491 fi
492 ])
493 + ac_objext="$save_objext"
494 CFLAGS="$save_CFLAGS"
495 ])
496 compiler_o_lo=$lt_cv_compiler_o_lo
497 @@ -1268,7 +1345,7 @@
498 extract_expsyms_cmds=
499
500 case $host_os in
501 -cygwin* | mingw* | pw32* )
502 +cygwin* | mingw* | pw32*)
503 # FIXME: the MSVC++ port hasn't been tested in a loooong time
504 # When not using gcc, we currently assume that we are using
505 # Microsoft Visual C++.
506 @@ -1276,7 +1353,9 @@
507 with_gnu_ld=no
508 fi
509 ;;
510 -
511 +openbsd*)
512 + with_gnu_ld=no
513 + ;;
514 esac
515
516 ld_shlibs=yes
517 @@ -1363,7 +1442,7 @@
518 # can override, but on older systems we have to supply one (in ltdll.c)
519 if test "x$lt_cv_need_dllmain" = "xyes"; then
520 ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
521 - 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~
522 + 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~
523 test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
524 else
525 ltdll_obj=
526 @@ -1376,24 +1455,25 @@
527 # Be careful not to strip the DATA tag left be newer dlltools.
528 export_symbols_cmds="$ltdll_cmds"'
529 $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
530 - [sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//"] < $output_objdir/$soname-def > $export_symbols'
531 + sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
532
533 # If the export-symbols file already is a .def file (1st line
534 # is EXPORTS), use it as is.
535 # If DATA tags from a recent dlltool are present, honour them!
536 - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
537 - cp $export_symbols $output_objdir/$soname-def;
538 + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
539 + cp $export_symbols $output_objdir/$soname-def;
540 else
541 - echo EXPORTS > $output_objdir/$soname-def;
542 - _lt_hint=1;
543 - cat $export_symbols | while read symbol; do
544 - set dummy \$symbol;
545 - case \[$]# in
546 - 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
547 - *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
548 - esac;
549 - _lt_hint=`expr 1 + \$_lt_hint`;
550 - done;
551 + echo EXPORTS > $output_objdir/$soname-def;
552 + _lt_hint=1;
553 + cat $export_symbols | while read symbol; do
554 + set dummy \$symbol;
555 + case \[$]# in
556 + 2) echo " \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
557 + 4) echo " \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
558 + *) echo " \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
559 + esac;
560 + _lt_hint=`expr 1 + \$_lt_hint`;
561 + done;
562 fi~
563 '"$ltdll_cmds"'
564 $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~
565 @@ -1488,80 +1568,98 @@
566 ;;
567
568 aix4* | aix5*)
569 + if test "$host_cpu" = ia64; then
570 + # On IA64, the linker does run time linking by default, so we don't
571 + # have to do anything special.
572 + aix_use_runtimelinking=no
573 + exp_sym_flag='-Bexport'
574 + no_entry_flag=""
575 + else
576 + aix_use_runtimelinking=no
577 +
578 + # Test if we are trying to use run time linking or normal
579 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
580 + # need to do runtime linking.
581 + case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
582 + for ld_flag in $LDFLAGS; do
583 + case $ld_flag in
584 + *-brtl*)
585 + aix_use_runtimelinking=yes
586 + break
587 + ;;
588 + esac
589 + done
590 + esac
591 +
592 + exp_sym_flag='-bexport'
593 + no_entry_flag='-bnoentry'
594 + fi
595 +
596 # When large executables or shared objects are built, AIX ld can
597 # have problems creating the table of contents. If linking a library
598 # or program results in "error TOC overflow" add -mminimal-toc to
599 # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
600 # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
601
602 + hardcode_direct=yes
603 archive_cmds=''
604 hardcode_libdir_separator=':'
605 if test "$GCC" = yes; then
606 - collect2name=`${CC} -print-prog-name=collect2`
607 - if test -f "$collect2name" && \
608 - strings "$collect2name" | grep resolve_lib_name >/dev/null
609 - then
610 - # We have reworked collect2
611 - hardcode_direct=yes
612 - else
613 - # We have old collect2
614 - hardcode_direct=unsupported
615 - # It fails to find uninstalled libraries when the uninstalled
616 - # path is not listed in the libpath. Setting hardcode_minus_L
617 - # to unsupported forces relinking
618 - hardcode_minus_L=yes
619 - hardcode_libdir_flag_spec='-L$libdir'
620 - hardcode_libdir_separator=
621 - fi
622 + case $host_os in aix4.[[012]]|aix4.[[012]].*)
623 + collect2name=`${CC} -print-prog-name=collect2`
624 + if test -f "$collect2name" && \
625 + strings "$collect2name" | grep resolve_lib_name >/dev/null
626 + then
627 + # We have reworked collect2
628 + hardcode_direct=yes
629 + else
630 + # We have old collect2
631 + hardcode_direct=unsupported
632 + # It fails to find uninstalled libraries when the uninstalled
633 + # path is not listed in the libpath. Setting hardcode_minus_L
634 + # to unsupported forces relinking
635 + hardcode_minus_L=yes
636 + hardcode_libdir_flag_spec='-L$libdir'
637 + hardcode_libdir_separator=
638 + fi
639 + esac
640 +
641 shared_flag='-shared'
642 else
643 + # not using gcc
644 if test "$host_cpu" = ia64; then
645 - shared_flag='-G'
646 + shared_flag='${wl}-G'
647 else
648 - shared_flag='${wl}-bM:SRE'
649 + if test "$aix_use_runtimelinking" = yes; then
650 + shared_flag='${wl}-G'
651 + else
652 + shared_flag='${wl}-bM:SRE'
653 + fi
654 fi
655 - hardcode_direct=yes
656 fi
657
658 - if test "$host_cpu" = ia64; then
659 - # On IA64, the linker does run time linking by default, so we don't
660 - # have to do anything special.
661 - aix_use_runtimelinking=no
662 - exp_sym_flag='-Bexport'
663 - no_entry_flag=""
664 - else
665 - # Test if we are trying to use run time linking, or normal AIX style linking.
666 - # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
667 - aix_use_runtimelinking=no
668 - for ld_flag in $LDFLAGS; do
669 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
670 - aix_use_runtimelinking=yes
671 - break
672 - fi
673 - done
674 - exp_sym_flag='-bexport'
675 - no_entry_flag='-bnoentry'
676 - fi
677 # It seems that -bexpall can do strange things, so it is better to
678 # generate a list of symbols to export.
679 always_export_symbols=yes
680 if test "$aix_use_runtimelinking" = yes; then
681 + # Warning - without using the other runtime loading flags (-brtl),
682 + # -berok will link without error, but may produce a broken library.
683 + allow_undefined_flag='-berok'
684 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
685 - allow_undefined_flag=' -Wl,-G'
686 - 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"
687 + 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"
688 else
689 if test "$host_cpu" = ia64; then
690 - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
691 - allow_undefined_flag="-znodefs"
692 - 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"
693 + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
694 + allow_undefined_flag="-z nodefs"
695 + 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"
696 else
697 - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
698 - # Warning - without using the other run time loading flags, -berok will
699 - # link without error, but may produce a broken library.
700 - allow_undefined_flag='${wl}-berok'
701 - # This is a bit strange, but is similar to how AIX traditionally builds
702 - # it's shared libraries.
703 - 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'
704 + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
705 + # Warning - without using the other run time loading flags,
706 + # -berok will link without error, but may produce a broken library.
707 + allow_undefined_flag='${wl}-berok'
708 + # This is a bit strange, but is similar to how AIX traditionally builds
709 + # it's shared libraries.
710 + 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'
711 fi
712 fi
713 ;;
714 @@ -1593,11 +1691,19 @@
715 ;;
716
717 darwin* | rhapsody*)
718 - allow_undefined_flag='-undefined suppress'
719 + case "$host_os" in
720 + rhapsody* | darwin1.[[012]])
721 + allow_undefined_flag='-undefined suppress'
722 + ;;
723 + *) # Darwin 1.3 on
724 + allow_undefined_flag='-flat_namespace -undefined suppress'
725 + ;;
726 + esac
727 # FIXME: Relying on posixy $() will cause problems for
728 # cross-compilation, but unfortunately the echo tests do not
729 - # yet detect zsh echo's removal of \ escapes.
730 - 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)'
731 + # yet detect zsh echo's removal of \ escapes. Also zsh mangles
732 + # `"' quotes if we put them in here... so don't!
733 + 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)'
734 # We need to add '_' to the symbols in $export_symbols first
735 #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
736 hardcode_direct=yes
737 @@ -1649,13 +1755,14 @@
738 export_dynamic_flag_spec='${wl}-E'
739 ;;
740
741 - irix5* | irix6*)
742 + irix5* | irix6* | nonstopux*)
743 if test "$GCC" = yes; then
744 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'
745 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
746 else
747 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'
748 + hardcode_libdir_flag_spec='-rpath $libdir'
749 fi
750 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
751 hardcode_libdir_separator=:
752 link_all_deplibs=yes
753 ;;
754 @@ -1672,7 +1779,7 @@
755 ;;
756
757 newsos6)
758 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
759 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
760 hardcode_direct=yes
761 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
762 hardcode_libdir_separator=:
763 @@ -1680,10 +1787,24 @@
764 ;;
765
766 openbsd*)
767 - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
768 - hardcode_libdir_flag_spec='-R$libdir'
769 hardcode_direct=yes
770 hardcode_shlibpath_var=no
771 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
772 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
773 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
774 + export_dynamic_flag_spec='${wl}-E'
775 + else
776 + case "$host_os" in
777 + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
778 + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
779 + hardcode_libdir_flag_spec='-R$libdir'
780 + ;;
781 + *)
782 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
783 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
784 + ;;
785 + esac
786 + fi
787 ;;
788
789 os2*)
790 @@ -1728,10 +1849,39 @@
791 hardcode_shlibpath_var=no
792 runpath_var=LD_RUN_PATH
793 hardcode_runpath_var=yes
794 + export_dynamic_flag_spec='${wl}-Bexport'
795 ;;
796
797 solaris*)
798 + # gcc --version < 3.0 without binutils cannot create self contained
799 + # shared libraries reliably, requiring libgcc.a to resolve some of
800 + # the object symbols generated in some cases. Libraries that use
801 + # assert need libgcc.a to resolve __eprintf, for example. Linking
802 + # a copy of libgcc.a into every shared library to guarantee resolving
803 + # such symbols causes other problems: According to Tim Van Holder
804 + # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
805 + # (to the application) exception stack for one thing.
806 no_undefined_flag=' -z defs'
807 + if test "$GCC" = yes; then
808 + case `$CC --version 2>/dev/null` in
809 + [[12]].*)
810 + cat <<EOF 1>&2
811 +
812 +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
813 +*** create self contained shared libraries on Solaris systems, without
814 +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
815 +*** -no-undefined support, which will at least allow you to build shared
816 +*** libraries. However, you may find that when you link such libraries
817 +*** into an application without using GCC, you have to manually add
818 +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
819 +*** upgrade to a newer version of GCC. Another option is to rebuild your
820 +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
821 +
822 +EOF
823 + no_undefined_flag=
824 + ;;
825 + esac
826 + fi
827 # $CC -shared without GNU ld will not create a library from C++
828 # object files and a static libstdc++, better avoid it by now
829 archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
830 @@ -1740,7 +1890,7 @@
831 hardcode_libdir_flag_spec='-R$libdir'
832 hardcode_shlibpath_var=no
833 case $host_os in
834 - [solaris2.[0-5] | solaris2.[0-5].*]) ;;
835 + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
836 *) # Supported since Solaris 2.6 (maybe 2.5.1?)
837 whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
838 esac
839 @@ -1762,13 +1912,23 @@
840 ;;
841
842 sysv4)
843 - if test "x$host_vendor" = xsno; then
844 - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
845 - hardcode_direct=yes # is this really true???
846 - else
847 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
848 - hardcode_direct=no #Motorola manual says yes, but my tests say they lie
849 - fi
850 + case $host_vendor in
851 + sni)
852 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
853 + hardcode_direct=yes # is this really true???
854 + ;;
855 + siemens)
856 + ## LD is ld it makes a PLAMLIB
857 + ## CC just makes a GrossModule.
858 + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
859 + reload_cmds='$CC -r -o $output$reload_objs'
860 + hardcode_direct=no
861 + ;;
862 + motorola)
863 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
864 + hardcode_direct=no #Motorola manual says yes, but my tests say they lie
865 + ;;
866 + esac
867 runpath_var='LD_RUN_PATH'
868 hardcode_shlibpath_var=no
869 ;;
870 @@ -1909,6 +2069,9 @@
871
872 aix4* | aix5*)
873 version_type=linux
874 + need_lib_prefix=no
875 + need_version=no
876 + hardcode_into_libs=yes
877 if test "$host_cpu" = ia64; then
878 # AIX 5 supports IA64
879 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
880 @@ -1920,22 +2083,24 @@
881 # depend on `.', always an invalid library. This was fixed in
882 # development snapshots of GCC prior to 3.0.
883 case $host_os in
884 - [ aix4 | aix4.[01] | aix4.[01].*)]
885 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
886 - echo ' yes '
887 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
888 - :
889 - else
890 - can_build_shared=no
891 - fi
892 - ;;
893 + aix4 | aix4.[[01]] | aix4.[[01]].*)
894 + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
895 + echo ' yes '
896 + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
897 + :
898 + else
899 + can_build_shared=no
900 + fi
901 + ;;
902 esac
903 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
904 - # soname into executable. Probably we can add versioning support to
905 - # collect2, so additional links can be useful in future.
906 + # AIX (on Power*) has no versioning support, so currently we can
907 + # not hardcode correct soname into executable. Probably we can
908 + # add versioning support to collect2, so additional links can
909 + # be useful in future.
910 if test "$aix_use_runtimelinking" = yes; then
911 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
912 - # lib<name>.a to let people know that these are not typical AIX shared libraries.
913 + # If using run time linking (on AIX 4.2 or later) use lib<name>.so
914 + # instead of lib<name>.a to let people know that these are not
915 + # typical AIX shared libraries.
916 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
917 else
918 # We preserve .a as extension for shared libraries through AIX4.2
919 @@ -1944,14 +2109,14 @@
920 soname_spec='${libname}${release}.so$major'
921 fi
922 shlibpath_var=LIBPATH
923 - deplibs_check_method=pass_all
924 fi
925 + hardcode_into_libs=yes
926 ;;
927
928 amigaos*)
929 library_names_spec='$libname.ixlibrary $libname.a'
930 # Create ${libname}_ixlibrary.a entries in /sys/libs.
931 - 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'
932 + 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'
933 ;;
934
935 beos*)
936 @@ -1982,7 +2147,7 @@
937 case $GCC,$host_os in
938 yes,cygwin*)
939 library_names_spec='$libname.dll.a'
940 - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
941 + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
942 postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
943 dldir=$destdir/`dirname \$dlpath`~
944 test -d \$dldir || mkdir -p \$dldir~
945 @@ -1992,14 +2157,14 @@
946 $rm \$dlpath'
947 ;;
948 yes,mingw*)
949 - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll'
950 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
951 + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
952 + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
953 ;;
954 yes,pw32*)
955 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
956 ;;
957 *)
958 - library_names_spec='${libname}`echo ${release} | [sed -e 's/[.]/-/g']`${versuffix}.dll $libname.lib'
959 + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
960 ;;
961 esac
962 dynamic_linker='Win32 ld.exe'
963 @@ -2025,6 +2190,18 @@
964 dynamic_linker=no
965 ;;
966
967 +freebsd*-gnu*)
968 + version_type=linux
969 + need_lib_prefix=no
970 + need_version=no
971 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
972 + soname_spec='${libname}${release}.so$major'
973 + shlibpath_var=LD_LIBRARY_PATH
974 + shlibpath_overrides_runpath=no
975 + hardcode_into_libs=yes
976 + dynamic_linker='GNU/FreeBSD ld.so'
977 + ;;
978 +
979 freebsd*)
980 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
981 version_type=freebsd-$objformat
982 @@ -2076,14 +2253,17 @@
983 postinstall_cmds='chmod 555 $lib'
984 ;;
985
986 -irix5* | irix6*)
987 - version_type=irix
988 +irix5* | irix6* | nonstopux*)
989 + case $host_os in
990 + nonstopux*) version_type=nonstopux ;;
991 + *) version_type=irix ;;
992 + esac
993 need_lib_prefix=no
994 need_version=no
995 soname_spec='${libname}${release}.so$major'
996 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
997 case $host_os in
998 - irix5*)
999 + irix5* | nonstopux*)
1000 libsuff= shlibsuff=
1001 ;;
1002 *)
1003 @@ -2157,9 +2337,19 @@
1004
1005 openbsd*)
1006 version_type=sunos
1007 - if test "$with_gnu_ld" = yes; then
1008 - need_lib_prefix=no
1009 - need_version=no
1010 + need_lib_prefix=no
1011 + need_version=no
1012 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
1013 + case "$host_os" in
1014 + openbsd2.[[89]] | openbsd2.[[89]].*)
1015 + shlibpath_overrides_runpath=no
1016 + ;;
1017 + *)
1018 + shlibpath_overrides_runpath=yes
1019 + ;;
1020 + esac
1021 + else
1022 + shlibpath_overrides_runpath=yes
1023 fi
1024 library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
1025 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
1026 @@ -2177,11 +2367,13 @@
1027 osf3* | osf4* | osf5*)
1028 version_type=osf
1029 need_version=no
1030 - soname_spec='${libname}${release}.so'
1031 - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
1032 + need_lib_prefix=no
1033 + soname_spec='${libname}${release}.so$major'
1034 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
1035 shlibpath_var=LD_LIBRARY_PATH
1036 sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
1037 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
1038 + hardcode_into_libs=yes
1039 ;;
1040
1041 sco3.2v5*)
1042 @@ -2224,6 +2416,12 @@
1043 case $host_vendor in
1044 sni)
1045 shlibpath_overrides_runpath=no
1046 + need_lib_prefix=no
1047 + export_dynamic_flag_spec='${wl}-Blargedynsym'
1048 + runpath_var=LD_RUN_PATH
1049 + ;;
1050 + siemens)
1051 + need_lib_prefix=no
1052 ;;
1053 motorola)
1054 need_lib_prefix=no
1055 @@ -2270,6 +2468,33 @@
1056 AC_MSG_CHECKING([if libtool supports shared libraries])
1057 AC_MSG_RESULT([$can_build_shared])
1058
1059 +AC_MSG_CHECKING([whether to build shared libraries])
1060 +test "$can_build_shared" = "no" && enable_shared=no
1061 +
1062 +# On AIX, shared libraries and static libraries use the same namespace, and
1063 +# are all built from PIC.
1064 +case "$host_os" in
1065 +aix3*)
1066 + test "$enable_shared" = yes && enable_static=no
1067 + if test -n "$RANLIB"; then
1068 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
1069 + postinstall_cmds='$RANLIB $lib'
1070 + fi
1071 + ;;
1072 +
1073 +aix4*)
1074 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
1075 + test "$enable_shared" = yes && enable_static=no
1076 + fi
1077 + ;;
1078 +esac
1079 +AC_MSG_RESULT([$enable_shared])
1080 +
1081 +AC_MSG_CHECKING([whether to build static libraries])
1082 +# Make sure either enable_shared or enable_static is yes.
1083 +test "$enable_shared" = yes || enable_static=yes
1084 +AC_MSG_RESULT([$enable_static])
1085 +
1086 if test "$hardcode_action" = relink; then
1087 # Fast installation is not supported
1088 enable_fast_install=no
1089 @@ -2351,7 +2576,7 @@
1090 # Now quote all the things that may contain metacharacters while being
1091 # careful not to overquote the AC_SUBSTed values. We take copies of the
1092 # variables and quote the copies for generation of the libtool script.
1093 - for var in echo old_CC old_CFLAGS \
1094 + for var in echo old_CC old_CFLAGS SED \
1095 AR AR_FLAGS CC LD LN_S NM SHELL \
1096 reload_flag reload_cmds wl \
1097 pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
1098 @@ -2363,6 +2588,7 @@
1099 old_striplib striplib file_magic_cmd export_symbols_cmds \
1100 deplibs_check_method allow_undefined_flag no_undefined_flag \
1101 finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
1102 + global_symbol_to_c_name_address \
1103 hardcode_libdir_flag_spec hardcode_libdir_separator \
1104 sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
1105 compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
1106 @@ -2412,8 +2638,11 @@
1107 # configuration script generated by Autoconf, you may include it under
1108 # the same distribution terms that you use for the rest of that program.
1109
1110 +# A sed that does not truncate output.
1111 +SED=$lt_SED
1112 +
1113 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
1114 -Xsed="sed -e s/^X//"
1115 +Xsed="${SED} -e s/^X//"
1116
1117 # The HP-UX ksh and POSIX shell print the target directory to stdout
1118 # if CDPATH is set.
1119 @@ -2429,12 +2658,12 @@
1120 # Whether or not to build shared libraries.
1121 build_libtool_libs=$enable_shared
1122
1123 -# Whether or not to add -lc for building shared libraries.
1124 -build_libtool_need_lc=$need_lc
1125 -
1126 # Whether or not to build static libraries.
1127 build_old_libs=$enable_static
1128
1129 +# Whether or not to add -lc for building shared libraries.
1130 +build_libtool_need_lc=$need_lc
1131 +
1132 # Whether or not to optimize for fast installation.
1133 fast_install=$enable_fast_install
1134
1135 @@ -2600,6 +2829,9 @@
1136 # Transform the output of nm in a proper C declaration
1137 global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
1138
1139 +# Transform the output of nm in a C name address pair
1140 +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
1141 +
1142 # This is the shared library runtime path variable.
1143 runpath_var=$runpath_var
1144
1145 @@ -2722,9 +2954,9 @@
1146 # return TRUE;
1147 # }
1148 # /* ltdll.c ends here */
1149 - # This is a source program that is used to create import libraries
1150 - # on Windows for dlls which lack them. Don't remove nor modify the
1151 - # starting and closing comments
1152 + # This is a source program that is used to create import libraries
1153 + # on Windows for dlls which lack them. Don't remove nor modify the
1154 + # starting and closing comments
1155 # /* impgen.c starts here */
1156 # /* Copyright (C) 1999-2000 Free Software Foundation, Inc.
1157 #
1158 @@ -3079,6 +3311,7 @@
1159 AC_REQUIRE([AC_PROG_CC])dnl
1160 AC_REQUIRE([AC_CANONICAL_HOST])dnl
1161 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
1162 +AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
1163 ac_prog=ld
1164 if test "$GCC" = yes; then
1165 # Check if gcc -print-prog-name=ld gives a path.
1166 @@ -3092,8 +3325,8 @@
1167 esac
1168 case $ac_prog in
1169 # Accept absolute paths.
1170 - [[\\/]* | [A-Za-z]:[\\/]*)]
1171 - [re_direlt='/[^/][^/]*/\.\./']
1172 + [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
1173 + re_direlt='/[[^/]][[^/]]*/\.\./'
1174 # Canonicalize the path of ld
1175 ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
1176 while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
1177 @@ -3117,7 +3350,7 @@
1178 fi
1179 AC_CACHE_VAL(lt_cv_path_LD,
1180 [if test -z "$LD"; then
1181 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
1182 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1183 for ac_dir in $PATH; do
1184 test -z "$ac_dir" && ac_dir=.
1185 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
1186 @@ -3170,7 +3403,7 @@
1187 # AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
1188 # -- PORTME fill in with the dynamic library characteristics
1189 AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
1190 -[AC_CACHE_CHECK([how to recognise dependant libraries],
1191 +[AC_CACHE_CHECK([how to recognise dependent libraries],
1192 lt_cv_deplibs_check_method,
1193 [lt_cv_file_magic_cmd='$MAGIC_CMD'
1194 lt_cv_file_magic_test_file=
1195 @@ -3181,7 +3414,7 @@
1196 # `unknown' -- same as none, but documents that we really don't know.
1197 # 'pass_all' -- all dependencies passed with no checks.
1198 # 'test_compile' -- check by making test program.
1199 -# ['file_magic [regex]'] -- check by looking for files in library path
1200 +# 'file_magic [[regex]]' -- check by looking for files in library path
1201 # which responds to the $file_magic_cmd with a given egrep regex.
1202 # If you have `file' or equivalent on your system and you're not sure
1203 # whether `pass_all' will *always* work, you probably want this one.
1204 @@ -3196,7 +3429,7 @@
1205 ;;
1206
1207 bsdi4*)
1208 - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)']
1209 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
1210 lt_cv_file_magic_cmd='/usr/bin/file -L'
1211 lt_cv_file_magic_test_file=/shlib/libc.so
1212 ;;
1213 @@ -3210,7 +3443,7 @@
1214 lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
1215 lt_cv_file_magic_cmd='/usr/bin/file -L'
1216 case "$host_os" in
1217 - rhapsody* | darwin1.[012])
1218 + rhapsody* | darwin1.[[012]])
1219 lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
1220 ;;
1221 *) # Darwin 1.3 on
1222 @@ -3225,7 +3458,7 @@
1223 i*86 )
1224 # Not sure whether the presence of OpenBSD here was a mistake.
1225 # Let's accept both of them until this is cleared up.
1226 - [lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library']
1227 + lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
1228 lt_cv_file_magic_cmd=/usr/bin/file
1229 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
1230 ;;
1231 @@ -3240,14 +3473,14 @@
1232 ;;
1233
1234 hpux10.20*|hpux11*)
1235 - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
1236 + lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
1237 lt_cv_file_magic_cmd=/usr/bin/file
1238 lt_cv_file_magic_test_file=/usr/lib/libc.sl
1239 ;;
1240
1241 -irix5* | irix6*)
1242 +irix5* | irix6* | nonstopux*)
1243 case $host_os in
1244 - irix5*)
1245 + irix5* | nonstopux*)
1246 # this will be overridden with pass_all, but let us keep it just in case
1247 lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
1248 ;;
1249 @@ -3259,7 +3492,7 @@
1250 *) libmagic=never-match;;
1251 esac
1252 # this will be overridden with pass_all, but let us keep it just in case
1253 - [lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"]
1254 + lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
1255 ;;
1256 esac
1257 lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
1258 @@ -3269,29 +3502,39 @@
1259 # This must be Linux ELF.
1260 linux-gnu*)
1261 case $host_cpu in
1262 - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
1263 + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k)
1264 lt_cv_deplibs_check_method=pass_all ;;
1265 *)
1266 # glibc up to 2.1.1 does not perform some relocations on ARM
1267 - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;]
1268 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
1269 esac
1270 lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
1271 ;;
1272
1273 netbsd*)
1274 if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
1275 - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
1276 + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
1277 else
1278 - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$']
1279 + lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
1280 fi
1281 ;;
1282
1283 newos6*)
1284 - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
1285 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
1286 lt_cv_file_magic_cmd=/usr/bin/file
1287 lt_cv_file_magic_test_file=/usr/lib/libnls.so
1288 ;;
1289
1290 +openbsd*)
1291 + lt_cv_file_magic_cmd=/usr/bin/file
1292 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
1293 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
1294 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
1295 + else
1296 + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
1297 + fi
1298 + ;;
1299 +
1300 osf3* | osf4* | osf5*)
1301 # this will be overridden with pass_all, but let us keep it just in case
1302 lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
1303 @@ -3308,14 +3551,14 @@
1304 lt_cv_file_magic_test_file=/lib/libc.so
1305 ;;
1306
1307 -[sysv5uw[78]* | sysv4*uw2*)]
1308 +sysv5uw[[78]]* | sysv4*uw2*)
1309 lt_cv_deplibs_check_method=pass_all
1310 ;;
1311
1312 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
1313 case $host_vendor in
1314 motorola)
1315 - [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]']
1316 + 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]]'
1317 lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
1318 ;;
1319 ncr)
1320 @@ -3323,13 +3566,16 @@
1321 ;;
1322 sequent)
1323 lt_cv_file_magic_cmd='/bin/file'
1324 - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )']
1325 + lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
1326 ;;
1327 sni)
1328 lt_cv_file_magic_cmd='/bin/file'
1329 - [lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"]
1330 + lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
1331 lt_cv_file_magic_test_file=/lib/libc.so
1332 ;;
1333 + siemens)
1334 + lt_cv_deplibs_check_method=pass_all
1335 + ;;
1336 esac
1337 ;;
1338 esac
1339 @@ -3341,13 +3587,14 @@
1340
1341 # AC_PROG_NM - find the path to a BSD-compatible name lister
1342 AC_DEFUN([AC_PROG_NM],
1343 -[AC_MSG_CHECKING([for BSD-compatible nm])
1344 +[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
1345 +AC_MSG_CHECKING([for BSD-compatible nm])
1346 AC_CACHE_VAL(lt_cv_path_NM,
1347 [if test -n "$NM"; then
1348 # Let the user override the test.
1349 lt_cv_path_NM="$NM"
1350 else
1351 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
1352 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
1353 for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
1354 test -z "$ac_dir" && ac_dir=.
1355 tmp_nm=$ac_dir/${ac_tool_prefix}nm
1356 @@ -3394,12 +3641,12 @@
1357 ])
1358
1359 # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
1360 -# the libltdl convenience library and INCLTDL to the include flags for
1361 +# the libltdl convenience library and LTDLINCL to the include flags for
1362 # the libltdl header and adds --enable-ltdl-convenience to the
1363 -# configure arguments. Note that LIBLTDL and INCLTDL are not
1364 +# configure arguments. Note that LIBLTDL and LTDLINCL are not
1365 # AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
1366 # provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
1367 -# with '${top_builddir}/' and INCLTDL will be prefixed with
1368 +# with '${top_builddir}/' and LTDLINCL will be prefixed with
1369 # '${top_srcdir}/' (note the single quotes!). If your package is not
1370 # flat and you're not using automake, define top_builddir and
1371 # top_srcdir appropriately in the Makefiles.
1372 @@ -3411,16 +3658,18 @@
1373 ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
1374 esac
1375 LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
1376 - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
1377 + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
1378 + # For backwards non-gettext consistent compatibility...
1379 + INCLTDL="$LTDLINCL"
1380 ])
1381
1382 # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
1383 -# the libltdl installable library and INCLTDL to the include flags for
1384 +# the libltdl installable library and LTDLINCL to the include flags for
1385 # the libltdl header and adds --enable-ltdl-install to the configure
1386 -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
1387 +# arguments. Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
1388 # AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
1389 # libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
1390 -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
1391 +# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
1392 # with '${top_srcdir}/' (note the single quotes!). If your package is
1393 # not flat and you're not using automake, define top_builddir and
1394 # top_srcdir appropriately in the Makefiles.
1395 @@ -3438,12 +3687,14 @@
1396 if test x"$enable_ltdl_install" = x"yes"; then
1397 ac_configure_args="$ac_configure_args --enable-ltdl-install"
1398 LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
1399 - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
1400 + LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
1401 else
1402 ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
1403 LIBLTDL="-lltdl"
1404 - INCLTDL=
1405 + LTDLINCL=
1406 fi
1407 + # For backwards non-gettext consistent compatibility...
1408 + INCLTDL="$LTDLINCL"
1409 ])
1410
1411 # old names
1412 @@ -3458,3 +3709,92 @@
1413 # This is just to silence aclocal about the macro not being used
1414 ifelse([AC_DISABLE_FAST_INSTALL])
1415
1416 +# NOTE: This macro has been submitted for inclusion into #
1417 +# GNU Autoconf as AC_PROG_SED. When it is available in #
1418 +# a released version of Autoconf we should remove this #
1419 +# macro and use it instead. #
1420 +# LT_AC_PROG_SED
1421 +# --------------
1422 +# Check for a fully-functional sed program, that truncates
1423 +# as few characters as possible. Prefer GNU sed if found.
1424 +AC_DEFUN([LT_AC_PROG_SED],
1425 +[AC_MSG_CHECKING([for a sed that does not truncate output])
1426 +AC_CACHE_VAL(lt_cv_path_SED,
1427 +[# Loop through the user's path and test for sed and gsed.
1428 +# Then use that list of sed's as ones to test for truncation.
1429 +as_executable_p="test -f"
1430 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1431 +for as_dir in $PATH
1432 +do
1433 + IFS=$as_save_IFS
1434 + test -z "$as_dir" && as_dir=.
1435 + for ac_prog in sed gsed; do
1436 + for ac_exec_ext in '' $ac_executable_extensions; do
1437 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
1438 + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
1439 + fi
1440 + done
1441 + done
1442 +done
1443 +
1444 + # Create a temporary directory, and hook for its removal unless debugging.
1445 +$debug ||
1446 +{
1447 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
1448 + trap '{ (exit 1); exit 1; }' 1 2 13 15
1449 +}
1450 +
1451 +# Create a (secure) tmp directory for tmp files.
1452 +: ${TMPDIR=/tmp}
1453 +{
1454 + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
1455 + test -n "$tmp" && test -d "$tmp"
1456 +} ||
1457 +{
1458 + tmp=$TMPDIR/sed$$-$RANDOM
1459 + (umask 077 && mkdir $tmp)
1460 +} ||
1461 +{
1462 + echo "$me: cannot create a temporary directory in $TMPDIR" >&2
1463 + { (exit 1); exit 1; }
1464 +}
1465 + _max=0
1466 + _count=0
1467 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris
1468 + # along with /bin/sed that truncates output.
1469 + for _sed in $_sed_list /usr/xpg4/bin/sed; do
1470 + test ! -f ${_sed} && break
1471 + cat /dev/null > "$tmp/sed.in"
1472 + _count=0
1473 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
1474 + # Check for GNU sed and select it if it is found.
1475 + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
1476 + lt_cv_path_SED=${_sed}
1477 + break
1478 + fi
1479 + while true; do
1480 + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
1481 + mv "$tmp/sed.tmp" "$tmp/sed.in"
1482 + cp "$tmp/sed.in" "$tmp/sed.nl"
1483 + echo >>"$tmp/sed.nl"
1484 + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
1485 + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
1486 + # 40000 chars as input seems more than enough
1487 + test $_count -gt 10 && break
1488 + _count=`expr $_count + 1`
1489 + if test $_count -gt $_max; then
1490 + _max=$_count
1491 + lt_cv_path_SED=$_sed
1492 + fi
1493 + done
1494 + done
1495 + rm -rf "$tmp"
1496 +])
1497 +if test "X$SED" != "X"; then
1498 + lt_cv_path_SED=$SED
1499 +else
1500 + SED=$lt_cv_path_SED
1501 +fi
1502 +AC_MSG_RESULT([$SED])
1503 +])
1504 +
1505 Index: linux-atm-2.4.1/config.guess
1506 ===================================================================
1507 --- linux-atm-2.4.1.orig/config.guess 2007-06-04 13:23:53.896540376 +0200
1508 +++ linux-atm-2.4.1/config.guess 2007-06-04 13:23:54.463454192 +0200
1509 @@ -1,9 +1,9 @@
1510 #! /bin/sh
1511 # Attempt to guess a canonical system name.
1512 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1513 -# Free Software Foundation, Inc.
1514 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
1515 +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
1516
1517 -timestamp='2001-04-20'
1518 +timestamp='2003-05-19'
1519
1520 # This file is free software; you can redistribute it and/or modify it
1521 # under the terms of the GNU General Public License as published by
1522 @@ -24,8 +24,9 @@
1523 # configuration script generated by Autoconf, you may include it under
1524 # the same distribution terms that you use for the rest of that program.
1525
1526 -# Written by Per Bothner <bothner@cygnus.com>.
1527 -# Please send patches to <config-patches@gnu.org>.
1528 +# Originally written by Per Bothner <per@bothner.com>.
1529 +# Please send patches to <config-patches@gnu.org>. Submit a context
1530 +# diff and a properly formatted ChangeLog entry.
1531 #
1532 # This script attempts to guess a canonical system name similar to
1533 # config.sub. If it succeeds, it prints the system name on stdout, and
1534 @@ -52,7 +53,7 @@
1535 GNU config.guess ($timestamp)
1536
1537 Originally written by Per Bothner.
1538 -Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
1539 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
1540 Free Software Foundation, Inc.
1541
1542 This is free software; see the source for copying conditions. There is NO
1543 @@ -87,33 +88,44 @@
1544 exit 1
1545 fi
1546
1547 +trap 'exit 1' 1 2 15
1548
1549 -dummy=dummy-$$
1550 -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
1551 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
1552 +# compiler to aid in system detection is discouraged as it requires
1553 +# temporary files to be created and, as you can see below, it is a
1554 +# headache to deal with in a portable fashion.
1555
1556 -# CC_FOR_BUILD -- compiler used by this script.
1557 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
1558 # use `HOST_CC' if defined, but it is deprecated.
1559
1560 +# Portable tmp directory creation inspired by the Autoconf team.
1561 +
1562 +set_cc_for_build='
1563 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
1564 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
1565 +: ${TMPDIR=/tmp} ;
1566 + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
1567 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
1568 + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
1569 +dummy=$tmp/dummy ;
1570 +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
1571 case $CC_FOR_BUILD,$HOST_CC,$CC in
1572 - ,,) echo "int dummy(){}" > $dummy.c
1573 - for c in cc gcc c89 ; do
1574 - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
1575 - if test $? = 0 ; then
1576 - CC_FOR_BUILD="$c"; break
1577 - fi
1578 - done
1579 - rm -f $dummy.c $dummy.o $dummy.rel
1580 + ,,) echo "int x;" > $dummy.c ;
1581 + for c in cc gcc c89 c99 ; do
1582 + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
1583 + CC_FOR_BUILD="$c"; break ;
1584 + fi ;
1585 + done ;
1586 if test x"$CC_FOR_BUILD" = x ; then
1587 - CC_FOR_BUILD=no_compiler_found
1588 + CC_FOR_BUILD=no_compiler_found ;
1589 fi
1590 ;;
1591 ,,*) CC_FOR_BUILD=$CC ;;
1592 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
1593 -esac
1594 +esac ;'
1595
1596 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
1597 -# (ghazi@noc.rutgers.edu 8/24/94.)
1598 +# (ghazi@noc.rutgers.edu 1994-08-24)
1599 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
1600 PATH=$PATH:/.attbin ; export PATH
1601 fi
1602 @@ -127,29 +139,31 @@
1603
1604 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
1605 *:NetBSD:*:*)
1606 - # Netbsd (nbsd) targets should (where applicable) match one or
1607 + # NetBSD (nbsd) targets should (where applicable) match one or
1608 # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
1609 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
1610 # switched to ELF, *-*-netbsd* would select the old
1611 # object file format. This provides both forward
1612 # compatibility and a consistent mechanism for selecting the
1613 # object file format.
1614 - # Determine the machine/vendor (is the vendor relevant).
1615 - case "${UNAME_MACHINE}" in
1616 - amiga) machine=m68k-unknown ;;
1617 - arm32) machine=arm-unknown ;;
1618 - atari*) machine=m68k-atari ;;
1619 - sun3*) machine=m68k-sun ;;
1620 - mac68k) machine=m68k-apple ;;
1621 - macppc) machine=powerpc-apple ;;
1622 - hp3[0-9][05]) machine=m68k-hp ;;
1623 - ibmrt|romp-ibm) machine=romp-ibm ;;
1624 - *) machine=${UNAME_MACHINE}-unknown ;;
1625 + #
1626 + # Note: NetBSD doesn't particularly care about the vendor
1627 + # portion of the name. We always set it to "unknown".
1628 + sysctl="sysctl -n hw.machine_arch"
1629 + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
1630 + /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
1631 + case "${UNAME_MACHINE_ARCH}" in
1632 + armeb) machine=armeb-unknown ;;
1633 + arm*) machine=arm-unknown ;;
1634 + sh3el) machine=shl-unknown ;;
1635 + sh3eb) machine=sh-unknown ;;
1636 + *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
1637 esac
1638 # The Operating System including object format, if it has switched
1639 # to ELF recently, or will in the future.
1640 - case "${UNAME_MACHINE}" in
1641 - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
1642 + case "${UNAME_MACHINE_ARCH}" in
1643 + arm*|i386|m68k|ns32k|sh3*|sparc|vax)
1644 + eval $set_cc_for_build
1645 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
1646 | grep __ELF__ >/dev/null
1647 then
1648 @@ -165,69 +179,107 @@
1649 ;;
1650 esac
1651 # The OS release
1652 - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
1653 + # Debian GNU/NetBSD machines have a different userland, and
1654 + # thus, need a distinct triplet. However, they do not need
1655 + # kernel version information, so it can be replaced with a
1656 + # suitable tag, in the style of linux-gnu.
1657 + case "${UNAME_VERSION}" in
1658 + Debian*)
1659 + release='-gnu'
1660 + ;;
1661 + *)
1662 + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
1663 + ;;
1664 + esac
1665 # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
1666 # contains redundant information, the shorter form:
1667 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
1668 echo "${machine}-${os}${release}"
1669 exit 0 ;;
1670 + amiga:OpenBSD:*:*)
1671 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1672 + exit 0 ;;
1673 + arc:OpenBSD:*:*)
1674 + echo mipsel-unknown-openbsd${UNAME_RELEASE}
1675 + exit 0 ;;
1676 + hp300:OpenBSD:*:*)
1677 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1678 + exit 0 ;;
1679 + mac68k:OpenBSD:*:*)
1680 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1681 + exit 0 ;;
1682 + macppc:OpenBSD:*:*)
1683 + echo powerpc-unknown-openbsd${UNAME_RELEASE}
1684 + exit 0 ;;
1685 + mvme68k:OpenBSD:*:*)
1686 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1687 + exit 0 ;;
1688 + mvme88k:OpenBSD:*:*)
1689 + echo m88k-unknown-openbsd${UNAME_RELEASE}
1690 + exit 0 ;;
1691 + mvmeppc:OpenBSD:*:*)
1692 + echo powerpc-unknown-openbsd${UNAME_RELEASE}
1693 + exit 0 ;;
1694 + pmax:OpenBSD:*:*)
1695 + echo mipsel-unknown-openbsd${UNAME_RELEASE}
1696 + exit 0 ;;
1697 + sgi:OpenBSD:*:*)
1698 + echo mipseb-unknown-openbsd${UNAME_RELEASE}
1699 + exit 0 ;;
1700 + sun3:OpenBSD:*:*)
1701 + echo m68k-unknown-openbsd${UNAME_RELEASE}
1702 + exit 0 ;;
1703 + wgrisc:OpenBSD:*:*)
1704 + echo mipsel-unknown-openbsd${UNAME_RELEASE}
1705 + exit 0 ;;
1706 + *:OpenBSD:*:*)
1707 + echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
1708 + exit 0 ;;
1709 alpha:OSF1:*:*)
1710 if test $UNAME_RELEASE = "V4.0"; then
1711 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
1712 fi
1713 + # According to Compaq, /usr/sbin/psrinfo has been available on
1714 + # OSF/1 and Tru64 systems produced since 1995. I hope that
1715 + # covers most systems running today. This code pipes the CPU
1716 + # types through head -n 1, so we only detect the type of CPU 0.
1717 + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
1718 + case "$ALPHA_CPU_TYPE" in
1719 + "EV4 (21064)")
1720 + UNAME_MACHINE="alpha" ;;
1721 + "EV4.5 (21064)")
1722 + UNAME_MACHINE="alpha" ;;
1723 + "LCA4 (21066/21068)")
1724 + UNAME_MACHINE="alpha" ;;
1725 + "EV5 (21164)")
1726 + UNAME_MACHINE="alphaev5" ;;
1727 + "EV5.6 (21164A)")
1728 + UNAME_MACHINE="alphaev56" ;;
1729 + "EV5.6 (21164PC)")
1730 + UNAME_MACHINE="alphapca56" ;;
1731 + "EV5.7 (21164PC)")
1732 + UNAME_MACHINE="alphapca57" ;;
1733 + "EV6 (21264)")
1734 + UNAME_MACHINE="alphaev6" ;;
1735 + "EV6.7 (21264A)")
1736 + UNAME_MACHINE="alphaev67" ;;
1737 + "EV6.8CB (21264C)")
1738 + UNAME_MACHINE="alphaev68" ;;
1739 + "EV6.8AL (21264B)")
1740 + UNAME_MACHINE="alphaev68" ;;
1741 + "EV6.8CX (21264D)")
1742 + UNAME_MACHINE="alphaev68" ;;
1743 + "EV6.9A (21264/EV69A)")
1744 + UNAME_MACHINE="alphaev69" ;;
1745 + "EV7 (21364)")
1746 + UNAME_MACHINE="alphaev7" ;;
1747 + "EV7.9 (21364A)")
1748 + UNAME_MACHINE="alphaev79" ;;
1749 + esac
1750 # A Vn.n version is a released version.
1751 # A Tn.n version is a released field test version.
1752 # A Xn.n version is an unreleased experimental baselevel.
1753 # 1.2 uses "1.2" for uname -r.
1754 - cat <<EOF >$dummy.s
1755 - .data
1756 -\$Lformat:
1757 - .byte 37,100,45,37,120,10,0 # "%d-%x\n"
1758 -
1759 - .text
1760 - .globl main
1761 - .align 4
1762 - .ent main
1763 -main:
1764 - .frame \$30,16,\$26,0
1765 - ldgp \$29,0(\$27)
1766 - .prologue 1
1767 - .long 0x47e03d80 # implver \$0
1768 - lda \$2,-1
1769 - .long 0x47e20c21 # amask \$2,\$1
1770 - lda \$16,\$Lformat
1771 - mov \$0,\$17
1772 - not \$1,\$18
1773 - jsr \$26,printf
1774 - ldgp \$29,0(\$26)
1775 - mov 0,\$16
1776 - jsr \$26,exit
1777 - .end main
1778 -EOF
1779 - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
1780 - if test "$?" = 0 ; then
1781 - case `./$dummy` in
1782 - 0-0)
1783 - UNAME_MACHINE="alpha"
1784 - ;;
1785 - 1-0)
1786 - UNAME_MACHINE="alphaev5"
1787 - ;;
1788 - 1-1)
1789 - UNAME_MACHINE="alphaev56"
1790 - ;;
1791 - 1-101)
1792 - UNAME_MACHINE="alphapca56"
1793 - ;;
1794 - 2-303)
1795 - UNAME_MACHINE="alphaev6"
1796 - ;;
1797 - 2-307)
1798 - UNAME_MACHINE="alphaev67"
1799 - ;;
1800 - esac
1801 - fi
1802 - rm -f $dummy.s $dummy
1803 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
1804 exit 0 ;;
1805 Alpha\ *:Windows_NT*:*)
1806 @@ -242,29 +294,11 @@
1807 Amiga*:UNIX_System_V:4.0:*)
1808 echo m68k-unknown-sysv4
1809 exit 0;;
1810 - amiga:OpenBSD:*:*)
1811 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1812 - exit 0 ;;
1813 *:[Aa]miga[Oo][Ss]:*:*)
1814 echo ${UNAME_MACHINE}-unknown-amigaos
1815 exit 0 ;;
1816 - arc64:OpenBSD:*:*)
1817 - echo mips64el-unknown-openbsd${UNAME_RELEASE}
1818 - exit 0 ;;
1819 - arc:OpenBSD:*:*)
1820 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
1821 - exit 0 ;;
1822 - hkmips:OpenBSD:*:*)
1823 - echo mips-unknown-openbsd${UNAME_RELEASE}
1824 - exit 0 ;;
1825 - pmax:OpenBSD:*:*)
1826 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
1827 - exit 0 ;;
1828 - sgi:OpenBSD:*:*)
1829 - echo mips-unknown-openbsd${UNAME_RELEASE}
1830 - exit 0 ;;
1831 - wgrisc:OpenBSD:*:*)
1832 - echo mipsel-unknown-openbsd${UNAME_RELEASE}
1833 + *:[Mm]orph[Oo][Ss]:*:*)
1834 + echo ${UNAME_MACHINE}-unknown-morphos
1835 exit 0 ;;
1836 *:OS/390:*:*)
1837 echo i370-ibm-openedition
1838 @@ -286,6 +320,10 @@
1839 NILE*:*:*:dcosx)
1840 echo pyramid-pyramid-svr4
1841 exit 0 ;;
1842 + DRS?6000:UNIX_SV:4.2*:7*)
1843 + case `/usr/bin/uname -p` in
1844 + sparc) echo sparc-icl-nx7 && exit 0 ;;
1845 + esac ;;
1846 sun4H:SunOS:5.*:*)
1847 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
1848 exit 0 ;;
1849 @@ -314,7 +352,7 @@
1850 echo m68k-sun-sunos${UNAME_RELEASE}
1851 exit 0 ;;
1852 sun*:*:4.2BSD:*)
1853 - UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
1854 + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
1855 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
1856 case "`/bin/arch`" in
1857 sun3)
1858 @@ -328,9 +366,6 @@
1859 aushp:SunOS:*:*)
1860 echo sparc-auspex-sunos${UNAME_RELEASE}
1861 exit 0 ;;
1862 - atari*:OpenBSD:*:*)
1863 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1864 - exit 0 ;;
1865 # The situation for MiNT is a little confusing. The machine name
1866 # can be virtually everything (everything which is not
1867 # "atarist" or "atariste" at least should have a processor
1868 @@ -357,18 +392,6 @@
1869 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
1870 echo m68k-unknown-mint${UNAME_RELEASE}
1871 exit 0 ;;
1872 - sun3*:OpenBSD:*:*)
1873 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1874 - exit 0 ;;
1875 - mac68k:OpenBSD:*:*)
1876 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1877 - exit 0 ;;
1878 - mvme68k:OpenBSD:*:*)
1879 - echo m68k-unknown-openbsd${UNAME_RELEASE}
1880 - exit 0 ;;
1881 - mvme88k:OpenBSD:*:*)
1882 - echo m88k-unknown-openbsd${UNAME_RELEASE}
1883 - exit 0 ;;
1884 powerpc:machten:*:*)
1885 echo powerpc-apple-machten${UNAME_RELEASE}
1886 exit 0 ;;
1887 @@ -385,6 +408,7 @@
1888 echo clipper-intergraph-clix${UNAME_RELEASE}
1889 exit 0 ;;
1890 mips:*:*:UMIPS | mips:*:*:RISCos)
1891 + eval $set_cc_for_build
1892 sed 's/^ //' << EOF >$dummy.c
1893 #ifdef __cplusplus
1894 #include <stdio.h> /* for printf() prototype */
1895 @@ -406,15 +430,20 @@
1896 exit (-1);
1897 }
1898 EOF
1899 - $CC_FOR_BUILD $dummy.c -o $dummy \
1900 - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
1901 - && rm -f $dummy.c $dummy && exit 0
1902 - rm -f $dummy.c $dummy
1903 + $CC_FOR_BUILD -o $dummy $dummy.c \
1904 + && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
1905 + && exit 0
1906 echo mips-mips-riscos${UNAME_RELEASE}
1907 exit 0 ;;
1908 Motorola:PowerMAX_OS:*:*)
1909 echo powerpc-motorola-powermax
1910 exit 0 ;;
1911 + Motorola:*:4.3:PL8-*)
1912 + echo powerpc-harris-powermax
1913 + exit 0 ;;
1914 + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
1915 + echo powerpc-harris-powermax
1916 + exit 0 ;;
1917 Night_Hawk:Power_UNIX:*:*)
1918 echo powerpc-harris-powerunix
1919 exit 0 ;;
1920 @@ -475,6 +504,7 @@
1921 exit 0 ;;
1922 *:AIX:2:3)
1923 if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
1924 + eval $set_cc_for_build
1925 sed 's/^ //' << EOF >$dummy.c
1926 #include <sys/systemcfg.h>
1927
1928 @@ -486,8 +516,7 @@
1929 exit(0);
1930 }
1931 EOF
1932 - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
1933 - rm -f $dummy.c $dummy
1934 + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
1935 echo rs6000-ibm-aix3.2.5
1936 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
1937 echo rs6000-ibm-aix3.2.4
1938 @@ -496,7 +525,7 @@
1939 fi
1940 exit 0 ;;
1941 *:AIX:*:[45])
1942 - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
1943 + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
1944 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
1945 IBM_ARCH=rs6000
1946 else
1947 @@ -536,10 +565,8 @@
1948 9000/31? ) HP_ARCH=m68000 ;;
1949 9000/[34]?? ) HP_ARCH=m68k ;;
1950 9000/[678][0-9][0-9])
1951 - case "${HPUX_REV}" in
1952 - 11.[0-9][0-9])
1953 - if [ -x /usr/bin/getconf ]; then
1954 - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
1955 + if [ -x /usr/bin/getconf ]; then
1956 + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
1957 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
1958 case "${sc_cpu_version}" in
1959 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
1960 @@ -548,12 +575,13 @@
1961 case "${sc_kernel_bits}" in
1962 32) HP_ARCH="hppa2.0n" ;;
1963 64) HP_ARCH="hppa2.0w" ;;
1964 + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
1965 esac ;;
1966 esac
1967 - fi ;;
1968 - esac
1969 - if [ "${HP_ARCH}" = "" ]; then
1970 - sed 's/^ //' << EOF >$dummy.c
1971 + fi
1972 + if [ "${HP_ARCH}" = "" ]; then
1973 + eval $set_cc_for_build
1974 + sed 's/^ //' << EOF >$dummy.c
1975
1976 #define _HPUX_SOURCE
1977 #include <stdlib.h>
1978 @@ -586,11 +614,21 @@
1979 exit (0);
1980 }
1981 EOF
1982 - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
1983 - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
1984 - rm -f $dummy.c $dummy
1985 - fi ;;
1986 + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
1987 + test -z "$HP_ARCH" && HP_ARCH=hppa
1988 + fi ;;
1989 esac
1990 + if [ ${HP_ARCH} = "hppa2.0w" ]
1991 + then
1992 + # avoid double evaluation of $set_cc_for_build
1993 + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
1994 + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
1995 + then
1996 + HP_ARCH="hppa2.0w"
1997 + else
1998 + HP_ARCH="hppa64"
1999 + fi
2000 + fi
2001 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
2002 exit 0 ;;
2003 ia64:HP-UX:*:*)
2004 @@ -598,6 +636,7 @@
2005 echo ia64-hp-hpux${HPUX_REV}
2006 exit 0 ;;
2007 3050*:HI-UX:*:*)
2008 + eval $set_cc_for_build
2009 sed 's/^ //' << EOF >$dummy.c
2010 #include <unistd.h>
2011 int
2012 @@ -623,8 +662,7 @@
2013 exit (0);
2014 }
2015 EOF
2016 - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
2017 - rm -f $dummy.c $dummy
2018 + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
2019 echo unknown-hitachi-hiuxwe2
2020 exit 0 ;;
2021 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
2022 @@ -633,7 +671,7 @@
2023 9000/8??:4.3bsd:*:*)
2024 echo hppa1.0-hp-bsd
2025 exit 0 ;;
2026 - *9??*:MPE/iX:*:*)
2027 + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
2028 echo hppa1.0-hp-mpeix
2029 exit 0 ;;
2030 hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
2031 @@ -652,9 +690,6 @@
2032 parisc*:Lites*:*:*)
2033 echo hppa1.1-hp-lites
2034 exit 0 ;;
2035 - hppa*:OpenBSD:*:*)
2036 - echo hppa-unknown-openbsd
2037 - exit 0 ;;
2038 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
2039 echo c1-convex-bsd
2040 exit 0 ;;
2041 @@ -673,41 +708,33 @@
2042 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
2043 echo c4-convex-bsd
2044 exit 0 ;;
2045 - CRAY*X-MP:*:*:*)
2046 - echo xmp-cray-unicos
2047 - exit 0 ;;
2048 CRAY*Y-MP:*:*:*)
2049 - echo ymp-cray-unicos${UNAME_RELEASE}
2050 + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2051 exit 0 ;;
2052 CRAY*[A-Z]90:*:*:*)
2053 echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
2054 | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
2055 - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
2056 + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
2057 + -e 's/\.[^.]*$/.X/'
2058 exit 0 ;;
2059 CRAY*TS:*:*:*)
2060 echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2061 exit 0 ;;
2062 - CRAY*T3D:*:*:*)
2063 - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2064 - exit 0 ;;
2065 CRAY*T3E:*:*:*)
2066 echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2067 exit 0 ;;
2068 CRAY*SV1:*:*:*)
2069 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2070 exit 0 ;;
2071 - CRAY-2:*:*:*)
2072 - echo cray2-cray-unicos
2073 - exit 0 ;;
2074 + *:UNICOS/mp:*:*)
2075 + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2076 + exit 0 ;;
2077 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
2078 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
2079 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
2080 FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
2081 echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
2082 exit 0 ;;
2083 - hp300:OpenBSD:*:*)
2084 - echo m68k-unknown-openbsd${UNAME_RELEASE}
2085 - exit 0 ;;
2086 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
2087 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
2088 exit 0 ;;
2089 @@ -717,11 +744,19 @@
2090 *:BSD/OS:*:*)
2091 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
2092 exit 0 ;;
2093 - *:FreeBSD:*:*)
2094 - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
2095 - exit 0 ;;
2096 - *:OpenBSD:*:*)
2097 - echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
2098 + *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
2099 + # Determine whether the default compiler uses glibc.
2100 + eval $set_cc_for_build
2101 + sed 's/^ //' << EOF >$dummy.c
2102 + #include <features.h>
2103 + #if __GLIBC__ >= 2
2104 + LIBC=gnu
2105 + #else
2106 + LIBC=
2107 + #endif
2108 +EOF
2109 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
2110 + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
2111 exit 0 ;;
2112 i*:CYGWIN*:*)
2113 echo ${UNAME_MACHINE}-pc-cygwin
2114 @@ -732,11 +767,17 @@
2115 i*:PW*:*)
2116 echo ${UNAME_MACHINE}-pc-pw32
2117 exit 0 ;;
2118 + x86:Interix*:3*)
2119 + echo i586-pc-interix3
2120 + exit 0 ;;
2121 + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
2122 + echo i${UNAME_MACHINE}-pc-mks
2123 + exit 0 ;;
2124 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
2125 # How do we know it's Interix rather than the generic POSIX subsystem?
2126 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
2127 # UNAME_MACHINE based on the output of uname instead of i386?
2128 - echo i386-pc-interix
2129 + echo i586-pc-interix
2130 exit 0 ;;
2131 i*:UWIN*:*)
2132 echo ${UNAME_MACHINE}-pc-uwin
2133 @@ -756,104 +797,71 @@
2134 arm*:Linux:*:*)
2135 echo ${UNAME_MACHINE}-unknown-linux-gnu
2136 exit 0 ;;
2137 + cris:Linux:*:*)
2138 + echo cris-axis-linux-gnu
2139 + exit 0 ;;
2140 ia64:Linux:*:*)
2141 - echo ${UNAME_MACHINE}-unknown-linux
2142 + echo ${UNAME_MACHINE}-unknown-linux-gnu
2143 exit 0 ;;
2144 m68*:Linux:*:*)
2145 echo ${UNAME_MACHINE}-unknown-linux-gnu
2146 exit 0 ;;
2147 mips:Linux:*:*)
2148 - cat >$dummy.c <<EOF
2149 -#ifdef __cplusplus
2150 -#include <stdio.h> /* for printf() prototype */
2151 -int main (int argc, char *argv[]) {
2152 -#else
2153 -int main (argc, argv) int argc; char *argv[]; {
2154 -#endif
2155 -#ifdef __MIPSEB__
2156 - printf ("%s-unknown-linux-gnu\n", argv[1]);
2157 -#endif
2158 -#ifdef __MIPSEL__
2159 - printf ("%sel-unknown-linux-gnu\n", argv[1]);
2160 -#endif
2161 - return 0;
2162 -}
2163 + eval $set_cc_for_build
2164 + sed 's/^ //' << EOF >$dummy.c
2165 + #undef CPU
2166 + #undef mips
2167 + #undef mipsel
2168 + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
2169 + CPU=mipsel
2170 + #else
2171 + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
2172 + CPU=mips
2173 + #else
2174 + CPU=
2175 + #endif
2176 + #endif
2177 EOF
2178 - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
2179 - rm -f $dummy.c $dummy
2180 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
2181 + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
2182 ;;
2183 - ppc:Linux:*:*)
2184 - # Determine Lib Version
2185 - cat >$dummy.c <<EOF
2186 -#include <features.h>
2187 -#if defined(__GLIBC__)
2188 -extern char __libc_version[];
2189 -extern char __libc_release[];
2190 -#endif
2191 -main(argc, argv)
2192 - int argc;
2193 - char *argv[];
2194 -{
2195 -#if defined(__GLIBC__)
2196 - printf("%s %s\n", __libc_version, __libc_release);
2197 -#else
2198 - printf("unknown\n");
2199 -#endif
2200 - return 0;
2201 -}
2202 + mips64:Linux:*:*)
2203 + eval $set_cc_for_build
2204 + sed 's/^ //' << EOF >$dummy.c
2205 + #undef CPU
2206 + #undef mips64
2207 + #undef mips64el
2208 + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
2209 + CPU=mips64el
2210 + #else
2211 + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
2212 + CPU=mips64
2213 + #else
2214 + CPU=
2215 + #endif
2216 + #endif
2217 EOF
2218 - LIBC=""
2219 - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
2220 - if test "$?" = 0 ; then
2221 - ./$dummy | grep 1\.99 > /dev/null
2222 - if test "$?" = 0 ; then LIBC="libc1" ; fi
2223 - fi
2224 - rm -f $dummy.c $dummy
2225 - echo powerpc-unknown-linux-gnu${LIBC}
2226 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
2227 + test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
2228 + ;;
2229 + ppc:Linux:*:*)
2230 + echo powerpc-unknown-linux-gnu
2231 + exit 0 ;;
2232 + ppc64:Linux:*:*)
2233 + echo powerpc64-unknown-linux-gnu
2234 exit 0 ;;
2235 alpha:Linux:*:*)
2236 - cat <<EOF >$dummy.s
2237 - .data
2238 - \$Lformat:
2239 - .byte 37,100,45,37,120,10,0 # "%d-%x\n"
2240 - .text
2241 - .globl main
2242 - .align 4
2243 - .ent main
2244 - main:
2245 - .frame \$30,16,\$26,0
2246 - ldgp \$29,0(\$27)
2247 - .prologue 1
2248 - .long 0x47e03d80 # implver \$0
2249 - lda \$2,-1
2250 - .long 0x47e20c21 # amask \$2,\$1
2251 - lda \$16,\$Lformat
2252 - mov \$0,\$17
2253 - not \$1,\$18
2254 - jsr \$26,printf
2255 - ldgp \$29,0(\$26)
2256 - mov 0,\$16
2257 - jsr \$26,exit
2258 - .end main
2259 -EOF
2260 - LIBC=""
2261 - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
2262 - if test "$?" = 0 ; then
2263 - case `./$dummy` in
2264 - 0-0) UNAME_MACHINE="alpha" ;;
2265 - 1-0) UNAME_MACHINE="alphaev5" ;;
2266 - 1-1) UNAME_MACHINE="alphaev56" ;;
2267 - 1-101) UNAME_MACHINE="alphapca56" ;;
2268 - 2-303) UNAME_MACHINE="alphaev6" ;;
2269 - 2-307) UNAME_MACHINE="alphaev67" ;;
2270 - esac
2271 - objdump --private-headers $dummy | \
2272 - grep ld.so.1 > /dev/null
2273 - if test "$?" = 0 ; then
2274 - LIBC="libc1"
2275 - fi
2276 - fi
2277 - rm -f $dummy.s $dummy
2278 + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
2279 + EV5) UNAME_MACHINE=alphaev5 ;;
2280 + EV56) UNAME_MACHINE=alphaev56 ;;
2281 + PCA56) UNAME_MACHINE=alphapca56 ;;
2282 + PCA57) UNAME_MACHINE=alphapca56 ;;
2283 + EV6) UNAME_MACHINE=alphaev6 ;;
2284 + EV67) UNAME_MACHINE=alphaev67 ;;
2285 + EV68*) UNAME_MACHINE=alphaev68 ;;
2286 + esac
2287 + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
2288 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
2289 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
2290 exit 0 ;;
2291 parisc:Linux:*:* | hppa:Linux:*:*)
2292 @@ -883,71 +891,59 @@
2293 # The BFD linker knows what the default object file format is, so
2294 # first see if it will tell us. cd to the root directory to prevent
2295 # problems with other programs or directories called `ld' in the path.
2296 - ld_supported_emulations=`cd /; ld --help 2>&1 \
2297 - | sed -ne '/supported emulations:/!d
2298 + # Set LC_ALL=C to ensure ld outputs messages in English.
2299 + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
2300 + | sed -ne '/supported targets:/!d
2301 s/[ ][ ]*/ /g
2302 - s/.*supported emulations: *//
2303 + s/.*supported targets: *//
2304 s/ .*//
2305 p'`
2306 - case "$ld_supported_emulations" in
2307 - i*86linux)
2308 - echo "${UNAME_MACHINE}-pc-linux-gnuaout"
2309 - exit 0
2310 - ;;
2311 - elf_i*86)
2312 + case "$ld_supported_targets" in
2313 + elf32-i386)
2314 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
2315 ;;
2316 - i*86coff)
2317 + a.out-i386-linux)
2318 + echo "${UNAME_MACHINE}-pc-linux-gnuaout"
2319 + exit 0 ;;
2320 + coff-i386)
2321 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
2322 - exit 0
2323 - ;;
2324 - esac
2325 - # Either a pre-BFD a.out linker (linux-gnuoldld)
2326 - # or one that does not give us useful --help.
2327 - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
2328 - # If ld does not provide *any* "supported emulations:"
2329 - # that means it is gnuoldld.
2330 - test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
2331 - case "${UNAME_MACHINE}" in
2332 - i*86)
2333 - VENDOR=pc;
2334 - ;;
2335 - *)
2336 - VENDOR=unknown;
2337 - ;;
2338 + exit 0 ;;
2339 + "")
2340 + # Either a pre-BFD a.out linker (linux-gnuoldld) or
2341 + # one that does not give us useful --help.
2342 + echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
2343 + exit 0 ;;
2344 esac
2345 # Determine whether the default compiler is a.out or elf
2346 - cat >$dummy.c <<EOF
2347 -#include <features.h>
2348 -#ifdef __cplusplus
2349 -#include <stdio.h> /* for printf() prototype */
2350 - int main (int argc, char *argv[]) {
2351 -#else
2352 - int main (argc, argv) int argc; char *argv[]; {
2353 -#endif
2354 -#ifdef __ELF__
2355 -# ifdef __GLIBC__
2356 -# if __GLIBC__ >= 2
2357 - printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
2358 -# else
2359 - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
2360 -# endif
2361 -# else
2362 - printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
2363 -# endif
2364 -#else
2365 - printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
2366 -#endif
2367 - return 0;
2368 -}
2369 + eval $set_cc_for_build
2370 + sed 's/^ //' << EOF >$dummy.c
2371 + #include <features.h>
2372 + #ifdef __ELF__
2373 + # ifdef __GLIBC__
2374 + # if __GLIBC__ >= 2
2375 + LIBC=gnu
2376 + # else
2377 + LIBC=gnulibc1
2378 + # endif
2379 + # else
2380 + LIBC=gnulibc1
2381 + # endif
2382 + #else
2383 + #ifdef __INTEL_COMPILER
2384 + LIBC=gnu
2385 + #else
2386 + LIBC=gnuaout
2387 + #endif
2388 + #endif
2389 EOF
2390 - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
2391 - rm -f $dummy.c $dummy
2392 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
2393 + test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
2394 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
2395 ;;
2396 -# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
2397 -# are messed up and put the nodename in both sysname and nodename.
2398 i*86:DYNIX/ptx:4*:*)
2399 + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
2400 + # earlier versions are messed up and put the nodename in both
2401 + # sysname and nodename.
2402 echo i386-sequent-sysv4
2403 exit 0 ;;
2404 i*86:UNIX_SV:4.2MP:2.*)
2405 @@ -958,6 +954,23 @@
2406 # Use sysv4.2uw... so that sysv4* matches it.
2407 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
2408 exit 0 ;;
2409 + i*86:OS/2:*:*)
2410 + # If we were able to find `uname', then EMX Unix compatibility
2411 + # is probably installed.
2412 + echo ${UNAME_MACHINE}-pc-os2-emx
2413 + exit 0 ;;
2414 + i*86:XTS-300:*:STOP)
2415 + echo ${UNAME_MACHINE}-unknown-stop
2416 + exit 0 ;;
2417 + i*86:atheos:*:*)
2418 + echo ${UNAME_MACHINE}-unknown-atheos
2419 + exit 0 ;;
2420 + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
2421 + echo i386-unknown-lynxos${UNAME_RELEASE}
2422 + exit 0 ;;
2423 + i*86:*DOS:*:*)
2424 + echo ${UNAME_MACHINE}-pc-msdosdjgpp
2425 + exit 0 ;;
2426 i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
2427 UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
2428 if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
2429 @@ -966,36 +979,32 @@
2430 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
2431 fi
2432 exit 0 ;;
2433 - i*86:*:5:7*)
2434 - # Fixed at (any) Pentium or better
2435 - UNAME_MACHINE=i586
2436 - if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
2437 - echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
2438 - else
2439 - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
2440 - fi
2441 + i*86:*:5:[78]*)
2442 + case `/bin/uname -X | grep "^Machine"` in
2443 + *486*) UNAME_MACHINE=i486 ;;
2444 + *Pentium) UNAME_MACHINE=i586 ;;
2445 + *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
2446 + esac
2447 + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
2448 exit 0 ;;
2449 i*86:*:3.2:*)
2450 if test -f /usr/options/cb.name; then
2451 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
2452 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
2453 elif /bin/uname -X 2>/dev/null >/dev/null ; then
2454 - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
2455 - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
2456 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
2457 + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
2458 + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
2459 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
2460 && UNAME_MACHINE=i586
2461 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
2462 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
2463 && UNAME_MACHINE=i686
2464 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
2465 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
2466 && UNAME_MACHINE=i686
2467 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
2468 else
2469 echo ${UNAME_MACHINE}-pc-sysv32
2470 fi
2471 exit 0 ;;
2472 - i*86:*DOS:*:*)
2473 - echo ${UNAME_MACHINE}-pc-msdosdjgpp
2474 - exit 0 ;;
2475 pc:*:*:*)
2476 # Left here for compatibility:
2477 # uname -m prints for DJGPP always 'pc', but it prints nothing about
2478 @@ -1019,9 +1028,15 @@
2479 # "miniframe"
2480 echo m68010-convergent-sysv
2481 exit 0 ;;
2482 + mc68k:UNIX:SYSTEM5:3.51m)
2483 + echo m68k-convergent-sysv
2484 + exit 0 ;;
2485 + M680?0:D-NIX:5.3:*)
2486 + echo m68k-diab-dnix
2487 + exit 0 ;;
2488 M68*:*:R3V[567]*:*)
2489 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
2490 - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
2491 + 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)
2492 OS_REL=''
2493 test -r /etc/.relid \
2494 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
2495 @@ -1038,9 +1053,6 @@
2496 mc68030:UNIX_System_V:4.*:*)
2497 echo m68k-atari-sysv4
2498 exit 0 ;;
2499 - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
2500 - echo i386-unknown-lynxos${UNAME_RELEASE}
2501 - exit 0 ;;
2502 TSUNAMI:LynxOS:2.*:*)
2503 echo sparc-unknown-lynxos${UNAME_RELEASE}
2504 exit 0 ;;
2505 @@ -1067,8 +1079,8 @@
2506 echo ns32k-sni-sysv
2507 fi
2508 exit 0 ;;
2509 - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
2510 - # says <Richard.M.Bartel@ccMail.Census.GOV>
2511 + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
2512 + # says <Richard.M.Bartel@ccMail.Census.GOV>
2513 echo i586-unisys-sysv4
2514 exit 0 ;;
2515 *:UNIX_System_V:4*:FTX*)
2516 @@ -1080,6 +1092,10 @@
2517 # From seanf@swdc.stratus.com.
2518 echo i860-stratus-sysv4
2519 exit 0 ;;
2520 + *:VOS:*:*)
2521 + # From Paul.Green@stratus.com.
2522 + echo hppa1.1-stratus-vos
2523 + exit 0 ;;
2524 mc68*:A/UX:*:*)
2525 echo m68k-apple-aux${UNAME_RELEASE}
2526 exit 0 ;;
2527 @@ -1108,6 +1124,9 @@
2528 SX-5:SUPER-UX:*:*)
2529 echo sx5-nec-superux${UNAME_RELEASE}
2530 exit 0 ;;
2531 + SX-6:SUPER-UX:*:*)
2532 + echo sx6-nec-superux${UNAME_RELEASE}
2533 + exit 0 ;;
2534 Power*:Rhapsody:*:*)
2535 echo powerpc-apple-rhapsody${UNAME_RELEASE}
2536 exit 0 ;;
2537 @@ -1115,18 +1134,24 @@
2538 echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
2539 exit 0 ;;
2540 *:Darwin:*:*)
2541 - echo `uname -p`-apple-darwin${UNAME_RELEASE}
2542 + case `uname -p` in
2543 + *86) UNAME_PROCESSOR=i686 ;;
2544 + powerpc) UNAME_PROCESSOR=powerpc ;;
2545 + esac
2546 + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
2547 exit 0 ;;
2548 *:procnto*:*:* | *:QNX:[0123456789]*:*)
2549 - if test "${UNAME_MACHINE}" = "x86pc"; then
2550 + UNAME_PROCESSOR=`uname -p`
2551 + if test "$UNAME_PROCESSOR" = "x86"; then
2552 + UNAME_PROCESSOR=i386
2553 UNAME_MACHINE=pc
2554 fi
2555 - echo `uname -p`-${UNAME_MACHINE}-nto-qnx
2556 + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
2557 exit 0 ;;
2558 *:QNX:*:4*)
2559 echo i386-pc-qnx
2560 exit 0 ;;
2561 - NSR-[KW]:NONSTOP_KERNEL:*:*)
2562 + NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
2563 echo nsr-tandem-nsk${UNAME_RELEASE}
2564 exit 0 ;;
2565 *:NonStop-UX:*:*)
2566 @@ -1149,11 +1174,6 @@
2567 fi
2568 echo ${UNAME_MACHINE}-unknown-plan9
2569 exit 0 ;;
2570 - i*86:OS/2:*:*)
2571 - # If we were able to find `uname', then EMX Unix compatibility
2572 - # is probably installed.
2573 - echo ${UNAME_MACHINE}-pc-os2-emx
2574 - exit 0 ;;
2575 *:TOPS-10:*:*)
2576 echo pdp10-unknown-tops10
2577 exit 0 ;;
2578 @@ -1177,6 +1197,7 @@
2579 #echo '(No uname command or uname output not recognized.)' 1>&2
2580 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
2581
2582 +eval $set_cc_for_build
2583 cat >$dummy.c <<EOF
2584 #ifdef _SEQUENT_
2585 # include <sys/types.h>
2586 @@ -1291,8 +1312,7 @@
2587 }
2588 EOF
2589
2590 -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
2591 -rm -f $dummy.c $dummy
2592 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
2593
2594 # Apollos put the system type in the environment.
2595
2596 Index: linux-atm-2.4.1/config.h.in
2597 ===================================================================
2598 --- linux-atm-2.4.1.orig/config.h.in 2007-06-04 13:23:53.902539464 +0200
2599 +++ linux-atm-2.4.1/config.h.in 2007-06-04 13:23:54.463454192 +0200
2600 @@ -1,4 +1,4 @@
2601 -/* config.h.in. Generated automatically from configure.in by autoheader. */
2602 +/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
2603 #ifndef _ATM_CONFIG_H
2604 #define _ATM_CONFIG_H
2605
2606 Index: linux-atm-2.4.1/config.sub
2607 ===================================================================
2608 --- linux-atm-2.4.1.orig/config.sub 2007-06-04 13:23:53.907538704 +0200
2609 +++ linux-atm-2.4.1/config.sub 2007-06-04 13:23:54.464454040 +0200
2610 @@ -1,9 +1,9 @@
2611 #! /bin/sh
2612 # Configuration validation subroutine script.
2613 -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
2614 -# Free Software Foundation, Inc.
2615 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2616 +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
2617
2618 -timestamp='2001-04-20'
2619 +timestamp='2003-05-09'
2620
2621 # This file is (in principle) common to ALL GNU software.
2622 # The presence of a machine in this file suggests that SOME GNU software
2623 @@ -29,7 +29,8 @@
2624 # configuration script generated by Autoconf, you may include it under
2625 # the same distribution terms that you use for the rest of that program.
2626
2627 -# Please send patches to <config-patches@gnu.org>.
2628 +# Please send patches to <config-patches@gnu.org>. Submit a context
2629 +# diff and a properly formatted ChangeLog entry.
2630 #
2631 # Configuration subroutine to validate and canonicalize a configuration type.
2632 # Supply the specified configuration type as an argument.
2633 @@ -117,7 +118,7 @@
2634 # Here we must recognize all the valid KERNEL-OS combinations.
2635 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
2636 case $maybe_os in
2637 - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
2638 + nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
2639 os=-$maybe_os
2640 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
2641 ;;
2642 @@ -157,6 +158,14 @@
2643 os=-vxworks
2644 basic_machine=$1
2645 ;;
2646 + -chorusos*)
2647 + os=-chorusos
2648 + basic_machine=$1
2649 + ;;
2650 + -chorusrdb)
2651 + os=-chorusrdb
2652 + basic_machine=$1
2653 + ;;
2654 -hiux*)
2655 os=-hiuxwe2
2656 ;;
2657 @@ -215,26 +224,48 @@
2658 case $basic_machine in
2659 # Recognize the basic CPU types without company name.
2660 # Some are omitted here because they have special meanings below.
2661 - tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
2662 - | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
2663 - | pyramid | mn10200 | mn10300 | tron | a29k \
2664 - | 580 | i960 | h8300 \
2665 - | x86 | ppcbe | mipsbe | mipsle | shbe | shle \
2666 - | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
2667 - | hppa64 \
2668 - | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
2669 - | alphaev6[78] \
2670 - | we32k | ns16k | clipper | i370 | sh | sh[34] \
2671 - | powerpc | powerpcle \
2672 - | 1750a | dsp16xx | pdp10 | pdp11 \
2673 - | mips16 | mips64 | mipsel | mips64el \
2674 - | mips64orion | mips64orionel | mipstx39 | mipstx39el \
2675 - | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
2676 - | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
2677 - | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
2678 - | v850 | c4x \
2679 - | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
2680 - | pj | pjl | h8500)
2681 + 1750a | 580 \
2682 + | a29k \
2683 + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
2684 + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
2685 + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
2686 + | clipper \
2687 + | d10v | d30v | dlx | dsp16xx \
2688 + | fr30 | frv \
2689 + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
2690 + | i370 | i860 | i960 | ia64 \
2691 + | ip2k \
2692 + | m32r | m68000 | m68k | m88k | mcore \
2693 + | mips | mipsbe | mipseb | mipsel | mipsle \
2694 + | mips16 \
2695 + | mips64 | mips64el \
2696 + | mips64vr | mips64vrel \
2697 + | mips64orion | mips64orionel \
2698 + | mips64vr4100 | mips64vr4100el \
2699 + | mips64vr4300 | mips64vr4300el \
2700 + | mips64vr5000 | mips64vr5000el \
2701 + | mipsisa32 | mipsisa32el \
2702 + | mipsisa32r2 | mipsisa32r2el \
2703 + | mipsisa64 | mipsisa64el \
2704 + | mipsisa64sb1 | mipsisa64sb1el \
2705 + | mipsisa64sr71k | mipsisa64sr71kel \
2706 + | mipstx39 | mipstx39el \
2707 + | mn10200 | mn10300 \
2708 + | msp430 \
2709 + | ns16k | ns32k \
2710 + | openrisc | or32 \
2711 + | pdp10 | pdp11 | pj | pjl \
2712 + | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
2713 + | pyramid \
2714 + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
2715 + | sh64 | sh64le \
2716 + | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
2717 + | strongarm \
2718 + | tahoe | thumb | tic80 | tron \
2719 + | v850 | v850e \
2720 + | we32k \
2721 + | x86 | xscale | xstormy16 | xtensa \
2722 + | z8k)
2723 basic_machine=$basic_machine-unknown
2724 ;;
2725 m6811 | m68hc11 | m6812 | m68hc12)
2726 @@ -242,7 +273,7 @@
2727 basic_machine=$basic_machine-unknown
2728 os=-none
2729 ;;
2730 - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65)
2731 + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
2732 ;;
2733
2734 # We use `pc' rather than `unknown'
2735 @@ -257,31 +288,60 @@
2736 exit 1
2737 ;;
2738 # Recognize the basic CPU types with company name.
2739 - # FIXME: clean up the formatting here.
2740 - vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
2741 - | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
2742 - | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
2743 - | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
2744 - | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
2745 - | xmp-* | ymp-* \
2746 - | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
2747 - | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
2748 - | hppa2.0n-* | hppa64-* \
2749 - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
2750 - | alphaev6[78]-* \
2751 - | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
2752 - | clipper-* | orion-* \
2753 - | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
2754 - | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
2755 - | mips16-* | mips64-* | mipsel-* \
2756 - | mips64el-* | mips64orion-* | mips64orionel-* \
2757 - | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
2758 - | mipstx39-* | mipstx39el-* | mcore-* \
2759 - | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
2760 - | [cjt]90-* \
2761 - | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
2762 - | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
2763 - | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
2764 + 580-* \
2765 + | a29k-* \
2766 + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
2767 + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
2768 + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
2769 + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
2770 + | avr-* \
2771 + | bs2000-* \
2772 + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
2773 + | clipper-* | cydra-* \
2774 + | d10v-* | d30v-* | dlx-* \
2775 + | elxsi-* \
2776 + | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
2777 + | h8300-* | h8500-* \
2778 + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
2779 + | i*86-* | i860-* | i960-* | ia64-* \
2780 + | ip2k-* \
2781 + | m32r-* \
2782 + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
2783 + | m88110-* | m88k-* | mcore-* \
2784 + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
2785 + | mips16-* \
2786 + | mips64-* | mips64el-* \
2787 + | mips64vr-* | mips64vrel-* \
2788 + | mips64orion-* | mips64orionel-* \
2789 + | mips64vr4100-* | mips64vr4100el-* \
2790 + | mips64vr4300-* | mips64vr4300el-* \
2791 + | mips64vr5000-* | mips64vr5000el-* \
2792 + | mipsisa32-* | mipsisa32el-* \
2793 + | mipsisa32r2-* | mipsisa32r2el-* \
2794 + | mipsisa64-* | mipsisa64el-* \
2795 + | mipsisa64sb1-* | mipsisa64sb1el-* \
2796 + | mipsisa64sr71k-* | mipsisa64sr71kel-* \
2797 + | mipstx39-* | mipstx39el-* \
2798 + | msp430-* \
2799 + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
2800 + | orion-* \
2801 + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
2802 + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
2803 + | pyramid-* \
2804 + | romp-* | rs6000-* \
2805 + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
2806 + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
2807 + | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
2808 + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
2809 + | tahoe-* | thumb-* \
2810 + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
2811 + | tron-* \
2812 + | v850-* | v850e-* | vax-* \
2813 + | we32k-* \
2814 + | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
2815 + | xtensa-* \
2816 + | ymp-* \
2817 + | z8k-*)
2818 ;;
2819 # Recognize the various machine names and aliases which stand
2820 # for a CPU type and a company and sometimes even an OS.
2821 @@ -313,6 +373,9 @@
2822 basic_machine=a29k-none
2823 os=-bsd
2824 ;;
2825 + amd64)
2826 + basic_machine=x86_64-pc
2827 + ;;
2828 amdahl)
2829 basic_machine=580-amdahl
2830 os=-sysv
2831 @@ -344,6 +407,10 @@
2832 basic_machine=ns32k-sequent
2833 os=-dynix
2834 ;;
2835 + c90)
2836 + basic_machine=c90-cray
2837 + os=-unicos
2838 + ;;
2839 convex-c1)
2840 basic_machine=c1-convex
2841 os=-bsd
2842 @@ -364,16 +431,8 @@
2843 basic_machine=c38-convex
2844 os=-bsd
2845 ;;
2846 - cray | ymp)
2847 - basic_machine=ymp-cray
2848 - os=-unicos
2849 - ;;
2850 - cray2)
2851 - basic_machine=cray2-cray
2852 - os=-unicos
2853 - ;;
2854 - [cjt]90)
2855 - basic_machine=${basic_machine}-cray
2856 + cray | j90)
2857 + basic_machine=j90-cray
2858 os=-unicos
2859 ;;
2860 crds | unos)
2861 @@ -388,6 +447,14 @@
2862 decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
2863 basic_machine=mips-dec
2864 ;;
2865 + decsystem10* | dec10*)
2866 + basic_machine=pdp10-dec
2867 + os=-tops10
2868 + ;;
2869 + decsystem20* | dec20*)
2870 + basic_machine=pdp10-dec
2871 + os=-tops20
2872 + ;;
2873 delta | 3300 | motorola-3300 | motorola-delta \
2874 | 3300-motorola | delta-motorola)
2875 basic_machine=m68k-motorola
2876 @@ -568,14 +635,6 @@
2877 basic_machine=m68k-atari
2878 os=-mint
2879 ;;
2880 - mipsel*-linux*)
2881 - basic_machine=mipsel-unknown
2882 - os=-linux-gnu
2883 - ;;
2884 - mips*-linux*)
2885 - basic_machine=mips-unknown
2886 - os=-linux-gnu
2887 - ;;
2888 mips3*-*)
2889 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
2890 ;;
2891 @@ -590,6 +649,10 @@
2892 basic_machine=m68k-rom68k
2893 os=-coff
2894 ;;
2895 + morphos)
2896 + basic_machine=powerpc-unknown
2897 + os=-morphos
2898 + ;;
2899 msdos)
2900 basic_machine=i386-pc
2901 os=-msdos
2902 @@ -662,6 +725,10 @@
2903 np1)
2904 basic_machine=np1-gould
2905 ;;
2906 + nv1)
2907 + basic_machine=nv1-cray
2908 + os=-unicosmp
2909 + ;;
2910 nsr-tandem)
2911 basic_machine=nsr-tandem
2912 ;;
2913 @@ -669,6 +736,10 @@
2914 basic_machine=hppa1.1-oki
2915 os=-proelf
2916 ;;
2917 + or32 | or32-*)
2918 + basic_machine=or32-unknown
2919 + os=-coff
2920 + ;;
2921 OSE68000 | ose68000)
2922 basic_machine=m68000-ericsson
2923 os=-ose
2924 @@ -691,19 +762,19 @@
2925 pbb)
2926 basic_machine=m68k-tti
2927 ;;
2928 - pc532 | pc532-*)
2929 + pc532 | pc532-*)
2930 basic_machine=ns32k-pc532
2931 ;;
2932 - pentium | p5 | k5 | k6 | nexgen)
2933 + pentium | p5 | k5 | k6 | nexgen | viac3)
2934 basic_machine=i586-pc
2935 ;;
2936 - pentiumpro | p6 | 6x86 | athlon)
2937 + pentiumpro | p6 | 6x86 | athlon | athlon_*)
2938 basic_machine=i686-pc
2939 ;;
2940 pentiumii | pentium2)
2941 basic_machine=i686-pc
2942 ;;
2943 - pentium-* | p5-* | k5-* | k6-* | nexgen-*)
2944 + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
2945 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
2946 ;;
2947 pentiumpro-* | p6-* | 6x86-* | athlon-*)
2948 @@ -718,15 +789,25 @@
2949 power) basic_machine=power-ibm
2950 ;;
2951 ppc) basic_machine=powerpc-unknown
2952 - ;;
2953 + ;;
2954 ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
2955 ;;
2956 ppcle | powerpclittle | ppc-le | powerpc-little)
2957 basic_machine=powerpcle-unknown
2958 - ;;
2959 + ;;
2960 ppcle-* | powerpclittle-*)
2961 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
2962 ;;
2963 + ppc64) basic_machine=powerpc64-unknown
2964 + ;;
2965 + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
2966 + ;;
2967 + ppc64le | powerpc64little | ppc64-le | powerpc64-little)
2968 + basic_machine=powerpc64le-unknown
2969 + ;;
2970 + ppc64le-* | powerpc64little-*)
2971 + basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
2972 + ;;
2973 ps2)
2974 basic_machine=i386-ibm
2975 ;;
2976 @@ -744,10 +825,22 @@
2977 rtpc | rtpc-*)
2978 basic_machine=romp-ibm
2979 ;;
2980 + s390 | s390-*)
2981 + basic_machine=s390-ibm
2982 + ;;
2983 + s390x | s390x-*)
2984 + basic_machine=s390x-ibm
2985 + ;;
2986 sa29200)
2987 basic_machine=a29k-amd
2988 os=-udi
2989 ;;
2990 + sb1)
2991 + basic_machine=mipsisa64sb1-unknown
2992 + ;;
2993 + sb1el)
2994 + basic_machine=mipsisa64sb1el-unknown
2995 + ;;
2996 sequent)
2997 basic_machine=i386-sequent
2998 ;;
2999 @@ -755,7 +848,7 @@
3000 basic_machine=sh-hitachi
3001 os=-hms
3002 ;;
3003 - sparclite-wrs)
3004 + sparclite-wrs | simso-wrs)
3005 basic_machine=sparclite-wrs
3006 os=-vxworks
3007 ;;
3008 @@ -822,19 +915,39 @@
3009 os=-dynix
3010 ;;
3011 t3e)
3012 - basic_machine=t3e-cray
3013 + basic_machine=alphaev5-cray
3014 os=-unicos
3015 ;;
3016 + t90)
3017 + basic_machine=t90-cray
3018 + os=-unicos
3019 + ;;
3020 + tic4x | c4x*)
3021 + basic_machine=tic4x-unknown
3022 + os=-coff
3023 + ;;
3024 tic54x | c54x*)
3025 basic_machine=tic54x-unknown
3026 os=-coff
3027 ;;
3028 + tic55x | c55x*)
3029 + basic_machine=tic55x-unknown
3030 + os=-coff
3031 + ;;
3032 + tic6x | c6x*)
3033 + basic_machine=tic6x-unknown
3034 + os=-coff
3035 + ;;
3036 tx39)
3037 basic_machine=mipstx39-unknown
3038 ;;
3039 tx39el)
3040 basic_machine=mipstx39el-unknown
3041 ;;
3042 + toad1)
3043 + basic_machine=pdp10-xkl
3044 + os=-tops20
3045 + ;;
3046 tower | tower-32)
3047 basic_machine=m68k-ncr
3048 ;;
3049 @@ -859,8 +972,8 @@
3050 os=-vms
3051 ;;
3052 vpp*|vx|vx-*)
3053 - basic_machine=f301-fujitsu
3054 - ;;
3055 + basic_machine=f301-fujitsu
3056 + ;;
3057 vxworks960)
3058 basic_machine=i960-wrs
3059 os=-vxworks
3060 @@ -881,13 +994,13 @@
3061 basic_machine=hppa1.1-winbond
3062 os=-proelf
3063 ;;
3064 - xmp)
3065 - basic_machine=xmp-cray
3066 - os=-unicos
3067 - ;;
3068 - xps | xps100)
3069 + xps | xps100)
3070 basic_machine=xps100-honeywell
3071 ;;
3072 + ymp)
3073 + basic_machine=ymp-cray
3074 + os=-unicos
3075 + ;;
3076 z8k-*-coff)
3077 basic_machine=z8k-unknown
3078 os=-sim
3079 @@ -908,13 +1021,6 @@
3080 op60c)
3081 basic_machine=hppa1.1-oki
3082 ;;
3083 - mips)
3084 - if [ x$os = x-linux-gnu ]; then
3085 - basic_machine=mips-unknown
3086 - else
3087 - basic_machine=mips-mips
3088 - fi
3089 - ;;
3090 romp)
3091 basic_machine=romp-ibm
3092 ;;
3093 @@ -934,13 +1040,16 @@
3094 we32k)
3095 basic_machine=we32k-att
3096 ;;
3097 - sh3 | sh4)
3098 + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
3099 basic_machine=sh-unknown
3100 ;;
3101 + sh64)
3102 + basic_machine=sh64-unknown
3103 + ;;
3104 sparc | sparcv9 | sparcv9b)
3105 basic_machine=sparc-sun
3106 ;;
3107 - cydra)
3108 + cydra)
3109 basic_machine=cydra-cydrome
3110 ;;
3111 orion)
3112 @@ -955,10 +1064,6 @@
3113 pmac | pmac-mpw)
3114 basic_machine=powerpc-apple
3115 ;;
3116 - c4x*)
3117 - basic_machine=c4x-none
3118 - os=-coff
3119 - ;;
3120 *-unknown)
3121 # Make sure to match an already-canonicalized machine name.
3122 ;;
3123 @@ -1018,11 +1123,15 @@
3124 | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
3125 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
3126 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
3127 + | -chorusos* | -chorusrdb* \
3128 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
3129 | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
3130 - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
3131 + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
3132 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
3133 - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
3134 + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
3135 + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
3136 + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
3137 + | -powermax* | -dnix*)
3138 # Remember, each alternative MUST END IN *, to match a version number.
3139 ;;
3140 -qnx*)
3141 @@ -1034,8 +1143,10 @@
3142 ;;
3143 esac
3144 ;;
3145 + -nto-qnx*)
3146 + ;;
3147 -nto*)
3148 - os=-nto-qnx
3149 + os=`echo $os | sed -e 's|nto|nto-qnx|'`
3150 ;;
3151 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
3152 | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
3153 @@ -1074,14 +1185,20 @@
3154 -acis*)
3155 os=-aos
3156 ;;
3157 + -atheos*)
3158 + os=-atheos
3159 + ;;
3160 -386bsd)
3161 os=-bsd
3162 ;;
3163 -ctix* | -uts*)
3164 os=-sysv
3165 ;;
3166 + -nova*)
3167 + os=-rtmk-nova
3168 + ;;
3169 -ns2 )
3170 - os=-nextstep2
3171 + os=-nextstep2
3172 ;;
3173 -nsk*)
3174 os=-nsk
3175 @@ -1120,8 +1237,14 @@
3176 -xenix)
3177 os=-xenix
3178 ;;
3179 - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3180 - os=-mint
3181 + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3182 + os=-mint
3183 + ;;
3184 + -aros*)
3185 + os=-aros
3186 + ;;
3187 + -kaos*)
3188 + os=-kaos
3189 ;;
3190 -none)
3191 ;;
3192 @@ -1154,10 +1277,11 @@
3193 arm*-semi)
3194 os=-aout
3195 ;;
3196 + # This must come before the *-dec entry.
3197 pdp10-*)
3198 os=-tops20
3199 ;;
3200 - pdp11-*)
3201 + pdp11-*)
3202 os=-none
3203 ;;
3204 *-dec | vax-*)
3205 @@ -1184,6 +1308,9 @@
3206 mips*-*)
3207 os=-elf
3208 ;;
3209 + or32-*)
3210 + os=-coff
3211 + ;;
3212 *-tti) # must be before sparc entry or we get the wrong os.
3213 os=-sysv3
3214 ;;
3215 @@ -1247,19 +1374,19 @@
3216 *-next)
3217 os=-nextstep3
3218 ;;
3219 - *-gould)
3220 + *-gould)
3221 os=-sysv
3222 ;;
3223 - *-highlevel)
3224 + *-highlevel)
3225 os=-bsd
3226 ;;
3227 *-encore)
3228 os=-bsd
3229 ;;
3230 - *-sgi)
3231 + *-sgi)
3232 os=-irix
3233 ;;
3234 - *-siemens)
3235 + *-siemens)
3236 os=-sysv4
3237 ;;
3238 *-masscomp)
3239 @@ -1331,7 +1458,7 @@
3240 -ptx*)
3241 vendor=sequent
3242 ;;
3243 - -vxsim* | -vxworks*)
3244 + -vxsim* | -vxworks* | -windiss*)
3245 vendor=wrs
3246 ;;
3247 -aux*)
3248 @@ -1346,6 +1473,9 @@
3249 -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
3250 vendor=atari
3251 ;;
3252 + -vos*)
3253 + vendor=stratus
3254 + ;;
3255 esac
3256 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
3257 ;;
3258 Index: linux-atm-2.4.1/configure
3259 ===================================================================
3260 --- linux-atm-2.4.1.orig/configure 2007-06-04 13:23:53.913537792 +0200
3261 +++ linux-atm-2.4.1/configure 2007-06-04 13:23:54.473452672 +0200
3262 @@ -1,24 +1,244 @@
3263 #! /bin/sh
3264 -
3265 # Guess values for system-dependent variables and create Makefiles.
3266 -# Generated automatically using autoconf version 2.13
3267 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
3268 +# Generated by GNU Autoconf 2.57.
3269 #
3270 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
3271 +# Free Software Foundation, Inc.
3272 # This configure script is free software; the Free Software Foundation
3273 # gives unlimited permission to copy, distribute and modify it.
3274 +## --------------------- ##
3275 +## M4sh Initialization. ##
3276 +## --------------------- ##
3277 +
3278 +# Be Bourne compatible
3279 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3280 + emulate sh
3281 + NULLCMD=:
3282 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3283 + # is contrary to our usage. Disable this feature.
3284 + alias -g '${1+"$@"}'='"$@"'
3285 +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
3286 + set -o posix
3287 +fi
3288 +
3289 +# Support unset when possible.
3290 +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
3291 + as_unset=unset
3292 +else
3293 + as_unset=false
3294 +fi
3295 +
3296 +
3297 +# Work around bugs in pre-3.0 UWIN ksh.
3298 +$as_unset ENV MAIL MAILPATH
3299 +PS1='$ '
3300 +PS2='> '
3301 +PS4='+ '
3302 +
3303 +# NLS nuisances.
3304 +for as_var in \
3305 + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
3306 + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
3307 + LC_TELEPHONE LC_TIME
3308 +do
3309 + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
3310 + eval $as_var=C; export $as_var
3311 + else
3312 + $as_unset $as_var
3313 + fi
3314 +done
3315 +
3316 +# Required to use basename.
3317 +if expr a : '\(a\)' >/dev/null 2>&1; then
3318 + as_expr=expr
3319 +else
3320 + as_expr=false
3321 +fi
3322 +
3323 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
3324 + as_basename=basename
3325 +else
3326 + as_basename=false
3327 +fi
3328 +
3329 +
3330 +# Name of the executable.
3331 +as_me=`$as_basename "$0" ||
3332 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
3333 + X"$0" : 'X\(//\)$' \| \
3334 + X"$0" : 'X\(/\)$' \| \
3335 + . : '\(.\)' 2>/dev/null ||
3336 +echo X/"$0" |
3337 + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
3338 + /^X\/\(\/\/\)$/{ s//\1/; q; }
3339 + /^X\/\(\/\).*/{ s//\1/; q; }
3340 + s/.*/./; q'`
3341 +
3342 +
3343 +# PATH needs CR, and LINENO needs CR and PATH.
3344 +# Avoid depending upon Character Ranges.
3345 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
3346 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
3347 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
3348 +as_cr_digits='0123456789'
3349 +as_cr_alnum=$as_cr_Letters$as_cr_digits
3350 +
3351 +# The user is always right.
3352 +if test "${PATH_SEPARATOR+set}" != set; then
3353 + echo "#! /bin/sh" >conf$$.sh
3354 + echo "exit 0" >>conf$$.sh
3355 + chmod +x conf$$.sh
3356 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
3357 + PATH_SEPARATOR=';'
3358 + else
3359 + PATH_SEPARATOR=:
3360 + fi
3361 + rm -f conf$$.sh
3362 +fi
3363 +
3364 +
3365 + as_lineno_1=$LINENO
3366 + as_lineno_2=$LINENO
3367 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
3368 + test "x$as_lineno_1" != "x$as_lineno_2" &&
3369 + test "x$as_lineno_3" = "x$as_lineno_2" || {
3370 + # Find who we are. Look in the path if we contain no path at all
3371 + # relative or not.
3372 + case $0 in
3373 + *[\\/]* ) as_myself=$0 ;;
3374 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3375 +for as_dir in $PATH
3376 +do
3377 + IFS=$as_save_IFS
3378 + test -z "$as_dir" && as_dir=.
3379 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
3380 +done
3381 +
3382 + ;;
3383 + esac
3384 + # We did not find ourselves, most probably we were run as `sh COMMAND'
3385 + # in which case we are not to be found in the path.
3386 + if test "x$as_myself" = x; then
3387 + as_myself=$0
3388 + fi
3389 + if test ! -f "$as_myself"; then
3390 + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
3391 + { (exit 1); exit 1; }; }
3392 + fi
3393 + case $CONFIG_SHELL in
3394 + '')
3395 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3396 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
3397 +do
3398 + IFS=$as_save_IFS
3399 + test -z "$as_dir" && as_dir=.
3400 + for as_base in sh bash ksh sh5; do
3401 + case $as_dir in
3402 + /*)
3403 + if ("$as_dir/$as_base" -c '
3404 + as_lineno_1=$LINENO
3405 + as_lineno_2=$LINENO
3406 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
3407 + test "x$as_lineno_1" != "x$as_lineno_2" &&
3408 + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
3409 + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
3410 + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
3411 + CONFIG_SHELL=$as_dir/$as_base
3412 + export CONFIG_SHELL
3413 + exec "$CONFIG_SHELL" "$0" ${1+"$@"}
3414 + fi;;
3415 + esac
3416 + done
3417 +done
3418 +;;
3419 + esac
3420 +
3421 + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
3422 + # uniformly replaced by the line number. The first 'sed' inserts a
3423 + # line-number line before each line; the second 'sed' does the real
3424 + # work. The second script uses 'N' to pair each line-number line
3425 + # with the numbered line, and appends trailing '-' during
3426 + # substitution so that $LINENO is not a special case at line end.
3427 + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
3428 + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
3429 + sed '=' <$as_myself |
3430 + sed '
3431 + N
3432 + s,$,-,
3433 + : loop
3434 + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
3435 + t loop
3436 + s,-$,,
3437 + s,^['$as_cr_digits']*\n,,
3438 + ' >$as_me.lineno &&
3439 + chmod +x $as_me.lineno ||
3440 + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3441 + { (exit 1); exit 1; }; }
3442 +
3443 + # Don't try to exec as it changes $[0], causing all sort of problems
3444 + # (the dirname of $[0] is not the place where we might find the
3445 + # original and so on. Autoconf is especially sensible to this).
3446 + . ./$as_me.lineno
3447 + # Exit status is that of the last command.
3448 + exit
3449 +}
3450 +
3451 +
3452 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
3453 + *c*,-n*) ECHO_N= ECHO_C='
3454 +' ECHO_T=' ' ;;
3455 + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
3456 + *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
3457 +esac
3458 +
3459 +if expr a : '\(a\)' >/dev/null 2>&1; then
3460 + as_expr=expr
3461 +else
3462 + as_expr=false
3463 +fi
3464 +
3465 +rm -f conf$$ conf$$.exe conf$$.file
3466 +echo >conf$$.file
3467 +if ln -s conf$$.file conf$$ 2>/dev/null; then
3468 + # We could just check for DJGPP; but this test a) works b) is more generic
3469 + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
3470 + if test -f conf$$.exe; then
3471 + # Don't use ln at all; we don't have any links
3472 + as_ln_s='cp -p'
3473 + else
3474 + as_ln_s='ln -s'
3475 + fi
3476 +elif ln conf$$.file conf$$ 2>/dev/null; then
3477 + as_ln_s=ln
3478 +else
3479 + as_ln_s='cp -p'
3480 +fi
3481 +rm -f conf$$ conf$$.exe conf$$.file
3482 +
3483 +if mkdir -p . 2>/dev/null; then
3484 + as_mkdir_p=:
3485 +else
3486 + as_mkdir_p=false
3487 +fi
3488 +
3489 +as_executable_p="test -f"
3490 +
3491 +# Sed expression to map a string onto a valid CPP name.
3492 +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
3493 +
3494 +# Sed expression to map a string onto a valid variable name.
3495 +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
3496 +
3497 +
3498 +# IFS
3499 +# We need space, tab and new line, in precisely that order.
3500 +as_nl='
3501 +'
3502 +IFS=" $as_nl"
3503 +
3504 +# CDPATH.
3505 +$as_unset CDPATH
3506
3507 -# Defaults:
3508 -ac_help=
3509 -ac_default_prefix=/usr/local
3510 -# Any additions from configure.in:
3511 -ac_help="$ac_help
3512 - --enable-shared[=PKGS] build shared libraries [default=yes]"
3513 -ac_help="$ac_help
3514 - --enable-static[=PKGS] build static libraries [default=yes]"
3515 -ac_help="$ac_help
3516 - --enable-fast-install[=PKGS] optimize for fast installation [default=yes]"
3517 -ac_help="$ac_help
3518 - --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
3519
3520 # Find the correct PATH separator. Usually this is `:', but
3521 # DJGPP uses `;' like DOS.
3522 @@ -28,6 +248,7 @@
3523 *-DOS) lt_cv_sys_path_separator=';' ;;
3524 *) lt_cv_sys_path_separator=':' ;;
3525 esac
3526 + PATH_SEPARATOR=$lt_cv_sys_path_separator
3527 fi
3528
3529
3530 @@ -94,7 +315,7 @@
3531 #
3532 # So, first we look for a working echo in the user's PATH.
3533
3534 - IFS="${IFS= }"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
3535 + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
3536 for dir in $PATH /usr/ucb; do
3537 if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
3538 test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
3539 @@ -177,34 +398,86 @@
3540 fi
3541
3542
3543 -ac_help="$ac_help
3544 - --disable-libtool-lock avoid locking (might break parallel builds)"
3545 -ac_help="$ac_help
3546 - --with-pic try to use only PIC/non-PIC objects [default=use both]"
3547 -ac_help="$ac_help
3548 - --with-uni=VERSION UNI version to use (3.0,3.1,4.0) [default=dynamic]"
3549 -ac_help="$ac_help
3550 - --enable-allow_uni30 Allow UNI 3.0 backwards-compatible extensions (if using UNI 3.1)"
3551 -ac_help="$ac_help
3552 - --enable-q2963_1 Enable peak cell rate modification as specified in Q.2963.1 (if using UNI 4.0)"
3553 -ac_help="$ac_help
3554 - --enable-cisco Enable work around for point-to-multipoint signaling bug in Cisco LS100 or LS7010 switches"
3555 -ac_help="$ac_help
3556 - --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."
3557 -ac_help="$ac_help
3558 - --enable-mpoa_1_1 Enable proposed MPOA 1.1 features"
3559 -ac_help="$ac_help
3560 - --enable-mpr Enable memory debugging (if MPR is installed)"
3561 +
3562 +# Name of the host.
3563 +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
3564 +# so uname gets run too.
3565 +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
3566 +
3567 +exec 6>&1
3568 +
3569 +#
3570 +# Initializations.
3571 +#
3572 +ac_default_prefix=/usr/local
3573 +ac_config_libobj_dir=.
3574 +cross_compiling=no
3575 +subdirs=
3576 +MFLAGS=
3577 +MAKEFLAGS=
3578 +SHELL=${CONFIG_SHELL-/bin/sh}
3579 +
3580 +# Maximum number of lines to put in a shell here document.
3581 +# This variable seems obsolete. It should probably be removed, and
3582 +# only ac_max_sed_lines should be used.
3583 +: ${ac_max_here_lines=38}
3584 +
3585 +# Identity of this package.
3586 +PACKAGE_NAME=
3587 +PACKAGE_TARNAME=
3588 +PACKAGE_VERSION=
3589 +PACKAGE_STRING=
3590 +PACKAGE_BUGREPORT=
3591 +
3592 +ac_unique_file="src/include/atm.h"
3593 +# Factoring default headers for most tests.
3594 +ac_includes_default="\
3595 +#include <stdio.h>
3596 +#if HAVE_SYS_TYPES_H
3597 +# include <sys/types.h>
3598 +#endif
3599 +#if HAVE_SYS_STAT_H
3600 +# include <sys/stat.h>
3601 +#endif
3602 +#if STDC_HEADERS
3603 +# include <stdlib.h>
3604 +# include <stddef.h>
3605 +#else
3606 +# if HAVE_STDLIB_H
3607 +# include <stdlib.h>
3608 +# endif
3609 +#endif
3610 +#if HAVE_STRING_H
3611 +# if !STDC_HEADERS && HAVE_MEMORY_H
3612 +# include <memory.h>
3613 +# endif
3614 +# include <string.h>
3615 +#endif
3616 +#if HAVE_STRINGS_H
3617 +# include <strings.h>
3618 +#endif
3619 +#if HAVE_INTTYPES_H
3620 +# include <inttypes.h>
3621 +#else
3622 +# if HAVE_STDINT_H
3623 +# include <stdint.h>
3624 +# endif
3625 +#endif
3626 +#if HAVE_UNISTD_H
3627 +# include <unistd.h>
3628 +#endif"
3629 +
3630 +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'
3631 +ac_subst_files=''
3632
3633 # Initialize some variables set by options.
3634 +ac_init_help=
3635 +ac_init_version=false
3636 # The variables have the same names as the options, with
3637 # dashes changed to underlines.
3638 -build=NONE
3639 -cache_file=./config.cache
3640 +cache_file=/dev/null
3641 exec_prefix=NONE
3642 -host=NONE
3643 no_create=
3644 -nonopt=NONE
3645 no_recursion=
3646 prefix=NONE
3647 program_prefix=NONE
3648 @@ -213,10 +486,15 @@
3649 silent=
3650 site=
3651 srcdir=
3652 -target=NONE
3653 verbose=
3654 x_includes=NONE
3655 x_libraries=NONE
3656 +
3657 +# Installation directory options.
3658 +# These are left unexpanded so users can "make install exec_prefix=/foo"
3659 +# and all the variables that are supposed to be based on exec_prefix
3660 +# by default will actually change.
3661 +# Use braces instead of parens because sh, perl, etc. also accept them.
3662 bindir='${exec_prefix}/bin'
3663 sbindir='${exec_prefix}/sbin'
3664 libexecdir='${exec_prefix}/libexec'
3665 @@ -230,17 +508,9 @@
3666 infodir='${prefix}/info'
3667 mandir='${prefix}/man'
3668
3669 -# Initialize some other variables.
3670 -subdirs=
3671 -MFLAGS= MAKEFLAGS=
3672 -SHELL=${CONFIG_SHELL-/bin/sh}
3673 -# Maximum number of lines to put in a shell here document.
3674 -ac_max_here_lines=12
3675 -
3676 ac_prev=
3677 for ac_option
3678 do
3679 -
3680 # If the previous option needs an argument, assign it.
3681 if test -n "$ac_prev"; then
3682 eval "$ac_prev=\$ac_option"
3683 @@ -248,59 +518,59 @@
3684 continue
3685 fi
3686
3687 - case "$ac_option" in
3688 - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
3689 - *) ac_optarg= ;;
3690 - esac
3691 + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
3692
3693 # Accept the important Cygnus configure options, so we can diagnose typos.
3694
3695 - case "$ac_option" in
3696 + case $ac_option in
3697
3698 -bindir | --bindir | --bindi | --bind | --bin | --bi)
3699 ac_prev=bindir ;;
3700 -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
3701 - bindir="$ac_optarg" ;;
3702 + bindir=$ac_optarg ;;
3703
3704 -build | --build | --buil | --bui | --bu)
3705 - ac_prev=build ;;
3706 + ac_prev=build_alias ;;
3707 -build=* | --build=* | --buil=* | --bui=* | --bu=*)
3708 - build="$ac_optarg" ;;
3709 + build_alias=$ac_optarg ;;
3710
3711 -cache-file | --cache-file | --cache-fil | --cache-fi \
3712 | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
3713 ac_prev=cache_file ;;
3714 -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
3715 | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
3716 - cache_file="$ac_optarg" ;;
3717 + cache_file=$ac_optarg ;;
3718 +
3719 + --config-cache | -C)
3720 + cache_file=config.cache ;;
3721
3722 -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
3723 ac_prev=datadir ;;
3724 -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
3725 | --da=*)
3726 - datadir="$ac_optarg" ;;
3727 + datadir=$ac_optarg ;;
3728
3729 -disable-* | --disable-*)
3730 - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
3731 + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
3732 # Reject names that are not valid shell variable names.
3733 - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
3734 - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
3735 - fi
3736 - ac_feature=`echo $ac_feature| sed 's/-/_/g'`
3737 - eval "enable_${ac_feature}=no" ;;
3738 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
3739 + { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3740 + { (exit 1); exit 1; }; }
3741 + ac_feature=`echo $ac_feature | sed 's/-/_/g'`
3742 + eval "enable_$ac_feature=no" ;;
3743
3744 -enable-* | --enable-*)
3745 - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
3746 + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
3747 # Reject names that are not valid shell variable names.
3748 - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
3749 - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
3750 - fi
3751 - ac_feature=`echo $ac_feature| sed 's/-/_/g'`
3752 - case "$ac_option" in
3753 - *=*) ;;
3754 + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
3755 + { echo "$as_me: error: invalid feature name: $ac_feature" >&2
3756 + { (exit 1); exit 1; }; }
3757 + ac_feature=`echo $ac_feature | sed 's/-/_/g'`
3758 + case $ac_option in
3759 + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
3760 *) ac_optarg=yes ;;
3761 esac
3762 - eval "enable_${ac_feature}='$ac_optarg'" ;;
3763 + eval "enable_$ac_feature='$ac_optarg'" ;;
3764
3765 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
3766 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
3767 @@ -309,95 +579,47 @@
3768 -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
3769 | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
3770 | --exec=* | --exe=* | --ex=*)
3771 - exec_prefix="$ac_optarg" ;;
3772 + exec_prefix=$ac_optarg ;;
3773
3774 -gas | --gas | --ga | --g)
3775 # Obsolete; use --with-gas.
3776 with_gas=yes ;;
3777
3778 - -help | --help | --hel | --he)
3779 - # Omit some internal or obsolete options to make the list less imposing.
3780 - # This message is too long to be a string in the A/UX 3.1 sh.
3781 - cat << EOF
3782 -Usage: configure [options] [host]
3783 -Options: [defaults in brackets after descriptions]
3784 -Configuration:
3785 - --cache-file=FILE cache test results in FILE
3786 - --help print this message
3787 - --no-create do not create output files
3788 - --quiet, --silent do not print \`checking...' messages
3789 - --version print the version of autoconf that created configure
3790 -Directory and file names:
3791 - --prefix=PREFIX install architecture-independent files in PREFIX
3792 - [$ac_default_prefix]
3793 - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
3794 - [same as prefix]
3795 - --bindir=DIR user executables in DIR [EPREFIX/bin]
3796 - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
3797 - --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
3798 - --datadir=DIR read-only architecture-independent data in DIR
3799 - [PREFIX/share]
3800 - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
3801 - --sharedstatedir=DIR modifiable architecture-independent data in DIR
3802 - [PREFIX/com]
3803 - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
3804 - --libdir=DIR object code libraries in DIR [EPREFIX/lib]
3805 - --includedir=DIR C header files in DIR [PREFIX/include]
3806 - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
3807 - --infodir=DIR info documentation in DIR [PREFIX/info]
3808 - --mandir=DIR man documentation in DIR [PREFIX/man]
3809 - --srcdir=DIR find the sources in DIR [configure dir or ..]
3810 - --program-prefix=PREFIX prepend PREFIX to installed program names
3811 - --program-suffix=SUFFIX append SUFFIX to installed program names
3812 - --program-transform-name=PROGRAM
3813 - run sed PROGRAM on installed program names
3814 -EOF
3815 - cat << EOF
3816 -Host type:
3817 - --build=BUILD configure for building on BUILD [BUILD=HOST]
3818 - --host=HOST configure for HOST [guessed]
3819 - --target=TARGET configure for TARGET [TARGET=HOST]
3820 -Features and packages:
3821 - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3822 - --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3823 - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
3824 - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
3825 - --x-includes=DIR X include files are in DIR
3826 - --x-libraries=DIR X library files are in DIR
3827 -EOF
3828 - if test -n "$ac_help"; then
3829 - echo "--enable and --with options recognized:$ac_help"
3830 - fi
3831 - exit 0 ;;
3832 + -help | --help | --hel | --he | -h)
3833 + ac_init_help=long ;;
3834 + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
3835 + ac_init_help=recursive ;;
3836 + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
3837 + ac_init_help=short ;;
3838
3839 -host | --host | --hos | --ho)
3840 - ac_prev=host ;;
3841 + ac_prev=host_alias ;;
3842 -host=* | --host=* | --hos=* | --ho=*)
3843 - host="$ac_optarg" ;;
3844 + host_alias=$ac_optarg ;;
3845
3846 -includedir | --includedir | --includedi | --included | --include \
3847 | --includ | --inclu | --incl | --inc)
3848 ac_prev=includedir ;;
3849 -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
3850 | --includ=* | --inclu=* | --incl=* | --inc=*)
3851 - includedir="$ac_optarg" ;;
3852 + includedir=$ac_optarg ;;
3853
3854 -infodir | --infodir | --infodi | --infod | --info | --inf)
3855 ac_prev=infodir ;;
3856 -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
3857 - infodir="$ac_optarg" ;;
3858 + infodir=$ac_optarg ;;
3859
3860 -libdir | --libdir | --libdi | --libd)
3861 ac_prev=libdir ;;
3862 -libdir=* | --libdir=* | --libdi=* | --libd=*)
3863 - libdir="$ac_optarg" ;;
3864 + libdir=$ac_optarg ;;
3865
3866 -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
3867 | --libexe | --libex | --libe)
3868 ac_prev=libexecdir ;;
3869 -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
3870 | --libexe=* | --libex=* | --libe=*)
3871 - libexecdir="$ac_optarg" ;;
3872 + libexecdir=$ac_optarg ;;
3873
3874 -localstatedir | --localstatedir | --localstatedi | --localstated \
3875 | --localstate | --localstat | --localsta | --localst \
3876 @@ -406,19 +628,19 @@
3877 -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
3878 | --localstate=* | --localstat=* | --localsta=* | --localst=* \
3879 | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
3880 - localstatedir="$ac_optarg" ;;
3881 + localstatedir=$ac_optarg ;;
3882
3883 -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
3884 ac_prev=mandir ;;
3885 -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
3886 - mandir="$ac_optarg" ;;
3887 + mandir=$ac_optarg ;;
3888
3889 -nfp | --nfp | --nf)
3890 # Obsolete; use --without-fp.
3891 with_fp=no ;;
3892
3893 -no-create | --no-create | --no-creat | --no-crea | --no-cre \
3894 - | --no-cr | --no-c)
3895 + | --no-cr | --no-c | -n)
3896 no_create=yes ;;
3897
3898 -no-recursion | --no-recursion | --no-recursio | --no-recursi \
3899 @@ -432,26 +654,26 @@
3900 -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
3901 | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
3902 | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
3903 - oldincludedir="$ac_optarg" ;;
3904 + oldincludedir=$ac_optarg ;;
3905
3906 -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
3907 ac_prev=prefix ;;
3908 -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
3909 - prefix="$ac_optarg" ;;
3910 + prefix=$ac_optarg ;;
3911
3912 -program-prefix | --program-prefix | --program-prefi | --program-pref \
3913 | --program-pre | --program-pr | --program-p)
3914 ac_prev=program_prefix ;;
3915 -program-prefix=* | --program-prefix=* | --program-prefi=* \
3916 | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
3917 - program_prefix="$ac_optarg" ;;
3918 + program_prefix=$ac_optarg ;;
3919
3920 -program-suffix | --program-suffix | --program-suffi | --program-suff \
3921 | --program-suf | --program-su | --program-s)
3922 ac_prev=program_suffix ;;
3923 -program-suffix=* | --program-suffix=* | --program-suffi=* \
3924 | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
3925 - program_suffix="$ac_optarg" ;;
3926 + program_suffix=$ac_optarg ;;
3927
3928 -program-transform-name | --program-transform-name \
3929 | --program-transform-nam | --program-transform-na \
3930 @@ -468,7 +690,7 @@
3931 | --program-transfo=* | --program-transf=* \
3932 | --program-trans=* | --program-tran=* \
3933 | --progr-tra=* | --program-tr=* | --program-t=*)
3934 - program_transform_name="$ac_optarg" ;;
3935 + program_transform_name=$ac_optarg ;;
3936
3937 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
3938 | -silent | --silent | --silen | --sile | --sil)
3939 @@ -478,7 +700,7 @@
3940 ac_prev=sbindir ;;
3941 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
3942 | --sbi=* | --sb=*)
3943 - sbindir="$ac_optarg" ;;
3944 + sbindir=$ac_optarg ;;
3945
3946 -sharedstatedir | --sharedstatedir | --sharedstatedi \
3947 | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
3948 @@ -489,58 +711,57 @@
3949 | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
3950 | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
3951 | --sha=* | --sh=*)
3952 - sharedstatedir="$ac_optarg" ;;
3953 + sharedstatedir=$ac_optarg ;;
3954
3955 -site | --site | --sit)
3956 ac_prev=site ;;
3957 -site=* | --site=* | --sit=*)
3958 - site="$ac_optarg" ;;
3959 + site=$ac_optarg ;;
3960
3961 -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
3962 ac_prev=srcdir ;;
3963 -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
3964 - srcdir="$ac_optarg" ;;
3965 + srcdir=$ac_optarg ;;
3966
3967 -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
3968 | --syscon | --sysco | --sysc | --sys | --sy)
3969 ac_prev=sysconfdir ;;
3970 -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
3971 | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
3972 - sysconfdir="$ac_optarg" ;;
3973 + sysconfdir=$ac_optarg ;;
3974
3975 -target | --target | --targe | --targ | --tar | --ta | --t)
3976 - ac_prev=target ;;
3977 + ac_prev=target_alias ;;
3978 -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
3979 - target="$ac_optarg" ;;
3980 + target_alias=$ac_optarg ;;
3981
3982 -v | -verbose | --verbose | --verbos | --verbo | --verb)
3983 verbose=yes ;;
3984
3985 - -version | --version | --versio | --versi | --vers)
3986 - echo "configure generated by autoconf version 2.13"
3987 - exit 0 ;;
3988 + -version | --version | --versio | --versi | --vers | -V)
3989 + ac_init_version=: ;;
3990
3991 -with-* | --with-*)
3992 - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
3993 + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
3994 # Reject names that are not valid shell variable names.
3995 - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
3996 - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
3997 - fi
3998 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
3999 + { echo "$as_me: error: invalid package name: $ac_package" >&2
4000 + { (exit 1); exit 1; }; }
4001 ac_package=`echo $ac_package| sed 's/-/_/g'`
4002 - case "$ac_option" in
4003 - *=*) ;;
4004 + case $ac_option in
4005 + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
4006 *) ac_optarg=yes ;;
4007 esac
4008 - eval "with_${ac_package}='$ac_optarg'" ;;
4009 + eval "with_$ac_package='$ac_optarg'" ;;
4010
4011 -without-* | --without-*)
4012 - ac_package=`echo $ac_option|sed -e 's/-*without-//'`
4013 + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
4014 # Reject names that are not valid shell variable names.
4015 - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
4016 - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
4017 - fi
4018 - ac_package=`echo $ac_package| sed 's/-/_/g'`
4019 - eval "with_${ac_package}=no" ;;
4020 + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
4021 + { echo "$as_me: error: invalid package name: $ac_package" >&2
4022 + { (exit 1); exit 1; }; }
4023 + ac_package=`echo $ac_package | sed 's/-/_/g'`
4024 + eval "with_$ac_package=no" ;;
4025
4026 --x)
4027 # Obsolete; use --with-x.
4028 @@ -551,99 +772,110 @@
4029 ac_prev=x_includes ;;
4030 -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
4031 | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
4032 - x_includes="$ac_optarg" ;;
4033 + x_includes=$ac_optarg ;;
4034
4035 -x-libraries | --x-libraries | --x-librarie | --x-librari \
4036 | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
4037 ac_prev=x_libraries ;;
4038 -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
4039 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
4040 - x_libraries="$ac_optarg" ;;
4041 + x_libraries=$ac_optarg ;;
4042
4043 - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
4044 + -*) { echo "$as_me: error: unrecognized option: $ac_option
4045 +Try \`$0 --help' for more information." >&2
4046 + { (exit 1); exit 1; }; }
4047 ;;
4048
4049 + *=*)
4050 + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
4051 + # Reject names that are not valid shell variable names.
4052 + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
4053 + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
4054 + { (exit 1); exit 1; }; }
4055 + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
4056 + eval "$ac_envvar='$ac_optarg'"
4057 + export $ac_envvar ;;
4058 +
4059 *)
4060 - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
4061 - echo "configure: warning: $ac_option: invalid host type" 1>&2
4062 - fi
4063 - if test "x$nonopt" != xNONE; then
4064 - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
4065 - fi
4066 - nonopt="$ac_option"
4067 + # FIXME: should be removed in autoconf 3.0.
4068 + echo "$as_me: WARNING: you should use --build, --host, --target" >&2
4069 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
4070 + echo "$as_me: WARNING: invalid host type: $ac_option" >&2
4071 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
4072 ;;
4073
4074 esac
4075 done
4076
4077 if test -n "$ac_prev"; then
4078 - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
4079 -fi
4080 -
4081 -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
4082 -
4083 -# File descriptor usage:
4084 -# 0 standard input
4085 -# 1 file creation
4086 -# 2 errors and warnings
4087 -# 3 some systems may open it to /dev/tty
4088 -# 4 used on the Kubota Titan
4089 -# 6 checking for... messages and results
4090 -# 5 compiler messages saved in config.log
4091 -if test "$silent" = yes; then
4092 - exec 6>/dev/null
4093 -else
4094 - exec 6>&1
4095 + ac_option=--`echo $ac_prev | sed 's/_/-/g'`
4096 + { echo "$as_me: error: missing argument to $ac_option" >&2
4097 + { (exit 1); exit 1; }; }
4098 fi
4099 -exec 5>./config.log
4100
4101 -echo "\
4102 -This file contains any messages produced by compilers while
4103 -running configure, to aid debugging if configure makes a mistake.
4104 -" 1>&5
4105 +# Be sure to have absolute paths.
4106 +for ac_var in exec_prefix prefix
4107 +do
4108 + eval ac_val=$`echo $ac_var`
4109 + case $ac_val in
4110 + [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
4111 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
4112 + { (exit 1); exit 1; }; };;
4113 + esac
4114 +done
4115
4116 -# Strip out --no-create and --no-recursion so they do not pile up.
4117 -# Also quote any args containing shell metacharacters.
4118 -ac_configure_args=
4119 -for ac_arg
4120 +# Be sure to have absolute paths.
4121 +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
4122 + localstatedir libdir includedir oldincludedir infodir mandir
4123 do
4124 - case "$ac_arg" in
4125 - -no-create | --no-create | --no-creat | --no-crea | --no-cre \
4126 - | --no-cr | --no-c) ;;
4127 - -no-recursion | --no-recursion | --no-recursio | --no-recursi \
4128 - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
4129 - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
4130 - ac_configure_args="$ac_configure_args '$ac_arg'" ;;
4131 - *) ac_configure_args="$ac_configure_args $ac_arg" ;;
4132 + eval ac_val=$`echo $ac_var`
4133 + case $ac_val in
4134 + [\\/$]* | ?:[\\/]* ) ;;
4135 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
4136 + { (exit 1); exit 1; }; };;
4137 esac
4138 done
4139
4140 -# NLS nuisances.
4141 -# Only set these to C if already set. These must not be set unconditionally
4142 -# because not all systems understand e.g. LANG=C (notably SCO).
4143 -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
4144 -# Non-C LC_CTYPE values break the ctype check.
4145 -if test "${LANG+set}" = set; then LANG=C; export LANG; fi
4146 -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
4147 -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
4148 -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
4149 +# There might be people who depend on the old broken behavior: `$host'
4150 +# used to hold the argument of --host etc.
4151 +# FIXME: To remove some day.
4152 +build=$build_alias
4153 +host=$host_alias
4154 +target=$target_alias
4155 +
4156 +# FIXME: To remove some day.
4157 +if test "x$host_alias" != x; then
4158 + if test "x$build_alias" = x; then
4159 + cross_compiling=maybe
4160 + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
4161 + If a cross compiler is detected then cross compile mode will be used." >&2
4162 + elif test "x$build_alias" != "x$host_alias"; then
4163 + cross_compiling=yes
4164 + fi
4165 +fi
4166
4167 -# confdefs.h avoids OS command line length limits that DEFS can exceed.
4168 -rm -rf conftest* confdefs.h
4169 -# AIX cpp loses on an empty file, so make sure it contains at least a newline.
4170 -echo > confdefs.h
4171 +ac_tool_prefix=
4172 +test -n "$host_alias" && ac_tool_prefix=$host_alias-
4173 +
4174 +test "$silent" = yes && exec 6>/dev/null
4175
4176 -# A filename unique to this package, relative to the directory that
4177 -# configure is in, which we can look for to find out if srcdir is correct.
4178 -ac_unique_file=src/include/atm.h
4179
4180 # Find the source files, if location was not specified.
4181 if test -z "$srcdir"; then
4182 ac_srcdir_defaulted=yes
4183 # Try the directory containing this script, then its parent.
4184 - ac_prog=$0
4185 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
4186 - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
4187 + ac_confdir=`(dirname "$0") 2>/dev/null ||
4188 +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
4189 + X"$0" : 'X\(//\)[^/]' \| \
4190 + X"$0" : 'X\(//\)$' \| \
4191 + X"$0" : 'X\(/\)' \| \
4192 + . : '\(.\)' 2>/dev/null ||
4193 +echo X"$0" |
4194 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
4195 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
4196 + /^X\(\/\/\)$/{ s//\1/; q; }
4197 + /^X\(\/\).*/{ s//\1/; q; }
4198 + s/.*/./; q'`
4199 srcdir=$ac_confdir
4200 if test ! -r $srcdir/$ac_unique_file; then
4201 srcdir=..
4202 @@ -653,13 +885,453 @@
4203 fi
4204 if test ! -r $srcdir/$ac_unique_file; then
4205 if test "$ac_srcdir_defaulted" = yes; then
4206 - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
4207 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
4208 + { (exit 1); exit 1; }; }
4209 else
4210 - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
4211 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
4212 + { (exit 1); exit 1; }; }
4213 fi
4214 fi
4215 -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
4216 +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
4217 + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
4218 + { (exit 1); exit 1; }; }
4219 +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
4220 +ac_env_build_alias_set=${build_alias+set}
4221 +ac_env_build_alias_value=$build_alias
4222 +ac_cv_env_build_alias_set=${build_alias+set}
4223 +ac_cv_env_build_alias_value=$build_alias
4224 +ac_env_host_alias_set=${host_alias+set}
4225 +ac_env_host_alias_value=$host_alias
4226 +ac_cv_env_host_alias_set=${host_alias+set}
4227 +ac_cv_env_host_alias_value=$host_alias
4228 +ac_env_target_alias_set=${target_alias+set}
4229 +ac_env_target_alias_value=$target_alias
4230 +ac_cv_env_target_alias_set=${target_alias+set}
4231 +ac_cv_env_target_alias_value=$target_alias
4232 +ac_env_CC_set=${CC+set}
4233 +ac_env_CC_value=$CC
4234 +ac_cv_env_CC_set=${CC+set}
4235 +ac_cv_env_CC_value=$CC
4236 +ac_env_CFLAGS_set=${CFLAGS+set}
4237 +ac_env_CFLAGS_value=$CFLAGS
4238 +ac_cv_env_CFLAGS_set=${CFLAGS+set}
4239 +ac_cv_env_CFLAGS_value=$CFLAGS
4240 +ac_env_LDFLAGS_set=${LDFLAGS+set}
4241 +ac_env_LDFLAGS_value=$LDFLAGS
4242 +ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
4243 +ac_cv_env_LDFLAGS_value=$LDFLAGS
4244 +ac_env_CPPFLAGS_set=${CPPFLAGS+set}
4245 +ac_env_CPPFLAGS_value=$CPPFLAGS
4246 +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
4247 +ac_cv_env_CPPFLAGS_value=$CPPFLAGS
4248 +ac_env_CPP_set=${CPP+set}
4249 +ac_env_CPP_value=$CPP
4250 +ac_cv_env_CPP_set=${CPP+set}
4251 +ac_cv_env_CPP_value=$CPP
4252 +
4253 +#
4254 +# Report the --help message.
4255 +#
4256 +if test "$ac_init_help" = "long"; then
4257 + # Omit some internal or obsolete options to make the list less imposing.
4258 + # This message is too long to be a string in the A/UX 3.1 sh.
4259 + cat <<_ACEOF
4260 +\`configure' configures this package to adapt to many kinds of systems.
4261 +
4262 +Usage: $0 [OPTION]... [VAR=VALUE]...
4263 +
4264 +To assign environment variables (e.g., CC, CFLAGS...), specify them as
4265 +VAR=VALUE. See below for descriptions of some of the useful variables.
4266 +
4267 +Defaults for the options are specified in brackets.
4268 +
4269 +Configuration:
4270 + -h, --help display this help and exit
4271 + --help=short display options specific to this package
4272 + --help=recursive display the short help of all the included packages
4273 + -V, --version display version information and exit
4274 + -q, --quiet, --silent do not print \`checking...' messages
4275 + --cache-file=FILE cache test results in FILE [disabled]
4276 + -C, --config-cache alias for \`--cache-file=config.cache'
4277 + -n, --no-create do not create output files
4278 + --srcdir=DIR find the sources in DIR [configure dir or \`..']
4279 +
4280 +_ACEOF
4281 +
4282 + cat <<_ACEOF
4283 +Installation directories:
4284 + --prefix=PREFIX install architecture-independent files in PREFIX
4285 + [$ac_default_prefix]
4286 + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
4287 + [PREFIX]
4288 +
4289 +By default, \`make install' will install all the files in
4290 +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
4291 +an installation prefix other than \`$ac_default_prefix' using \`--prefix',
4292 +for instance \`--prefix=\$HOME'.
4293 +
4294 +For better control, use the options below.
4295 +
4296 +Fine tuning of the installation directories:
4297 + --bindir=DIR user executables [EPREFIX/bin]
4298 + --sbindir=DIR system admin executables [EPREFIX/sbin]
4299 + --libexecdir=DIR program executables [EPREFIX/libexec]
4300 + --datadir=DIR read-only architecture-independent data [PREFIX/share]
4301 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
4302 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
4303 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
4304 + --libdir=DIR object code libraries [EPREFIX/lib]
4305 + --includedir=DIR C header files [PREFIX/include]
4306 + --oldincludedir=DIR C header files for non-gcc [/usr/include]
4307 + --infodir=DIR info documentation [PREFIX/info]
4308 + --mandir=DIR man documentation [PREFIX/man]
4309 +_ACEOF
4310 +
4311 + cat <<\_ACEOF
4312 +
4313 +Program names:
4314 + --program-prefix=PREFIX prepend PREFIX to installed program names
4315 + --program-suffix=SUFFIX append SUFFIX to installed program names
4316 + --program-transform-name=PROGRAM run sed PROGRAM on installed program names
4317 +
4318 +System types:
4319 + --build=BUILD configure for building on BUILD [guessed]
4320 + --host=HOST cross-compile to build programs to run on HOST [BUILD]
4321 + --target=TARGET configure for building compilers for TARGET [HOST]
4322 +_ACEOF
4323 +fi
4324 +
4325 +if test -n "$ac_init_help"; then
4326 +
4327 + cat <<\_ACEOF
4328 +
4329 +Optional Features:
4330 + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
4331 + --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
4332 + --enable-shared=PKGS build shared libraries default=yes
4333 + --enable-static=PKGS build static libraries default=yes
4334 + --enable-fast-install=PKGS optimize for fast installation default=yes
4335 + --disable-libtool-lock avoid locking (might break parallel builds)
4336 + --enable-allow_uni30 Allow UNI 3.0 backwards-compatible extensions (if using UNI 3.1)
4337 + --enable-q2963_1 Enable peak cell rate modification as specified in Q.2963.1 (if using UNI 4.0)
4338 + --enable-cisco Enable work around for point-to-multipoint signaling bug in Cisco LS100 or LS7010 switches
4339 + --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.
4340 + --enable-mpoa_1_1 Enable proposed MPOA 1.1 features
4341 + --enable-mpr Enable memory debugging (if MPR is installed)
4342 +
4343 +Optional Packages:
4344 + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
4345 + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
4346 + --with-gnu-ld assume the C compiler uses GNU ld default=no
4347 + --with-pic try to use only PIC/non-PIC objects default=use both
4348 + --with-uni=VERSION UNI version to use (3.0,3.1,4.0) default=dynamic
4349 +
4350 +Some influential environment variables:
4351 + CC C compiler command
4352 + CFLAGS C compiler flags
4353 + LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
4354 + nonstandard directory <lib dir>
4355 + CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
4356 + headers in a nonstandard directory <include dir>
4357 + CPP C preprocessor
4358 +
4359 +Use these variables to override the choices made by `configure' or to help
4360 +it to find libraries and programs with nonstandard names/locations.
4361 +
4362 +_ACEOF
4363 +fi
4364 +
4365 +if test "$ac_init_help" = "recursive"; then
4366 + # If there are subdirs, report their specific --help.
4367 + ac_popdir=`pwd`
4368 + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
4369 + test -d $ac_dir || continue
4370 + ac_builddir=.
4371 +
4372 +if test "$ac_dir" != .; then
4373 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
4374 + # A "../" for each directory in $ac_dir_suffix.
4375 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
4376 +else
4377 + ac_dir_suffix= ac_top_builddir=
4378 +fi
4379 +
4380 +case $srcdir in
4381 + .) # No --srcdir option. We are building in place.
4382 + ac_srcdir=.
4383 + if test -z "$ac_top_builddir"; then
4384 + ac_top_srcdir=.
4385 + else
4386 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
4387 + fi ;;
4388 + [\\/]* | ?:[\\/]* ) # Absolute path.
4389 + ac_srcdir=$srcdir$ac_dir_suffix;
4390 + ac_top_srcdir=$srcdir ;;
4391 + *) # Relative path.
4392 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
4393 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
4394 +esac
4395 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
4396 +# absolute.
4397 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
4398 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
4399 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
4400 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
4401 +
4402 + cd $ac_dir
4403 + # Check for guested configure; otherwise get Cygnus style configure.
4404 + if test -f $ac_srcdir/configure.gnu; then
4405 + echo
4406 + $SHELL $ac_srcdir/configure.gnu --help=recursive
4407 + elif test -f $ac_srcdir/configure; then
4408 + echo
4409 + $SHELL $ac_srcdir/configure --help=recursive
4410 + elif test -f $ac_srcdir/configure.ac ||
4411 + test -f $ac_srcdir/configure.in; then
4412 + echo
4413 + $ac_configure --help
4414 + else
4415 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
4416 + fi
4417 + cd $ac_popdir
4418 + done
4419 +fi
4420 +
4421 +test -n "$ac_init_help" && exit 0
4422 +if $ac_init_version; then
4423 + cat <<\_ACEOF
4424 +
4425 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
4426 +Free Software Foundation, Inc.
4427 +This configure script is free software; the Free Software Foundation
4428 +gives unlimited permission to copy, distribute and modify it.
4429 +_ACEOF
4430 + exit 0
4431 +fi
4432 +exec 5>config.log
4433 +cat >&5 <<_ACEOF
4434 +This file contains any messages produced by compilers while
4435 +running configure, to aid debugging if configure makes a mistake.
4436 +
4437 +It was created by $as_me, which was
4438 +generated by GNU Autoconf 2.57. Invocation command line was
4439 +
4440 + $ $0 $@
4441 +
4442 +_ACEOF
4443 +{
4444 +cat <<_ASUNAME
4445 +## --------- ##
4446 +## Platform. ##
4447 +## --------- ##
4448 +
4449 +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
4450 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
4451 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
4452 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
4453 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
4454 +
4455 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
4456 +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
4457 +
4458 +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
4459 +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
4460 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
4461 +hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
4462 +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
4463 +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
4464 +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
4465 +
4466 +_ASUNAME
4467 +
4468 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4469 +for as_dir in $PATH
4470 +do
4471 + IFS=$as_save_IFS
4472 + test -z "$as_dir" && as_dir=.
4473 + echo "PATH: $as_dir"
4474 +done
4475 +
4476 +} >&5
4477 +
4478 +cat >&5 <<_ACEOF
4479 +
4480 +
4481 +## ----------- ##
4482 +## Core tests. ##
4483 +## ----------- ##
4484 +
4485 +_ACEOF
4486 +
4487 +
4488 +# Keep a trace of the command line.
4489 +# Strip out --no-create and --no-recursion so they do not pile up.
4490 +# Strip out --silent because we don't want to record it for future runs.
4491 +# Also quote any args containing shell meta-characters.
4492 +# Make two passes to allow for proper duplicate-argument suppression.
4493 +ac_configure_args=
4494 +ac_configure_args0=
4495 +ac_configure_args1=
4496 +ac_sep=
4497 +ac_must_keep_next=false
4498 +for ac_pass in 1 2
4499 +do
4500 + for ac_arg
4501 + do
4502 + case $ac_arg in
4503 + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
4504 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
4505 + | -silent | --silent | --silen | --sile | --sil)
4506 + continue ;;
4507 + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
4508 + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
4509 + esac
4510 + case $ac_pass in
4511 + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
4512 + 2)
4513 + ac_configure_args1="$ac_configure_args1 '$ac_arg'"
4514 + if test $ac_must_keep_next = true; then
4515 + ac_must_keep_next=false # Got value, back to normal.
4516 + else
4517 + case $ac_arg in
4518 + *=* | --config-cache | -C | -disable-* | --disable-* \
4519 + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
4520 + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
4521 + | -with-* | --with-* | -without-* | --without-* | --x)
4522 + case "$ac_configure_args0 " in
4523 + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
4524 + esac
4525 + ;;
4526 + -* ) ac_must_keep_next=true ;;
4527 + esac
4528 + fi
4529 + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
4530 + # Get rid of the leading space.
4531 + ac_sep=" "
4532 + ;;
4533 + esac
4534 + done
4535 +done
4536 +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
4537 +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
4538 +
4539 +# When interrupted or exit'd, cleanup temporary files, and complete
4540 +# config.log. We remove comments because anyway the quotes in there
4541 +# would cause problems or look ugly.
4542 +# WARNING: Be sure not to use single quotes in there, as some shells,
4543 +# such as our DU 5.0 friend, will then `close' the trap.
4544 +trap 'exit_status=$?
4545 + # Save into config.log some information that might help in debugging.
4546 + {
4547 + echo
4548 +
4549 + cat <<\_ASBOX
4550 +## ---------------- ##
4551 +## Cache variables. ##
4552 +## ---------------- ##
4553 +_ASBOX
4554 + echo
4555 + # The following way of writing the cache mishandles newlines in values,
4556 +{
4557 + (set) 2>&1 |
4558 + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
4559 + *ac_space=\ *)
4560 + sed -n \
4561 + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
4562 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
4563 + ;;
4564 + *)
4565 + sed -n \
4566 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
4567 + ;;
4568 + esac;
4569 +}
4570 + echo
4571 +
4572 + cat <<\_ASBOX
4573 +## ----------------- ##
4574 +## Output variables. ##
4575 +## ----------------- ##
4576 +_ASBOX
4577 + echo
4578 + for ac_var in $ac_subst_vars
4579 + do
4580 + eval ac_val=$`echo $ac_var`
4581 + echo "$ac_var='"'"'$ac_val'"'"'"
4582 + done | sort
4583 + echo
4584 +
4585 + if test -n "$ac_subst_files"; then
4586 + cat <<\_ASBOX
4587 +## ------------- ##
4588 +## Output files. ##
4589 +## ------------- ##
4590 +_ASBOX
4591 + echo
4592 + for ac_var in $ac_subst_files
4593 + do
4594 + eval ac_val=$`echo $ac_var`
4595 + echo "$ac_var='"'"'$ac_val'"'"'"
4596 + done | sort
4597 + echo
4598 + fi
4599 +
4600 + if test -s confdefs.h; then
4601 + cat <<\_ASBOX
4602 +## ----------- ##
4603 +## confdefs.h. ##
4604 +## ----------- ##
4605 +_ASBOX
4606 + echo
4607 + sed "/^$/d" confdefs.h | sort
4608 + echo
4609 + fi
4610 + test "$ac_signal" != 0 &&
4611 + echo "$as_me: caught signal $ac_signal"
4612 + echo "$as_me: exit $exit_status"
4613 + } >&5
4614 + rm -f core *.core &&
4615 + rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
4616 + exit $exit_status
4617 + ' 0
4618 +for ac_signal in 1 2 13 15; do
4619 + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
4620 +done
4621 +ac_signal=0
4622 +
4623 +# confdefs.h avoids OS command line length limits that DEFS can exceed.
4624 +rm -rf conftest* confdefs.h
4625 +# AIX cpp loses on an empty file, so make sure it contains at least a newline.
4626 +echo >confdefs.h
4627 +
4628 +# Predefined preprocessor variables.
4629
4630 +cat >>confdefs.h <<_ACEOF
4631 +#define PACKAGE_NAME "$PACKAGE_NAME"
4632 +_ACEOF
4633 +
4634 +
4635 +cat >>confdefs.h <<_ACEOF
4636 +#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
4637 +_ACEOF
4638 +
4639 +
4640 +cat >>confdefs.h <<_ACEOF
4641 +#define PACKAGE_VERSION "$PACKAGE_VERSION"
4642 +_ACEOF
4643 +
4644 +
4645 +cat >>confdefs.h <<_ACEOF
4646 +#define PACKAGE_STRING "$PACKAGE_STRING"
4647 +_ACEOF
4648 +
4649 +
4650 +cat >>confdefs.h <<_ACEOF
4651 +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
4652 +_ACEOF
4653 +
4654 +
4655 +# Let the site file select an alternate cache file if it wants to.
4656 # Prefer explicitly selected file to automatically selected ones.
4657 if test -z "$CONFIG_SITE"; then
4658 if test "x$prefix" != xNONE; then
4659 @@ -670,45 +1342,111 @@
4660 fi
4661 for ac_site_file in $CONFIG_SITE; do
4662 if test -r "$ac_site_file"; then
4663 - echo "loading site script $ac_site_file"
4664 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
4665 +echo "$as_me: loading site script $ac_site_file" >&6;}
4666 + sed 's/^/| /' "$ac_site_file" >&5
4667 . "$ac_site_file"
4668 fi
4669 done
4670
4671 if test -r "$cache_file"; then
4672 - echo "loading cache $cache_file"
4673 - . $cache_file
4674 + # Some versions of bash will fail to source /dev/null (special
4675 + # files actually), so we avoid doing that.
4676 + if test -f "$cache_file"; then
4677 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5
4678 +echo "$as_me: loading cache $cache_file" >&6;}
4679 + case $cache_file in
4680 + [\\/]* | ?:[\\/]* ) . $cache_file;;
4681 + *) . ./$cache_file;;
4682 + esac
4683 + fi
4684 else
4685 - echo "creating cache $cache_file"
4686 - > $cache_file
4687 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5
4688 +echo "$as_me: creating cache $cache_file" >&6;}
4689 + >$cache_file
4690 +fi
4691 +
4692 +# Check that the precious variables saved in the cache have kept the same
4693 +# value.
4694 +ac_cache_corrupted=false
4695 +for ac_var in `(set) 2>&1 |
4696 + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
4697 + eval ac_old_set=\$ac_cv_env_${ac_var}_set
4698 + eval ac_new_set=\$ac_env_${ac_var}_set
4699 + eval ac_old_val="\$ac_cv_env_${ac_var}_value"
4700 + eval ac_new_val="\$ac_env_${ac_var}_value"
4701 + case $ac_old_set,$ac_new_set in
4702 + set,)
4703 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
4704 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
4705 + ac_cache_corrupted=: ;;
4706 + ,set)
4707 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
4708 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
4709 + ac_cache_corrupted=: ;;
4710 + ,);;
4711 + *)
4712 + if test "x$ac_old_val" != "x$ac_new_val"; then
4713 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
4714 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
4715 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
4716 +echo "$as_me: former value: $ac_old_val" >&2;}
4717 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
4718 +echo "$as_me: current value: $ac_new_val" >&2;}
4719 + ac_cache_corrupted=:
4720 + fi;;
4721 + esac
4722 + # Pass precious variables to config.status.
4723 + if test "$ac_new_set" = set; then
4724 + case $ac_new_val in
4725 + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
4726 + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
4727 + *) ac_arg=$ac_var=$ac_new_val ;;
4728 + esac
4729 + case " $ac_configure_args " in
4730 + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
4731 + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
4732 + esac
4733 + fi
4734 +done
4735 +if $ac_cache_corrupted; then
4736 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
4737 +echo "$as_me: error: changes in the environment can compromise the build" >&2;}
4738 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
4739 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
4740 + { (exit 1); exit 1; }; }
4741 fi
4742
4743 ac_ext=c
4744 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
4745 ac_cpp='$CPP $CPPFLAGS'
4746 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
4747 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
4748 -cross_compiling=$ac_cv_prog_cc_cross
4749 -
4750 -ac_exeext=
4751 -ac_objext=o
4752 -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
4753 - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
4754 - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
4755 - ac_n= ac_c='
4756 -' ac_t=' '
4757 - else
4758 - ac_n=-n ac_c= ac_t=
4759 - fi
4760 -else
4761 - ac_n= ac_c='\c' ac_t=
4762 -fi
4763 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
4764 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
4765 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
4766 +
4767 +
4768 +
4769 +
4770 +
4771 +
4772 +
4773 +
4774 +
4775 +
4776
4777
4778
4779
4780
4781
4782 +
4783 +
4784 +
4785 +
4786 + ac_config_headers="$ac_config_headers config.h"
4787 +
4788 + ac_config_commands="$ac_config_commands default-1"
4789 +
4790 +
4791 ac_aux_dir=
4792 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
4793 if test -f $ac_dir/install-sh; then
4794 @@ -719,105 +1457,105 @@
4795 ac_aux_dir=$ac_dir
4796 ac_install_sh="$ac_aux_dir/install.sh -c"
4797 break
4798 + elif test -f $ac_dir/shtool; then
4799 + ac_aux_dir=$ac_dir
4800 + ac_install_sh="$ac_aux_dir/shtool install -c"
4801 + break
4802 fi
4803 done
4804 if test -z "$ac_aux_dir"; then
4805 - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
4806 -fi
4807 -ac_config_guess=$ac_aux_dir/config.guess
4808 -ac_config_sub=$ac_aux_dir/config.sub
4809 -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
4810 -
4811 -
4812 -# Do some error checking and defaulting for the host and target type.
4813 -# The inputs are:
4814 -# configure --host=HOST --target=TARGET --build=BUILD NONOPT
4815 -#
4816 -# The rules are:
4817 -# 1. You are not allowed to specify --host, --target, and nonopt at the
4818 -# same time.
4819 -# 2. Host defaults to nonopt.
4820 -# 3. If nonopt is not specified, then host defaults to the current host,
4821 -# as determined by config.guess.
4822 -# 4. Target and build default to nonopt.
4823 -# 5. If nonopt is not specified, then target and build default to host.
4824 -
4825 -# The aliases save the names the user supplied, while $host etc.
4826 -# will get canonicalized.
4827 -case $host---$target---$nonopt in
4828 -NONE---*---* | *---NONE---* | *---*---NONE) ;;
4829 -*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
4830 -esac
4831 -
4832 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
4833 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
4834 + { (exit 1); exit 1; }; }
4835 +fi
4836 +ac_config_guess="$SHELL $ac_aux_dir/config.guess"
4837 +ac_config_sub="$SHELL $ac_aux_dir/config.sub"
4838 +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
4839
4840 # Make sure we can run config.sub.
4841 -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
4842 -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
4843 -fi
4844 +$ac_config_sub sun4 >/dev/null 2>&1 ||
4845 + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
4846 +echo "$as_me: error: cannot run $ac_config_sub" >&2;}
4847 + { (exit 1); exit 1; }; }
4848 +
4849 +echo "$as_me:$LINENO: checking build system type" >&5
4850 +echo $ECHO_N "checking build system type... $ECHO_C" >&6
4851 +if test "${ac_cv_build+set}" = set; then
4852 + echo $ECHO_N "(cached) $ECHO_C" >&6
4853 +else
4854 + ac_cv_build_alias=$build_alias
4855 +test -z "$ac_cv_build_alias" &&
4856 + ac_cv_build_alias=`$ac_config_guess`
4857 +test -z "$ac_cv_build_alias" &&
4858 + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
4859 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
4860 + { (exit 1); exit 1; }; }
4861 +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
4862 + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
4863 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
4864 + { (exit 1); exit 1; }; }
4865 +
4866 +fi
4867 +echo "$as_me:$LINENO: result: $ac_cv_build" >&5
4868 +echo "${ECHO_T}$ac_cv_build" >&6
4869 +build=$ac_cv_build
4870 +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4871 +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4872 +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4873 +
4874 +
4875 +echo "$as_me:$LINENO: checking host system type" >&5
4876 +echo $ECHO_N "checking host system type... $ECHO_C" >&6
4877 +if test "${ac_cv_host+set}" = set; then
4878 + echo $ECHO_N "(cached) $ECHO_C" >&6
4879 +else
4880 + ac_cv_host_alias=$host_alias
4881 +test -z "$ac_cv_host_alias" &&
4882 + ac_cv_host_alias=$ac_cv_build_alias
4883 +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
4884 + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
4885 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
4886 + { (exit 1); exit 1; }; }
4887 +
4888 +fi
4889 +echo "$as_me:$LINENO: result: $ac_cv_host" >&5
4890 +echo "${ECHO_T}$ac_cv_host" >&6
4891 +host=$ac_cv_host
4892 +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4893 +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4894 +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4895 +
4896 +
4897 +echo "$as_me:$LINENO: checking target system type" >&5
4898 +echo $ECHO_N "checking target system type... $ECHO_C" >&6
4899 +if test "${ac_cv_target+set}" = set; then
4900 + echo $ECHO_N "(cached) $ECHO_C" >&6
4901 +else
4902 + ac_cv_target_alias=$target_alias
4903 +test "x$ac_cv_target_alias" = "x" &&
4904 + ac_cv_target_alias=$ac_cv_host_alias
4905 +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
4906 + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5
4907 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
4908 + { (exit 1); exit 1; }; }
4909 +
4910 +fi
4911 +echo "$as_me:$LINENO: result: $ac_cv_target" >&5
4912 +echo "${ECHO_T}$ac_cv_target" >&6
4913 +target=$ac_cv_target
4914 +target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4915 +target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4916 +target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4917
4918 -echo $ac_n "checking host system type""... $ac_c" 1>&6
4919 -echo "configure:760: checking host system type" >&5
4920
4921 -host_alias=$host
4922 -case "$host_alias" in
4923 -NONE)
4924 - case $nonopt in
4925 - NONE)
4926 - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
4927 - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
4928 - fi ;;
4929 - *) host_alias=$nonopt ;;
4930 - esac ;;
4931 -esac
4932 -
4933 -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
4934 -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4935 -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4936 -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4937 -echo "$ac_t""$host" 1>&6
4938 -
4939 -echo $ac_n "checking target system type""... $ac_c" 1>&6
4940 -echo "configure:781: checking target system type" >&5
4941 -
4942 -target_alias=$target
4943 -case "$target_alias" in
4944 -NONE)
4945 - case $nonopt in
4946 - NONE) target_alias=$host_alias ;;
4947 - *) target_alias=$nonopt ;;
4948 - esac ;;
4949 -esac
4950 -
4951 -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
4952 -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4953 -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4954 -target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4955 -echo "$ac_t""$target" 1>&6
4956 -
4957 -echo $ac_n "checking build system type""... $ac_c" 1>&6
4958 -echo "configure:799: checking build system type" >&5
4959 -
4960 -build_alias=$build
4961 -case "$build_alias" in
4962 -NONE)
4963 - case $nonopt in
4964 - NONE) build_alias=$host_alias ;;
4965 - *) build_alias=$nonopt ;;
4966 - esac ;;
4967 -esac
4968 -
4969 -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
4970 -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
4971 -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
4972 -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
4973 -echo "$ac_t""$build" 1>&6
4974 -
4975 -test "$host_alias" != "$target_alias" &&
4976 +# The aliases save the names the user supplied, while $host etc.
4977 +# will get canonicalized.
4978 +test -n "$target_alias" &&
4979 test "$program_prefix$program_suffix$program_transform_name" = \
4980 NONENONEs,x,x, &&
4981 program_prefix=${target_alias}-
4982
4983 -
4984 +am__api_version="1.4"
4985 # Find a good install program. We prefer a C program (faster),
4986 # so one script is as good as another. But avoid the broken or
4987 # incompatible versions:
4988 @@ -825,65 +1563,78 @@
4989 # SunOS /usr/etc/install
4990 # IRIX /sbin/install
4991 # AIX /bin/install
4992 +# AmigaOS /C/install, which installs bootblocks on floppy discs
4993 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
4994 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
4995 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
4996 # ./install, which can be erroneously created by make from ./install.sh.
4997 -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
4998 -echo "configure:834: checking for a BSD compatible install" >&5
4999 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
5000 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
5001 if test -z "$INSTALL"; then
5002 -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
5003 - echo $ac_n "(cached) $ac_c" 1>&6
5004 +if test "${ac_cv_path_install+set}" = set; then
5005 + echo $ECHO_N "(cached) $ECHO_C" >&6
5006 else
5007 - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
5008 - for ac_dir in $PATH; do
5009 - # Account for people who put trailing slashes in PATH elements.
5010 - case "$ac_dir/" in
5011 - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
5012 - *)
5013 - # OSF1 and SCO ODT 3.0 have their own names for install.
5014 - # Don't use installbsd from OSF since it installs stuff as root
5015 - # by default.
5016 - for ac_prog in ginstall scoinst install; do
5017 - if test -f $ac_dir/$ac_prog; then
5018 - if test $ac_prog = install &&
5019 - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
5020 - # AIX install. It has an incompatible calling convention.
5021 - :
5022 - else
5023 - ac_cv_path_install="$ac_dir/$ac_prog -c"
5024 - break 2
5025 - fi
5026 - fi
5027 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5028 +for as_dir in $PATH
5029 +do
5030 + IFS=$as_save_IFS
5031 + test -z "$as_dir" && as_dir=.
5032 + # Account for people who put trailing slashes in PATH elements.
5033 +case $as_dir/ in
5034 + ./ | .// | /cC/* | \
5035 + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
5036 + /usr/ucb/* ) ;;
5037 + *)
5038 + # OSF1 and SCO ODT 3.0 have their own names for install.
5039 + # Don't use installbsd from OSF since it installs stuff as root
5040 + # by default.
5041 + for ac_prog in ginstall scoinst install; do
5042 + for ac_exec_ext in '' $ac_executable_extensions; do
5043 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
5044 + if test $ac_prog = install &&
5045 + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5046 + # AIX install. It has an incompatible calling convention.
5047 + :
5048 + elif test $ac_prog = install &&
5049 + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
5050 + # program-specific install script used by HP pwplus--don't use.
5051 + :
5052 + else
5053 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
5054 + break 3
5055 + fi
5056 + fi
5057 done
5058 - ;;
5059 - esac
5060 - done
5061 - IFS="$ac_save_IFS"
5062 + done
5063 + ;;
5064 +esac
5065 +done
5066 +
5067
5068 fi
5069 if test "${ac_cv_path_install+set}" = set; then
5070 - INSTALL="$ac_cv_path_install"
5071 + INSTALL=$ac_cv_path_install
5072 else
5073 # As a last resort, use the slow shell script. We don't cache a
5074 # path for INSTALL within a source directory, because that will
5075 # break other packages using the cache if that directory is
5076 # removed, or if the path is relative.
5077 - INSTALL="$ac_install_sh"
5078 + INSTALL=$ac_install_sh
5079 fi
5080 fi
5081 -echo "$ac_t""$INSTALL" 1>&6
5082 +echo "$as_me:$LINENO: result: $INSTALL" >&5
5083 +echo "${ECHO_T}$INSTALL" >&6
5084
5085 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
5086 # It thinks the first close brace ends the variable substitution.
5087 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
5088
5089 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
5090 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
5091
5092 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
5093
5094 -echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
5095 -echo "configure:887: checking whether build environment is sane" >&5
5096 +echo "$as_me:$LINENO: checking whether build environment is sane" >&5
5097 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
5098 # Just in case
5099 sleep 1
5100 echo timestamp > conftestfile
5101 @@ -905,8 +1656,11 @@
5102 # if, for instance, CONFIG_SHELL is bash and it inherits a
5103 # broken ls alias from the environment. This has actually
5104 # happened. Such a system could not be considered "sane".
5105 - { echo "configure: error: ls -t appears to fail. Make sure there is not a broken
5106 -alias in your environment" 1>&2; exit 1; }
5107 + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
5108 +alias in your environment" >&5
5109 +echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
5110 +alias in your environment" >&2;}
5111 + { (exit 1); exit 1; }; }
5112 fi
5113
5114 test "$2" = conftestfile
5115 @@ -915,54 +1669,54 @@
5116 # Ok.
5117 :
5118 else
5119 - { echo "configure: error: newly created file is older than distributed files!
5120 -Check your system clock" 1>&2; exit 1; }
5121 + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
5122 +Check your system clock" >&5
5123 +echo "$as_me: error: newly created file is older than distributed files!
5124 +Check your system clock" >&2;}
5125 + { (exit 1); exit 1; }; }
5126 fi
5127 rm -f conftest*
5128 -echo "$ac_t""yes" 1>&6
5129 -if test "$program_transform_name" = s,x,x,; then
5130 - program_transform_name=
5131 -else
5132 - # Double any \ or $. echo might interpret backslashes.
5133 - cat <<\EOF_SED > conftestsed
5134 -s,\\,\\\\,g; s,\$,$$,g
5135 -EOF_SED
5136 - program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
5137 - rm -f conftestsed
5138 -fi
5139 +echo "$as_me:$LINENO: result: yes" >&5
5140 +echo "${ECHO_T}yes" >&6
5141 test "$program_prefix" != NONE &&
5142 - program_transform_name="s,^,${program_prefix},; $program_transform_name"
5143 + program_transform_name="s,^,$program_prefix,;$program_transform_name"
5144 # Use a double $ so make ignores it.
5145 test "$program_suffix" != NONE &&
5146 - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
5147 -
5148 -# sed with no file args requires a program.
5149 -test "$program_transform_name" = "" && program_transform_name="s,x,x,"
5150 -
5151 -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
5152 -echo "configure:944: checking whether ${MAKE-make} sets \${MAKE}" >&5
5153 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
5154 -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
5155 - echo $ac_n "(cached) $ac_c" 1>&6
5156 + program_transform_name="s,\$,$program_suffix,;$program_transform_name"
5157 +# Double any \ or $. echo might interpret backslashes.
5158 +# By default was `s,x,x', remove it if useless.
5159 +cat <<\_ACEOF >conftest.sed
5160 +s/[\\$]/&&/g;s/;s,x,x,$//
5161 +_ACEOF
5162 +program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
5163 +rm conftest.sed
5164 +
5165 +echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
5166 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
5167 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
5168 +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
5169 + echo $ECHO_N "(cached) $ECHO_C" >&6
5170 else
5171 - cat > conftestmake <<\EOF
5172 + cat >conftest.make <<\_ACEOF
5173 all:
5174 - @echo 'ac_maketemp="${MAKE}"'
5175 -EOF
5176 + @echo 'ac_maketemp="$(MAKE)"'
5177 +_ACEOF
5178 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
5179 -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
5180 +eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
5181 if test -n "$ac_maketemp"; then
5182 eval ac_cv_prog_make_${ac_make}_set=yes
5183 else
5184 eval ac_cv_prog_make_${ac_make}_set=no
5185 fi
5186 -rm -f conftestmake
5187 +rm -f conftest.make
5188 fi
5189 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
5190 - echo "$ac_t""yes" 1>&6
5191 + echo "$as_me:$LINENO: result: yes" >&5
5192 +echo "${ECHO_T}yes" >&6
5193 SET_MAKE=
5194 else
5195 - echo "$ac_t""no" 1>&6
5196 + echo "$as_me:$LINENO: result: no" >&5
5197 +echo "${ECHO_T}no" >&6
5198 SET_MAKE="MAKE=${MAKE-make}"
5199 fi
5200
5201 @@ -972,82 +1726,96 @@
5202 VERSION=2.4.1
5203
5204 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
5205 - { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
5206 + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
5207 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
5208 + { (exit 1); exit 1; }; }
5209 fi
5210 -cat >> confdefs.h <<EOF
5211 +
5212 +cat >>confdefs.h <<_ACEOF
5213 #define PACKAGE "$PACKAGE"
5214 -EOF
5215 +_ACEOF
5216
5217 -cat >> confdefs.h <<EOF
5218 +
5219 +cat >>confdefs.h <<_ACEOF
5220 #define VERSION "$VERSION"
5221 -EOF
5222 +_ACEOF
5223
5224
5225
5226 missing_dir=`cd $ac_aux_dir && pwd`
5227 -echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
5228 -echo "configure:990: checking for working aclocal" >&5
5229 +echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5
5230 +echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6
5231 # Run test in a subshell; some versions of sh will print an error if
5232 # an executable is not found, even if stderr is redirected.
5233 # Redirect stdin to placate older versions of autoconf. Sigh.
5234 -if (aclocal --version) < /dev/null > /dev/null 2>&1; then
5235 - ACLOCAL=aclocal
5236 - echo "$ac_t""found" 1>&6
5237 -else
5238 - ACLOCAL="$missing_dir/missing aclocal"
5239 - echo "$ac_t""missing" 1>&6
5240 +if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
5241 + ACLOCAL=aclocal-${am__api_version}
5242 + echo "$as_me:$LINENO: result: found" >&5
5243 +echo "${ECHO_T}found" >&6
5244 +else
5245 + ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
5246 + echo "$as_me:$LINENO: result: missing" >&5
5247 +echo "${ECHO_T}missing" >&6
5248 fi
5249
5250 -echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
5251 -echo "configure:1003: checking for working autoconf" >&5
5252 +echo "$as_me:$LINENO: checking for working autoconf" >&5
5253 +echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
5254 # Run test in a subshell; some versions of sh will print an error if
5255 # an executable is not found, even if stderr is redirected.
5256 # Redirect stdin to placate older versions of autoconf. Sigh.
5257 if (autoconf --version) < /dev/null > /dev/null 2>&1; then
5258 AUTOCONF=autoconf
5259 - echo "$ac_t""found" 1>&6
5260 + echo "$as_me:$LINENO: result: found" >&5
5261 +echo "${ECHO_T}found" >&6
5262 else
5263 AUTOCONF="$missing_dir/missing autoconf"
5264 - echo "$ac_t""missing" 1>&6
5265 + echo "$as_me:$LINENO: result: missing" >&5
5266 +echo "${ECHO_T}missing" >&6
5267 fi
5268
5269 -echo $ac_n "checking for working automake""... $ac_c" 1>&6
5270 -echo "configure:1016: checking for working automake" >&5
5271 +echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5
5272 +echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6
5273 # Run test in a subshell; some versions of sh will print an error if
5274 # an executable is not found, even if stderr is redirected.
5275 # Redirect stdin to placate older versions of autoconf. Sigh.
5276 -if (automake --version) < /dev/null > /dev/null 2>&1; then
5277 - AUTOMAKE=automake
5278 - echo "$ac_t""found" 1>&6
5279 -else
5280 - AUTOMAKE="$missing_dir/missing automake"
5281 - echo "$ac_t""missing" 1>&6
5282 +if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
5283 + AUTOMAKE=automake-${am__api_version}
5284 + echo "$as_me:$LINENO: result: found" >&5
5285 +echo "${ECHO_T}found" >&6
5286 +else
5287 + AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
5288 + echo "$as_me:$LINENO: result: missing" >&5
5289 +echo "${ECHO_T}missing" >&6
5290 fi
5291
5292 -echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
5293 -echo "configure:1029: checking for working autoheader" >&5
5294 +echo "$as_me:$LINENO: checking for working autoheader" >&5
5295 +echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
5296 # Run test in a subshell; some versions of sh will print an error if
5297 # an executable is not found, even if stderr is redirected.
5298 # Redirect stdin to placate older versions of autoconf. Sigh.
5299 if (autoheader --version) < /dev/null > /dev/null 2>&1; then
5300 AUTOHEADER=autoheader
5301 - echo "$ac_t""found" 1>&6
5302 + echo "$as_me:$LINENO: result: found" >&5
5303 +echo "${ECHO_T}found" >&6
5304 else
5305 AUTOHEADER="$missing_dir/missing autoheader"
5306 - echo "$ac_t""missing" 1>&6
5307 + echo "$as_me:$LINENO: result: missing" >&5
5308 +echo "${ECHO_T}missing" >&6
5309 fi
5310
5311 -echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
5312 -echo "configure:1042: checking for working makeinfo" >&5
5313 +echo "$as_me:$LINENO: checking for working makeinfo" >&5
5314 +echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
5315 # Run test in a subshell; some versions of sh will print an error if
5316 # an executable is not found, even if stderr is redirected.
5317 # Redirect stdin to placate older versions of autoconf. Sigh.
5318 if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
5319 MAKEINFO=makeinfo
5320 - echo "$ac_t""found" 1>&6
5321 + echo "$as_me:$LINENO: result: found" >&5
5322 +echo "${ECHO_T}found" >&6
5323 else
5324 MAKEINFO="$missing_dir/missing makeinfo"
5325 - echo "$ac_t""missing" 1>&6
5326 + echo "$as_me:$LINENO: result: missing" >&5
5327 +echo "${ECHO_T}missing" >&6
5328 fi
5329
5330
5331 @@ -1059,214 +1827,643 @@
5332
5333
5334
5335 -# Extract the first word of "gcc", so it can be a program name with args.
5336 +ac_ext=c
5337 +ac_cpp='$CPP $CPPFLAGS'
5338 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5339 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5340 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
5341 +if test -n "$ac_tool_prefix"; then
5342 + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
5343 +set dummy ${ac_tool_prefix}gcc; ac_word=$2
5344 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5345 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5346 +if test "${ac_cv_prog_CC+set}" = set; then
5347 + echo $ECHO_N "(cached) $ECHO_C" >&6
5348 +else
5349 + if test -n "$CC"; then
5350 + ac_cv_prog_CC="$CC" # Let the user override the test.
5351 +else
5352 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5353 +for as_dir in $PATH
5354 +do
5355 + IFS=$as_save_IFS
5356 + test -z "$as_dir" && as_dir=.
5357 + for ac_exec_ext in '' $ac_executable_extensions; do
5358 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5359 + ac_cv_prog_CC="${ac_tool_prefix}gcc"
5360 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5361 + break 2
5362 + fi
5363 +done
5364 +done
5365 +
5366 +fi
5367 +fi
5368 +CC=$ac_cv_prog_CC
5369 +if test -n "$CC"; then
5370 + echo "$as_me:$LINENO: result: $CC" >&5
5371 +echo "${ECHO_T}$CC" >&6
5372 +else
5373 + echo "$as_me:$LINENO: result: no" >&5
5374 +echo "${ECHO_T}no" >&6
5375 +fi
5376 +
5377 +fi
5378 +if test -z "$ac_cv_prog_CC"; then
5379 + ac_ct_CC=$CC
5380 + # Extract the first word of "gcc", so it can be a program name with args.
5381 set dummy gcc; ac_word=$2
5382 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5383 -echo "configure:1066: checking for $ac_word" >&5
5384 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
5385 - echo $ac_n "(cached) $ac_c" 1>&6
5386 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5387 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5388 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
5389 + echo $ECHO_N "(cached) $ECHO_C" >&6
5390 +else
5391 + if test -n "$ac_ct_CC"; then
5392 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
5393 +else
5394 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5395 +for as_dir in $PATH
5396 +do
5397 + IFS=$as_save_IFS
5398 + test -z "$as_dir" && as_dir=.
5399 + for ac_exec_ext in '' $ac_executable_extensions; do
5400 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5401 + ac_cv_prog_ac_ct_CC="gcc"
5402 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5403 + break 2
5404 + fi
5405 +done
5406 +done
5407 +
5408 +fi
5409 +fi
5410 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
5411 +if test -n "$ac_ct_CC"; then
5412 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
5413 +echo "${ECHO_T}$ac_ct_CC" >&6
5414 +else
5415 + echo "$as_me:$LINENO: result: no" >&5
5416 +echo "${ECHO_T}no" >&6
5417 +fi
5418 +
5419 + CC=$ac_ct_CC
5420 +else
5421 + CC="$ac_cv_prog_CC"
5422 +fi
5423 +
5424 +if test -z "$CC"; then
5425 + if test -n "$ac_tool_prefix"; then
5426 + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
5427 +set dummy ${ac_tool_prefix}cc; ac_word=$2
5428 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5429 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5430 +if test "${ac_cv_prog_CC+set}" = set; then
5431 + echo $ECHO_N "(cached) $ECHO_C" >&6
5432 else
5433 if test -n "$CC"; then
5434 ac_cv_prog_CC="$CC" # Let the user override the test.
5435 else
5436 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
5437 - ac_dummy="$PATH"
5438 - for ac_dir in $ac_dummy; do
5439 - test -z "$ac_dir" && ac_dir=.
5440 - if test -f $ac_dir/$ac_word; then
5441 - ac_cv_prog_CC="gcc"
5442 - break
5443 - fi
5444 - done
5445 - IFS="$ac_save_ifs"
5446 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5447 +for as_dir in $PATH
5448 +do
5449 + IFS=$as_save_IFS
5450 + test -z "$as_dir" && as_dir=.
5451 + for ac_exec_ext in '' $ac_executable_extensions; do
5452 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5453 + ac_cv_prog_CC="${ac_tool_prefix}cc"
5454 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5455 + break 2
5456 + fi
5457 +done
5458 +done
5459 +
5460 fi
5461 fi
5462 -CC="$ac_cv_prog_CC"
5463 +CC=$ac_cv_prog_CC
5464 if test -n "$CC"; then
5465 - echo "$ac_t""$CC" 1>&6
5466 + echo "$as_me:$LINENO: result: $CC" >&5
5467 +echo "${ECHO_T}$CC" >&6
5468 +else
5469 + echo "$as_me:$LINENO: result: no" >&5
5470 +echo "${ECHO_T}no" >&6
5471 +fi
5472 +
5473 +fi
5474 +if test -z "$ac_cv_prog_CC"; then
5475 + ac_ct_CC=$CC
5476 + # Extract the first word of "cc", so it can be a program name with args.
5477 +set dummy cc; ac_word=$2
5478 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5479 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5480 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
5481 + echo $ECHO_N "(cached) $ECHO_C" >&6
5482 +else
5483 + if test -n "$ac_ct_CC"; then
5484 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
5485 +else
5486 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5487 +for as_dir in $PATH
5488 +do
5489 + IFS=$as_save_IFS
5490 + test -z "$as_dir" && as_dir=.
5491 + for ac_exec_ext in '' $ac_executable_extensions; do
5492 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5493 + ac_cv_prog_ac_ct_CC="cc"
5494 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5495 + break 2
5496 + fi
5497 +done
5498 +done
5499 +
5500 +fi
5501 +fi
5502 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
5503 +if test -n "$ac_ct_CC"; then
5504 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
5505 +echo "${ECHO_T}$ac_ct_CC" >&6
5506 else
5507 - echo "$ac_t""no" 1>&6
5508 + echo "$as_me:$LINENO: result: no" >&5
5509 +echo "${ECHO_T}no" >&6
5510 fi
5511
5512 + CC=$ac_ct_CC
5513 +else
5514 + CC="$ac_cv_prog_CC"
5515 +fi
5516 +
5517 +fi
5518 if test -z "$CC"; then
5519 # Extract the first word of "cc", so it can be a program name with args.
5520 set dummy cc; ac_word=$2
5521 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5522 -echo "configure:1096: checking for $ac_word" >&5
5523 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
5524 - echo $ac_n "(cached) $ac_c" 1>&6
5525 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5526 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5527 +if test "${ac_cv_prog_CC+set}" = set; then
5528 + echo $ECHO_N "(cached) $ECHO_C" >&6
5529 else
5530 if test -n "$CC"; then
5531 ac_cv_prog_CC="$CC" # Let the user override the test.
5532 else
5533 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
5534 ac_prog_rejected=no
5535 - ac_dummy="$PATH"
5536 - for ac_dir in $ac_dummy; do
5537 - test -z "$ac_dir" && ac_dir=.
5538 - if test -f $ac_dir/$ac_word; then
5539 - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
5540 - ac_prog_rejected=yes
5541 - continue
5542 - fi
5543 - ac_cv_prog_CC="cc"
5544 - break
5545 - fi
5546 - done
5547 - IFS="$ac_save_ifs"
5548 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5549 +for as_dir in $PATH
5550 +do
5551 + IFS=$as_save_IFS
5552 + test -z "$as_dir" && as_dir=.
5553 + for ac_exec_ext in '' $ac_executable_extensions; do
5554 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5555 + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
5556 + ac_prog_rejected=yes
5557 + continue
5558 + fi
5559 + ac_cv_prog_CC="cc"
5560 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5561 + break 2
5562 + fi
5563 +done
5564 +done
5565 +
5566 if test $ac_prog_rejected = yes; then
5567 # We found a bogon in the path, so make sure we never use it.
5568 set dummy $ac_cv_prog_CC
5569 shift
5570 - if test $# -gt 0; then
5571 + if test $# != 0; then
5572 # We chose a different compiler from the bogus one.
5573 # However, it has the same basename, so the bogon will be chosen
5574 # first if we set CC to just the basename; use the full file name.
5575 shift
5576 - set dummy "$ac_dir/$ac_word" "$@"
5577 - shift
5578 - ac_cv_prog_CC="$@"
5579 + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
5580 fi
5581 fi
5582 fi
5583 fi
5584 -CC="$ac_cv_prog_CC"
5585 +CC=$ac_cv_prog_CC
5586 if test -n "$CC"; then
5587 - echo "$ac_t""$CC" 1>&6
5588 + echo "$as_me:$LINENO: result: $CC" >&5
5589 +echo "${ECHO_T}$CC" >&6
5590 else
5591 - echo "$ac_t""no" 1>&6
5592 + echo "$as_me:$LINENO: result: no" >&5
5593 +echo "${ECHO_T}no" >&6
5594 fi
5595
5596 - if test -z "$CC"; then
5597 - case "`uname -s`" in
5598 - *win32* | *WIN32*)
5599 - # Extract the first word of "cl", so it can be a program name with args.
5600 -set dummy cl; ac_word=$2
5601 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5602 -echo "configure:1147: checking for $ac_word" >&5
5603 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
5604 - echo $ac_n "(cached) $ac_c" 1>&6
5605 +fi
5606 +if test -z "$CC"; then
5607 + if test -n "$ac_tool_prefix"; then
5608 + for ac_prog in cl
5609 + do
5610 + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
5611 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
5612 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5613 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5614 +if test "${ac_cv_prog_CC+set}" = set; then
5615 + echo $ECHO_N "(cached) $ECHO_C" >&6
5616 else
5617 if test -n "$CC"; then
5618 ac_cv_prog_CC="$CC" # Let the user override the test.
5619 else
5620 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
5621 - ac_dummy="$PATH"
5622 - for ac_dir in $ac_dummy; do
5623 - test -z "$ac_dir" && ac_dir=.
5624 - if test -f $ac_dir/$ac_word; then
5625 - ac_cv_prog_CC="cl"
5626 - break
5627 - fi
5628 - done
5629 - IFS="$ac_save_ifs"
5630 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5631 +for as_dir in $PATH
5632 +do
5633 + IFS=$as_save_IFS
5634 + test -z "$as_dir" && as_dir=.
5635 + for ac_exec_ext in '' $ac_executable_extensions; do
5636 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5637 + ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
5638 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5639 + break 2
5640 + fi
5641 +done
5642 +done
5643 +
5644 fi
5645 fi
5646 -CC="$ac_cv_prog_CC"
5647 +CC=$ac_cv_prog_CC
5648 if test -n "$CC"; then
5649 - echo "$ac_t""$CC" 1>&6
5650 + echo "$as_me:$LINENO: result: $CC" >&5
5651 +echo "${ECHO_T}$CC" >&6
5652 else
5653 - echo "$ac_t""no" 1>&6
5654 + echo "$as_me:$LINENO: result: no" >&5
5655 +echo "${ECHO_T}no" >&6
5656 fi
5657 - ;;
5658 - esac
5659 +
5660 + test -n "$CC" && break
5661 + done
5662 +fi
5663 +if test -z "$CC"; then
5664 + ac_ct_CC=$CC
5665 + for ac_prog in cl
5666 +do
5667 + # Extract the first word of "$ac_prog", so it can be a program name with args.
5668 +set dummy $ac_prog; ac_word=$2
5669 +echo "$as_me:$LINENO: checking for $ac_word" >&5
5670 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
5671 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
5672 + echo $ECHO_N "(cached) $ECHO_C" >&6
5673 +else
5674 + if test -n "$ac_ct_CC"; then
5675 + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
5676 +else
5677 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5678 +for as_dir in $PATH
5679 +do
5680 + IFS=$as_save_IFS
5681 + test -z "$as_dir" && as_dir=.
5682 + for ac_exec_ext in '' $ac_executable_extensions; do
5683 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5684 + ac_cv_prog_ac_ct_CC="$ac_prog"
5685 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5686 + break 2
5687 fi
5688 - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
5689 +done
5690 +done
5691 +
5692 fi
5693 +fi
5694 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
5695 +if test -n "$ac_ct_CC"; then
5696 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
5697 +echo "${ECHO_T}$ac_ct_CC" >&6
5698 +else
5699 + echo "$as_me:$LINENO: result: no" >&5
5700 +echo "${ECHO_T}no" >&6
5701 +fi
5702 +
5703 + test -n "$ac_ct_CC" && break
5704 +done
5705
5706 -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
5707 -echo "configure:1179: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
5708 + CC=$ac_ct_CC
5709 +fi
5710
5711 -ac_ext=c
5712 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
5713 -ac_cpp='$CPP $CPPFLAGS'
5714 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
5715 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
5716 -cross_compiling=$ac_cv_prog_cc_cross
5717 +fi
5718
5719 -cat > conftest.$ac_ext << EOF
5720
5721 -#line 1190 "configure"
5722 -#include "confdefs.h"
5723 +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
5724 +See \`config.log' for more details." >&5
5725 +echo "$as_me: error: no acceptable C compiler found in \$PATH
5726 +See \`config.log' for more details." >&2;}
5727 + { (exit 1); exit 1; }; }
5728 +
5729 +# Provide some information about the compiler.
5730 +echo "$as_me:$LINENO:" \
5731 + "checking for C compiler version" >&5
5732 +ac_compiler=`set X $ac_compile; echo $2`
5733 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
5734 + (eval $ac_compiler --version </dev/null >&5) 2>&5
5735 + ac_status=$?
5736 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5737 + (exit $ac_status); }
5738 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
5739 + (eval $ac_compiler -v </dev/null >&5) 2>&5
5740 + ac_status=$?
5741 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5742 + (exit $ac_status); }
5743 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
5744 + (eval $ac_compiler -V </dev/null >&5) 2>&5
5745 + ac_status=$?
5746 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5747 + (exit $ac_status); }
5748 +
5749 +cat >conftest.$ac_ext <<_ACEOF
5750 +#line $LINENO "configure"
5751 +/* confdefs.h. */
5752 +_ACEOF
5753 +cat confdefs.h >>conftest.$ac_ext
5754 +cat >>conftest.$ac_ext <<_ACEOF
5755 +/* end confdefs.h. */
5756
5757 -main(){return(0);}
5758 -EOF
5759 -if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5760 - ac_cv_prog_cc_works=yes
5761 - # If we can't run a trivial program, we are probably using a cross compiler.
5762 - if (./conftest; exit) 2>/dev/null; then
5763 - ac_cv_prog_cc_cross=no
5764 - else
5765 - ac_cv_prog_cc_cross=yes
5766 - fi
5767 +int
5768 +main ()
5769 +{
5770 +
5771 + ;
5772 + return 0;
5773 +}
5774 +_ACEOF
5775 +ac_clean_files_save=$ac_clean_files
5776 +ac_clean_files="$ac_clean_files a.out a.exe b.out"
5777 +# Try to create an executable without -o first, disregard a.out.
5778 +# It will help us diagnose broken compilers, and finding out an intuition
5779 +# of exeext.
5780 +echo "$as_me:$LINENO: checking for C compiler default output" >&5
5781 +echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
5782 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
5783 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
5784 + (eval $ac_link_default) 2>&5
5785 + ac_status=$?
5786 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5787 + (exit $ac_status); }; then
5788 + # Find the output, starting from the most likely. This scheme is
5789 +# not robust to junk in `.', hence go to wildcards (a.*) only as a last
5790 +# resort.
5791 +
5792 +# Be careful to initialize this variable, since it used to be cached.
5793 +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
5794 +ac_cv_exeext=
5795 +# b.out is created by i960 compilers.
5796 +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
5797 +do
5798 + test -f "$ac_file" || continue
5799 + case $ac_file in
5800 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
5801 + ;;
5802 + conftest.$ac_ext )
5803 + # This is the source file.
5804 + ;;
5805 + [ab].out )
5806 + # We found the default executable, but exeext='' is most
5807 + # certainly right.
5808 + break;;
5809 + *.* )
5810 + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
5811 + # FIXME: I believe we export ac_cv_exeext for Libtool,
5812 + # but it would be cool to find out if it's true. Does anybody
5813 + # maintain Libtool? --akim.
5814 + export ac_cv_exeext
5815 + break;;
5816 + * )
5817 + break;;
5818 + esac
5819 +done
5820 else
5821 - echo "configure: failed program was:" >&5
5822 - cat conftest.$ac_ext >&5
5823 - ac_cv_prog_cc_works=no
5824 + echo "$as_me: failed program was:" >&5
5825 +sed 's/^/| /' conftest.$ac_ext >&5
5826 +
5827 +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
5828 +See \`config.log' for more details." >&5
5829 +echo "$as_me: error: C compiler cannot create executables
5830 +See \`config.log' for more details." >&2;}
5831 + { (exit 77); exit 77; }; }
5832 +fi
5833 +
5834 +ac_exeext=$ac_cv_exeext
5835 +echo "$as_me:$LINENO: result: $ac_file" >&5
5836 +echo "${ECHO_T}$ac_file" >&6
5837 +
5838 +# Check the compiler produces executables we can run. If not, either
5839 +# the compiler is broken, or we cross compile.
5840 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5
5841 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
5842 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
5843 +# If not cross compiling, check that we can run a simple program.
5844 +if test "$cross_compiling" != yes; then
5845 + if { ac_try='./$ac_file'
5846 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
5847 + (eval $ac_try) 2>&5
5848 + ac_status=$?
5849 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5850 + (exit $ac_status); }; }; then
5851 + cross_compiling=no
5852 + else
5853 + if test "$cross_compiling" = maybe; then
5854 + cross_compiling=yes
5855 + else
5856 + { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
5857 +If you meant to cross compile, use \`--host'.
5858 +See \`config.log' for more details." >&5
5859 +echo "$as_me: error: cannot run C compiled programs.
5860 +If you meant to cross compile, use \`--host'.
5861 +See \`config.log' for more details." >&2;}
5862 + { (exit 1); exit 1; }; }
5863 + fi
5864 + fi
5865 fi
5866 -rm -fr conftest*
5867 -ac_ext=c
5868 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
5869 -ac_cpp='$CPP $CPPFLAGS'
5870 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
5871 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
5872 -cross_compiling=$ac_cv_prog_cc_cross
5873 -
5874 -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
5875 -if test $ac_cv_prog_cc_works = no; then
5876 - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
5877 -fi
5878 -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
5879 -echo "configure:1221: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
5880 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
5881 -cross_compiling=$ac_cv_prog_cc_cross
5882 -
5883 -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
5884 -echo "configure:1226: checking whether we are using GNU C" >&5
5885 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
5886 - echo $ac_n "(cached) $ac_c" 1>&6
5887 -else
5888 - cat > conftest.c <<EOF
5889 -#ifdef __GNUC__
5890 - yes;
5891 -#endif
5892 -EOF
5893 -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
5894 - ac_cv_prog_gcc=yes
5895 +echo "$as_me:$LINENO: result: yes" >&5
5896 +echo "${ECHO_T}yes" >&6
5897 +
5898 +rm -f a.out a.exe conftest$ac_cv_exeext b.out
5899 +ac_clean_files=$ac_clean_files_save
5900 +# Check the compiler produces executables we can run. If not, either
5901 +# the compiler is broken, or we cross compile.
5902 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
5903 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
5904 +echo "$as_me:$LINENO: result: $cross_compiling" >&5
5905 +echo "${ECHO_T}$cross_compiling" >&6
5906 +
5907 +echo "$as_me:$LINENO: checking for suffix of executables" >&5
5908 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
5909 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
5910 + (eval $ac_link) 2>&5
5911 + ac_status=$?
5912 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5913 + (exit $ac_status); }; then
5914 + # If both `conftest.exe' and `conftest' are `present' (well, observable)
5915 +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
5916 +# work properly (i.e., refer to `conftest.exe'), while it won't with
5917 +# `rm'.
5918 +for ac_file in conftest.exe conftest conftest.*; do
5919 + test -f "$ac_file" || continue
5920 + case $ac_file in
5921 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
5922 + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
5923 + export ac_cv_exeext
5924 + break;;
5925 + * ) break;;
5926 + esac
5927 +done
5928 else
5929 - ac_cv_prog_gcc=no
5930 -fi
5931 + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
5932 +See \`config.log' for more details." >&5
5933 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
5934 +See \`config.log' for more details." >&2;}
5935 + { (exit 1); exit 1; }; }
5936 fi
5937
5938 -echo "$ac_t""$ac_cv_prog_gcc" 1>&6
5939 +rm -f conftest$ac_cv_exeext
5940 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
5941 +echo "${ECHO_T}$ac_cv_exeext" >&6
5942 +
5943 +rm -f conftest.$ac_ext
5944 +EXEEXT=$ac_cv_exeext
5945 +ac_exeext=$EXEEXT
5946 +echo "$as_me:$LINENO: checking for suffix of object files" >&5
5947 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
5948 +if test "${ac_cv_objext+set}" = set; then
5949 + echo $ECHO_N "(cached) $ECHO_C" >&6
5950 +else
5951 + cat >conftest.$ac_ext <<_ACEOF
5952 +#line $LINENO "configure"
5953 +/* confdefs.h. */
5954 +_ACEOF
5955 +cat confdefs.h >>conftest.$ac_ext
5956 +cat >>conftest.$ac_ext <<_ACEOF
5957 +/* end confdefs.h. */
5958 +
5959 +int
5960 +main ()
5961 +{
5962
5963 -if test $ac_cv_prog_gcc = yes; then
5964 - GCC=yes
5965 + ;
5966 + return 0;
5967 +}
5968 +_ACEOF
5969 +rm -f conftest.o conftest.obj
5970 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
5971 + (eval $ac_compile) 2>&5
5972 + ac_status=$?
5973 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
5974 + (exit $ac_status); }; then
5975 + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
5976 + case $ac_file in
5977 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
5978 + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
5979 + break;;
5980 + esac
5981 +done
5982 else
5983 - GCC=
5984 + echo "$as_me: failed program was:" >&5
5985 +sed 's/^/| /' conftest.$ac_ext >&5
5986 +
5987 +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
5988 +See \`config.log' for more details." >&5
5989 +echo "$as_me: error: cannot compute suffix of object files: cannot compile
5990 +See \`config.log' for more details." >&2;}
5991 + { (exit 1); exit 1; }; }
5992 fi
5993
5994 -ac_test_CFLAGS="${CFLAGS+set}"
5995 -ac_save_CFLAGS="$CFLAGS"
5996 -CFLAGS=
5997 -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
5998 -echo "configure:1254: checking whether ${CC-cc} accepts -g" >&5
5999 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
6000 - echo $ac_n "(cached) $ac_c" 1>&6
6001 -else
6002 - echo 'void f(){}' > conftest.c
6003 -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
6004 +rm -f conftest.$ac_cv_objext conftest.$ac_ext
6005 +fi
6006 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
6007 +echo "${ECHO_T}$ac_cv_objext" >&6
6008 +OBJEXT=$ac_cv_objext
6009 +ac_objext=$OBJEXT
6010 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
6011 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
6012 +if test "${ac_cv_c_compiler_gnu+set}" = set; then
6013 + echo $ECHO_N "(cached) $ECHO_C" >&6
6014 +else
6015 + cat >conftest.$ac_ext <<_ACEOF
6016 +#line $LINENO "configure"
6017 +/* confdefs.h. */
6018 +_ACEOF
6019 +cat confdefs.h >>conftest.$ac_ext
6020 +cat >>conftest.$ac_ext <<_ACEOF
6021 +/* end confdefs.h. */
6022 +
6023 +int
6024 +main ()
6025 +{
6026 +#ifndef __GNUC__
6027 + choke me
6028 +#endif
6029 +
6030 + ;
6031 + return 0;
6032 +}
6033 +_ACEOF
6034 +rm -f conftest.$ac_objext
6035 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6036 + (eval $ac_compile) 2>&5
6037 + ac_status=$?
6038 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6039 + (exit $ac_status); } &&
6040 + { ac_try='test -s conftest.$ac_objext'
6041 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6042 + (eval $ac_try) 2>&5
6043 + ac_status=$?
6044 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6045 + (exit $ac_status); }; }; then
6046 + ac_compiler_gnu=yes
6047 +else
6048 + echo "$as_me: failed program was:" >&5
6049 +sed 's/^/| /' conftest.$ac_ext >&5
6050 +
6051 +ac_compiler_gnu=no
6052 +fi
6053 +rm -f conftest.$ac_objext conftest.$ac_ext
6054 +ac_cv_c_compiler_gnu=$ac_compiler_gnu
6055 +
6056 +fi
6057 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
6058 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
6059 +GCC=`test $ac_compiler_gnu = yes && echo yes`
6060 +ac_test_CFLAGS=${CFLAGS+set}
6061 +ac_save_CFLAGS=$CFLAGS
6062 +CFLAGS="-g"
6063 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
6064 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
6065 +if test "${ac_cv_prog_cc_g+set}" = set; then
6066 + echo $ECHO_N "(cached) $ECHO_C" >&6
6067 +else
6068 + cat >conftest.$ac_ext <<_ACEOF
6069 +#line $LINENO "configure"
6070 +/* confdefs.h. */
6071 +_ACEOF
6072 +cat confdefs.h >>conftest.$ac_ext
6073 +cat >>conftest.$ac_ext <<_ACEOF
6074 +/* end confdefs.h. */
6075 +
6076 +int
6077 +main ()
6078 +{
6079 +
6080 + ;
6081 + return 0;
6082 +}
6083 +_ACEOF
6084 +rm -f conftest.$ac_objext
6085 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6086 + (eval $ac_compile) 2>&5
6087 + ac_status=$?
6088 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6089 + (exit $ac_status); } &&
6090 + { ac_try='test -s conftest.$ac_objext'
6091 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6092 + (eval $ac_try) 2>&5
6093 + ac_status=$?
6094 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6095 + (exit $ac_status); }; }; then
6096 ac_cv_prog_cc_g=yes
6097 else
6098 - ac_cv_prog_cc_g=no
6099 -fi
6100 -rm -f conftest*
6101 + echo "$as_me: failed program was:" >&5
6102 +sed 's/^/| /' conftest.$ac_ext >&5
6103
6104 +ac_cv_prog_cc_g=no
6105 fi
6106 -
6107 -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
6108 +rm -f conftest.$ac_objext conftest.$ac_ext
6109 +fi
6110 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
6111 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
6112 if test "$ac_test_CFLAGS" = set; then
6113 - CFLAGS="$ac_save_CFLAGS"
6114 + CFLAGS=$ac_save_CFLAGS
6115 elif test $ac_cv_prog_cc_g = yes; then
6116 if test "$GCC" = yes; then
6117 CFLAGS="-g -O2"
6118 @@ -1280,295 +2477,548 @@
6119 CFLAGS=
6120 fi
6121 fi
6122 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
6123 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
6124 +if test "${ac_cv_prog_cc_stdc+set}" = set; then
6125 + echo $ECHO_N "(cached) $ECHO_C" >&6
6126 +else
6127 + ac_cv_prog_cc_stdc=no
6128 +ac_save_CC=$CC
6129 +cat >conftest.$ac_ext <<_ACEOF
6130 +#line $LINENO "configure"
6131 +/* confdefs.h. */
6132 +_ACEOF
6133 +cat confdefs.h >>conftest.$ac_ext
6134 +cat >>conftest.$ac_ext <<_ACEOF
6135 +/* end confdefs.h. */
6136 +#include <stdarg.h>
6137 +#include <stdio.h>
6138 +#include <sys/types.h>
6139 +#include <sys/stat.h>
6140 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
6141 +struct buf { int x; };
6142 +FILE * (*rcsopen) (struct buf *, struct stat *, int);
6143 +static char *e (p, i)
6144 + char **p;
6145 + int i;
6146 +{
6147 + return p[i];
6148 +}
6149 +static char *f (char * (*g) (char **, int), char **p, ...)
6150 +{
6151 + char *s;
6152 + va_list v;
6153 + va_start (v,p);
6154 + s = g (p, va_arg (v,int));
6155 + va_end (v);
6156 + return s;
6157 +}
6158 +int test (int i, double x);
6159 +struct s1 {int (*f) (int a);};
6160 +struct s2 {int (*f) (double a);};
6161 +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
6162 +int argc;
6163 +char **argv;
6164 +int
6165 +main ()
6166 +{
6167 +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
6168 + ;
6169 + return 0;
6170 +}
6171 +_ACEOF
6172 +# Don't try gcc -ansi; that turns off useful extensions and
6173 +# breaks some systems' header files.
6174 +# AIX -qlanglvl=ansi
6175 +# Ultrix and OSF/1 -std1
6176 +# HP-UX 10.20 and later -Ae
6177 +# HP-UX older versions -Aa -D_HPUX_SOURCE
6178 +# SVR4 -Xc -D__EXTENSIONS__
6179 +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
6180 +do
6181 + CC="$ac_save_CC $ac_arg"
6182 + rm -f conftest.$ac_objext
6183 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6184 + (eval $ac_compile) 2>&5
6185 + ac_status=$?
6186 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6187 + (exit $ac_status); } &&
6188 + { ac_try='test -s conftest.$ac_objext'
6189 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6190 + (eval $ac_try) 2>&5
6191 + ac_status=$?
6192 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6193 + (exit $ac_status); }; }; then
6194 + ac_cv_prog_cc_stdc=$ac_arg
6195 +break
6196 +else
6197 + echo "$as_me: failed program was:" >&5
6198 +sed 's/^/| /' conftest.$ac_ext >&5
6199 +
6200 +fi
6201 +rm -f conftest.$ac_objext
6202 +done
6203 +rm -f conftest.$ac_ext conftest.$ac_objext
6204 +CC=$ac_save_CC
6205
6206 -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
6207 -echo "configure:1286: checking how to run the C preprocessor" >&5
6208 -# On Suns, sometimes $CPP names a directory.
6209 -if test -n "$CPP" && test -d "$CPP"; then
6210 - CPP=
6211 fi
6212 -if test -z "$CPP"; then
6213 -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
6214 - echo $ac_n "(cached) $ac_c" 1>&6
6215 -else
6216 - # This must be in double quotes, not single quotes, because CPP may get
6217 - # substituted into the Makefile and "${CC-cc}" will confuse make.
6218 - CPP="${CC-cc} -E"
6219 - # On the NeXT, cc -E runs the code through the compiler's parser,
6220 - # not just through cpp.
6221 - cat > conftest.$ac_ext <<EOF
6222 -#line 1301 "configure"
6223 -#include "confdefs.h"
6224 -#include <assert.h>
6225 -Syntax Error
6226 -EOF
6227 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6228 -{ (eval echo configure:1307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6229 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
6230 -if test -z "$ac_err"; then
6231 - :
6232 -else
6233 - echo "$ac_err" >&5
6234 - echo "configure: failed program was:" >&5
6235 - cat conftest.$ac_ext >&5
6236 - rm -rf conftest*
6237 - CPP="${CC-cc} -E -traditional-cpp"
6238 - cat > conftest.$ac_ext <<EOF
6239 -#line 1318 "configure"
6240 -#include "confdefs.h"
6241 -#include <assert.h>
6242 -Syntax Error
6243 -EOF
6244 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6245 -{ (eval echo configure:1324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6246 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
6247 -if test -z "$ac_err"; then
6248 - :
6249 -else
6250 - echo "$ac_err" >&5
6251 - echo "configure: failed program was:" >&5
6252 - cat conftest.$ac_ext >&5
6253 - rm -rf conftest*
6254 - CPP="${CC-cc} -nologo -E"
6255 - cat > conftest.$ac_ext <<EOF
6256 -#line 1335 "configure"
6257 -#include "confdefs.h"
6258 -#include <assert.h>
6259 -Syntax Error
6260 -EOF
6261 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6262 -{ (eval echo configure:1341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6263 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
6264 -if test -z "$ac_err"; then
6265 +
6266 +case "x$ac_cv_prog_cc_stdc" in
6267 + x|xno)
6268 + echo "$as_me:$LINENO: result: none needed" >&5
6269 +echo "${ECHO_T}none needed" >&6 ;;
6270 + *)
6271 + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
6272 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
6273 + CC="$CC $ac_cv_prog_cc_stdc" ;;
6274 +esac
6275 +
6276 +# Some people use a C++ compiler to compile C. Since we use `exit',
6277 +# in C++ we need to declare it. In case someone uses the same compiler
6278 +# for both compiling C and C++ we need to have the C++ compiler decide
6279 +# the declaration of exit, since it's the most demanding environment.
6280 +cat >conftest.$ac_ext <<_ACEOF
6281 +#ifndef __cplusplus
6282 + choke me
6283 +#endif
6284 +_ACEOF
6285 +rm -f conftest.$ac_objext
6286 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6287 + (eval $ac_compile) 2>&5
6288 + ac_status=$?
6289 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6290 + (exit $ac_status); } &&
6291 + { ac_try='test -s conftest.$ac_objext'
6292 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6293 + (eval $ac_try) 2>&5
6294 + ac_status=$?
6295 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6296 + (exit $ac_status); }; }; then
6297 + for ac_declaration in \
6298 + '' \
6299 + 'extern "C" void std::exit (int) throw (); using std::exit;' \
6300 + 'extern "C" void std::exit (int); using std::exit;' \
6301 + 'extern "C" void exit (int) throw ();' \
6302 + 'extern "C" void exit (int);' \
6303 + 'void exit (int);'
6304 +do
6305 + cat >conftest.$ac_ext <<_ACEOF
6306 +#line $LINENO "configure"
6307 +/* confdefs.h. */
6308 +_ACEOF
6309 +cat confdefs.h >>conftest.$ac_ext
6310 +cat >>conftest.$ac_ext <<_ACEOF
6311 +/* end confdefs.h. */
6312 +$ac_declaration
6313 +#include <stdlib.h>
6314 +int
6315 +main ()
6316 +{
6317 +exit (42);
6318 + ;
6319 + return 0;
6320 +}
6321 +_ACEOF
6322 +rm -f conftest.$ac_objext
6323 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6324 + (eval $ac_compile) 2>&5
6325 + ac_status=$?
6326 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6327 + (exit $ac_status); } &&
6328 + { ac_try='test -s conftest.$ac_objext'
6329 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6330 + (eval $ac_try) 2>&5
6331 + ac_status=$?
6332 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6333 + (exit $ac_status); }; }; then
6334 :
6335 else
6336 - echo "$ac_err" >&5
6337 - echo "configure: failed program was:" >&5
6338 - cat conftest.$ac_ext >&5
6339 - rm -rf conftest*
6340 - CPP=/lib/cpp
6341 -fi
6342 -rm -f conftest*
6343 + echo "$as_me: failed program was:" >&5
6344 +sed 's/^/| /' conftest.$ac_ext >&5
6345 +
6346 +continue
6347 fi
6348 -rm -f conftest*
6349 +rm -f conftest.$ac_objext conftest.$ac_ext
6350 + cat >conftest.$ac_ext <<_ACEOF
6351 +#line $LINENO "configure"
6352 +/* confdefs.h. */
6353 +_ACEOF
6354 +cat confdefs.h >>conftest.$ac_ext
6355 +cat >>conftest.$ac_ext <<_ACEOF
6356 +/* end confdefs.h. */
6357 +$ac_declaration
6358 +int
6359 +main ()
6360 +{
6361 +exit (42);
6362 + ;
6363 + return 0;
6364 +}
6365 +_ACEOF
6366 +rm -f conftest.$ac_objext
6367 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6368 + (eval $ac_compile) 2>&5
6369 + ac_status=$?
6370 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6371 + (exit $ac_status); } &&
6372 + { ac_try='test -s conftest.$ac_objext'
6373 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6374 + (eval $ac_try) 2>&5
6375 + ac_status=$?
6376 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6377 + (exit $ac_status); }; }; then
6378 + break
6379 +else
6380 + echo "$as_me: failed program was:" >&5
6381 +sed 's/^/| /' conftest.$ac_ext >&5
6382 +
6383 fi
6384 +rm -f conftest.$ac_objext conftest.$ac_ext
6385 +done
6386 rm -f conftest*
6387 - ac_cv_prog_CPP="$CPP"
6388 +if test -n "$ac_declaration"; then
6389 + echo '#ifdef __cplusplus' >>confdefs.h
6390 + echo $ac_declaration >>confdefs.h
6391 + echo '#endif' >>confdefs.h
6392 fi
6393 - CPP="$ac_cv_prog_CPP"
6394 +
6395 else
6396 - ac_cv_prog_CPP="$CPP"
6397 + echo "$as_me: failed program was:" >&5
6398 +sed 's/^/| /' conftest.$ac_ext >&5
6399 +
6400 fi
6401 -echo "$ac_t""$CPP" 1>&6
6402 +rm -f conftest.$ac_objext conftest.$ac_ext
6403 +ac_ext=c
6404 +ac_cpp='$CPP $CPPFLAGS'
6405 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
6406 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
6407 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
6408 +
6409
6410 missing_dir=`cd $ac_aux_dir && pwd`
6411 for ac_prog in flex lex
6412 do
6413 -# Extract the first word of "$ac_prog", so it can be a program name with args.
6414 + # Extract the first word of "$ac_prog", so it can be a program name with args.
6415 set dummy $ac_prog; ac_word=$2
6416 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
6417 -echo "configure:1371: checking for $ac_word" >&5
6418 -if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
6419 - echo $ac_n "(cached) $ac_c" 1>&6
6420 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6421 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6422 +if test "${ac_cv_prog_LEX+set}" = set; then
6423 + echo $ECHO_N "(cached) $ECHO_C" >&6
6424 else
6425 if test -n "$LEX"; then
6426 ac_cv_prog_LEX="$LEX" # Let the user override the test.
6427 else
6428 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
6429 - ac_dummy="$PATH"
6430 - for ac_dir in $ac_dummy; do
6431 - test -z "$ac_dir" && ac_dir=.
6432 - if test -f $ac_dir/$ac_word; then
6433 - ac_cv_prog_LEX="$ac_prog"
6434 - break
6435 - fi
6436 - done
6437 - IFS="$ac_save_ifs"
6438 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6439 +for as_dir in $PATH
6440 +do
6441 + IFS=$as_save_IFS
6442 + test -z "$as_dir" && as_dir=.
6443 + for ac_exec_ext in '' $ac_executable_extensions; do
6444 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6445 + ac_cv_prog_LEX="$ac_prog"
6446 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6447 + break 2
6448 + fi
6449 +done
6450 +done
6451 +
6452 fi
6453 fi
6454 -LEX="$ac_cv_prog_LEX"
6455 +LEX=$ac_cv_prog_LEX
6456 if test -n "$LEX"; then
6457 - echo "$ac_t""$LEX" 1>&6
6458 + echo "$as_me:$LINENO: result: $LEX" >&5
6459 +echo "${ECHO_T}$LEX" >&6
6460 else
6461 - echo "$ac_t""no" 1>&6
6462 + echo "$as_me:$LINENO: result: no" >&5
6463 +echo "${ECHO_T}no" >&6
6464 fi
6465
6466 -test -n "$LEX" && break
6467 + test -n "$LEX" && break
6468 done
6469 -test -n "$LEX" || LEX=""$missing_dir/missing flex""
6470 +test -n "$LEX" || LEX="$missing_dir/missing flex"
6471
6472 -# Extract the first word of "flex", so it can be a program name with args.
6473 -set dummy flex; ac_word=$2
6474 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
6475 -echo "configure:1404: checking for $ac_word" >&5
6476 -if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
6477 - echo $ac_n "(cached) $ac_c" 1>&6
6478 +for ac_prog in flex lex
6479 +do
6480 + # Extract the first word of "$ac_prog", so it can be a program name with args.
6481 +set dummy $ac_prog; ac_word=$2
6482 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6483 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6484 +if test "${ac_cv_prog_LEX+set}" = set; then
6485 + echo $ECHO_N "(cached) $ECHO_C" >&6
6486 else
6487 if test -n "$LEX"; then
6488 ac_cv_prog_LEX="$LEX" # Let the user override the test.
6489 else
6490 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
6491 - ac_dummy="$PATH"
6492 - for ac_dir in $ac_dummy; do
6493 - test -z "$ac_dir" && ac_dir=.
6494 - if test -f $ac_dir/$ac_word; then
6495 - ac_cv_prog_LEX="flex"
6496 - break
6497 - fi
6498 - done
6499 - IFS="$ac_save_ifs"
6500 - test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
6501 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6502 +for as_dir in $PATH
6503 +do
6504 + IFS=$as_save_IFS
6505 + test -z "$as_dir" && as_dir=.
6506 + for ac_exec_ext in '' $ac_executable_extensions; do
6507 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6508 + ac_cv_prog_LEX="$ac_prog"
6509 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6510 + break 2
6511 + fi
6512 +done
6513 +done
6514 +
6515 fi
6516 fi
6517 -LEX="$ac_cv_prog_LEX"
6518 +LEX=$ac_cv_prog_LEX
6519 if test -n "$LEX"; then
6520 - echo "$ac_t""$LEX" 1>&6
6521 + echo "$as_me:$LINENO: result: $LEX" >&5
6522 +echo "${ECHO_T}$LEX" >&6
6523 else
6524 - echo "$ac_t""no" 1>&6
6525 + echo "$as_me:$LINENO: result: no" >&5
6526 +echo "${ECHO_T}no" >&6
6527 fi
6528
6529 + test -n "$LEX" && break
6530 +done
6531 +test -n "$LEX" || LEX=":"
6532 +
6533 if test -z "$LEXLIB"
6534 then
6535 - case "$LEX" in
6536 - flex*) ac_lib=fl ;;
6537 - *) ac_lib=l ;;
6538 - esac
6539 - echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
6540 -echo "configure:1438: checking for yywrap in -l$ac_lib" >&5
6541 -ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
6542 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6543 - echo $ac_n "(cached) $ac_c" 1>&6
6544 -else
6545 - ac_save_LIBS="$LIBS"
6546 -LIBS="-l$ac_lib $LIBS"
6547 -cat > conftest.$ac_ext <<EOF
6548 -#line 1446 "configure"
6549 -#include "confdefs.h"
6550 + echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
6551 +echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
6552 +if test "${ac_cv_lib_fl_yywrap+set}" = set; then
6553 + echo $ECHO_N "(cached) $ECHO_C" >&6
6554 +else
6555 + ac_check_lib_save_LIBS=$LIBS
6556 +LIBS="-lfl $LIBS"
6557 +cat >conftest.$ac_ext <<_ACEOF
6558 +#line $LINENO "configure"
6559 +/* confdefs.h. */
6560 +_ACEOF
6561 +cat confdefs.h >>conftest.$ac_ext
6562 +cat >>conftest.$ac_ext <<_ACEOF
6563 +/* end confdefs.h. */
6564 +
6565 /* Override any gcc2 internal prototype to avoid an error. */
6566 +#ifdef __cplusplus
6567 +extern "C"
6568 +#endif
6569 /* We use char because int might match the return type of a gcc2
6570 - builtin and then its argument prototype would still apply. */
6571 -char yywrap();
6572 + builtin and then its argument prototype would still apply. */
6573 +char yywrap ();
6574 +int
6575 +main ()
6576 +{
6577 +yywrap ();
6578 + ;
6579 + return 0;
6580 +}
6581 +_ACEOF
6582 +rm -f conftest.$ac_objext conftest$ac_exeext
6583 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6584 + (eval $ac_link) 2>&5
6585 + ac_status=$?
6586 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6587 + (exit $ac_status); } &&
6588 + { ac_try='test -s conftest$ac_exeext'
6589 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6590 + (eval $ac_try) 2>&5
6591 + ac_status=$?
6592 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6593 + (exit $ac_status); }; }; then
6594 + ac_cv_lib_fl_yywrap=yes
6595 +else
6596 + echo "$as_me: failed program was:" >&5
6597 +sed 's/^/| /' conftest.$ac_ext >&5
6598 +
6599 +ac_cv_lib_fl_yywrap=no
6600 +fi
6601 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6602 +LIBS=$ac_check_lib_save_LIBS
6603 +fi
6604 +echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
6605 +echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
6606 +if test $ac_cv_lib_fl_yywrap = yes; then
6607 + LEXLIB="-lfl"
6608 +else
6609 + echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
6610 +echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
6611 +if test "${ac_cv_lib_l_yywrap+set}" = set; then
6612 + echo $ECHO_N "(cached) $ECHO_C" >&6
6613 +else
6614 + ac_check_lib_save_LIBS=$LIBS
6615 +LIBS="-ll $LIBS"
6616 +cat >conftest.$ac_ext <<_ACEOF
6617 +#line $LINENO "configure"
6618 +/* confdefs.h. */
6619 +_ACEOF
6620 +cat confdefs.h >>conftest.$ac_ext
6621 +cat >>conftest.$ac_ext <<_ACEOF
6622 +/* end confdefs.h. */
6623
6624 -int main() {
6625 -yywrap()
6626 -; return 0; }
6627 -EOF
6628 -if { (eval echo configure:1457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6629 - rm -rf conftest*
6630 - eval "ac_cv_lib_$ac_lib_var=yes"
6631 +/* Override any gcc2 internal prototype to avoid an error. */
6632 +#ifdef __cplusplus
6633 +extern "C"
6634 +#endif
6635 +/* We use char because int might match the return type of a gcc2
6636 + builtin and then its argument prototype would still apply. */
6637 +char yywrap ();
6638 +int
6639 +main ()
6640 +{
6641 +yywrap ();
6642 + ;
6643 + return 0;
6644 +}
6645 +_ACEOF
6646 +rm -f conftest.$ac_objext conftest$ac_exeext
6647 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6648 + (eval $ac_link) 2>&5
6649 + ac_status=$?
6650 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6651 + (exit $ac_status); } &&
6652 + { ac_try='test -s conftest$ac_exeext'
6653 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6654 + (eval $ac_try) 2>&5
6655 + ac_status=$?
6656 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6657 + (exit $ac_status); }; }; then
6658 + ac_cv_lib_l_yywrap=yes
6659 else
6660 - echo "configure: failed program was:" >&5
6661 - cat conftest.$ac_ext >&5
6662 - rm -rf conftest*
6663 - eval "ac_cv_lib_$ac_lib_var=no"
6664 -fi
6665 -rm -f conftest*
6666 -LIBS="$ac_save_LIBS"
6667 + echo "$as_me: failed program was:" >&5
6668 +sed 's/^/| /' conftest.$ac_ext >&5
6669
6670 +ac_cv_lib_l_yywrap=no
6671 fi
6672 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
6673 - echo "$ac_t""yes" 1>&6
6674 - LEXLIB="-l$ac_lib"
6675 -else
6676 - echo "$ac_t""no" 1>&6
6677 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6678 +LIBS=$ac_check_lib_save_LIBS
6679 +fi
6680 +echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
6681 +echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
6682 +if test $ac_cv_lib_l_yywrap = yes; then
6683 + LEXLIB="-ll"
6684 +fi
6685 +
6686 fi
6687
6688 fi
6689
6690 -echo $ac_n "checking lex output file root""... $ac_c" 1>&6
6691 -echo "configure:1480: checking lex output file root" >&5
6692 -if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
6693 - echo $ac_n "(cached) $ac_c" 1>&6
6694 +if test "x$LEX" != "x:"; then
6695 + echo "$as_me:$LINENO: checking lex output file root" >&5
6696 +echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
6697 +if test "${ac_cv_prog_lex_root+set}" = set; then
6698 + echo $ECHO_N "(cached) $ECHO_C" >&6
6699 else
6700 # The minimal lex program is just a single line: %%. But some broken lexes
6701 # (Solaris, I think it was) want two %% lines, so accommodate them.
6702 -echo '%%
6703 -%%' | $LEX
6704 +cat >conftest.l <<_ACEOF
6705 +%%
6706 +%%
6707 +_ACEOF
6708 +{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
6709 + (eval $LEX conftest.l) 2>&5
6710 + ac_status=$?
6711 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6712 + (exit $ac_status); }
6713 if test -f lex.yy.c; then
6714 ac_cv_prog_lex_root=lex.yy
6715 elif test -f lexyy.c; then
6716 ac_cv_prog_lex_root=lexyy
6717 else
6718 - { echo "configure: error: cannot find output from $LEX; giving up" 1>&2; exit 1; }
6719 + { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
6720 +echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
6721 + { (exit 1); exit 1; }; }
6722 fi
6723 fi
6724 -
6725 -echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
6726 +echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
6727 +echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
6728 +rm -f conftest.l
6729 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
6730
6731 -echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
6732 -echo "configure:1501: checking whether yytext is a pointer" >&5
6733 -if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
6734 - echo $ac_n "(cached) $ac_c" 1>&6
6735 +echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
6736 +echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
6737 +if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
6738 + echo $ECHO_N "(cached) $ECHO_C" >&6
6739 else
6740 # POSIX says lex can declare yytext either as a pointer or an array; the
6741 # default is implementation-dependent. Figure out which it is, since
6742 # not all implementations provide the %pointer and %array declarations.
6743 ac_cv_prog_lex_yytext_pointer=no
6744 echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
6745 -ac_save_LIBS="$LIBS"
6746 +ac_save_LIBS=$LIBS
6747 LIBS="$LIBS $LEXLIB"
6748 -cat > conftest.$ac_ext <<EOF
6749 -#line 1513 "configure"
6750 -#include "confdefs.h"
6751 +cat >conftest.$ac_ext <<_ACEOF
6752 `cat $LEX_OUTPUT_ROOT.c`
6753 -int main() {
6754 -
6755 -; return 0; }
6756 -EOF
6757 -if { (eval echo configure:1520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6758 - rm -rf conftest*
6759 +_ACEOF
6760 +rm -f conftest.$ac_objext conftest$ac_exeext
6761 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
6762 + (eval $ac_link) 2>&5
6763 + ac_status=$?
6764 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6765 + (exit $ac_status); } &&
6766 + { ac_try='test -s conftest$ac_exeext'
6767 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
6768 + (eval $ac_try) 2>&5
6769 + ac_status=$?
6770 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
6771 + (exit $ac_status); }; }; then
6772 ac_cv_prog_lex_yytext_pointer=yes
6773 else
6774 - echo "configure: failed program was:" >&5
6775 - cat conftest.$ac_ext >&5
6776 + echo "$as_me: failed program was:" >&5
6777 +sed 's/^/| /' conftest.$ac_ext >&5
6778 +
6779 fi
6780 -rm -f conftest*
6781 -LIBS="$ac_save_LIBS"
6782 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
6783 +LIBS=$ac_save_LIBS
6784 rm -f "${LEX_OUTPUT_ROOT}.c"
6785
6786 fi
6787 -
6788 -echo "$ac_t""$ac_cv_prog_lex_yytext_pointer" 1>&6
6789 +echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
6790 +echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
6791 if test $ac_cv_prog_lex_yytext_pointer = yes; then
6792 - cat >> confdefs.h <<\EOF
6793 +
6794 +cat >>confdefs.h <<\_ACEOF
6795 #define YYTEXT_POINTER 1
6796 -EOF
6797 +_ACEOF
6798 +
6799 +fi
6800
6801 fi
6802
6803 for ac_prog in 'bison -y' byacc
6804 do
6805 -# Extract the first word of "$ac_prog", so it can be a program name with args.
6806 + # Extract the first word of "$ac_prog", so it can be a program name with args.
6807 set dummy $ac_prog; ac_word=$2
6808 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
6809 -echo "configure:1546: checking for $ac_word" >&5
6810 -if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
6811 - echo $ac_n "(cached) $ac_c" 1>&6
6812 +echo "$as_me:$LINENO: checking for $ac_word" >&5
6813 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
6814 +if test "${ac_cv_prog_YACC+set}" = set; then
6815 + echo $ECHO_N "(cached) $ECHO_C" >&6
6816 else
6817 if test -n "$YACC"; then
6818 ac_cv_prog_YACC="$YACC" # Let the user override the test.
6819 else
6820 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
6821 - ac_dummy="$PATH"
6822 - for ac_dir in $ac_dummy; do
6823 - test -z "$ac_dir" && ac_dir=.
6824 - if test -f $ac_dir/$ac_word; then
6825 - ac_cv_prog_YACC="$ac_prog"
6826 - break
6827 - fi
6828 - done
6829 - IFS="$ac_save_ifs"
6830 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6831 +for as_dir in $PATH
6832 +do
6833 + IFS=$as_save_IFS
6834 + test -z "$as_dir" && as_dir=.
6835 + for ac_exec_ext in '' $ac_executable_extensions; do
6836 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6837 + ac_cv_prog_YACC="$ac_prog"
6838 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
6839 + break 2
6840 + fi
6841 +done
6842 +done
6843 +
6844 fi
6845 fi
6846 -YACC="$ac_cv_prog_YACC"
6847 +YACC=$ac_cv_prog_YACC
6848 if test -n "$YACC"; then
6849 - echo "$ac_t""$YACC" 1>&6
6850 + echo "$as_me:$LINENO: result: $YACC" >&5
6851 +echo "${ECHO_T}$YACC" >&6
6852 else
6853 - echo "$ac_t""no" 1>&6
6854 + echo "$as_me:$LINENO: result: no" >&5
6855 +echo "${ECHO_T}no" >&6
6856 fi
6857
6858 -test -n "$YACC" && break
6859 + test -n "$YACC" && break
6860 done
6861 test -n "$YACC" || YACC="yacc"
6862
6863 @@ -1579,126 +3029,77 @@
6864 # SunOS /usr/etc/install
6865 # IRIX /sbin/install
6866 # AIX /bin/install
6867 +# AmigaOS /C/install, which installs bootblocks on floppy discs
6868 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
6869 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
6870 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
6871 # ./install, which can be erroneously created by make from ./install.sh.
6872 -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
6873 -echo "configure:1588: checking for a BSD compatible install" >&5
6874 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
6875 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
6876 if test -z "$INSTALL"; then
6877 -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
6878 - echo $ac_n "(cached) $ac_c" 1>&6
6879 +if test "${ac_cv_path_install+set}" = set; then
6880 + echo $ECHO_N "(cached) $ECHO_C" >&6
6881 else
6882 - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
6883 - for ac_dir in $PATH; do
6884 - # Account for people who put trailing slashes in PATH elements.
6885 - case "$ac_dir/" in
6886 - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
6887 - *)
6888 - # OSF1 and SCO ODT 3.0 have their own names for install.
6889 - # Don't use installbsd from OSF since it installs stuff as root
6890 - # by default.
6891 - for ac_prog in ginstall scoinst install; do
6892 - if test -f $ac_dir/$ac_prog; then
6893 - if test $ac_prog = install &&
6894 - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
6895 - # AIX install. It has an incompatible calling convention.
6896 - :
6897 - else
6898 - ac_cv_path_install="$ac_dir/$ac_prog -c"
6899 - break 2
6900 - fi
6901 - fi
6902 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
6903 +for as_dir in $PATH
6904 +do
6905 + IFS=$as_save_IFS
6906 + test -z "$as_dir" && as_dir=.
6907 + # Account for people who put trailing slashes in PATH elements.
6908 +case $as_dir/ in
6909 + ./ | .// | /cC/* | \
6910 + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
6911 + /usr/ucb/* ) ;;
6912 + *)
6913 + # OSF1 and SCO ODT 3.0 have their own names for install.
6914 + # Don't use installbsd from OSF since it installs stuff as root
6915 + # by default.
6916 + for ac_prog in ginstall scoinst install; do
6917 + for ac_exec_ext in '' $ac_executable_extensions; do
6918 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
6919 + if test $ac_prog = install &&
6920 + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
6921 + # AIX install. It has an incompatible calling convention.
6922 + :
6923 + elif test $ac_prog = install &&
6924 + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
6925 + # program-specific install script used by HP pwplus--don't use.
6926 + :
6927 + else
6928 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
6929 + break 3
6930 + fi
6931 + fi
6932 done
6933 - ;;
6934 - esac
6935 - done
6936 - IFS="$ac_save_IFS"
6937 + done
6938 + ;;
6939 +esac
6940 +done
6941 +
6942
6943 fi
6944 if test "${ac_cv_path_install+set}" = set; then
6945 - INSTALL="$ac_cv_path_install"
6946 + INSTALL=$ac_cv_path_install
6947 else
6948 # As a last resort, use the slow shell script. We don't cache a
6949 # path for INSTALL within a source directory, because that will
6950 # break other packages using the cache if that directory is
6951 # removed, or if the path is relative.
6952 - INSTALL="$ac_install_sh"
6953 + INSTALL=$ac_install_sh
6954 fi
6955 fi
6956 -echo "$ac_t""$INSTALL" 1>&6
6957 +echo "$as_me:$LINENO: result: $INSTALL" >&5
6958 +echo "${ECHO_T}$INSTALL" >&6
6959
6960 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
6961 # It thinks the first close brace ends the variable substitution.
6962 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
6963
6964 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
6965 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
6966
6967 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
6968
6969
6970 -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
6971 -echo "configure:1642: checking for Cygwin environment" >&5
6972 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
6973 - echo $ac_n "(cached) $ac_c" 1>&6
6974 -else
6975 - cat > conftest.$ac_ext <<EOF
6976 -#line 1647 "configure"
6977 -#include "confdefs.h"
6978 -
6979 -int main() {
6980 -
6981 -#ifndef __CYGWIN__
6982 -#define __CYGWIN__ __CYGWIN32__
6983 -#endif
6984 -return __CYGWIN__;
6985 -; return 0; }
6986 -EOF
6987 -if { (eval echo configure:1658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6988 - rm -rf conftest*
6989 - ac_cv_cygwin=yes
6990 -else
6991 - echo "configure: failed program was:" >&5
6992 - cat conftest.$ac_ext >&5
6993 - rm -rf conftest*
6994 - ac_cv_cygwin=no
6995 -fi
6996 -rm -f conftest*
6997 -rm -f conftest*
6998 -fi
6999 -
7000 -echo "$ac_t""$ac_cv_cygwin" 1>&6
7001 -CYGWIN=
7002 -test "$ac_cv_cygwin" = yes && CYGWIN=yes
7003 -echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
7004 -echo "configure:1675: checking for mingw32 environment" >&5
7005 -if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
7006 - echo $ac_n "(cached) $ac_c" 1>&6
7007 -else
7008 - cat > conftest.$ac_ext <<EOF
7009 -#line 1680 "configure"
7010 -#include "confdefs.h"
7011 -
7012 -int main() {
7013 -return __MINGW32__;
7014 -; return 0; }
7015 -EOF
7016 -if { (eval echo configure:1687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7017 - rm -rf conftest*
7018 - ac_cv_mingw32=yes
7019 -else
7020 - echo "configure: failed program was:" >&5
7021 - cat conftest.$ac_ext >&5
7022 - rm -rf conftest*
7023 - ac_cv_mingw32=no
7024 -fi
7025 -rm -f conftest*
7026 -rm -f conftest*
7027 -fi
7028 -
7029 -echo "$ac_t""$ac_cv_mingw32" 1>&6
7030 -MINGW32=
7031 -test "$ac_cv_mingw32" = yes && MINGW32=yes
7032 # Check whether --enable-shared or --disable-shared was given.
7033 if test "${enable_shared+set}" = set; then
7034 enableval="$enable_shared"
7035 @@ -1720,8 +3121,7 @@
7036 esac
7037 else
7038 enable_shared=yes
7039 -fi
7040 -
7041 +fi;
7042 # Check whether --enable-static or --disable-static was given.
7043 if test "${enable_static+set}" = set; then
7044 enableval="$enable_static"
7045 @@ -1743,8 +3143,7 @@
7046 esac
7047 else
7048 enable_static=yes
7049 -fi
7050 -
7051 +fi;
7052 # Check whether --enable-fast-install or --disable-fast-install was given.
7053 if test "${enable_fast_install+set}" = set; then
7054 enableval="$enable_fast_install"
7055 @@ -1766,21 +3165,31 @@
7056 esac
7057 else
7058 enable_fast_install=yes
7059 +fi;
7060 +# Find the correct PATH separator. Usually this is `:', but
7061 +# DJGPP uses `;' like DOS.
7062 +if test "X${PATH_SEPARATOR+set}" != Xset; then
7063 + UNAME=${UNAME-`uname 2>/dev/null`}
7064 + case X$UNAME in
7065 + *-DOS) lt_cv_sys_path_separator=';' ;;
7066 + *) lt_cv_sys_path_separator=':' ;;
7067 + esac
7068 + PATH_SEPARATOR=$lt_cv_sys_path_separator
7069 fi
7070
7071 +
7072 # Check whether --with-gnu-ld or --without-gnu-ld was given.
7073 if test "${with_gnu_ld+set}" = set; then
7074 withval="$with_gnu_ld"
7075 test "$withval" = no || with_gnu_ld=yes
7076 else
7077 with_gnu_ld=no
7078 -fi
7079 -
7080 +fi;
7081 ac_prog=ld
7082 if test "$GCC" = yes; then
7083 # Check if gcc -print-prog-name=ld gives a path.
7084 - echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
7085 -echo "configure:1784: checking for ld used by GCC" >&5
7086 + echo "$as_me:$LINENO: checking for ld used by GCC" >&5
7087 +echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
7088 case $host in
7089 *-*-mingw*)
7090 # gcc leaves a trailing carriage return which upsets mingw
7091 @@ -1809,17 +3218,17 @@
7092 ;;
7093 esac
7094 elif test "$with_gnu_ld" = yes; then
7095 - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
7096 -echo "configure:1814: checking for GNU ld" >&5
7097 + echo "$as_me:$LINENO: checking for GNU ld" >&5
7098 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
7099 else
7100 - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
7101 -echo "configure:1817: checking for non-GNU ld" >&5
7102 + echo "$as_me:$LINENO: checking for non-GNU ld" >&5
7103 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
7104 fi
7105 -if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
7106 - echo $ac_n "(cached) $ac_c" 1>&6
7107 +if test "${lt_cv_path_LD+set}" = set; then
7108 + echo $ECHO_N "(cached) $ECHO_C" >&6
7109 else
7110 if test -z "$LD"; then
7111 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
7112 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
7113 for ac_dir in $PATH; do
7114 test -z "$ac_dir" && ac_dir=.
7115 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
7116 @@ -1842,15 +3251,19 @@
7117
7118 LD="$lt_cv_path_LD"
7119 if test -n "$LD"; then
7120 - echo "$ac_t""$LD" 1>&6
7121 + echo "$as_me:$LINENO: result: $LD" >&5
7122 +echo "${ECHO_T}$LD" >&6
7123 else
7124 - echo "$ac_t""no" 1>&6
7125 + echo "$as_me:$LINENO: result: no" >&5
7126 +echo "${ECHO_T}no" >&6
7127 fi
7128 -test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
7129 -echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
7130 -echo "configure:1852: checking if the linker ($LD) is GNU ld" >&5
7131 -if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
7132 - echo $ac_n "(cached) $ac_c" 1>&6
7133 +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
7134 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
7135 + { (exit 1); exit 1; }; }
7136 +echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
7137 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
7138 +if test "${lt_cv_prog_gnu_ld+set}" = set; then
7139 + echo $ECHO_N "(cached) $ECHO_C" >&6
7140 else
7141 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
7142 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
7143 @@ -1859,33 +3272,33 @@
7144 lt_cv_prog_gnu_ld=no
7145 fi
7146 fi
7147 -
7148 -echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
7149 +echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
7150 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
7151 with_gnu_ld=$lt_cv_prog_gnu_ld
7152
7153
7154 -echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
7155 -echo "configure:1869: checking for $LD option to reload object files" >&5
7156 -if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
7157 - echo $ac_n "(cached) $ac_c" 1>&6
7158 +echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
7159 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
7160 +if test "${lt_cv_ld_reload_flag+set}" = set; then
7161 + echo $ECHO_N "(cached) $ECHO_C" >&6
7162 else
7163 lt_cv_ld_reload_flag='-r'
7164 fi
7165 -
7166 -echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
7167 +echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
7168 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
7169 reload_flag=$lt_cv_ld_reload_flag
7170 test -n "$reload_flag" && reload_flag=" $reload_flag"
7171
7172 -echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
7173 -echo "configure:1881: checking for BSD-compatible nm" >&5
7174 -if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
7175 - echo $ac_n "(cached) $ac_c" 1>&6
7176 +echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
7177 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
7178 +if test "${lt_cv_path_NM+set}" = set; then
7179 + echo $ECHO_N "(cached) $ECHO_C" >&6
7180 else
7181 if test -n "$NM"; then
7182 # Let the user override the test.
7183 lt_cv_path_NM="$NM"
7184 else
7185 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
7186 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
7187 for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
7188 test -z "$ac_dir" && ac_dir=.
7189 tmp_nm=$ac_dir/${ac_tool_prefix}nm
7190 @@ -1912,33 +3325,109 @@
7191 fi
7192
7193 NM="$lt_cv_path_NM"
7194 -echo "$ac_t""$NM" 1>&6
7195 +echo "$as_me:$LINENO: result: $NM" >&5
7196 +echo "${ECHO_T}$NM" >&6
7197 +
7198 +echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
7199 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
7200 +if test "${lt_cv_path_SED+set}" = set; then
7201 + echo $ECHO_N "(cached) $ECHO_C" >&6
7202 +else
7203 + # Loop through the user's path and test for sed and gsed.
7204 +# Then use that list of sed's as ones to test for truncation.
7205 +as_executable_p="test -f"
7206 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
7207 +for as_dir in $PATH
7208 +do
7209 + IFS=$as_save_IFS
7210 + test -z "$as_dir" && as_dir=.
7211 + for ac_prog in sed gsed; do
7212 + for ac_exec_ext in '' $ac_executable_extensions; do
7213 + if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
7214 + _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
7215 + fi
7216 + done
7217 + done
7218 +done
7219 +
7220 + # Create a temporary directory, and hook for its removal unless debugging.
7221 +$debug ||
7222 +{
7223 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
7224 + trap '{ (exit 1); exit 1; }' 1 2 13 15
7225 +}
7226 +
7227 +# Create a (secure) tmp directory for tmp files.
7228 +: ${TMPDIR=/tmp}
7229 +{
7230 + tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
7231 + test -n "$tmp" && test -d "$tmp"
7232 +} ||
7233 +{
7234 + tmp=$TMPDIR/sed$$-$RANDOM
7235 + (umask 077 && mkdir $tmp)
7236 +} ||
7237 +{
7238 + echo "$me: cannot create a temporary directory in $TMPDIR" >&2
7239 + { (exit 1); exit 1; }
7240 +}
7241 + _max=0
7242 + _count=0
7243 + # Add /usr/xpg4/bin/sed as it is typically found on Solaris
7244 + # along with /bin/sed that truncates output.
7245 + for _sed in $_sed_list /usr/xpg4/bin/sed; do
7246 + test ! -f ${_sed} && break
7247 + cat /dev/null > "$tmp/sed.in"
7248 + _count=0
7249 + echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
7250 + # Check for GNU sed and select it if it is found.
7251 + if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
7252 + lt_cv_path_SED=${_sed}
7253 + break
7254 + fi
7255 + while true; do
7256 + cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
7257 + mv "$tmp/sed.tmp" "$tmp/sed.in"
7258 + cp "$tmp/sed.in" "$tmp/sed.nl"
7259 + echo >>"$tmp/sed.nl"
7260 + ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
7261 + cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
7262 + # 40000 chars as input seems more than enough
7263 + test $_count -gt 10 && break
7264 + _count=`expr $_count + 1`
7265 + if test $_count -gt $_max; then
7266 + _max=$_count
7267 + lt_cv_path_SED=$_sed
7268 + fi
7269 + done
7270 + done
7271 + rm -rf "$tmp"
7272
7273 -echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
7274 -echo "configure:1919: checking whether ln -s works" >&5
7275 -if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
7276 - echo $ac_n "(cached) $ac_c" 1>&6
7277 -else
7278 - rm -f conftestdata
7279 -if ln -s X conftestdata 2>/dev/null
7280 -then
7281 - rm -f conftestdata
7282 - ac_cv_prog_LN_S="ln -s"
7283 -else
7284 - ac_cv_prog_LN_S=ln
7285 fi
7286 +
7287 +if test "X$SED" != "X"; then
7288 + lt_cv_path_SED=$SED
7289 +else
7290 + SED=$lt_cv_path_SED
7291 fi
7292 -LN_S="$ac_cv_prog_LN_S"
7293 -if test "$ac_cv_prog_LN_S" = "ln -s"; then
7294 - echo "$ac_t""yes" 1>&6
7295 +echo "$as_me:$LINENO: result: $SED" >&5
7296 +echo "${ECHO_T}$SED" >&6
7297 +
7298 +echo "$as_me:$LINENO: checking whether ln -s works" >&5
7299 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
7300 +LN_S=$as_ln_s
7301 +if test "$LN_S" = "ln -s"; then
7302 + echo "$as_me:$LINENO: result: yes" >&5
7303 +echo "${ECHO_T}yes" >&6
7304 else
7305 - echo "$ac_t""no" 1>&6
7306 + echo "$as_me:$LINENO: result: no, using $LN_S" >&5
7307 +echo "${ECHO_T}no, using $LN_S" >&6
7308 fi
7309
7310 -echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6
7311 -echo "configure:1940: checking how to recognise dependant libraries" >&5
7312 -if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
7313 - echo $ac_n "(cached) $ac_c" 1>&6
7314 +echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
7315 +echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
7316 +if test "${lt_cv_deplibs_check_method+set}" = set; then
7317 + echo $ECHO_N "(cached) $ECHO_C" >&6
7318 else
7319 lt_cv_file_magic_cmd='$MAGIC_CMD'
7320 lt_cv_file_magic_test_file=
7321 @@ -1949,7 +3438,7 @@
7322 # `unknown' -- same as none, but documents that we really don't know.
7323 # 'pass_all' -- all dependencies passed with no checks.
7324 # 'test_compile' -- check by making test program.
7325 -# ['file_magic [regex]'] -- check by looking for files in library path
7326 +# 'file_magic [[regex]]' -- check by looking for files in library path
7327 # which responds to the $file_magic_cmd with a given egrep regex.
7328 # If you have `file' or equivalent on your system and you're not sure
7329 # whether `pass_all' will *always* work, you probably want this one.
7330 @@ -1978,7 +3467,7 @@
7331 lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
7332 lt_cv_file_magic_cmd='/usr/bin/file -L'
7333 case "$host_os" in
7334 - rhapsody* | darwin1.012)
7335 + rhapsody* | darwin1.[012])
7336 lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
7337 ;;
7338 *) # Darwin 1.3 on
7339 @@ -2013,9 +3502,9 @@
7340 lt_cv_file_magic_test_file=/usr/lib/libc.sl
7341 ;;
7342
7343 -irix5* | irix6*)
7344 +irix5* | irix6* | nonstopux*)
7345 case $host_os in
7346 - irix5*)
7347 + irix5* | nonstopux*)
7348 # this will be overridden with pass_all, but let us keep it just in case
7349 lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
7350 ;;
7351 @@ -2037,7 +3526,7 @@
7352 # This must be Linux ELF.
7353 linux-gnu*)
7354 case $host_cpu in
7355 - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* )
7356 + alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | arm* | m68k)
7357 lt_cv_deplibs_check_method=pass_all ;;
7358 *)
7359 # glibc up to 2.1.1 does not perform some relocations on ARM
7360 @@ -2060,6 +3549,16 @@
7361 lt_cv_file_magic_test_file=/usr/lib/libnls.so
7362 ;;
7363
7364 +openbsd*)
7365 + lt_cv_file_magic_cmd=/usr/bin/file
7366 + lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
7367 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
7368 + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
7369 + else
7370 + lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
7371 + fi
7372 + ;;
7373 +
7374 osf3* | osf4* | osf5*)
7375 # this will be overridden with pass_all, but let us keep it just in case
7376 lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
7377 @@ -2098,89 +3597,32 @@
7378 lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
7379 lt_cv_file_magic_test_file=/lib/libc.so
7380 ;;
7381 + siemens)
7382 + lt_cv_deplibs_check_method=pass_all
7383 + ;;
7384 esac
7385 ;;
7386 esac
7387
7388 fi
7389 -
7390 -echo "$ac_t""$lt_cv_deplibs_check_method" 1>&6
7391 +echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
7392 +echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
7393 file_magic_cmd=$lt_cv_file_magic_cmd
7394 deplibs_check_method=$lt_cv_deplibs_check_method
7395
7396 -echo $ac_n "checking for object suffix""... $ac_c" 1>&6
7397 -echo "configure:2113: checking for object suffix" >&5
7398 -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
7399 - echo $ac_n "(cached) $ac_c" 1>&6
7400 -else
7401 - rm -f conftest*
7402 -echo 'int i = 1;' > conftest.$ac_ext
7403 -if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7404 - for ac_file in conftest.*; do
7405 - case $ac_file in
7406 - *.c) ;;
7407 - *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
7408 - esac
7409 - done
7410 -else
7411 - { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
7412 -fi
7413 -rm -f conftest*
7414 -fi
7415 -
7416 -echo "$ac_t""$ac_cv_objext" 1>&6
7417 -OBJEXT=$ac_cv_objext
7418 -ac_objext=$ac_cv_objext
7419 -
7420 -
7421 -
7422 -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
7423 -echo "configure:2139: checking for executable suffix" >&5
7424 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
7425 - echo $ac_n "(cached) $ac_c" 1>&6
7426 -else
7427 - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
7428 - ac_cv_exeext=.exe
7429 -else
7430 - rm -f conftest*
7431 - echo 'int main () { return 0; }' > conftest.$ac_ext
7432 - ac_cv_exeext=
7433 - if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
7434 - for file in conftest.*; do
7435 - case $file in
7436 - *.c | *.o | *.obj) ;;
7437 - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
7438 - esac
7439 - done
7440 - else
7441 - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
7442 - fi
7443 - rm -f conftest*
7444 - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
7445 -fi
7446 -fi
7447
7448 -EXEEXT=""
7449 -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
7450 -echo "$ac_t""${ac_cv_exeext}" 1>&6
7451 -ac_exeext=$EXEEXT
7452
7453 -if test $host != $build; then
7454 - ac_tool_prefix=${host_alias}-
7455 -else
7456 - ac_tool_prefix=
7457 -fi
7458
7459
7460
7461
7462 # Check for command to grab the raw symbol name followed by C symbol from nm.
7463 -echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
7464 -echo "configure:2180: checking command to parse $NM output" >&5
7465 -if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
7466 - echo $ac_n "(cached) $ac_c" 1>&6
7467 +echo "$as_me:$LINENO: checking command to parse $NM output" >&5
7468 +echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
7469 +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
7470 + echo $ECHO_N "(cached) $ECHO_C" >&6
7471 else
7472 -
7473 +
7474 # These are sane defaults that work on at least a few old systems.
7475 # [They come from Ultrix. What could be older than Ultrix?!! ;)]
7476
7477 @@ -2196,6 +3638,9 @@
7478 # Transform an extracted symbol line into a proper C declaration
7479 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
7480
7481 +# Transform an extracted symbol line into symbol name and symbol address
7482 +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'"
7483 +
7484 # Define system-specific variables.
7485 case $host_os in
7486 aix*)
7487 @@ -2206,10 +3651,14 @@
7488 ;;
7489 hpux*) # Its linker distinguishes data from code symbols
7490 lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
7491 + 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'"
7492 ;;
7493 -irix*)
7494 +irix* | nonstopux*)
7495 symcode='[BCDEGRST]'
7496 ;;
7497 +osf*)
7498 + symcode='[BCDEGQRST]'
7499 + ;;
7500 solaris* | sysv5*)
7501 symcode='[BDT]'
7502 ;;
7503 @@ -2252,10 +3701,18 @@
7504 int main(){nm_test_var='a';nm_test_func();return(0);}
7505 EOF
7506
7507 - if { (eval echo configure:2256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7508 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7509 + (eval $ac_compile) 2>&5
7510 + ac_status=$?
7511 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7512 + (exit $ac_status); }; then
7513 # Now try to grab the symbols.
7514 nlist=conftest.nm
7515 - 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
7516 + if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
7517 + (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
7518 + ac_status=$?
7519 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7520 + (exit $ac_status); } && test -s "$nlist"; then
7521 # Try sorting and uniquifying the output.
7522 if sort "$nlist" | uniq > "$nlist"T; then
7523 mv -f "$nlist"T "$nlist"
7524 @@ -2277,23 +3734,23 @@
7525
7526 cat <<EOF >> conftest.$ac_ext
7527 #if defined (__STDC__) && __STDC__
7528 -# define lt_ptr_t void *
7529 +# define lt_ptr void *
7530 #else
7531 -# define lt_ptr_t char *
7532 +# define lt_ptr char *
7533 # define const
7534 #endif
7535
7536 /* The mapping between symbol names and symbols. */
7537 const struct {
7538 const char *name;
7539 - lt_ptr_t address;
7540 + lt_ptr address;
7541 }
7542 lt_preloaded_symbols[] =
7543 {
7544 EOF
7545 - sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext
7546 + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
7547 cat <<\EOF >> conftest.$ac_ext
7548 - {0, (lt_ptr_t) 0}
7549 + {0, (lt_ptr) 0}
7550 };
7551
7552 #ifdef __cplusplus
7553 @@ -2306,7 +3763,11 @@
7554 save_CFLAGS="$CFLAGS"
7555 LIBS="conftstm.$ac_objext"
7556 CFLAGS="$CFLAGS$no_builtin_flag"
7557 - if { (eval echo configure:2310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
7558 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
7559 + (eval $ac_link) 2>&5
7560 + ac_status=$?
7561 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7562 + (exit $ac_status); } && test -s conftest$ac_exeext; then
7563 pipe_works=yes
7564 fi
7565 LIBS="$save_LIBS"
7566 @@ -2339,84 +3800,665 @@
7567 global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
7568 if test -z "$lt_cv_sys_global_symbol_pipe"; then
7569 global_symbol_to_cdecl=
7570 + global_symbol_to_c_name_address=
7571 else
7572 global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
7573 + global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
7574 fi
7575 -if test -z "$global_symbol_pipe$global_symbol_to_cdecl"; then
7576 - echo "$ac_t""failed" 1>&6
7577 +if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
7578 +then
7579 + echo "$as_me:$LINENO: result: failed" >&5
7580 +echo "${ECHO_T}failed" >&6
7581 else
7582 - echo "$ac_t""ok" 1>&6
7583 + echo "$as_me:$LINENO: result: ok" >&5
7584 +echo "${ECHO_T}ok" >&6
7585 fi
7586
7587 -for ac_hdr in dlfcn.h
7588 +ac_ext=c
7589 +ac_cpp='$CPP $CPPFLAGS'
7590 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7591 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7592 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
7593 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
7594 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
7595 +# On Suns, sometimes $CPP names a directory.
7596 +if test -n "$CPP" && test -d "$CPP"; then
7597 + CPP=
7598 +fi
7599 +if test -z "$CPP"; then
7600 + if test "${ac_cv_prog_CPP+set}" = set; then
7601 + echo $ECHO_N "(cached) $ECHO_C" >&6
7602 +else
7603 + # Double quotes because CPP needs to be expanded
7604 + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
7605 + do
7606 + ac_preproc_ok=false
7607 +for ac_c_preproc_warn_flag in '' yes
7608 do
7609 -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
7610 -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
7611 -echo "configure:2356: checking for $ac_hdr" >&5
7612 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
7613 - echo $ac_n "(cached) $ac_c" 1>&6
7614 + # Use a header file that comes with gcc, so configuring glibc
7615 + # with a fresh cross-compiler works.
7616 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7617 + # <limits.h> exists even on freestanding compilers.
7618 + # On the NeXT, cc -E runs the code through the compiler's parser,
7619 + # not just through cpp. "Syntax error" is here to catch this case.
7620 + cat >conftest.$ac_ext <<_ACEOF
7621 +#line $LINENO "configure"
7622 +/* confdefs.h. */
7623 +_ACEOF
7624 +cat confdefs.h >>conftest.$ac_ext
7625 +cat >>conftest.$ac_ext <<_ACEOF
7626 +/* end confdefs.h. */
7627 +#ifdef __STDC__
7628 +# include <limits.h>
7629 +#else
7630 +# include <assert.h>
7631 +#endif
7632 + Syntax error
7633 +_ACEOF
7634 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7635 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7636 + ac_status=$?
7637 + grep -v '^ *+' conftest.er1 >conftest.err
7638 + rm -f conftest.er1
7639 + cat conftest.err >&5
7640 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7641 + (exit $ac_status); } >/dev/null; then
7642 + if test -s conftest.err; then
7643 + ac_cpp_err=$ac_c_preproc_warn_flag
7644 + else
7645 + ac_cpp_err=
7646 + fi
7647 else
7648 - cat > conftest.$ac_ext <<EOF
7649 -#line 2361 "configure"
7650 -#include "confdefs.h"
7651 -#include <$ac_hdr>
7652 -EOF
7653 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
7654 -{ (eval echo configure:2366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
7655 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
7656 -if test -z "$ac_err"; then
7657 - rm -rf conftest*
7658 - eval "ac_cv_header_$ac_safe=yes"
7659 + ac_cpp_err=yes
7660 +fi
7661 +if test -z "$ac_cpp_err"; then
7662 + :
7663 else
7664 - echo "$ac_err" >&5
7665 - echo "configure: failed program was:" >&5
7666 - cat conftest.$ac_ext >&5
7667 - rm -rf conftest*
7668 - eval "ac_cv_header_$ac_safe=no"
7669 + echo "$as_me: failed program was:" >&5
7670 +sed 's/^/| /' conftest.$ac_ext >&5
7671 +
7672 + # Broken: fails on valid input.
7673 +continue
7674 fi
7675 -rm -f conftest*
7676 +rm -f conftest.err conftest.$ac_ext
7677 +
7678 + # OK, works on sane cases. Now check whether non-existent headers
7679 + # can be detected and how.
7680 + cat >conftest.$ac_ext <<_ACEOF
7681 +#line $LINENO "configure"
7682 +/* confdefs.h. */
7683 +_ACEOF
7684 +cat confdefs.h >>conftest.$ac_ext
7685 +cat >>conftest.$ac_ext <<_ACEOF
7686 +/* end confdefs.h. */
7687 +#include <ac_nonexistent.h>
7688 +_ACEOF
7689 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7690 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7691 + ac_status=$?
7692 + grep -v '^ *+' conftest.er1 >conftest.err
7693 + rm -f conftest.er1
7694 + cat conftest.err >&5
7695 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7696 + (exit $ac_status); } >/dev/null; then
7697 + if test -s conftest.err; then
7698 + ac_cpp_err=$ac_c_preproc_warn_flag
7699 + else
7700 + ac_cpp_err=
7701 + fi
7702 +else
7703 + ac_cpp_err=yes
7704 fi
7705 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
7706 - echo "$ac_t""yes" 1>&6
7707 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
7708 - cat >> confdefs.h <<EOF
7709 -#define $ac_tr_hdr 1
7710 -EOF
7711 -
7712 +if test -z "$ac_cpp_err"; then
7713 + # Broken: success on invalid input.
7714 +continue
7715 else
7716 - echo "$ac_t""no" 1>&6
7717 + echo "$as_me: failed program was:" >&5
7718 +sed 's/^/| /' conftest.$ac_ext >&5
7719 +
7720 + # Passes both tests.
7721 +ac_preproc_ok=:
7722 +break
7723 fi
7724 +rm -f conftest.err conftest.$ac_ext
7725 +
7726 done
7727 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7728 +rm -f conftest.err conftest.$ac_ext
7729 +if $ac_preproc_ok; then
7730 + break
7731 +fi
7732
7733 + done
7734 + ac_cv_prog_CPP=$CPP
7735 +
7736 +fi
7737 + CPP=$ac_cv_prog_CPP
7738 +else
7739 + ac_cv_prog_CPP=$CPP
7740 +fi
7741 +echo "$as_me:$LINENO: result: $CPP" >&5
7742 +echo "${ECHO_T}$CPP" >&6
7743 +ac_preproc_ok=false
7744 +for ac_c_preproc_warn_flag in '' yes
7745 +do
7746 + # Use a header file that comes with gcc, so configuring glibc
7747 + # with a fresh cross-compiler works.
7748 + # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
7749 + # <limits.h> exists even on freestanding compilers.
7750 + # On the NeXT, cc -E runs the code through the compiler's parser,
7751 + # not just through cpp. "Syntax error" is here to catch this case.
7752 + cat >conftest.$ac_ext <<_ACEOF
7753 +#line $LINENO "configure"
7754 +/* confdefs.h. */
7755 +_ACEOF
7756 +cat confdefs.h >>conftest.$ac_ext
7757 +cat >>conftest.$ac_ext <<_ACEOF
7758 +/* end confdefs.h. */
7759 +#ifdef __STDC__
7760 +# include <limits.h>
7761 +#else
7762 +# include <assert.h>
7763 +#endif
7764 + Syntax error
7765 +_ACEOF
7766 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7767 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7768 + ac_status=$?
7769 + grep -v '^ *+' conftest.er1 >conftest.err
7770 + rm -f conftest.er1
7771 + cat conftest.err >&5
7772 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7773 + (exit $ac_status); } >/dev/null; then
7774 + if test -s conftest.err; then
7775 + ac_cpp_err=$ac_c_preproc_warn_flag
7776 + else
7777 + ac_cpp_err=
7778 + fi
7779 +else
7780 + ac_cpp_err=yes
7781 +fi
7782 +if test -z "$ac_cpp_err"; then
7783 + :
7784 +else
7785 + echo "$as_me: failed program was:" >&5
7786 +sed 's/^/| /' conftest.$ac_ext >&5
7787
7788 + # Broken: fails on valid input.
7789 +continue
7790 +fi
7791 +rm -f conftest.err conftest.$ac_ext
7792
7793 + # OK, works on sane cases. Now check whether non-existent headers
7794 + # can be detected and how.
7795 + cat >conftest.$ac_ext <<_ACEOF
7796 +#line $LINENO "configure"
7797 +/* confdefs.h. */
7798 +_ACEOF
7799 +cat confdefs.h >>conftest.$ac_ext
7800 +cat >>conftest.$ac_ext <<_ACEOF
7801 +/* end confdefs.h. */
7802 +#include <ac_nonexistent.h>
7803 +_ACEOF
7804 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
7805 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
7806 + ac_status=$?
7807 + grep -v '^ *+' conftest.er1 >conftest.err
7808 + rm -f conftest.er1
7809 + cat conftest.err >&5
7810 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7811 + (exit $ac_status); } >/dev/null; then
7812 + if test -s conftest.err; then
7813 + ac_cpp_err=$ac_c_preproc_warn_flag
7814 + else
7815 + ac_cpp_err=
7816 + fi
7817 +else
7818 + ac_cpp_err=yes
7819 +fi
7820 +if test -z "$ac_cpp_err"; then
7821 + # Broken: success on invalid input.
7822 +continue
7823 +else
7824 + echo "$as_me: failed program was:" >&5
7825 +sed 's/^/| /' conftest.$ac_ext >&5
7826
7827 + # Passes both tests.
7828 +ac_preproc_ok=:
7829 +break
7830 +fi
7831 +rm -f conftest.err conftest.$ac_ext
7832
7833 -# Only perform the check for file, if the check method requires it
7834 -case $deplibs_check_method in
7835 -file_magic*)
7836 - if test "$file_magic_cmd" = '$MAGIC_CMD'; then
7837 - echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
7838 -echo "configure:2401: checking for ${ac_tool_prefix}file" >&5
7839 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
7840 - echo $ac_n "(cached) $ac_c" 1>&6
7841 +done
7842 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
7843 +rm -f conftest.err conftest.$ac_ext
7844 +if $ac_preproc_ok; then
7845 + :
7846 else
7847 - case $MAGIC_CMD in
7848 - /*)
7849 - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
7850 - ;;
7851 - ?:/*)
7852 - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
7853 - ;;
7854 - *)
7855 - ac_save_MAGIC_CMD="$MAGIC_CMD"
7856 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
7857 - ac_dummy="/usr/bin:$PATH"
7858 - for ac_dir in $ac_dummy; do
7859 - test -z "$ac_dir" && ac_dir=.
7860 - if test -f $ac_dir/${ac_tool_prefix}file; then
7861 - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
7862 - if test -n "$file_magic_test_file"; then
7863 + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
7864 +See \`config.log' for more details." >&5
7865 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
7866 +See \`config.log' for more details." >&2;}
7867 + { (exit 1); exit 1; }; }
7868 +fi
7869 +
7870 +ac_ext=c
7871 +ac_cpp='$CPP $CPPFLAGS'
7872 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
7873 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
7874 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
7875 +
7876 +
7877 +echo "$as_me:$LINENO: checking for egrep" >&5
7878 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6
7879 +if test "${ac_cv_prog_egrep+set}" = set; then
7880 + echo $ECHO_N "(cached) $ECHO_C" >&6
7881 +else
7882 + if echo a | (grep -E '(a|b)') >/dev/null 2>&1
7883 + then ac_cv_prog_egrep='grep -E'
7884 + else ac_cv_prog_egrep='egrep'
7885 + fi
7886 +fi
7887 +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
7888 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6
7889 + EGREP=$ac_cv_prog_egrep
7890 +
7891 +
7892 +echo "$as_me:$LINENO: checking for ANSI C header files" >&5
7893 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
7894 +if test "${ac_cv_header_stdc+set}" = set; then
7895 + echo $ECHO_N "(cached) $ECHO_C" >&6
7896 +else
7897 + cat >conftest.$ac_ext <<_ACEOF
7898 +#line $LINENO "configure"
7899 +/* confdefs.h. */
7900 +_ACEOF
7901 +cat confdefs.h >>conftest.$ac_ext
7902 +cat >>conftest.$ac_ext <<_ACEOF
7903 +/* end confdefs.h. */
7904 +#include <stdlib.h>
7905 +#include <stdarg.h>
7906 +#include <string.h>
7907 +#include <float.h>
7908 +
7909 +int
7910 +main ()
7911 +{
7912 +
7913 + ;
7914 + return 0;
7915 +}
7916 +_ACEOF
7917 +rm -f conftest.$ac_objext
7918 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
7919 + (eval $ac_compile) 2>&5
7920 + ac_status=$?
7921 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7922 + (exit $ac_status); } &&
7923 + { ac_try='test -s conftest.$ac_objext'
7924 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
7925 + (eval $ac_try) 2>&5
7926 + ac_status=$?
7927 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
7928 + (exit $ac_status); }; }; then
7929 + ac_cv_header_stdc=yes
7930 +else
7931 + echo "$as_me: failed program was:" >&5
7932 +sed 's/^/| /' conftest.$ac_ext >&5
7933 +
7934 +ac_cv_header_stdc=no
7935 +fi
7936 +rm -f conftest.$ac_objext conftest.$ac_ext
7937 +
7938 +if test $ac_cv_header_stdc = yes; then
7939 + # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
7940 + cat >conftest.$ac_ext <<_ACEOF
7941 +#line $LINENO "configure"
7942 +/* confdefs.h. */
7943 +_ACEOF
7944 +cat confdefs.h >>conftest.$ac_ext
7945 +cat >>conftest.$ac_ext <<_ACEOF
7946 +/* end confdefs.h. */
7947 +#include <string.h>
7948 +
7949 +_ACEOF
7950 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
7951 + $EGREP "memchr" >/dev/null 2>&1; then
7952 + :
7953 +else
7954 + ac_cv_header_stdc=no
7955 +fi
7956 +rm -f conftest*
7957 +
7958 +fi
7959 +
7960 +if test $ac_cv_header_stdc = yes; then
7961 + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
7962 + cat >conftest.$ac_ext <<_ACEOF
7963 +#line $LINENO "configure"
7964 +/* confdefs.h. */
7965 +_ACEOF
7966 +cat confdefs.h >>conftest.$ac_ext
7967 +cat >>conftest.$ac_ext <<_ACEOF
7968 +/* end confdefs.h. */
7969 +#include <stdlib.h>
7970 +
7971 +_ACEOF
7972 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
7973 + $EGREP "free" >/dev/null 2>&1; then
7974 + :
7975 +else
7976 + ac_cv_header_stdc=no
7977 +fi
7978 +rm -f conftest*
7979 +
7980 +fi
7981 +
7982 +if test $ac_cv_header_stdc = yes; then
7983 + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
7984 + if test "$cross_compiling" = yes; then
7985 + :
7986 +else
7987 + cat >conftest.$ac_ext <<_ACEOF
7988 +#line $LINENO "configure"
7989 +/* confdefs.h. */
7990 +_ACEOF
7991 +cat confdefs.h >>conftest.$ac_ext
7992 +cat >>conftest.$ac_ext <<_ACEOF
7993 +/* end confdefs.h. */
7994 +#include <ctype.h>
7995 +#if ((' ' & 0x0FF) == 0x020)
7996 +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
7997 +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
7998 +#else
7999 +# define ISLOWER(c) \
8000 + (('a' <= (c) && (c) <= 'i') \
8001 + || ('j' <= (c) && (c) <= 'r') \
8002 + || ('s' <= (c) && (c) <= 'z'))
8003 +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
8004 +#endif
8005 +
8006 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
8007 +int
8008 +main ()
8009 +{
8010 + int i;
8011 + for (i = 0; i < 256; i++)
8012 + if (XOR (islower (i), ISLOWER (i))
8013 + || toupper (i) != TOUPPER (i))
8014 + exit(2);
8015 + exit (0);
8016 +}
8017 +_ACEOF
8018 +rm -f conftest$ac_exeext
8019 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8020 + (eval $ac_link) 2>&5
8021 + ac_status=$?
8022 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8023 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
8024 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8025 + (eval $ac_try) 2>&5
8026 + ac_status=$?
8027 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8028 + (exit $ac_status); }; }; then
8029 + :
8030 +else
8031 + echo "$as_me: program exited with status $ac_status" >&5
8032 +echo "$as_me: failed program was:" >&5
8033 +sed 's/^/| /' conftest.$ac_ext >&5
8034 +
8035 +( exit $ac_status )
8036 +ac_cv_header_stdc=no
8037 +fi
8038 +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
8039 +fi
8040 +fi
8041 +fi
8042 +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
8043 +echo "${ECHO_T}$ac_cv_header_stdc" >&6
8044 +if test $ac_cv_header_stdc = yes; then
8045 +
8046 +cat >>confdefs.h <<\_ACEOF
8047 +#define STDC_HEADERS 1
8048 +_ACEOF
8049 +
8050 +fi
8051 +
8052 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
8053 +
8054 +
8055 +
8056 +
8057 +
8058 +
8059 +
8060 +
8061 +
8062 +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
8063 + inttypes.h stdint.h unistd.h
8064 +do
8065 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8066 +echo "$as_me:$LINENO: checking for $ac_header" >&5
8067 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8068 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8069 + echo $ECHO_N "(cached) $ECHO_C" >&6
8070 +else
8071 + cat >conftest.$ac_ext <<_ACEOF
8072 +#line $LINENO "configure"
8073 +/* confdefs.h. */
8074 +_ACEOF
8075 +cat confdefs.h >>conftest.$ac_ext
8076 +cat >>conftest.$ac_ext <<_ACEOF
8077 +/* end confdefs.h. */
8078 +$ac_includes_default
8079 +
8080 +#include <$ac_header>
8081 +_ACEOF
8082 +rm -f conftest.$ac_objext
8083 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8084 + (eval $ac_compile) 2>&5
8085 + ac_status=$?
8086 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8087 + (exit $ac_status); } &&
8088 + { ac_try='test -s conftest.$ac_objext'
8089 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8090 + (eval $ac_try) 2>&5
8091 + ac_status=$?
8092 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8093 + (exit $ac_status); }; }; then
8094 + eval "$as_ac_Header=yes"
8095 +else
8096 + echo "$as_me: failed program was:" >&5
8097 +sed 's/^/| /' conftest.$ac_ext >&5
8098 +
8099 +eval "$as_ac_Header=no"
8100 +fi
8101 +rm -f conftest.$ac_objext conftest.$ac_ext
8102 +fi
8103 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8104 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8105 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
8106 + cat >>confdefs.h <<_ACEOF
8107 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
8108 +_ACEOF
8109 +
8110 +fi
8111 +
8112 +done
8113 +
8114 +
8115 +
8116 +for ac_header in dlfcn.h
8117 +do
8118 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
8119 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8120 + echo "$as_me:$LINENO: checking for $ac_header" >&5
8121 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8122 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8123 + echo $ECHO_N "(cached) $ECHO_C" >&6
8124 +fi
8125 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8126 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8127 +else
8128 + # Is the header compilable?
8129 +echo "$as_me:$LINENO: checking $ac_header usability" >&5
8130 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
8131 +cat >conftest.$ac_ext <<_ACEOF
8132 +#line $LINENO "configure"
8133 +/* confdefs.h. */
8134 +_ACEOF
8135 +cat confdefs.h >>conftest.$ac_ext
8136 +cat >>conftest.$ac_ext <<_ACEOF
8137 +/* end confdefs.h. */
8138 +$ac_includes_default
8139 +#include <$ac_header>
8140 +_ACEOF
8141 +rm -f conftest.$ac_objext
8142 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8143 + (eval $ac_compile) 2>&5
8144 + ac_status=$?
8145 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8146 + (exit $ac_status); } &&
8147 + { ac_try='test -s conftest.$ac_objext'
8148 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8149 + (eval $ac_try) 2>&5
8150 + ac_status=$?
8151 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8152 + (exit $ac_status); }; }; then
8153 + ac_header_compiler=yes
8154 +else
8155 + echo "$as_me: failed program was:" >&5
8156 +sed 's/^/| /' conftest.$ac_ext >&5
8157 +
8158 +ac_header_compiler=no
8159 +fi
8160 +rm -f conftest.$ac_objext conftest.$ac_ext
8161 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
8162 +echo "${ECHO_T}$ac_header_compiler" >&6
8163 +
8164 +# Is the header present?
8165 +echo "$as_me:$LINENO: checking $ac_header presence" >&5
8166 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
8167 +cat >conftest.$ac_ext <<_ACEOF
8168 +#line $LINENO "configure"
8169 +/* confdefs.h. */
8170 +_ACEOF
8171 +cat confdefs.h >>conftest.$ac_ext
8172 +cat >>conftest.$ac_ext <<_ACEOF
8173 +/* end confdefs.h. */
8174 +#include <$ac_header>
8175 +_ACEOF
8176 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
8177 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
8178 + ac_status=$?
8179 + grep -v '^ *+' conftest.er1 >conftest.err
8180 + rm -f conftest.er1
8181 + cat conftest.err >&5
8182 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8183 + (exit $ac_status); } >/dev/null; then
8184 + if test -s conftest.err; then
8185 + ac_cpp_err=$ac_c_preproc_warn_flag
8186 + else
8187 + ac_cpp_err=
8188 + fi
8189 +else
8190 + ac_cpp_err=yes
8191 +fi
8192 +if test -z "$ac_cpp_err"; then
8193 + ac_header_preproc=yes
8194 +else
8195 + echo "$as_me: failed program was:" >&5
8196 +sed 's/^/| /' conftest.$ac_ext >&5
8197 +
8198 + ac_header_preproc=no
8199 +fi
8200 +rm -f conftest.err conftest.$ac_ext
8201 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
8202 +echo "${ECHO_T}$ac_header_preproc" >&6
8203 +
8204 +# So? What about this header?
8205 +case $ac_header_compiler:$ac_header_preproc in
8206 + yes:no )
8207 + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
8208 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
8209 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
8210 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
8211 + (
8212 + cat <<\_ASBOX
8213 +## ------------------------------------ ##
8214 +## Report this to bug-autoconf@gnu.org. ##
8215 +## ------------------------------------ ##
8216 +_ASBOX
8217 + ) |
8218 + sed "s/^/$as_me: WARNING: /" >&2
8219 + ;;
8220 + no:yes )
8221 + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
8222 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
8223 + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
8224 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
8225 + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
8226 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
8227 + (
8228 + cat <<\_ASBOX
8229 +## ------------------------------------ ##
8230 +## Report this to bug-autoconf@gnu.org. ##
8231 +## ------------------------------------ ##
8232 +_ASBOX
8233 + ) |
8234 + sed "s/^/$as_me: WARNING: /" >&2
8235 + ;;
8236 +esac
8237 +echo "$as_me:$LINENO: checking for $ac_header" >&5
8238 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
8239 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
8240 + echo $ECHO_N "(cached) $ECHO_C" >&6
8241 +else
8242 + eval "$as_ac_Header=$ac_header_preproc"
8243 +fi
8244 +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
8245 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
8246 +
8247 +fi
8248 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
8249 + cat >>confdefs.h <<_ACEOF
8250 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
8251 +_ACEOF
8252 +
8253 +fi
8254 +
8255 +done
8256 +
8257 +
8258 +
8259 +
8260 +
8261 +
8262 +# Only perform the check for file, if the check method requires it
8263 +case $deplibs_check_method in
8264 +file_magic*)
8265 + if test "$file_magic_cmd" = '$MAGIC_CMD'; then
8266 + echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
8267 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
8268 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
8269 + echo $ECHO_N "(cached) $ECHO_C" >&6
8270 +else
8271 + case $MAGIC_CMD in
8272 + /*)
8273 + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
8274 + ;;
8275 + ?:/*)
8276 + lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
8277 + ;;
8278 + *)
8279 + ac_save_MAGIC_CMD="$MAGIC_CMD"
8280 + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8281 + ac_dummy="/usr/bin:$PATH"
8282 + for ac_dir in $ac_dummy; do
8283 + test -z "$ac_dir" && ac_dir=.
8284 + if test -f $ac_dir/${ac_tool_prefix}file; then
8285 + lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
8286 + if test -n "$file_magic_test_file"; then
8287 case $deplibs_check_method in
8288 "file_magic "*)
8289 file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
8290 @@ -2451,17 +4493,19 @@
8291
8292 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
8293 if test -n "$MAGIC_CMD"; then
8294 - echo "$ac_t""$MAGIC_CMD" 1>&6
8295 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
8296 +echo "${ECHO_T}$MAGIC_CMD" >&6
8297 else
8298 - echo "$ac_t""no" 1>&6
8299 + echo "$as_me:$LINENO: result: no" >&5
8300 +echo "${ECHO_T}no" >&6
8301 fi
8302
8303 if test -z "$lt_cv_path_MAGIC_CMD"; then
8304 if test -n "$ac_tool_prefix"; then
8305 - echo $ac_n "checking for file""... $ac_c" 1>&6
8306 -echo "configure:2463: checking for file" >&5
8307 -if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
8308 - echo $ac_n "(cached) $ac_c" 1>&6
8309 + echo "$as_me:$LINENO: checking for file" >&5
8310 +echo $ECHO_N "checking for file... $ECHO_C" >&6
8311 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
8312 + echo $ECHO_N "(cached) $ECHO_C" >&6
8313 else
8314 case $MAGIC_CMD in
8315 /*)
8316 @@ -2513,9 +4557,11 @@
8317
8318 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
8319 if test -n "$MAGIC_CMD"; then
8320 - echo "$ac_t""$MAGIC_CMD" 1>&6
8321 + echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
8322 +echo "${ECHO_T}$MAGIC_CMD" >&6
8323 else
8324 - echo "$ac_t""no" 1>&6
8325 + echo "$as_me:$LINENO: result: no" >&5
8326 +echo "${ECHO_T}no" >&6
8327 fi
8328
8329 else
8330 @@ -2527,138 +4573,164 @@
8331 ;;
8332 esac
8333
8334 -# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
8335 +if test -n "$ac_tool_prefix"; then
8336 + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
8337 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
8338 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
8339 -echo "configure:2534: checking for $ac_word" >&5
8340 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
8341 - echo $ac_n "(cached) $ac_c" 1>&6
8342 +echo "$as_me:$LINENO: checking for $ac_word" >&5
8343 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8344 +if test "${ac_cv_prog_RANLIB+set}" = set; then
8345 + echo $ECHO_N "(cached) $ECHO_C" >&6
8346 else
8347 if test -n "$RANLIB"; then
8348 ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
8349 else
8350 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8351 - ac_dummy="$PATH"
8352 - for ac_dir in $ac_dummy; do
8353 - test -z "$ac_dir" && ac_dir=.
8354 - if test -f $ac_dir/$ac_word; then
8355 - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
8356 - break
8357 - fi
8358 - done
8359 - IFS="$ac_save_ifs"
8360 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8361 +for as_dir in $PATH
8362 +do
8363 + IFS=$as_save_IFS
8364 + test -z "$as_dir" && as_dir=.
8365 + for ac_exec_ext in '' $ac_executable_extensions; do
8366 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8367 + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
8368 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8369 + break 2
8370 + fi
8371 +done
8372 +done
8373 +
8374 fi
8375 fi
8376 -RANLIB="$ac_cv_prog_RANLIB"
8377 +RANLIB=$ac_cv_prog_RANLIB
8378 if test -n "$RANLIB"; then
8379 - echo "$ac_t""$RANLIB" 1>&6
8380 + echo "$as_me:$LINENO: result: $RANLIB" >&5
8381 +echo "${ECHO_T}$RANLIB" >&6
8382 else
8383 - echo "$ac_t""no" 1>&6
8384 + echo "$as_me:$LINENO: result: no" >&5
8385 +echo "${ECHO_T}no" >&6
8386 fi
8387
8388 -
8389 +fi
8390 if test -z "$ac_cv_prog_RANLIB"; then
8391 -if test -n "$ac_tool_prefix"; then
8392 + ac_ct_RANLIB=$RANLIB
8393 # Extract the first word of "ranlib", so it can be a program name with args.
8394 set dummy ranlib; ac_word=$2
8395 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
8396 -echo "configure:2566: checking for $ac_word" >&5
8397 -if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
8398 - echo $ac_n "(cached) $ac_c" 1>&6
8399 +echo "$as_me:$LINENO: checking for $ac_word" >&5
8400 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8401 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
8402 + echo $ECHO_N "(cached) $ECHO_C" >&6
8403 else
8404 - if test -n "$RANLIB"; then
8405 - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
8406 + if test -n "$ac_ct_RANLIB"; then
8407 + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
8408 else
8409 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8410 - ac_dummy="$PATH"
8411 - for ac_dir in $ac_dummy; do
8412 - test -z "$ac_dir" && ac_dir=.
8413 - if test -f $ac_dir/$ac_word; then
8414 - ac_cv_prog_RANLIB="ranlib"
8415 - break
8416 - fi
8417 - done
8418 - IFS="$ac_save_ifs"
8419 - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
8420 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8421 +for as_dir in $PATH
8422 +do
8423 + IFS=$as_save_IFS
8424 + test -z "$as_dir" && as_dir=.
8425 + for ac_exec_ext in '' $ac_executable_extensions; do
8426 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8427 + ac_cv_prog_ac_ct_RANLIB="ranlib"
8428 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8429 + break 2
8430 + fi
8431 +done
8432 +done
8433 +
8434 + test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
8435 fi
8436 fi
8437 -RANLIB="$ac_cv_prog_RANLIB"
8438 -if test -n "$RANLIB"; then
8439 - echo "$ac_t""$RANLIB" 1>&6
8440 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
8441 +if test -n "$ac_ct_RANLIB"; then
8442 + echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
8443 +echo "${ECHO_T}$ac_ct_RANLIB" >&6
8444 else
8445 - echo "$ac_t""no" 1>&6
8446 + echo "$as_me:$LINENO: result: no" >&5
8447 +echo "${ECHO_T}no" >&6
8448 fi
8449
8450 + RANLIB=$ac_ct_RANLIB
8451 else
8452 - RANLIB=":"
8453 -fi
8454 + RANLIB="$ac_cv_prog_RANLIB"
8455 fi
8456
8457 -# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8458 +if test -n "$ac_tool_prefix"; then
8459 + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
8460 set dummy ${ac_tool_prefix}strip; ac_word=$2
8461 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
8462 -echo "configure:2601: checking for $ac_word" >&5
8463 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
8464 - echo $ac_n "(cached) $ac_c" 1>&6
8465 +echo "$as_me:$LINENO: checking for $ac_word" >&5
8466 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8467 +if test "${ac_cv_prog_STRIP+set}" = set; then
8468 + echo $ECHO_N "(cached) $ECHO_C" >&6
8469 else
8470 if test -n "$STRIP"; then
8471 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
8472 else
8473 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8474 - ac_dummy="$PATH"
8475 - for ac_dir in $ac_dummy; do
8476 - test -z "$ac_dir" && ac_dir=.
8477 - if test -f $ac_dir/$ac_word; then
8478 - ac_cv_prog_STRIP="${ac_tool_prefix}strip"
8479 - break
8480 - fi
8481 - done
8482 - IFS="$ac_save_ifs"
8483 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8484 +for as_dir in $PATH
8485 +do
8486 + IFS=$as_save_IFS
8487 + test -z "$as_dir" && as_dir=.
8488 + for ac_exec_ext in '' $ac_executable_extensions; do
8489 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8490 + ac_cv_prog_STRIP="${ac_tool_prefix}strip"
8491 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8492 + break 2
8493 + fi
8494 +done
8495 +done
8496 +
8497 fi
8498 fi
8499 -STRIP="$ac_cv_prog_STRIP"
8500 +STRIP=$ac_cv_prog_STRIP
8501 if test -n "$STRIP"; then
8502 - echo "$ac_t""$STRIP" 1>&6
8503 + echo "$as_me:$LINENO: result: $STRIP" >&5
8504 +echo "${ECHO_T}$STRIP" >&6
8505 else
8506 - echo "$ac_t""no" 1>&6
8507 + echo "$as_me:$LINENO: result: no" >&5
8508 +echo "${ECHO_T}no" >&6
8509 fi
8510
8511 -
8512 +fi
8513 if test -z "$ac_cv_prog_STRIP"; then
8514 -if test -n "$ac_tool_prefix"; then
8515 + ac_ct_STRIP=$STRIP
8516 # Extract the first word of "strip", so it can be a program name with args.
8517 set dummy strip; ac_word=$2
8518 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
8519 -echo "configure:2633: checking for $ac_word" >&5
8520 -if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
8521 - echo $ac_n "(cached) $ac_c" 1>&6
8522 +echo "$as_me:$LINENO: checking for $ac_word" >&5
8523 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
8524 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
8525 + echo $ECHO_N "(cached) $ECHO_C" >&6
8526 else
8527 - if test -n "$STRIP"; then
8528 - ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
8529 + if test -n "$ac_ct_STRIP"; then
8530 + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
8531 else
8532 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
8533 - ac_dummy="$PATH"
8534 - for ac_dir in $ac_dummy; do
8535 - test -z "$ac_dir" && ac_dir=.
8536 - if test -f $ac_dir/$ac_word; then
8537 - ac_cv_prog_STRIP="strip"
8538 - break
8539 - fi
8540 - done
8541 - IFS="$ac_save_ifs"
8542 - test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
8543 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
8544 +for as_dir in $PATH
8545 +do
8546 + IFS=$as_save_IFS
8547 + test -z "$as_dir" && as_dir=.
8548 + for ac_exec_ext in '' $ac_executable_extensions; do
8549 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
8550 + ac_cv_prog_ac_ct_STRIP="strip"
8551 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
8552 + break 2
8553 + fi
8554 +done
8555 +done
8556 +
8557 + test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
8558 fi
8559 fi
8560 -STRIP="$ac_cv_prog_STRIP"
8561 -if test -n "$STRIP"; then
8562 - echo "$ac_t""$STRIP" 1>&6
8563 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
8564 +if test -n "$ac_ct_STRIP"; then
8565 + echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
8566 +echo "${ECHO_T}$ac_ct_STRIP" >&6
8567 else
8568 - echo "$ac_t""no" 1>&6
8569 + echo "$as_me:$LINENO: result: no" >&5
8570 +echo "${ECHO_T}no" >&6
8571 fi
8572
8573 + STRIP=$ac_ct_STRIP
8574 else
8575 - STRIP=":"
8576 -fi
8577 + STRIP="$ac_cv_prog_STRIP"
8578 fi
8579
8580
8581 @@ -2668,9 +4740,8 @@
8582 # Check whether --enable-libtool-lock or --disable-libtool-lock was given.
8583 if test "${enable_libtool_lock+set}" = set; then
8584 enableval="$enable_libtool_lock"
8585 - :
8586 -fi
8587
8588 +fi;
8589 test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
8590
8591 # Some flags need to be propagated to the compiler or linker for good
8592 @@ -2678,8 +4749,12 @@
8593 case $host in
8594 *-*-irix6*)
8595 # Find out which ABI we are using.
8596 - echo '#line 2682 "configure"' > conftest.$ac_ext
8597 - if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8598 + echo '#line 4752 "configure"' > conftest.$ac_ext
8599 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8600 + (eval $ac_compile) 2>&5
8601 + ac_status=$?
8602 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8603 + (exit $ac_status); }; then
8604 case `/usr/bin/file conftest.$ac_objext` in
8605 *32-bit*)
8606 LD="${LD-ld} -32"
8607 @@ -2699,47 +4774,64 @@
8608 # On SCO OpenServer 5, we need -belf to get full-featured binaries.
8609 SAVE_CFLAGS="$CFLAGS"
8610 CFLAGS="$CFLAGS -belf"
8611 - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
8612 -echo "configure:2704: checking whether the C compiler needs -belf" >&5
8613 -if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
8614 - echo $ac_n "(cached) $ac_c" 1>&6
8615 + echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
8616 +echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
8617 +if test "${lt_cv_cc_needs_belf+set}" = set; then
8618 + echo $ECHO_N "(cached) $ECHO_C" >&6
8619 else
8620 -
8621 +
8622 +
8623 ac_ext=c
8624 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
8625 ac_cpp='$CPP $CPPFLAGS'
8626 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
8627 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
8628 -cross_compiling=$ac_cv_prog_cc_cross
8629 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8630 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8631 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
8632 +
8633 + cat >conftest.$ac_ext <<_ACEOF
8634 +#line $LINENO "configure"
8635 +/* confdefs.h. */
8636 +_ACEOF
8637 +cat confdefs.h >>conftest.$ac_ext
8638 +cat >>conftest.$ac_ext <<_ACEOF
8639 +/* end confdefs.h. */
8640
8641 - cat > conftest.$ac_ext <<EOF
8642 -#line 2717 "configure"
8643 -#include "confdefs.h"
8644 -
8645 -int main() {
8646 +int
8647 +main ()
8648 +{
8649
8650 -; return 0; }
8651 -EOF
8652 -if { (eval echo configure:2724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8653 - rm -rf conftest*
8654 + ;
8655 + return 0;
8656 +}
8657 +_ACEOF
8658 +rm -f conftest.$ac_objext conftest$ac_exeext
8659 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8660 + (eval $ac_link) 2>&5
8661 + ac_status=$?
8662 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8663 + (exit $ac_status); } &&
8664 + { ac_try='test -s conftest$ac_exeext'
8665 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8666 + (eval $ac_try) 2>&5
8667 + ac_status=$?
8668 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8669 + (exit $ac_status); }; }; then
8670 lt_cv_cc_needs_belf=yes
8671 else
8672 - echo "configure: failed program was:" >&5
8673 - cat conftest.$ac_ext >&5
8674 - rm -rf conftest*
8675 - lt_cv_cc_needs_belf=no
8676 + echo "$as_me: failed program was:" >&5
8677 +sed 's/^/| /' conftest.$ac_ext >&5
8678 +
8679 +lt_cv_cc_needs_belf=no
8680 fi
8681 -rm -f conftest*
8682 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8683 ac_ext=c
8684 -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
8685 ac_cpp='$CPP $CPPFLAGS'
8686 -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
8687 -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
8688 -cross_compiling=$ac_cv_prog_cc_cross
8689 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
8690 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
8691 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
8692
8693 fi
8694 -
8695 -echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
8696 +echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
8697 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
8698 if test x"$lt_cv_cc_needs_belf" != x"yes"; then
8699 # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
8700 CFLAGS="$SAVE_CFLAGS"
8701 @@ -2824,16 +4916,23 @@
8702 old_postuninstall_cmds=
8703
8704 if test -n "$RANLIB"; then
8705 + case $host_os in
8706 + openbsd*)
8707 + old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
8708 + ;;
8709 + *)
8710 + old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
8711 + ;;
8712 + esac
8713 old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
8714 - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
8715 fi
8716
8717 # Allow CC to be a program name with arguments.
8718 set dummy $CC
8719 compiler="$2"
8720
8721 -echo $ac_n "checking for objdir""... $ac_c" 1>&6
8722 -echo "configure:2837: checking for objdir" >&5
8723 +echo "$as_me:$LINENO: checking for objdir" >&5
8724 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6
8725 rm -f .libs 2>/dev/null
8726 mkdir .libs 2>/dev/null
8727 if test -d .libs; then
8728 @@ -2843,7 +4942,9 @@
8729 objdir=_libs
8730 fi
8731 rmdir .libs 2>/dev/null
8732 -echo "$ac_t""$objdir" 1>&6
8733 +echo "$as_me:$LINENO: result: $objdir" >&5
8734 +echo "${ECHO_T}$objdir" >&6
8735 +
8736
8737
8738 # Check whether --with-pic or --without-pic was given.
8739 @@ -2852,17 +4953,16 @@
8740 pic_mode="$withval"
8741 else
8742 pic_mode=default
8743 -fi
8744 -
8745 +fi;
8746 test -z "$pic_mode" && pic_mode=default
8747
8748 # We assume here that the value for lt_cv_prog_cc_pic will not be cached
8749 # in isolation, and that seeing it set (from the cache) indicates that
8750 # the associated values are set (in the cache) correctly too.
8751 -echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
8752 -echo "configure:2864: checking for $compiler option to produce PIC" >&5
8753 -if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
8754 - echo $ac_n "(cached) $ac_c" 1>&6
8755 +echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
8756 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
8757 +if test "${lt_cv_prog_cc_pic+set}" = set; then
8758 + echo $ECHO_N "(cached) $ECHO_C" >&6
8759 else
8760 lt_cv_prog_cc_pic=
8761 lt_cv_prog_cc_shlib=
8762 @@ -2882,7 +4982,7 @@
8763 # libC (AIX C++ library), which obviously doesn't included in libraries
8764 # list by gcc. This cause undefined symbols with -static flags.
8765 # This hack allows C programs to be linked with "-static -ldl", but
8766 - # we not sure about C++ programs.
8767 + # not sure about C++ programs.
8768 lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
8769 ;;
8770 amigaos*)
8771 @@ -2891,7 +4991,7 @@
8772 # like `-m68040'.
8773 lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
8774 ;;
8775 - beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
8776 + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
8777 # PIC is the default for these OSes.
8778 ;;
8779 darwin* | rhapsody*)
8780 @@ -2917,13 +5017,13 @@
8781 # PORTME Check for PIC flags for the system compiler.
8782 case $host_os in
8783 aix3* | aix4* | aix5*)
8784 + lt_cv_prog_cc_wl='-Wl,'
8785 # All AIX code is PIC.
8786 if test "$host_cpu" = ia64; then
8787 - # AIX 5 now supports IA64 processor
8788 - lt_cv_prog_cc_static='-Bstatic'
8789 - lt_cv_prog_cc_wl='-Wl,'
8790 + # AIX 5 now supports IA64 processor
8791 + lt_cv_prog_cc_static='-Bstatic'
8792 else
8793 - lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
8794 + lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
8795 fi
8796 ;;
8797
8798 @@ -2934,7 +5034,7 @@
8799 lt_cv_prog_cc_pic='+Z'
8800 ;;
8801
8802 - irix5* | irix6*)
8803 + irix5* | irix6* | nonstopux*)
8804 lt_cv_prog_cc_wl='-Wl,'
8805 lt_cv_prog_cc_static='-non_shared'
8806 # PIC (with -KPIC) is the default.
8807 @@ -2978,11 +5078,7 @@
8808 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
8809 lt_cv_prog_cc_pic='-KPIC'
8810 lt_cv_prog_cc_static='-Bstatic'
8811 - if test "x$host_vendor" = xsni; then
8812 - lt_cv_prog_cc_wl='-LD'
8813 - else
8814 - lt_cv_prog_cc_wl='-Wl,'
8815 - fi
8816 + lt_cv_prog_cc_wl='-Wl,'
8817 ;;
8818
8819 uts4*)
8820 @@ -3006,28 +5102,48 @@
8821 fi
8822
8823 if test -z "$lt_cv_prog_cc_pic"; then
8824 - echo "$ac_t""none" 1>&6
8825 + echo "$as_me:$LINENO: result: none" >&5
8826 +echo "${ECHO_T}none" >&6
8827 else
8828 - echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
8829 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5
8830 +echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
8831
8832 # Check to make sure the pic_flag actually works.
8833 - echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
8834 -echo "configure:3016: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
8835 - if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
8836 - echo $ac_n "(cached) $ac_c" 1>&6
8837 + echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
8838 +echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
8839 + if test "${lt_cv_prog_cc_pic_works+set}" = set; then
8840 + echo $ECHO_N "(cached) $ECHO_C" >&6
8841 else
8842 save_CFLAGS="$CFLAGS"
8843 CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
8844 - cat > conftest.$ac_ext <<EOF
8845 -#line 3023 "configure"
8846 -#include "confdefs.h"
8847 + cat >conftest.$ac_ext <<_ACEOF
8848 +#line $LINENO "configure"
8849 +/* confdefs.h. */
8850 +_ACEOF
8851 +cat confdefs.h >>conftest.$ac_ext
8852 +cat >>conftest.$ac_ext <<_ACEOF
8853 +/* end confdefs.h. */
8854
8855 -int main() {
8856 +int
8857 +main ()
8858 +{
8859
8860 -; return 0; }
8861 -EOF
8862 -if { (eval echo configure:3030: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8863 - rm -rf conftest*
8864 + ;
8865 + return 0;
8866 +}
8867 +_ACEOF
8868 +rm -f conftest.$ac_objext
8869 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
8870 + (eval $ac_compile) 2>&5
8871 + ac_status=$?
8872 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8873 + (exit $ac_status); } &&
8874 + { ac_try='test -s conftest.$ac_objext'
8875 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8876 + (eval $ac_try) 2>&5
8877 + ac_status=$?
8878 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8879 + (exit $ac_status); }; }; then
8880 case $host_os in
8881 hpux9* | hpux10* | hpux11*)
8882 # On HP-UX, both CC and GCC only warn that PIC is supported... then
8883 @@ -3043,17 +5159,17 @@
8884 lt_cv_prog_cc_pic_works=yes
8885 ;;
8886 esac
8887 -
8888 +
8889 else
8890 - echo "configure: failed program was:" >&5
8891 - cat conftest.$ac_ext >&5
8892 - rm -rf conftest*
8893 - lt_cv_prog_cc_pic_works=no
8894 -
8895 + echo "$as_me: failed program was:" >&5
8896 +sed 's/^/| /' conftest.$ac_ext >&5
8897 +
8898 + lt_cv_prog_cc_pic_works=no
8899 +
8900 fi
8901 -rm -f conftest*
8902 +rm -f conftest.$ac_objext conftest.$ac_ext
8903 CFLAGS="$save_CFLAGS"
8904 -
8905 +
8906 fi
8907
8908
8909 @@ -3064,43 +5180,65 @@
8910 lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
8911 fi
8912
8913 - echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
8914 + echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5
8915 +echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
8916 fi
8917
8918 # Check for any special shared library compilation flags.
8919 if test -n "$lt_cv_prog_cc_shlib"; then
8920 - echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
8921 + { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
8922 +echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
8923 if echo "$old_CC $old_CFLAGS " | egrep -e "[ ]$lt_cv_prog_cc_shlib[ ]" >/dev/null; then :
8924 else
8925 - echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
8926 + { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
8927 +echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
8928 lt_cv_prog_cc_can_build_shared=no
8929 fi
8930 fi
8931
8932 -echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
8933 -echo "configure:3082: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
8934 -if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
8935 - echo $ac_n "(cached) $ac_c" 1>&6
8936 +echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
8937 +echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
8938 +if test "${lt_cv_prog_cc_static_works+set}" = set; then
8939 + echo $ECHO_N "(cached) $ECHO_C" >&6
8940 else
8941 lt_cv_prog_cc_static_works=no
8942 save_LDFLAGS="$LDFLAGS"
8943 LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
8944 - cat > conftest.$ac_ext <<EOF
8945 -#line 3090 "configure"
8946 -#include "confdefs.h"
8947 + cat >conftest.$ac_ext <<_ACEOF
8948 +#line $LINENO "configure"
8949 +/* confdefs.h. */
8950 +_ACEOF
8951 +cat confdefs.h >>conftest.$ac_ext
8952 +cat >>conftest.$ac_ext <<_ACEOF
8953 +/* end confdefs.h. */
8954
8955 -int main() {
8956 +int
8957 +main ()
8958 +{
8959
8960 -; return 0; }
8961 -EOF
8962 -if { (eval echo configure:3097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8963 - rm -rf conftest*
8964 + ;
8965 + return 0;
8966 +}
8967 +_ACEOF
8968 +rm -f conftest.$ac_objext conftest$ac_exeext
8969 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
8970 + (eval $ac_link) 2>&5
8971 + ac_status=$?
8972 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8973 + (exit $ac_status); } &&
8974 + { ac_try='test -s conftest$ac_exeext'
8975 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
8976 + (eval $ac_try) 2>&5
8977 + ac_status=$?
8978 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
8979 + (exit $ac_status); }; }; then
8980 lt_cv_prog_cc_static_works=yes
8981 else
8982 - echo "configure: failed program was:" >&5
8983 - cat conftest.$ac_ext >&5
8984 + echo "$as_me: failed program was:" >&5
8985 +sed 's/^/| /' conftest.$ac_ext >&5
8986 +
8987 fi
8988 -rm -f conftest*
8989 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
8990 LDFLAGS="$save_LDFLAGS"
8991
8992 fi
8993 @@ -3108,7 +5246,8 @@
8994
8995 # Belt *and* braces to stop my trousers falling down:
8996 test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
8997 -echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
8998 +echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5
8999 +echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
9000
9001 pic_flag="$lt_cv_prog_cc_pic"
9002 special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
9003 @@ -3119,12 +5258,12 @@
9004
9005
9006 # Check to see if options -o and -c are simultaneously supported by compiler
9007 -echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
9008 -echo "configure:3124: checking if $compiler supports -c -o file.$ac_objext" >&5
9009 -if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
9010 - echo $ac_n "(cached) $ac_c" 1>&6
9011 +echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
9012 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
9013 +if test "${lt_cv_compiler_c_o+set}" = set; then
9014 + echo $ECHO_N "(cached) $ECHO_C" >&6
9015 else
9016 -
9017 +
9018 $rm -r conftest 2>/dev/null
9019 mkdir conftest
9020 cd conftest
9021 @@ -3139,7 +5278,7 @@
9022 save_CFLAGS="$CFLAGS"
9023 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
9024 compiler_c_o=no
9025 -if { (eval echo configure:3143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
9026 +if { (eval echo configure:5281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
9027 # The compiler can only warn and ignore the option if not recognized
9028 # So say no if there are warnings
9029 if test -s out/conftest.err; then
9030 @@ -3163,29 +5302,50 @@
9031 fi
9032
9033 compiler_c_o=$lt_cv_compiler_c_o
9034 -echo "$ac_t""$compiler_c_o" 1>&6
9035 +echo "$as_me:$LINENO: result: $compiler_c_o" >&5
9036 +echo "${ECHO_T}$compiler_c_o" >&6
9037
9038 if test x"$compiler_c_o" = x"yes"; then
9039 # Check to see if we can write to a .lo
9040 - echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
9041 -echo "configure:3172: checking if $compiler supports -c -o file.lo" >&5
9042 - if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
9043 - echo $ac_n "(cached) $ac_c" 1>&6
9044 + echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5
9045 +echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
9046 + if test "${lt_cv_compiler_o_lo+set}" = set; then
9047 + echo $ECHO_N "(cached) $ECHO_C" >&6
9048 else
9049 -
9050 +
9051 lt_cv_compiler_o_lo=no
9052 save_CFLAGS="$CFLAGS"
9053 CFLAGS="$CFLAGS -c -o conftest.lo"
9054 - cat > conftest.$ac_ext <<EOF
9055 -#line 3181 "configure"
9056 -#include "confdefs.h"
9057 + save_objext="$ac_objext"
9058 + ac_objext=lo
9059 + cat >conftest.$ac_ext <<_ACEOF
9060 +#line $LINENO "configure"
9061 +/* confdefs.h. */
9062 +_ACEOF
9063 +cat confdefs.h >>conftest.$ac_ext
9064 +cat >>conftest.$ac_ext <<_ACEOF
9065 +/* end confdefs.h. */
9066
9067 -int main() {
9068 +int
9069 +main ()
9070 +{
9071 int some_variable = 0;
9072 -; return 0; }
9073 -EOF
9074 -if { (eval echo configure:3188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9075 - rm -rf conftest*
9076 + ;
9077 + return 0;
9078 +}
9079 +_ACEOF
9080 +rm -f conftest.$ac_objext
9081 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9082 + (eval $ac_compile) 2>&5
9083 + ac_status=$?
9084 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9085 + (exit $ac_status); } &&
9086 + { ac_try='test -s conftest.$ac_objext'
9087 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9088 + (eval $ac_try) 2>&5
9089 + ac_status=$?
9090 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9091 + (exit $ac_status); }; }; then
9092 # The compiler can only warn and ignore the option if not recognized
9093 # So say no if there are warnings
9094 if test -s conftest.err; then
9095 @@ -3193,18 +5353,21 @@
9096 else
9097 lt_cv_compiler_o_lo=yes
9098 fi
9099 -
9100 +
9101 else
9102 - echo "configure: failed program was:" >&5
9103 - cat conftest.$ac_ext >&5
9104 + echo "$as_me: failed program was:" >&5
9105 +sed 's/^/| /' conftest.$ac_ext >&5
9106 +
9107 fi
9108 -rm -f conftest*
9109 +rm -f conftest.$ac_objext conftest.$ac_ext
9110 + ac_objext="$save_objext"
9111 CFLAGS="$save_CFLAGS"
9112 -
9113 +
9114 fi
9115
9116 compiler_o_lo=$lt_cv_compiler_o_lo
9117 - echo "$ac_t""$compiler_o_lo" 1>&6
9118 + echo "$as_me:$LINENO: result: $compiler_o_lo" >&5
9119 +echo "${ECHO_T}$compiler_o_lo" >&6
9120 else
9121 compiler_o_lo=no
9122 fi
9123 @@ -3213,17 +5376,19 @@
9124 hard_links="nottested"
9125 if test "$compiler_c_o" = no && test "$need_locks" != no; then
9126 # do not overwrite the value of need_locks provided by the user
9127 - echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
9128 -echo "configure:3218: checking if we can lock with hard links" >&5
9129 + echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
9130 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
9131 hard_links=yes
9132 $rm conftest*
9133 ln conftest.a conftest.b 2>/dev/null && hard_links=no
9134 touch conftest.a
9135 ln conftest.a conftest.b 2>&5 || hard_links=no
9136 ln conftest.a conftest.b 2>/dev/null && hard_links=no
9137 - echo "$ac_t""$hard_links" 1>&6
9138 + echo "$as_me:$LINENO: result: $hard_links" >&5
9139 +echo "${ECHO_T}$hard_links" >&6
9140 if test "$hard_links" = no; then
9141 - echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
9142 + { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
9143 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
9144 need_locks=warn
9145 fi
9146 else
9147 @@ -3232,22 +5397,40 @@
9148
9149 if test "$GCC" = yes; then
9150 # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
9151 - echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
9152 -echo "configure:3237: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
9153 + echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
9154 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
9155 echo "int some_variable = 0;" > conftest.$ac_ext
9156 save_CFLAGS="$CFLAGS"
9157 CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
9158 compiler_rtti_exceptions=no
9159 - cat > conftest.$ac_ext <<EOF
9160 -#line 3243 "configure"
9161 -#include "confdefs.h"
9162 + cat >conftest.$ac_ext <<_ACEOF
9163 +#line $LINENO "configure"
9164 +/* confdefs.h. */
9165 +_ACEOF
9166 +cat confdefs.h >>conftest.$ac_ext
9167 +cat >>conftest.$ac_ext <<_ACEOF
9168 +/* end confdefs.h. */
9169
9170 -int main() {
9171 +int
9172 +main ()
9173 +{
9174 int some_variable = 0;
9175 -; return 0; }
9176 -EOF
9177 -if { (eval echo configure:3250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
9178 - rm -rf conftest*
9179 + ;
9180 + return 0;
9181 +}
9182 +_ACEOF
9183 +rm -f conftest.$ac_objext
9184 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
9185 + (eval $ac_compile) 2>&5
9186 + ac_status=$?
9187 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9188 + (exit $ac_status); } &&
9189 + { ac_try='test -s conftest.$ac_objext'
9190 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9191 + (eval $ac_try) 2>&5
9192 + ac_status=$?
9193 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9194 + (exit $ac_status); }; }; then
9195 # The compiler can only warn and ignore the option if not recognized
9196 # So say no if there are warnings
9197 if test -s conftest.err; then
9198 @@ -3255,14 +5438,16 @@
9199 else
9200 compiler_rtti_exceptions=yes
9201 fi
9202 -
9203 +
9204 else
9205 - echo "configure: failed program was:" >&5
9206 - cat conftest.$ac_ext >&5
9207 + echo "$as_me: failed program was:" >&5
9208 +sed 's/^/| /' conftest.$ac_ext >&5
9209 +
9210 fi
9211 -rm -f conftest*
9212 +rm -f conftest.$ac_objext conftest.$ac_ext
9213 CFLAGS="$save_CFLAGS"
9214 - echo "$ac_t""$compiler_rtti_exceptions" 1>&6
9215 + echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5
9216 +echo "${ECHO_T}$compiler_rtti_exceptions" >&6
9217
9218 if test "$compiler_rtti_exceptions" = "yes"; then
9219 no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
9220 @@ -3272,8 +5457,8 @@
9221 fi
9222
9223 # See if the linker supports building shared libraries.
9224 -echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
9225 -echo "configure:3277: checking whether the linker ($LD) supports shared libraries" >&5
9226 +echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5
9227 +echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
9228
9229 allow_undefined_flag=
9230 no_undefined_flag=
9231 @@ -3314,7 +5499,7 @@
9232 extract_expsyms_cmds=
9233
9234 case $host_os in
9235 -cygwin* | mingw* | pw32* )
9236 +cygwin* | mingw* | pw32*)
9237 # FIXME: the MSVC++ port hasn't been tested in a loooong time
9238 # When not using gcc, we currently assume that we are using
9239 # Microsoft Visual C++.
9240 @@ -3322,7 +5507,9 @@
9241 with_gnu_ld=no
9242 fi
9243 ;;
9244 -
9245 +openbsd*)
9246 + with_gnu_ld=no
9247 + ;;
9248 esac
9249
9250 ld_shlibs=yes
9251 @@ -3409,7 +5596,7 @@
9252 # can override, but on older systems we have to supply one (in ltdll.c)
9253 if test "x$lt_cv_need_dllmain" = "xyes"; then
9254 ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
9255 - 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~
9256 + 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~
9257 test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
9258 else
9259 ltdll_obj=
9260 @@ -3427,19 +5614,20 @@
9261 # If the export-symbols file already is a .def file (1st line
9262 # is EXPORTS), use it as is.
9263 # If DATA tags from a recent dlltool are present, honour them!
9264 - archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
9265 - cp $export_symbols $output_objdir/$soname-def;
9266 + archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
9267 + cp $export_symbols $output_objdir/$soname-def;
9268 else
9269 - echo EXPORTS > $output_objdir/$soname-def;
9270 - _lt_hint=1;
9271 - cat $export_symbols | while read symbol; do
9272 - set dummy \$symbol;
9273 - case \$# in
9274 - 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
9275 - *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
9276 - esac;
9277 - _lt_hint=`expr 1 + \$_lt_hint`;
9278 - done;
9279 + echo EXPORTS > $output_objdir/$soname-def;
9280 + _lt_hint=1;
9281 + cat $export_symbols | while read symbol; do
9282 + set dummy \$symbol;
9283 + case \$# in
9284 + 2) echo " \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
9285 + 4) echo " \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
9286 + *) echo " \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
9287 + esac;
9288 + _lt_hint=`expr 1 + \$_lt_hint`;
9289 + done;
9290 fi~
9291 '"$ltdll_cmds"'
9292 $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~
9293 @@ -3534,80 +5722,98 @@
9294 ;;
9295
9296 aix4* | aix5*)
9297 + if test "$host_cpu" = ia64; then
9298 + # On IA64, the linker does run time linking by default, so we don't
9299 + # have to do anything special.
9300 + aix_use_runtimelinking=no
9301 + exp_sym_flag='-Bexport'
9302 + no_entry_flag=""
9303 + else
9304 + aix_use_runtimelinking=no
9305 +
9306 + # Test if we are trying to use run time linking or normal
9307 + # AIX style linking. If -brtl is somewhere in LDFLAGS, we
9308 + # need to do runtime linking.
9309 + case $host_os in aix4.[23]|aix4.[23].*|aix5*)
9310 + for ld_flag in $LDFLAGS; do
9311 + case $ld_flag in
9312 + *-brtl*)
9313 + aix_use_runtimelinking=yes
9314 + break
9315 + ;;
9316 + esac
9317 + done
9318 + esac
9319 +
9320 + exp_sym_flag='-bexport'
9321 + no_entry_flag='-bnoentry'
9322 + fi
9323 +
9324 # When large executables or shared objects are built, AIX ld can
9325 # have problems creating the table of contents. If linking a library
9326 # or program results in "error TOC overflow" add -mminimal-toc to
9327 # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
9328 # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
9329
9330 + hardcode_direct=yes
9331 archive_cmds=''
9332 hardcode_libdir_separator=':'
9333 if test "$GCC" = yes; then
9334 - collect2name=`${CC} -print-prog-name=collect2`
9335 - if test -f "$collect2name" && \
9336 - strings "$collect2name" | grep resolve_lib_name >/dev/null
9337 - then
9338 - # We have reworked collect2
9339 - hardcode_direct=yes
9340 - else
9341 - # We have old collect2
9342 - hardcode_direct=unsupported
9343 - # It fails to find uninstalled libraries when the uninstalled
9344 - # path is not listed in the libpath. Setting hardcode_minus_L
9345 - # to unsupported forces relinking
9346 - hardcode_minus_L=yes
9347 - hardcode_libdir_flag_spec='-L$libdir'
9348 - hardcode_libdir_separator=
9349 - fi
9350 - shared_flag='-shared'
9351 - else
9352 + case $host_os in aix4.[012]|aix4.[012].*)
9353 + collect2name=`${CC} -print-prog-name=collect2`
9354 + if test -f "$collect2name" && \
9355 + strings "$collect2name" | grep resolve_lib_name >/dev/null
9356 + then
9357 + # We have reworked collect2
9358 + hardcode_direct=yes
9359 + else
9360 + # We have old collect2
9361 + hardcode_direct=unsupported
9362 + # It fails to find uninstalled libraries when the uninstalled
9363 + # path is not listed in the libpath. Setting hardcode_minus_L
9364 + # to unsupported forces relinking
9365 + hardcode_minus_L=yes
9366 + hardcode_libdir_flag_spec='-L$libdir'
9367 + hardcode_libdir_separator=
9368 + fi
9369 + esac
9370 +
9371 + shared_flag='-shared'
9372 + else
9373 + # not using gcc
9374 if test "$host_cpu" = ia64; then
9375 - shared_flag='-G'
9376 + shared_flag='${wl}-G'
9377 else
9378 - shared_flag='${wl}-bM:SRE'
9379 + if test "$aix_use_runtimelinking" = yes; then
9380 + shared_flag='${wl}-G'
9381 + else
9382 + shared_flag='${wl}-bM:SRE'
9383 + fi
9384 fi
9385 - hardcode_direct=yes
9386 fi
9387
9388 - if test "$host_cpu" = ia64; then
9389 - # On IA64, the linker does run time linking by default, so we don't
9390 - # have to do anything special.
9391 - aix_use_runtimelinking=no
9392 - exp_sym_flag='-Bexport'
9393 - no_entry_flag=""
9394 - else
9395 - # Test if we are trying to use run time linking, or normal AIX style linking.
9396 - # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
9397 - aix_use_runtimelinking=no
9398 - for ld_flag in $LDFLAGS; do
9399 - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
9400 - aix_use_runtimelinking=yes
9401 - break
9402 - fi
9403 - done
9404 - exp_sym_flag='-bexport'
9405 - no_entry_flag='-bnoentry'
9406 - fi
9407 # It seems that -bexpall can do strange things, so it is better to
9408 # generate a list of symbols to export.
9409 always_export_symbols=yes
9410 if test "$aix_use_runtimelinking" = yes; then
9411 + # Warning - without using the other runtime loading flags (-brtl),
9412 + # -berok will link without error, but may produce a broken library.
9413 + allow_undefined_flag='-berok'
9414 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
9415 - allow_undefined_flag=' -Wl,-G'
9416 - 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"
9417 + 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"
9418 else
9419 if test "$host_cpu" = ia64; then
9420 - hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
9421 - allow_undefined_flag="-znodefs"
9422 - 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"
9423 + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
9424 + allow_undefined_flag="-z nodefs"
9425 + 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"
9426 else
9427 - hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
9428 - # Warning - without using the other run time loading flags, -berok will
9429 - # link without error, but may produce a broken library.
9430 - allow_undefined_flag='${wl}-berok'
9431 - # This is a bit strange, but is similar to how AIX traditionally builds
9432 - # it's shared libraries.
9433 - 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'
9434 + hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
9435 + # Warning - without using the other run time loading flags,
9436 + # -berok will link without error, but may produce a broken library.
9437 + allow_undefined_flag='${wl}-berok'
9438 + # This is a bit strange, but is similar to how AIX traditionally builds
9439 + # it's shared libraries.
9440 + 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'
9441 fi
9442 fi
9443 ;;
9444 @@ -3639,11 +5845,19 @@
9445 ;;
9446
9447 darwin* | rhapsody*)
9448 - allow_undefined_flag='-undefined suppress'
9449 + case "$host_os" in
9450 + rhapsody* | darwin1.[012])
9451 + allow_undefined_flag='-undefined suppress'
9452 + ;;
9453 + *) # Darwin 1.3 on
9454 + allow_undefined_flag='-flat_namespace -undefined suppress'
9455 + ;;
9456 + esac
9457 # FIXME: Relying on posixy $() will cause problems for
9458 # cross-compilation, but unfortunately the echo tests do not
9459 - # yet detect zsh echo's removal of \ escapes.
9460 - 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)'
9461 + # yet detect zsh echo's removal of \ escapes. Also zsh mangles
9462 + # `"' quotes if we put them in here... so don't!
9463 + 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)'
9464 # We need to add '_' to the symbols in $export_symbols first
9465 #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
9466 hardcode_direct=yes
9467 @@ -3695,13 +5909,14 @@
9468 export_dynamic_flag_spec='${wl}-E'
9469 ;;
9470
9471 - irix5* | irix6*)
9472 + irix5* | irix6* | nonstopux*)
9473 if test "$GCC" = yes; then
9474 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'
9475 + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9476 else
9477 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'
9478 + hardcode_libdir_flag_spec='-rpath $libdir'
9479 fi
9480 - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9481 hardcode_libdir_separator=:
9482 link_all_deplibs=yes
9483 ;;
9484 @@ -3718,7 +5933,7 @@
9485 ;;
9486
9487 newsos6)
9488 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
9489 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
9490 hardcode_direct=yes
9491 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
9492 hardcode_libdir_separator=:
9493 @@ -3726,10 +5941,24 @@
9494 ;;
9495
9496 openbsd*)
9497 - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
9498 - hardcode_libdir_flag_spec='-R$libdir'
9499 hardcode_direct=yes
9500 hardcode_shlibpath_var=no
9501 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
9502 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
9503 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
9504 + export_dynamic_flag_spec='${wl}-E'
9505 + else
9506 + case "$host_os" in
9507 + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
9508 + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
9509 + hardcode_libdir_flag_spec='-R$libdir'
9510 + ;;
9511 + *)
9512 + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
9513 + hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
9514 + ;;
9515 + esac
9516 + fi
9517 ;;
9518
9519 os2*)
9520 @@ -3774,10 +6003,39 @@
9521 hardcode_shlibpath_var=no
9522 runpath_var=LD_RUN_PATH
9523 hardcode_runpath_var=yes
9524 + export_dynamic_flag_spec='${wl}-Bexport'
9525 ;;
9526
9527 solaris*)
9528 + # gcc --version < 3.0 without binutils cannot create self contained
9529 + # shared libraries reliably, requiring libgcc.a to resolve some of
9530 + # the object symbols generated in some cases. Libraries that use
9531 + # assert need libgcc.a to resolve __eprintf, for example. Linking
9532 + # a copy of libgcc.a into every shared library to guarantee resolving
9533 + # such symbols causes other problems: According to Tim Van Holder
9534 + # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
9535 + # (to the application) exception stack for one thing.
9536 no_undefined_flag=' -z defs'
9537 + if test "$GCC" = yes; then
9538 + case `$CC --version 2>/dev/null` in
9539 + [12].*)
9540 + cat <<EOF 1>&2
9541 +
9542 +*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
9543 +*** create self contained shared libraries on Solaris systems, without
9544 +*** introducing a dependency on libgcc.a. Therefore, libtool is disabling
9545 +*** -no-undefined support, which will at least allow you to build shared
9546 +*** libraries. However, you may find that when you link such libraries
9547 +*** into an application without using GCC, you have to manually add
9548 +*** \`gcc --print-libgcc-file-name\` to the link command. We urge you to
9549 +*** upgrade to a newer version of GCC. Another option is to rebuild your
9550 +*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
9551 +
9552 +EOF
9553 + no_undefined_flag=
9554 + ;;
9555 + esac
9556 + fi
9557 # $CC -shared without GNU ld will not create a library from C++
9558 # object files and a static libstdc++, better avoid it by now
9559 archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
9560 @@ -3808,13 +6066,23 @@
9561 ;;
9562
9563 sysv4)
9564 - if test "x$host_vendor" = xsno; then
9565 - archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linkopts'
9566 - hardcode_direct=yes # is this really true???
9567 - else
9568 - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
9569 - hardcode_direct=no #Motorola manual says yes, but my tests say they lie
9570 - fi
9571 + case $host_vendor in
9572 + sni)
9573 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
9574 + hardcode_direct=yes # is this really true???
9575 + ;;
9576 + siemens)
9577 + ## LD is ld it makes a PLAMLIB
9578 + ## CC just makes a GrossModule.
9579 + archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
9580 + reload_cmds='$CC -r -o $output$reload_objs'
9581 + hardcode_direct=no
9582 + ;;
9583 + motorola)
9584 + archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
9585 + hardcode_direct=no #Motorola manual says yes, but my tests say they lie
9586 + ;;
9587 + esac
9588 runpath_var='LD_RUN_PATH'
9589 hardcode_shlibpath_var=no
9590 ;;
9591 @@ -3884,12 +6152,13 @@
9592 ;;
9593 esac
9594 fi
9595 -echo "$ac_t""$ld_shlibs" 1>&6
9596 +echo "$as_me:$LINENO: result: $ld_shlibs" >&5
9597 +echo "${ECHO_T}$ld_shlibs" >&6
9598 test "$ld_shlibs" = no && can_build_shared=no
9599
9600 # Check hardcoding attributes.
9601 -echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
9602 -echo "configure:3893: checking how to hardcode library paths into programs" >&5
9603 +echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
9604 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
9605 hardcode_action=
9606 if test -n "$hardcode_libdir_flag_spec" || \
9607 test -n "$runpath_var"; then
9608 @@ -3912,26 +6181,29 @@
9609 # directories.
9610 hardcode_action=unsupported
9611 fi
9612 -echo "$ac_t""$hardcode_action" 1>&6
9613 +echo "$as_me:$LINENO: result: $hardcode_action" >&5
9614 +echo "${ECHO_T}$hardcode_action" >&6
9615
9616 striplib=
9617 old_striplib=
9618 -echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
9619 -echo "configure:3921: checking whether stripping libraries is possible" >&5
9620 +echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
9621 +echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
9622 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
9623 test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
9624 test -z "$striplib" && striplib="$STRIP --strip-unneeded"
9625 - echo "$ac_t""yes" 1>&6
9626 + echo "$as_me:$LINENO: result: yes" >&5
9627 +echo "${ECHO_T}yes" >&6
9628 else
9629 - echo "$ac_t""no" 1>&6
9630 + echo "$as_me:$LINENO: result: no" >&5
9631 +echo "${ECHO_T}no" >&6
9632 fi
9633
9634 reload_cmds='$LD$reload_flag -o $output$reload_objs'
9635 test -z "$deplibs_check_method" && deplibs_check_method=unknown
9636
9637 # PORTME Fill in your ld.so characteristics
9638 -echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
9639 -echo "configure:3935: checking dynamic linker characteristics" >&5
9640 +echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
9641 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
9642 library_names_spec=
9643 libname_spec='lib$name'
9644 soname_spec=
9645 @@ -3958,6 +6230,9 @@
9646
9647 aix4* | aix5*)
9648 version_type=linux
9649 + need_lib_prefix=no
9650 + need_version=no
9651 + hardcode_into_libs=yes
9652 if test "$host_cpu" = ia64; then
9653 # AIX 5 supports IA64
9654 library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
9655 @@ -3969,22 +6244,24 @@
9656 # depend on `.', always an invalid library. This was fixed in
9657 # development snapshots of GCC prior to 3.0.
9658 case $host_os in
9659 - aix4 | aix4.[01] | aix4.[01].*)
9660 - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
9661 - echo ' yes '
9662 - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
9663 - :
9664 - else
9665 - can_build_shared=no
9666 - fi
9667 - ;;
9668 + aix4 | aix4.[01] | aix4.[01].*)
9669 + if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
9670 + echo ' yes '
9671 + echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
9672 + :
9673 + else
9674 + can_build_shared=no
9675 + fi
9676 + ;;
9677 esac
9678 - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
9679 - # soname into executable. Probably we can add versioning support to
9680 - # collect2, so additional links can be useful in future.
9681 + # AIX (on Power*) has no versioning support, so currently we can
9682 + # not hardcode correct soname into executable. Probably we can
9683 + # add versioning support to collect2, so additional links can
9684 + # be useful in future.
9685 if test "$aix_use_runtimelinking" = yes; then
9686 - # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
9687 - # lib<name>.a to let people know that these are not typical AIX shared libraries.
9688 + # If using run time linking (on AIX 4.2 or later) use lib<name>.so
9689 + # instead of lib<name>.a to let people know that these are not
9690 + # typical AIX shared libraries.
9691 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
9692 else
9693 # We preserve .a as extension for shared libraries through AIX4.2
9694 @@ -3993,8 +6270,8 @@
9695 soname_spec='${libname}${release}.so$major'
9696 fi
9697 shlibpath_var=LIBPATH
9698 - deplibs_check_method=pass_all
9699 fi
9700 + hardcode_into_libs=yes
9701 ;;
9702
9703 amigaos*)
9704 @@ -4042,7 +6319,7 @@
9705 ;;
9706 yes,mingw*)
9707 library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
9708 - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
9709 + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
9710 ;;
9711 yes,pw32*)
9712 library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
9713 @@ -4074,6 +6351,18 @@
9714 dynamic_linker=no
9715 ;;
9716
9717 +freebsd*-gnu*)
9718 + version_type=linux
9719 + need_lib_prefix=no
9720 + need_version=no
9721 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
9722 + soname_spec='${libname}${release}.so$major'
9723 + shlibpath_var=LD_LIBRARY_PATH
9724 + shlibpath_overrides_runpath=no
9725 + hardcode_into_libs=yes
9726 + dynamic_linker='GNU/FreeBSD ld.so'
9727 + ;;
9728 +
9729 freebsd*)
9730 objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
9731 version_type=freebsd-$objformat
9732 @@ -4125,14 +6414,17 @@
9733 postinstall_cmds='chmod 555 $lib'
9734 ;;
9735
9736 -irix5* | irix6*)
9737 - version_type=irix
9738 +irix5* | irix6* | nonstopux*)
9739 + case $host_os in
9740 + nonstopux*) version_type=nonstopux ;;
9741 + *) version_type=irix ;;
9742 + esac
9743 need_lib_prefix=no
9744 need_version=no
9745 soname_spec='${libname}${release}.so$major'
9746 library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
9747 case $host_os in
9748 - irix5*)
9749 + irix5* | nonstopux*)
9750 libsuff= shlibsuff=
9751 ;;
9752 *)
9753 @@ -4206,9 +6498,19 @@
9754
9755 openbsd*)
9756 version_type=sunos
9757 - if test "$with_gnu_ld" = yes; then
9758 - need_lib_prefix=no
9759 - need_version=no
9760 + need_lib_prefix=no
9761 + need_version=no
9762 + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
9763 + case "$host_os" in
9764 + openbsd2.[89] | openbsd2.[89].*)
9765 + shlibpath_overrides_runpath=no
9766 + ;;
9767 + *)
9768 + shlibpath_overrides_runpath=yes
9769 + ;;
9770 + esac
9771 + else
9772 + shlibpath_overrides_runpath=yes
9773 fi
9774 library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
9775 finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
9776 @@ -4226,11 +6528,13 @@
9777 osf3* | osf4* | osf5*)
9778 version_type=osf
9779 need_version=no
9780 - soname_spec='${libname}${release}.so'
9781 - library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
9782 + need_lib_prefix=no
9783 + soname_spec='${libname}${release}.so$major'
9784 + library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
9785 shlibpath_var=LD_LIBRARY_PATH
9786 sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
9787 sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
9788 + hardcode_into_libs=yes
9789 ;;
9790
9791 sco3.2v5*)
9792 @@ -4273,6 +6577,12 @@
9793 case $host_vendor in
9794 sni)
9795 shlibpath_overrides_runpath=no
9796 + need_lib_prefix=no
9797 + export_dynamic_flag_spec='${wl}-Blargedynsym'
9798 + runpath_var=LD_RUN_PATH
9799 + ;;
9800 + siemens)
9801 + need_lib_prefix=no
9802 ;;
9803 motorola)
9804 need_lib_prefix=no
9805 @@ -4312,13 +6622,46 @@
9806 dynamic_linker=no
9807 ;;
9808 esac
9809 -echo "$ac_t""$dynamic_linker" 1>&6
9810 +echo "$as_me:$LINENO: result: $dynamic_linker" >&5
9811 +echo "${ECHO_T}$dynamic_linker" >&6
9812 test "$dynamic_linker" = no && can_build_shared=no
9813
9814 # Report the final consequences.
9815 -echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
9816 -echo "configure:4321: checking if libtool supports shared libraries" >&5
9817 -echo "$ac_t""$can_build_shared" 1>&6
9818 +echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
9819 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
9820 +echo "$as_me:$LINENO: result: $can_build_shared" >&5
9821 +echo "${ECHO_T}$can_build_shared" >&6
9822 +
9823 +echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
9824 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
9825 +test "$can_build_shared" = "no" && enable_shared=no
9826 +
9827 +# On AIX, shared libraries and static libraries use the same namespace, and
9828 +# are all built from PIC.
9829 +case "$host_os" in
9830 +aix3*)
9831 + test "$enable_shared" = yes && enable_static=no
9832 + if test -n "$RANLIB"; then
9833 + archive_cmds="$archive_cmds~\$RANLIB \$lib"
9834 + postinstall_cmds='$RANLIB $lib'
9835 + fi
9836 + ;;
9837 +
9838 +aix4*)
9839 + if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
9840 + test "$enable_shared" = yes && enable_static=no
9841 + fi
9842 + ;;
9843 +esac
9844 +echo "$as_me:$LINENO: result: $enable_shared" >&5
9845 +echo "${ECHO_T}$enable_shared" >&6
9846 +
9847 +echo "$as_me:$LINENO: checking whether to build static libraries" >&5
9848 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
9849 +# Make sure either enable_shared or enable_static is yes.
9850 +test "$enable_shared" = yes || enable_static=yes
9851 +echo "$as_me:$LINENO: result: $enable_static" >&5
9852 +echo "${ECHO_T}$enable_static" >&6
9853
9854 if test "$hardcode_action" = relink; then
9855 # Fast installation is not supported
9856 @@ -4355,224 +6698,398 @@
9857 ;;
9858
9859 *)
9860 - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
9861 -echo "configure:4360: checking for dlopen in -ldl" >&5
9862 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
9863 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
9864 - echo $ac_n "(cached) $ac_c" 1>&6
9865 -else
9866 - ac_save_LIBS="$LIBS"
9867 -LIBS="-ldl $LIBS"
9868 -cat > conftest.$ac_ext <<EOF
9869 -#line 4368 "configure"
9870 -#include "confdefs.h"
9871 -/* Override any gcc2 internal prototype to avoid an error. */
9872 -/* We use char because int might match the return type of a gcc2
9873 - builtin and then its argument prototype would still apply. */
9874 -char dlopen();
9875 -
9876 -int main() {
9877 -dlopen()
9878 -; return 0; }
9879 -EOF
9880 -if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9881 - rm -rf conftest*
9882 - eval "ac_cv_lib_$ac_lib_var=yes"
9883 -else
9884 - echo "configure: failed program was:" >&5
9885 - cat conftest.$ac_ext >&5
9886 - rm -rf conftest*
9887 - eval "ac_cv_lib_$ac_lib_var=no"
9888 -fi
9889 -rm -f conftest*
9890 -LIBS="$ac_save_LIBS"
9891 -
9892 -fi
9893 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
9894 - echo "$ac_t""yes" 1>&6
9895 - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
9896 -else
9897 - echo "$ac_t""no" 1>&6
9898 -echo $ac_n "checking for dlopen""... $ac_c" 1>&6
9899 -echo "configure:4398: checking for dlopen" >&5
9900 -if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
9901 - echo $ac_n "(cached) $ac_c" 1>&6
9902 -else
9903 - cat > conftest.$ac_ext <<EOF
9904 -#line 4403 "configure"
9905 -#include "confdefs.h"
9906 + echo "$as_me:$LINENO: checking for shl_load" >&5
9907 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
9908 +if test "${ac_cv_func_shl_load+set}" = set; then
9909 + echo $ECHO_N "(cached) $ECHO_C" >&6
9910 +else
9911 + cat >conftest.$ac_ext <<_ACEOF
9912 +#line $LINENO "configure"
9913 +/* confdefs.h. */
9914 +_ACEOF
9915 +cat confdefs.h >>conftest.$ac_ext
9916 +cat >>conftest.$ac_ext <<_ACEOF
9917 +/* end confdefs.h. */
9918 /* System header to define __stub macros and hopefully few prototypes,
9919 - which can conflict with char dlopen(); below. */
9920 -#include <assert.h>
9921 + which can conflict with char shl_load (); below.
9922 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
9923 + <limits.h> exists even on freestanding compilers. */
9924 +#ifdef __STDC__
9925 +# include <limits.h>
9926 +#else
9927 +# include <assert.h>
9928 +#endif
9929 /* Override any gcc2 internal prototype to avoid an error. */
9930 +#ifdef __cplusplus
9931 +extern "C"
9932 +{
9933 +#endif
9934 /* We use char because int might match the return type of a gcc2
9935 - builtin and then its argument prototype would still apply. */
9936 -char dlopen();
9937 -
9938 -int main() {
9939 -
9940 + builtin and then its argument prototype would still apply. */
9941 +char shl_load ();
9942 /* The GNU C library defines this for functions which it implements
9943 to always fail with ENOSYS. Some functions are actually named
9944 something starting with __ and the normal name is an alias. */
9945 -#if defined (__stub_dlopen) || defined (__stub___dlopen)
9946 +#if defined (__stub_shl_load) || defined (__stub___shl_load)
9947 choke me
9948 #else
9949 -dlopen();
9950 +char (*f) () = shl_load;
9951 +#endif
9952 +#ifdef __cplusplus
9953 +}
9954 #endif
9955
9956 -; return 0; }
9957 -EOF
9958 -if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
9959 - rm -rf conftest*
9960 - eval "ac_cv_func_dlopen=yes"
9961 -else
9962 - echo "configure: failed program was:" >&5
9963 - cat conftest.$ac_ext >&5
9964 - rm -rf conftest*
9965 - eval "ac_cv_func_dlopen=no"
9966 -fi
9967 -rm -f conftest*
9968 -fi
9969 -
9970 -if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
9971 - echo "$ac_t""yes" 1>&6
9972 - lt_cv_dlopen="dlopen"
9973 +int
9974 +main ()
9975 +{
9976 +return f != shl_load;
9977 + ;
9978 + return 0;
9979 +}
9980 +_ACEOF
9981 +rm -f conftest.$ac_objext conftest$ac_exeext
9982 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
9983 + (eval $ac_link) 2>&5
9984 + ac_status=$?
9985 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9986 + (exit $ac_status); } &&
9987 + { ac_try='test -s conftest$ac_exeext'
9988 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
9989 + (eval $ac_try) 2>&5
9990 + ac_status=$?
9991 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
9992 + (exit $ac_status); }; }; then
9993 + ac_cv_func_shl_load=yes
9994 +else
9995 + echo "$as_me: failed program was:" >&5
9996 +sed 's/^/| /' conftest.$ac_ext >&5
9997 +
9998 +ac_cv_func_shl_load=no
9999 +fi
10000 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10001 +fi
10002 +echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
10003 +echo "${ECHO_T}$ac_cv_func_shl_load" >&6
10004 +if test $ac_cv_func_shl_load = yes; then
10005 + lt_cv_dlopen="shl_load"
10006 else
10007 - echo "$ac_t""no" 1>&6
10008 -echo $ac_n "checking for shl_load""... $ac_c" 1>&6
10009 -echo "configure:4444: checking for shl_load" >&5
10010 -if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
10011 - echo $ac_n "(cached) $ac_c" 1>&6
10012 + echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
10013 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
10014 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then
10015 + echo $ECHO_N "(cached) $ECHO_C" >&6
10016 else
10017 - cat > conftest.$ac_ext <<EOF
10018 -#line 4449 "configure"
10019 -#include "confdefs.h"
10020 + ac_check_lib_save_LIBS=$LIBS
10021 +LIBS="-ldld $LIBS"
10022 +cat >conftest.$ac_ext <<_ACEOF
10023 +#line $LINENO "configure"
10024 +/* confdefs.h. */
10025 +_ACEOF
10026 +cat confdefs.h >>conftest.$ac_ext
10027 +cat >>conftest.$ac_ext <<_ACEOF
10028 +/* end confdefs.h. */
10029 +
10030 +/* Override any gcc2 internal prototype to avoid an error. */
10031 +#ifdef __cplusplus
10032 +extern "C"
10033 +#endif
10034 +/* We use char because int might match the return type of a gcc2
10035 + builtin and then its argument prototype would still apply. */
10036 +char shl_load ();
10037 +int
10038 +main ()
10039 +{
10040 +shl_load ();
10041 + ;
10042 + return 0;
10043 +}
10044 +_ACEOF
10045 +rm -f conftest.$ac_objext conftest$ac_exeext
10046 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10047 + (eval $ac_link) 2>&5
10048 + ac_status=$?
10049 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10050 + (exit $ac_status); } &&
10051 + { ac_try='test -s conftest$ac_exeext'
10052 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10053 + (eval $ac_try) 2>&5
10054 + ac_status=$?
10055 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10056 + (exit $ac_status); }; }; then
10057 + ac_cv_lib_dld_shl_load=yes
10058 +else
10059 + echo "$as_me: failed program was:" >&5
10060 +sed 's/^/| /' conftest.$ac_ext >&5
10061 +
10062 +ac_cv_lib_dld_shl_load=no
10063 +fi
10064 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10065 +LIBS=$ac_check_lib_save_LIBS
10066 +fi
10067 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
10068 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
10069 +if test $ac_cv_lib_dld_shl_load = yes; then
10070 + lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
10071 +else
10072 + echo "$as_me:$LINENO: checking for dlopen" >&5
10073 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
10074 +if test "${ac_cv_func_dlopen+set}" = set; then
10075 + echo $ECHO_N "(cached) $ECHO_C" >&6
10076 +else
10077 + cat >conftest.$ac_ext <<_ACEOF
10078 +#line $LINENO "configure"
10079 +/* confdefs.h. */
10080 +_ACEOF
10081 +cat confdefs.h >>conftest.$ac_ext
10082 +cat >>conftest.$ac_ext <<_ACEOF
10083 +/* end confdefs.h. */
10084 /* System header to define __stub macros and hopefully few prototypes,
10085 - which can conflict with char shl_load(); below. */
10086 -#include <assert.h>
10087 + which can conflict with char dlopen (); below.
10088 + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
10089 + <limits.h> exists even on freestanding compilers. */
10090 +#ifdef __STDC__
10091 +# include <limits.h>
10092 +#else
10093 +# include <assert.h>
10094 +#endif
10095 /* Override any gcc2 internal prototype to avoid an error. */
10096 +#ifdef __cplusplus
10097 +extern "C"
10098 +{
10099 +#endif
10100 /* We use char because int might match the return type of a gcc2
10101 - builtin and then its argument prototype would still apply. */
10102 -char shl_load();
10103 -
10104 -int main() {
10105 -
10106 + builtin and then its argument prototype would still apply. */
10107 +char dlopen ();
10108 /* The GNU C library defines this for functions which it implements
10109 to always fail with ENOSYS. Some functions are actually named
10110 something starting with __ and the normal name is an alias. */
10111 -#if defined (__stub_shl_load) || defined (__stub___shl_load)
10112 +#if defined (__stub_dlopen) || defined (__stub___dlopen)
10113 choke me
10114 #else
10115 -shl_load();
10116 +char (*f) () = dlopen;
10117 +#endif
10118 +#ifdef __cplusplus
10119 +}
10120 #endif
10121
10122 -; return 0; }
10123 -EOF
10124 -if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10125 - rm -rf conftest*
10126 - eval "ac_cv_func_shl_load=yes"
10127 +int
10128 +main ()
10129 +{
10130 +return f != dlopen;
10131 + ;
10132 + return 0;
10133 +}
10134 +_ACEOF
10135 +rm -f conftest.$ac_objext conftest$ac_exeext
10136 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10137 + (eval $ac_link) 2>&5
10138 + ac_status=$?
10139 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10140 + (exit $ac_status); } &&
10141 + { ac_try='test -s conftest$ac_exeext'
10142 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10143 + (eval $ac_try) 2>&5
10144 + ac_status=$?
10145 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10146 + (exit $ac_status); }; }; then
10147 + ac_cv_func_dlopen=yes
10148 +else
10149 + echo "$as_me: failed program was:" >&5
10150 +sed 's/^/| /' conftest.$ac_ext >&5
10151 +
10152 +ac_cv_func_dlopen=no
10153 +fi
10154 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10155 +fi
10156 +echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
10157 +echo "${ECHO_T}$ac_cv_func_dlopen" >&6
10158 +if test $ac_cv_func_dlopen = yes; then
10159 + lt_cv_dlopen="dlopen"
10160 else
10161 - echo "configure: failed program was:" >&5
10162 - cat conftest.$ac_ext >&5
10163 - rm -rf conftest*
10164 - eval "ac_cv_func_shl_load=no"
10165 -fi
10166 -rm -f conftest*
10167 -fi
10168 + echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
10169 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
10170 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then
10171 + echo $ECHO_N "(cached) $ECHO_C" >&6
10172 +else
10173 + ac_check_lib_save_LIBS=$LIBS
10174 +LIBS="-ldl $LIBS"
10175 +cat >conftest.$ac_ext <<_ACEOF
10176 +#line $LINENO "configure"
10177 +/* confdefs.h. */
10178 +_ACEOF
10179 +cat confdefs.h >>conftest.$ac_ext
10180 +cat >>conftest.$ac_ext <<_ACEOF
10181 +/* end confdefs.h. */
10182
10183 -if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
10184 - echo "$ac_t""yes" 1>&6
10185 - lt_cv_dlopen="shl_load"
10186 +/* Override any gcc2 internal prototype to avoid an error. */
10187 +#ifdef __cplusplus
10188 +extern "C"
10189 +#endif
10190 +/* We use char because int might match the return type of a gcc2
10191 + builtin and then its argument prototype would still apply. */
10192 +char dlopen ();
10193 +int
10194 +main ()
10195 +{
10196 +dlopen ();
10197 + ;
10198 + return 0;
10199 +}
10200 +_ACEOF
10201 +rm -f conftest.$ac_objext conftest$ac_exeext
10202 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10203 + (eval $ac_link) 2>&5
10204 + ac_status=$?
10205 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10206 + (exit $ac_status); } &&
10207 + { ac_try='test -s conftest$ac_exeext'
10208 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10209 + (eval $ac_try) 2>&5
10210 + ac_status=$?
10211 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10212 + (exit $ac_status); }; }; then
10213 + ac_cv_lib_dl_dlopen=yes
10214 +else
10215 + echo "$as_me: failed program was:" >&5
10216 +sed 's/^/| /' conftest.$ac_ext >&5
10217 +
10218 +ac_cv_lib_dl_dlopen=no
10219 +fi
10220 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10221 +LIBS=$ac_check_lib_save_LIBS
10222 +fi
10223 +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
10224 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
10225 +if test $ac_cv_lib_dl_dlopen = yes; then
10226 + lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
10227 else
10228 - echo "$ac_t""no" 1>&6
10229 -echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
10230 -echo "configure:4490: checking for dlopen in -lsvld" >&5
10231 -ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
10232 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10233 - echo $ac_n "(cached) $ac_c" 1>&6
10234 + echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
10235 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
10236 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then
10237 + echo $ECHO_N "(cached) $ECHO_C" >&6
10238 else
10239 - ac_save_LIBS="$LIBS"
10240 + ac_check_lib_save_LIBS=$LIBS
10241 LIBS="-lsvld $LIBS"
10242 -cat > conftest.$ac_ext <<EOF
10243 -#line 4498 "configure"
10244 -#include "confdefs.h"
10245 +cat >conftest.$ac_ext <<_ACEOF
10246 +#line $LINENO "configure"
10247 +/* confdefs.h. */
10248 +_ACEOF
10249 +cat confdefs.h >>conftest.$ac_ext
10250 +cat >>conftest.$ac_ext <<_ACEOF
10251 +/* end confdefs.h. */
10252 +
10253 /* Override any gcc2 internal prototype to avoid an error. */
10254 +#ifdef __cplusplus
10255 +extern "C"
10256 +#endif
10257 /* We use char because int might match the return type of a gcc2
10258 - builtin and then its argument prototype would still apply. */
10259 -char dlopen();
10260 -
10261 -int main() {
10262 -dlopen()
10263 -; return 0; }
10264 -EOF
10265 -if { (eval echo configure:4509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10266 - rm -rf conftest*
10267 - eval "ac_cv_lib_$ac_lib_var=yes"
10268 -else
10269 - echo "configure: failed program was:" >&5
10270 - cat conftest.$ac_ext >&5
10271 - rm -rf conftest*
10272 - eval "ac_cv_lib_$ac_lib_var=no"
10273 -fi
10274 -rm -f conftest*
10275 -LIBS="$ac_save_LIBS"
10276 -
10277 -fi
10278 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
10279 - echo "$ac_t""yes" 1>&6
10280 + builtin and then its argument prototype would still apply. */
10281 +char dlopen ();
10282 +int
10283 +main ()
10284 +{
10285 +dlopen ();
10286 + ;
10287 + return 0;
10288 +}
10289 +_ACEOF
10290 +rm -f conftest.$ac_objext conftest$ac_exeext
10291 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10292 + (eval $ac_link) 2>&5
10293 + ac_status=$?
10294 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10295 + (exit $ac_status); } &&
10296 + { ac_try='test -s conftest$ac_exeext'
10297 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10298 + (eval $ac_try) 2>&5
10299 + ac_status=$?
10300 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10301 + (exit $ac_status); }; }; then
10302 + ac_cv_lib_svld_dlopen=yes
10303 +else
10304 + echo "$as_me: failed program was:" >&5
10305 +sed 's/^/| /' conftest.$ac_ext >&5
10306 +
10307 +ac_cv_lib_svld_dlopen=no
10308 +fi
10309 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10310 +LIBS=$ac_check_lib_save_LIBS
10311 +fi
10312 +echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
10313 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
10314 +if test $ac_cv_lib_svld_dlopen = yes; then
10315 lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
10316 else
10317 - echo "$ac_t""no" 1>&6
10318 -echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
10319 -echo "configure:4528: checking for shl_load in -ldld" >&5
10320 -ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
10321 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
10322 - echo $ac_n "(cached) $ac_c" 1>&6
10323 + echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
10324 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
10325 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then
10326 + echo $ECHO_N "(cached) $ECHO_C" >&6
10327 else
10328 - ac_save_LIBS="$LIBS"
10329 + ac_check_lib_save_LIBS=$LIBS
10330 LIBS="-ldld $LIBS"
10331 -cat > conftest.$ac_ext <<EOF
10332 -#line 4536 "configure"
10333 -#include "confdefs.h"
10334 +cat >conftest.$ac_ext <<_ACEOF
10335 +#line $LINENO "configure"
10336 +/* confdefs.h. */
10337 +_ACEOF
10338 +cat confdefs.h >>conftest.$ac_ext
10339 +cat >>conftest.$ac_ext <<_ACEOF
10340 +/* end confdefs.h. */
10341 +
10342 /* Override any gcc2 internal prototype to avoid an error. */
10343 +#ifdef __cplusplus
10344 +extern "C"
10345 +#endif
10346 /* We use char because int might match the return type of a gcc2
10347 - builtin and then its argument prototype would still apply. */
10348 -char shl_load();
10349 -
10350 -int main() {
10351 -shl_load()
10352 -; return 0; }
10353 -EOF
10354 -if { (eval echo configure:4547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
10355 - rm -rf conftest*
10356 - eval "ac_cv_lib_$ac_lib_var=yes"
10357 -else
10358 - echo "configure: failed program was:" >&5
10359 - cat conftest.$ac_ext >&5
10360 - rm -rf conftest*
10361 - eval "ac_cv_lib_$ac_lib_var=no"
10362 + builtin and then its argument prototype would still apply. */
10363 +char dld_link ();
10364 +int
10365 +main ()
10366 +{
10367 +dld_link ();
10368 + ;
10369 + return 0;
10370 +}
10371 +_ACEOF
10372 +rm -f conftest.$ac_objext conftest$ac_exeext
10373 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10374 + (eval $ac_link) 2>&5
10375 + ac_status=$?
10376 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10377 + (exit $ac_status); } &&
10378 + { ac_try='test -s conftest$ac_exeext'
10379 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10380 + (eval $ac_try) 2>&5
10381 + ac_status=$?
10382 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10383 + (exit $ac_status); }; }; then
10384 + ac_cv_lib_dld_dld_link=yes
10385 +else
10386 + echo "$as_me: failed program was:" >&5
10387 +sed 's/^/| /' conftest.$ac_ext >&5
10388 +
10389 +ac_cv_lib_dld_dld_link=no
10390 +fi
10391 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
10392 +LIBS=$ac_check_lib_save_LIBS
10393 +fi
10394 +echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
10395 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
10396 +if test $ac_cv_lib_dld_dld_link = yes; then
10397 + lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
10398 fi
10399 -rm -f conftest*
10400 -LIBS="$ac_save_LIBS"
10401
10402 -fi
10403 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
10404 - echo "$ac_t""yes" 1>&6
10405 - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
10406 -else
10407 - echo "$ac_t""no" 1>&6
10408 +
10409 fi
10410
10411 -
10412 +
10413 fi
10414
10415 -
10416 +
10417 fi
10418
10419 -
10420 +
10421 fi
10422
10423 -
10424 +
10425 fi
10426
10427 ;;
10428 @@ -4595,10 +7112,10 @@
10429 save_LIBS="$LIBS"
10430 LIBS="$lt_cv_dlopen_libs $LIBS"
10431
10432 - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
10433 -echo "configure:4600: checking whether a program can dlopen itself" >&5
10434 -if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
10435 - echo $ac_n "(cached) $ac_c" 1>&6
10436 + echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
10437 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
10438 +if test "${lt_cv_dlopen_self+set}" = set; then
10439 + echo $ECHO_N "(cached) $ECHO_C" >&6
10440 else
10441 if test "$cross_compiling" = yes; then :
10442 lt_cv_dlopen_self=cross
10443 @@ -4606,7 +7123,7 @@
10444 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10445 lt_status=$lt_dlunknown
10446 cat > conftest.$ac_ext <<EOF
10447 -#line 4610 "configure"
10448 +#line 7126 "configure"
10449 #include "confdefs.h"
10450
10451 #if HAVE_DLFCN_H
10452 @@ -4667,7 +7184,11 @@
10453 exit (status);
10454 }
10455 EOF
10456 - if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
10457 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10458 + (eval $ac_link) 2>&5
10459 + ac_status=$?
10460 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10461 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
10462 (./conftest; exit; ) 2>/dev/null
10463 lt_status=$?
10464 case x$lt_status in
10465 @@ -4682,17 +7203,17 @@
10466 fi
10467 rm -fr conftest*
10468
10469 -
10470 -fi
10471
10472 -echo "$ac_t""$lt_cv_dlopen_self" 1>&6
10473 +fi
10474 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
10475 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6
10476
10477 if test "x$lt_cv_dlopen_self" = xyes; then
10478 LDFLAGS="$LDFLAGS $link_static_flag"
10479 - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
10480 -echo "configure:4694: checking whether a statically linked program can dlopen itself" >&5
10481 -if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
10482 - echo $ac_n "(cached) $ac_c" 1>&6
10483 + echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
10484 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
10485 +if test "${lt_cv_dlopen_self_static+set}" = set; then
10486 + echo $ECHO_N "(cached) $ECHO_C" >&6
10487 else
10488 if test "$cross_compiling" = yes; then :
10489 lt_cv_dlopen_self_static=cross
10490 @@ -4700,7 +7221,7 @@
10491 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
10492 lt_status=$lt_dlunknown
10493 cat > conftest.$ac_ext <<EOF
10494 -#line 4704 "configure"
10495 +#line 7224 "configure"
10496 #include "confdefs.h"
10497
10498 #if HAVE_DLFCN_H
10499 @@ -4761,7 +7282,11 @@
10500 exit (status);
10501 }
10502 EOF
10503 - if { (eval echo configure:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
10504 + if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
10505 + (eval $ac_link) 2>&5
10506 + ac_status=$?
10507 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10508 + (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
10509 (./conftest; exit; ) 2>/dev/null
10510 lt_status=$?
10511 case x$lt_status in
10512 @@ -4776,10 +7301,10 @@
10513 fi
10514 rm -fr conftest*
10515
10516 -
10517 -fi
10518
10519 -echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
10520 +fi
10521 +echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
10522 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
10523 fi
10524
10525 CPPFLAGS="$save_CPPFLAGS"
10526 @@ -4809,15 +7334,19 @@
10527 # Test whether the compiler implicitly links with -lc since on some
10528 # systems, -lgcc has to come before -lc. If gcc already passes -lc
10529 # to ld, don't add -lc before -lgcc.
10530 - echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
10531 -echo "configure:4814: checking whether -lc should be explicitly linked in" >&5
10532 - if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
10533 - echo $ac_n "(cached) $ac_c" 1>&6
10534 + echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
10535 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
10536 + if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
10537 + echo $ECHO_N "(cached) $ECHO_C" >&6
10538 else
10539 $rm conftest*
10540 echo 'static int dummy;' > conftest.$ac_ext
10541
10542 - if { (eval echo configure:4821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
10543 + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10544 + (eval $ac_compile) 2>&5
10545 + ac_status=$?
10546 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10547 + (exit $ac_status); }; then
10548 soname=conftest
10549 lib=conftest
10550 libobjs=conftest.$ac_objext
10551 @@ -4830,7 +7359,11 @@
10552 libname=conftest
10553 save_allow_undefined_flag=$allow_undefined_flag
10554 allow_undefined_flag=
10555 - 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; }
10556 + if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
10557 + (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
10558 + ac_status=$?
10559 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10560 + (exit $ac_status); }
10561 then
10562 lt_cv_archive_cmds_need_lc=no
10563 else
10564 @@ -4842,7 +7375,8 @@
10565 fi
10566 fi
10567
10568 - echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
10569 + echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
10570 +echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
10571 ;;
10572 esac
10573 fi
10574 @@ -4870,7 +7404,7 @@
10575 # Now quote all the things that may contain metacharacters while being
10576 # careful not to overquote the AC_SUBSTed values. We take copies of the
10577 # variables and quote the copies for generation of the libtool script.
10578 - for var in echo old_CC old_CFLAGS \
10579 + for var in echo old_CC old_CFLAGS SED \
10580 AR AR_FLAGS CC LD LN_S NM SHELL \
10581 reload_flag reload_cmds wl \
10582 pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
10583 @@ -4882,6 +7416,7 @@
10584 old_striplib striplib file_magic_cmd export_symbols_cmds \
10585 deplibs_check_method allow_undefined_flag no_undefined_flag \
10586 finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
10587 + global_symbol_to_c_name_address \
10588 hardcode_libdir_flag_spec hardcode_libdir_separator \
10589 sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
10590 compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
10591 @@ -4931,8 +7466,11 @@
10592 # configuration script generated by Autoconf, you may include it under
10593 # the same distribution terms that you use for the rest of that program.
10594
10595 +# A sed that does not truncate output.
10596 +SED=$lt_SED
10597 +
10598 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
10599 -Xsed="sed -e s/^X//"
10600 +Xsed="${SED} -e s/^X//"
10601
10602 # The HP-UX ksh and POSIX shell print the target directory to stdout
10603 # if CDPATH is set.
10604 @@ -4948,12 +7486,12 @@
10605 # Whether or not to build shared libraries.
10606 build_libtool_libs=$enable_shared
10607
10608 -# Whether or not to add -lc for building shared libraries.
10609 -build_libtool_need_lc=$need_lc
10610 -
10611 # Whether or not to build static libraries.
10612 build_old_libs=$enable_static
10613
10614 +# Whether or not to add -lc for building shared libraries.
10615 +build_libtool_need_lc=$need_lc
10616 +
10617 # Whether or not to optimize for fast installation.
10618 fast_install=$enable_fast_install
10619
10620 @@ -5119,6 +7657,9 @@
10621 # Transform the output of nm in a proper C declaration
10622 global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
10623
10624 +# Transform the output of nm in a C name address pair
10625 +global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
10626 +
10627 # This is the shared library runtime path variable.
10628 runpath_var=$runpath_var
10629
10630 @@ -5241,9 +7782,9 @@
10631 # return TRUE;
10632 # }
10633 # /* ltdll.c ends here */
10634 - # This is a source program that is used to create import libraries
10635 - # on Windows for dlls which lack them. Don't remove nor modify the
10636 - # starting and closing comments
10637 + # This is a source program that is used to create import libraries
10638 + # on Windows for dlls which lack them. Don't remove nor modify the
10639 + # starting and closing comments
10640 # /* impgen.c starts here */
10641 # /* Copyright (C) 1999-2000 Free Software Foundation, Inc.
10642 #
10643 @@ -5411,156 +7952,386 @@
10644
10645 # Extract the first word of "perl", so it can be a program name with args.
10646 set dummy perl; ac_word=$2
10647 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
10648 -echo "configure:5416: checking for $ac_word" >&5
10649 -if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then
10650 - echo $ac_n "(cached) $ac_c" 1>&6
10651 +echo "$as_me:$LINENO: checking for $ac_word" >&5
10652 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
10653 +if test "${ac_cv_path_PERL+set}" = set; then
10654 + echo $ECHO_N "(cached) $ECHO_C" >&6
10655 else
10656 - case "$PERL" in
10657 - /*)
10658 + case $PERL in
10659 + [\\/]* | ?:[\\/]*)
10660 ac_cv_path_PERL="$PERL" # Let the user override the test with a path.
10661 ;;
10662 - ?:/*)
10663 - ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path.
10664 - ;;
10665 *)
10666 - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
10667 - ac_dummy="$PATH"
10668 - for ac_dir in $ac_dummy; do
10669 - test -z "$ac_dir" && ac_dir=.
10670 - if test -f $ac_dir/$ac_word; then
10671 - ac_cv_path_PERL="$ac_dir/$ac_word"
10672 - break
10673 - fi
10674 - done
10675 - IFS="$ac_save_ifs"
10676 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
10677 +for as_dir in $PATH
10678 +do
10679 + IFS=$as_save_IFS
10680 + test -z "$as_dir" && as_dir=.
10681 + for ac_exec_ext in '' $ac_executable_extensions; do
10682 + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
10683 + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
10684 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
10685 + break 2
10686 + fi
10687 +done
10688 +done
10689 +
10690 ;;
10691 esac
10692 fi
10693 -PERL="$ac_cv_path_PERL"
10694 +PERL=$ac_cv_path_PERL
10695 +
10696 if test -n "$PERL"; then
10697 - echo "$ac_t""$PERL" 1>&6
10698 + echo "$as_me:$LINENO: result: $PERL" >&5
10699 +echo "${ECHO_T}$PERL" >&6
10700 else
10701 - echo "$ac_t""no" 1>&6
10702 + echo "$as_me:$LINENO: result: no" >&5
10703 +echo "${ECHO_T}no" >&6
10704 fi
10705
10706
10707
10708
10709 -ac_safe=`echo "asm/errno.h" | sed 'y%./+-%__p_%'`
10710 -echo $ac_n "checking for asm/errno.h""... $ac_c" 1>&6
10711 -echo "configure:5453: checking for asm/errno.h" >&5
10712 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
10713 - echo $ac_n "(cached) $ac_c" 1>&6
10714 +if test "${ac_cv_header_asm_errno_h+set}" = set; then
10715 + echo "$as_me:$LINENO: checking for asm/errno.h" >&5
10716 +echo $ECHO_N "checking for asm/errno.h... $ECHO_C" >&6
10717 +if test "${ac_cv_header_asm_errno_h+set}" = set; then
10718 + echo $ECHO_N "(cached) $ECHO_C" >&6
10719 +fi
10720 +echo "$as_me:$LINENO: result: $ac_cv_header_asm_errno_h" >&5
10721 +echo "${ECHO_T}$ac_cv_header_asm_errno_h" >&6
10722 else
10723 - cat > conftest.$ac_ext <<EOF
10724 -#line 5458 "configure"
10725 -#include "confdefs.h"
10726 + # Is the header compilable?
10727 +echo "$as_me:$LINENO: checking asm/errno.h usability" >&5
10728 +echo $ECHO_N "checking asm/errno.h usability... $ECHO_C" >&6
10729 +cat >conftest.$ac_ext <<_ACEOF
10730 +#line $LINENO "configure"
10731 +/* confdefs.h. */
10732 +_ACEOF
10733 +cat confdefs.h >>conftest.$ac_ext
10734 +cat >>conftest.$ac_ext <<_ACEOF
10735 +/* end confdefs.h. */
10736 +$ac_includes_default
10737 #include <asm/errno.h>
10738 -EOF
10739 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
10740 -{ (eval echo configure:5463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10741 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
10742 -if test -z "$ac_err"; then
10743 - rm -rf conftest*
10744 - eval "ac_cv_header_$ac_safe=yes"
10745 +_ACEOF
10746 +rm -f conftest.$ac_objext
10747 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10748 + (eval $ac_compile) 2>&5
10749 + ac_status=$?
10750 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10751 + (exit $ac_status); } &&
10752 + { ac_try='test -s conftest.$ac_objext'
10753 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10754 + (eval $ac_try) 2>&5
10755 + ac_status=$?
10756 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10757 + (exit $ac_status); }; }; then
10758 + ac_header_compiler=yes
10759 +else
10760 + echo "$as_me: failed program was:" >&5
10761 +sed 's/^/| /' conftest.$ac_ext >&5
10762 +
10763 +ac_header_compiler=no
10764 +fi
10765 +rm -f conftest.$ac_objext conftest.$ac_ext
10766 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
10767 +echo "${ECHO_T}$ac_header_compiler" >&6
10768 +
10769 +# Is the header present?
10770 +echo "$as_me:$LINENO: checking asm/errno.h presence" >&5
10771 +echo $ECHO_N "checking asm/errno.h presence... $ECHO_C" >&6
10772 +cat >conftest.$ac_ext <<_ACEOF
10773 +#line $LINENO "configure"
10774 +/* confdefs.h. */
10775 +_ACEOF
10776 +cat confdefs.h >>conftest.$ac_ext
10777 +cat >>conftest.$ac_ext <<_ACEOF
10778 +/* end confdefs.h. */
10779 +#include <asm/errno.h>
10780 +_ACEOF
10781 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
10782 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10783 + ac_status=$?
10784 + grep -v '^ *+' conftest.er1 >conftest.err
10785 + rm -f conftest.er1
10786 + cat conftest.err >&5
10787 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10788 + (exit $ac_status); } >/dev/null; then
10789 + if test -s conftest.err; then
10790 + ac_cpp_err=$ac_c_preproc_warn_flag
10791 + else
10792 + ac_cpp_err=
10793 + fi
10794 else
10795 - echo "$ac_err" >&5
10796 - echo "configure: failed program was:" >&5
10797 - cat conftest.$ac_ext >&5
10798 - rm -rf conftest*
10799 - eval "ac_cv_header_$ac_safe=no"
10800 + ac_cpp_err=yes
10801 fi
10802 -rm -f conftest*
10803 +if test -z "$ac_cpp_err"; then
10804 + ac_header_preproc=yes
10805 +else
10806 + echo "$as_me: failed program was:" >&5
10807 +sed 's/^/| /' conftest.$ac_ext >&5
10808 +
10809 + ac_header_preproc=no
10810 +fi
10811 +rm -f conftest.err conftest.$ac_ext
10812 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
10813 +echo "${ECHO_T}$ac_header_preproc" >&6
10814 +
10815 +# So? What about this header?
10816 +case $ac_header_compiler:$ac_header_preproc in
10817 + yes:no )
10818 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: accepted by the compiler, rejected by the preprocessor!" >&5
10819 +echo "$as_me: WARNING: asm/errno.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
10820 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: proceeding with the preprocessor's result" >&5
10821 +echo "$as_me: WARNING: asm/errno.h: proceeding with the preprocessor's result" >&2;}
10822 + (
10823 + cat <<\_ASBOX
10824 +## ------------------------------------ ##
10825 +## Report this to bug-autoconf@gnu.org. ##
10826 +## ------------------------------------ ##
10827 +_ASBOX
10828 + ) |
10829 + sed "s/^/$as_me: WARNING: /" >&2
10830 + ;;
10831 + no:yes )
10832 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: present but cannot be compiled" >&5
10833 +echo "$as_me: WARNING: asm/errno.h: present but cannot be compiled" >&2;}
10834 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: check for missing prerequisite headers?" >&5
10835 +echo "$as_me: WARNING: asm/errno.h: check for missing prerequisite headers?" >&2;}
10836 + { echo "$as_me:$LINENO: WARNING: asm/errno.h: proceeding with the preprocessor's result" >&5
10837 +echo "$as_me: WARNING: asm/errno.h: proceeding with the preprocessor's result" >&2;}
10838 + (
10839 + cat <<\_ASBOX
10840 +## ------------------------------------ ##
10841 +## Report this to bug-autoconf@gnu.org. ##
10842 +## ------------------------------------ ##
10843 +_ASBOX
10844 + ) |
10845 + sed "s/^/$as_me: WARNING: /" >&2
10846 + ;;
10847 +esac
10848 +echo "$as_me:$LINENO: checking for asm/errno.h" >&5
10849 +echo $ECHO_N "checking for asm/errno.h... $ECHO_C" >&6
10850 +if test "${ac_cv_header_asm_errno_h+set}" = set; then
10851 + echo $ECHO_N "(cached) $ECHO_C" >&6
10852 +else
10853 + ac_cv_header_asm_errno_h=$ac_header_preproc
10854 +fi
10855 +echo "$as_me:$LINENO: result: $ac_cv_header_asm_errno_h" >&5
10856 +echo "${ECHO_T}$ac_cv_header_asm_errno_h" >&6
10857 +
10858 fi
10859 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
10860 - echo "$ac_t""yes" 1>&6
10861 +if test $ac_cv_header_asm_errno_h = yes; then
10862 :
10863 else
10864 - echo "$ac_t""no" 1>&6
10865 -{ echo "configure: error: *** Unable to find asm/errno.h!!!" 1>&2; exit 1; }
10866 + { { echo "$as_me:$LINENO: error: *** Unable to find asm/errno.h!!!" >&5
10867 +echo "$as_me: error: *** Unable to find asm/errno.h!!!" >&2;}
10868 + { (exit 1); exit 1; }; }
10869
10870 fi
10871
10872
10873 -ac_safe=`echo "linux/atmsap.h" | sed 'y%./+-%__p_%'`
10874 -echo $ac_n "checking for linux/atmsap.h""... $ac_c" 1>&6
10875 -echo "configure:5489: checking for linux/atmsap.h" >&5
10876 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
10877 - echo $ac_n "(cached) $ac_c" 1>&6
10878 -else
10879 - cat > conftest.$ac_ext <<EOF
10880 -#line 5494 "configure"
10881 -#include "confdefs.h"
10882 +
10883 +if test "${ac_cv_header_linux_atmsap_h+set}" = set; then
10884 + echo "$as_me:$LINENO: checking for linux/atmsap.h" >&5
10885 +echo $ECHO_N "checking for linux/atmsap.h... $ECHO_C" >&6
10886 +if test "${ac_cv_header_linux_atmsap_h+set}" = set; then
10887 + echo $ECHO_N "(cached) $ECHO_C" >&6
10888 +fi
10889 +echo "$as_me:$LINENO: result: $ac_cv_header_linux_atmsap_h" >&5
10890 +echo "${ECHO_T}$ac_cv_header_linux_atmsap_h" >&6
10891 +else
10892 + # Is the header compilable?
10893 +echo "$as_me:$LINENO: checking linux/atmsap.h usability" >&5
10894 +echo $ECHO_N "checking linux/atmsap.h usability... $ECHO_C" >&6
10895 +cat >conftest.$ac_ext <<_ACEOF
10896 +#line $LINENO "configure"
10897 +/* confdefs.h. */
10898 +_ACEOF
10899 +cat confdefs.h >>conftest.$ac_ext
10900 +cat >>conftest.$ac_ext <<_ACEOF
10901 +/* end confdefs.h. */
10902 +$ac_includes_default
10903 #include <linux/atmsap.h>
10904 -EOF
10905 -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
10906 -{ (eval echo configure:5499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
10907 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
10908 -if test -z "$ac_err"; then
10909 - rm -rf conftest*
10910 - eval "ac_cv_header_$ac_safe=yes"
10911 +_ACEOF
10912 +rm -f conftest.$ac_objext
10913 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
10914 + (eval $ac_compile) 2>&5
10915 + ac_status=$?
10916 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10917 + (exit $ac_status); } &&
10918 + { ac_try='test -s conftest.$ac_objext'
10919 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
10920 + (eval $ac_try) 2>&5
10921 + ac_status=$?
10922 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10923 + (exit $ac_status); }; }; then
10924 + ac_header_compiler=yes
10925 +else
10926 + echo "$as_me: failed program was:" >&5
10927 +sed 's/^/| /' conftest.$ac_ext >&5
10928 +
10929 +ac_header_compiler=no
10930 +fi
10931 +rm -f conftest.$ac_objext conftest.$ac_ext
10932 +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
10933 +echo "${ECHO_T}$ac_header_compiler" >&6
10934 +
10935 +# Is the header present?
10936 +echo "$as_me:$LINENO: checking linux/atmsap.h presence" >&5
10937 +echo $ECHO_N "checking linux/atmsap.h presence... $ECHO_C" >&6
10938 +cat >conftest.$ac_ext <<_ACEOF
10939 +#line $LINENO "configure"
10940 +/* confdefs.h. */
10941 +_ACEOF
10942 +cat confdefs.h >>conftest.$ac_ext
10943 +cat >>conftest.$ac_ext <<_ACEOF
10944 +/* end confdefs.h. */
10945 +#include <linux/atmsap.h>
10946 +_ACEOF
10947 +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
10948 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
10949 + ac_status=$?
10950 + grep -v '^ *+' conftest.er1 >conftest.err
10951 + rm -f conftest.er1
10952 + cat conftest.err >&5
10953 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
10954 + (exit $ac_status); } >/dev/null; then
10955 + if test -s conftest.err; then
10956 + ac_cpp_err=$ac_c_preproc_warn_flag
10957 + else
10958 + ac_cpp_err=
10959 + fi
10960 else
10961 - echo "$ac_err" >&5
10962 - echo "configure: failed program was:" >&5
10963 - cat conftest.$ac_ext >&5
10964 - rm -rf conftest*
10965 - eval "ac_cv_header_$ac_safe=no"
10966 + ac_cpp_err=yes
10967 fi
10968 -rm -f conftest*
10969 +if test -z "$ac_cpp_err"; then
10970 + ac_header_preproc=yes
10971 +else
10972 + echo "$as_me: failed program was:" >&5
10973 +sed 's/^/| /' conftest.$ac_ext >&5
10974 +
10975 + ac_header_preproc=no
10976 +fi
10977 +rm -f conftest.err conftest.$ac_ext
10978 +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
10979 +echo "${ECHO_T}$ac_header_preproc" >&6
10980 +
10981 +# So? What about this header?
10982 +case $ac_header_compiler:$ac_header_preproc in
10983 + yes:no )
10984 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: accepted by the compiler, rejected by the preprocessor!" >&5
10985 +echo "$as_me: WARNING: linux/atmsap.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
10986 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: proceeding with the preprocessor's result" >&5
10987 +echo "$as_me: WARNING: linux/atmsap.h: proceeding with the preprocessor's result" >&2;}
10988 + (
10989 + cat <<\_ASBOX
10990 +## ------------------------------------ ##
10991 +## Report this to bug-autoconf@gnu.org. ##
10992 +## ------------------------------------ ##
10993 +_ASBOX
10994 + ) |
10995 + sed "s/^/$as_me: WARNING: /" >&2
10996 + ;;
10997 + no:yes )
10998 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: present but cannot be compiled" >&5
10999 +echo "$as_me: WARNING: linux/atmsap.h: present but cannot be compiled" >&2;}
11000 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: check for missing prerequisite headers?" >&5
11001 +echo "$as_me: WARNING: linux/atmsap.h: check for missing prerequisite headers?" >&2;}
11002 + { echo "$as_me:$LINENO: WARNING: linux/atmsap.h: proceeding with the preprocessor's result" >&5
11003 +echo "$as_me: WARNING: linux/atmsap.h: proceeding with the preprocessor's result" >&2;}
11004 + (
11005 + cat <<\_ASBOX
11006 +## ------------------------------------ ##
11007 +## Report this to bug-autoconf@gnu.org. ##
11008 +## ------------------------------------ ##
11009 +_ASBOX
11010 + ) |
11011 + sed "s/^/$as_me: WARNING: /" >&2
11012 + ;;
11013 +esac
11014 +echo "$as_me:$LINENO: checking for linux/atmsap.h" >&5
11015 +echo $ECHO_N "checking for linux/atmsap.h... $ECHO_C" >&6
11016 +if test "${ac_cv_header_linux_atmsap_h+set}" = set; then
11017 + echo $ECHO_N "(cached) $ECHO_C" >&6
11018 +else
11019 + ac_cv_header_linux_atmsap_h=$ac_header_preproc
11020 fi
11021 -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
11022 - echo "$ac_t""yes" 1>&6
11023 +echo "$as_me:$LINENO: result: $ac_cv_header_linux_atmsap_h" >&5
11024 +echo "${ECHO_T}$ac_cv_header_linux_atmsap_h" >&6
11025 +
11026 +fi
11027 +if test $ac_cv_header_linux_atmsap_h = yes; then
11028 :
11029 else
11030 - echo "$ac_t""no" 1>&6
11031 -{ echo "configure: error: *** Unable to find linux/atmsap.h!!!" 1>&2; exit 1; }
11032 + { { echo "$as_me:$LINENO: error: *** Unable to find linux/atmsap.h!!!" >&5
11033 +echo "$as_me: error: *** Unable to find linux/atmsap.h!!!" >&2;}
11034 + { (exit 1); exit 1; }; }
11035
11036 fi
11037
11038
11039 -echo $ac_n "checking for main in -lresolv""... $ac_c" 1>&6
11040 -echo "configure:5524: checking for main in -lresolv" >&5
11041 -ac_lib_var=`echo resolv'_'main | sed 'y%./+-%__p_%'`
11042 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11043 - echo $ac_n "(cached) $ac_c" 1>&6
11044 +
11045 +
11046 +echo "$as_me:$LINENO: checking for main in -lresolv" >&5
11047 +echo $ECHO_N "checking for main in -lresolv... $ECHO_C" >&6
11048 +if test "${ac_cv_lib_resolv_main+set}" = set; then
11049 + echo $ECHO_N "(cached) $ECHO_C" >&6
11050 else
11051 - ac_save_LIBS="$LIBS"
11052 + ac_check_lib_save_LIBS=$LIBS
11053 LIBS="-lresolv $LIBS"
11054 -cat > conftest.$ac_ext <<EOF
11055 -#line 5532 "configure"
11056 -#include "confdefs.h"
11057 +cat >conftest.$ac_ext <<_ACEOF
11058 +#line $LINENO "configure"
11059 +/* confdefs.h. */
11060 +_ACEOF
11061 +cat confdefs.h >>conftest.$ac_ext
11062 +cat >>conftest.$ac_ext <<_ACEOF
11063 +/* end confdefs.h. */
11064
11065 -int main() {
11066 -main()
11067 -; return 0; }
11068 -EOF
11069 -if { (eval echo configure:5539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11070 - rm -rf conftest*
11071 - eval "ac_cv_lib_$ac_lib_var=yes"
11072 -else
11073 - echo "configure: failed program was:" >&5
11074 - cat conftest.$ac_ext >&5
11075 - rm -rf conftest*
11076 - eval "ac_cv_lib_$ac_lib_var=no"
11077 -fi
11078 -rm -f conftest*
11079 -LIBS="$ac_save_LIBS"
11080
11081 -fi
11082 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
11083 - echo "$ac_t""yes" 1>&6
11084 - ac_tr_lib=HAVE_LIB`echo resolv | sed -e 's/[^a-zA-Z0-9_]/_/g' \
11085 - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
11086 - cat >> confdefs.h <<EOF
11087 -#define $ac_tr_lib 1
11088 -EOF
11089 +int
11090 +main ()
11091 +{
11092 +main ();
11093 + ;
11094 + return 0;
11095 +}
11096 +_ACEOF
11097 +rm -f conftest.$ac_objext conftest$ac_exeext
11098 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11099 + (eval $ac_link) 2>&5
11100 + ac_status=$?
11101 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
11102 + (exit $ac_status); } &&
11103 + { ac_try='test -s conftest$ac_exeext'
11104 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11105 + (eval $ac_try) 2>&5
11106 + ac_status=$?
11107 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
11108 + (exit $ac_status); }; }; then
11109 + ac_cv_lib_resolv_main=yes
11110 +else
11111 + echo "$as_me: failed program was:" >&5
11112 +sed 's/^/| /' conftest.$ac_ext >&5
11113 +
11114 +ac_cv_lib_resolv_main=no
11115 +fi
11116 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11117 +LIBS=$ac_check_lib_save_LIBS
11118 +fi
11119 +echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_main" >&5
11120 +echo "${ECHO_T}$ac_cv_lib_resolv_main" >&6
11121 +if test $ac_cv_lib_resolv_main = yes; then
11122 + cat >>confdefs.h <<_ACEOF
11123 +#define HAVE_LIBRESOLV 1
11124 +_ACEOF
11125
11126 LIBS="-lresolv $LIBS"
11127
11128 else
11129 - echo "$ac_t""no" 1>&6
11130 -{ echo "configure: error: *** Unable to find libresolv!!!" 1>&2; exit 1; }
11131 + { { echo "$as_me:$LINENO: error: *** Unable to find libresolv!!!" >&5
11132 +echo "$as_me: error: *** Unable to find libresolv!!!" >&2;}
11133 + { (exit 1); exit 1; }; }
11134
11135 fi
11136
11137 @@ -5571,639 +8342,1417 @@
11138 CFLAGS="$INCLUDES $CFLAGS -Wall -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes"
11139 YACC="$YACC -d"
11140
11141 -cat >> confdefs.h <<\EOF
11142 +cat >>confdefs.h <<\_ACEOF
11143 #define YY_USE_CONST 1
11144 -EOF
11145 +_ACEOF
11146
11147
11148 atmsigd_conf_dir=` test "x$exec_prefix" = xNONE && exec_prefix=$ac_default_prefix
11149 test "x$prefix" = xNONE && prefix=${exec_prefix}
11150 eval echo "$sysconfdir"`
11151 -cat >> confdefs.h <<EOF
11152 +cat >>confdefs.h <<_ACEOF
11153 #define ATMSIGD_CONF "$atmsigd_conf_dir/atmsigd.conf"
11154 -EOF
11155 +_ACEOF
11156 +
11157
11158
11159 # Check whether --with-uni or --without-uni was given.
11160 if test "${with_uni+set}" = set; then
11161 withval="$with_uni"
11162 -
11163 +
11164 case "$with_uni" in
11165 - "3.0" ) cat >> confdefs.h <<\EOF
11166 + "3.0" ) cat >>confdefs.h <<\_ACEOF
11167 #define UNI30 1
11168 -EOF
11169 +_ACEOF
11170
11171 ;;
11172 - "3.1" ) cat >> confdefs.h <<\EOF
11173 + "3.1" ) cat >>confdefs.h <<\_ACEOF
11174 #define UNI31 1
11175 -EOF
11176 +_ACEOF
11177
11178 ;;
11179 - "4.0" ) cat >> confdefs.h <<\EOF
11180 + "4.0" ) cat >>confdefs.h <<\_ACEOF
11181 #define UNI40 1
11182 -EOF
11183 +_ACEOF
11184
11185 ;;
11186 *)
11187 - cat >> confdefs.h <<\EOF
11188 + cat >>confdefs.h <<\_ACEOF
11189 #define DYNAMIC_UNI 1
11190 -EOF
11191 +_ACEOF
11192
11193 - echo "configure: warning: *** UNI version not specified correctly. Defaulting to dynamic UNI." 1>&2
11194 + { echo "$as_me:$LINENO: WARNING: *** UNI version not specified correctly. Defaulting to dynamic UNI." >&5
11195 +echo "$as_me: WARNING: *** UNI version not specified correctly. Defaulting to dynamic UNI." >&2;}
11196 esac
11197 -
11198 +
11199 else
11200 - cat >> confdefs.h <<\EOF
11201 + cat >>confdefs.h <<\_ACEOF
11202 #define DYNAMIC_UNI 1
11203 -EOF
11204 +_ACEOF
11205
11206
11207 -fi
11208 -
11209 +fi;
11210
11211 # Check whether --enable-allow_uni30 or --disable-allow_uni30 was given.
11212 if test "${enable_allow_uni30+set}" = set; then
11213 enableval="$enable_allow_uni30"
11214 -
11215 +
11216 if test "$with_uni" = "3.1" ; then
11217 - cat >> confdefs.h <<\EOF
11218 + cat >>confdefs.h <<\_ACEOF
11219 #define ALLOW_UNI30 1
11220 -EOF
11221 +_ACEOF
11222
11223 else
11224 - 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
11225 + { 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
11226 +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;}
11227 fi
11228 -
11229
11230 -fi
11231
11232 +fi;
11233
11234 # Check whether --enable-q2963_1 or --disable-q2963_1 was given.
11235 if test "${enable_q2963_1+set}" = set; then
11236 enableval="$enable_q2963_1"
11237 -
11238 +
11239 if test "$with_uni" = "4.0" ; then
11240 - cat >> confdefs.h <<\EOF
11241 + cat >>confdefs.h <<\_ACEOF
11242 #define Q2963_1 1
11243 -EOF
11244 +_ACEOF
11245
11246 else
11247 - 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
11248 + { 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
11249 +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;}
11250 fi
11251 -
11252
11253 -fi
11254
11255 +fi;
11256
11257 # Check whether --enable-cisco or --disable-cisco was given.
11258 if test "${enable_cisco+set}" = set; then
11259 enableval="$enable_cisco"
11260 - cat >> confdefs.h <<\EOF
11261 + cat >>confdefs.h <<\_ACEOF
11262 #define CISCO 1
11263 -EOF
11264 +_ACEOF
11265
11266
11267 -fi
11268 -
11269 +fi;
11270
11271 # Check whether --enable-thomflex or --disable-thomflex was given.
11272 if test "${enable_thomflex+set}" = set; then
11273 enableval="$enable_thomflex"
11274 - cat >> confdefs.h <<\EOF
11275 + cat >>confdefs.h <<\_ACEOF
11276 #define THOMFLEX 1
11277 -EOF
11278 -
11279 +_ACEOF
11280
11281 -fi
11282
11283 +fi;
11284
11285 -cat >> confdefs.h <<\EOF
11286 +cat >>confdefs.h <<\_ACEOF
11287 #define BROKEN_POLL 1
11288 -EOF
11289 +_ACEOF
11290
11291
11292 # Check whether --enable-mpoa_1_1 or --disable-mpoa_1_1 was given.
11293 if test "${enable_mpoa_1_1+set}" = set; then
11294 enableval="$enable_mpoa_1_1"
11295 - cat >> confdefs.h <<\EOF
11296 + cat >>confdefs.h <<\_ACEOF
11297 #define MPOA_1_1 1
11298 -EOF
11299 -
11300 +_ACEOF
11301
11302 -fi
11303
11304 +fi;
11305
11306 # Check whether --enable-mpr or --disable-mpr was given.
11307 if test "${enable_mpr+set}" = set; then
11308 enableval="$enable_mpr"
11309 -
11310 +
11311 case "$enable_mpr" in
11312 "" | y | ye | yes | Y | YE | YES )
11313 - echo $ac_n "checking for main in -lmpr""... $ac_c" 1>&6
11314 -echo "configure:5704: checking for main in -lmpr" >&5
11315 -ac_lib_var=`echo mpr'_'main | sed 'y%./+-%__p_%'`
11316 -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
11317 - echo $ac_n "(cached) $ac_c" 1>&6
11318 +
11319 +echo "$as_me:$LINENO: checking for main in -lmpr" >&5
11320 +echo $ECHO_N "checking for main in -lmpr... $ECHO_C" >&6
11321 +if test "${ac_cv_lib_mpr_main+set}" = set; then
11322 + echo $ECHO_N "(cached) $ECHO_C" >&6
11323 else
11324 - ac_save_LIBS="$LIBS"
11325 + ac_check_lib_save_LIBS=$LIBS
11326 LIBS="-lmpr $LIBS"
11327 -cat > conftest.$ac_ext <<EOF
11328 -#line 5712 "configure"
11329 -#include "confdefs.h"
11330 +cat >conftest.$ac_ext <<_ACEOF
11331 +#line $LINENO "configure"
11332 +/* confdefs.h. */
11333 +_ACEOF
11334 +cat confdefs.h >>conftest.$ac_ext
11335 +cat >>conftest.$ac_ext <<_ACEOF
11336 +/* end confdefs.h. */
11337
11338 -int main() {
11339 -main()
11340 -; return 0; }
11341 -EOF
11342 -if { (eval echo configure:5719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
11343 - rm -rf conftest*
11344 - eval "ac_cv_lib_$ac_lib_var=yes"
11345 -else
11346 - echo "configure: failed program was:" >&5
11347 - cat conftest.$ac_ext >&5
11348 - rm -rf conftest*
11349 - eval "ac_cv_lib_$ac_lib_var=no"
11350 -fi
11351 -rm -f conftest*
11352 -LIBS="$ac_save_LIBS"
11353
11354 -fi
11355 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
11356 - echo "$ac_t""yes" 1>&6
11357 - ac_tr_lib=HAVE_LIB`echo mpr | sed -e 's/[^a-zA-Z0-9_]/_/g' \
11358 - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
11359 - cat >> confdefs.h <<EOF
11360 -#define $ac_tr_lib 1
11361 -EOF
11362 +int
11363 +main ()
11364 +{
11365 +main ();
11366 + ;
11367 + return 0;
11368 +}
11369 +_ACEOF
11370 +rm -f conftest.$ac_objext conftest$ac_exeext
11371 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
11372 + (eval $ac_link) 2>&5
11373 + ac_status=$?
11374 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
11375 + (exit $ac_status); } &&
11376 + { ac_try='test -s conftest$ac_exeext'
11377 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
11378 + (eval $ac_try) 2>&5
11379 + ac_status=$?
11380 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
11381 + (exit $ac_status); }; }; then
11382 + ac_cv_lib_mpr_main=yes
11383 +else
11384 + echo "$as_me: failed program was:" >&5
11385 +sed 's/^/| /' conftest.$ac_ext >&5
11386 +
11387 +ac_cv_lib_mpr_main=no
11388 +fi
11389 +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
11390 +LIBS=$ac_check_lib_save_LIBS
11391 +fi
11392 +echo "$as_me:$LINENO: result: $ac_cv_lib_mpr_main" >&5
11393 +echo "${ECHO_T}$ac_cv_lib_mpr_main" >&6
11394 +if test $ac_cv_lib_mpr_main = yes; then
11395 + cat >>confdefs.h <<_ACEOF
11396 +#define HAVE_LIBMPR 1
11397 +_ACEOF
11398
11399 LIBS="-lmpr $LIBS"
11400
11401 else
11402 - echo "$ac_t""no" 1>&6
11403
11404 - echo "configure: warning: *** Could not find libmpr! Is MPR installed?" 1>&2
11405 -
11406 -
11407 + { echo "$as_me:$LINENO: WARNING: *** Could not find libmpr! Is MPR installed?" >&5
11408 +echo "$as_me: WARNING: *** Could not find libmpr! Is MPR installed?" >&2;}
11409 +
11410 +
11411 fi
11412
11413 ;;
11414 esac
11415 -
11416
11417 -fi
11418
11419 +fi;
11420
11421
11422 -trap '' 1 2 15
11423 -cat > confcache <<\EOF
11424 + 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"
11425 +cat >confcache <<\_ACEOF
11426 # This file is a shell script that caches the results of configure
11427 # tests run on this system so they can be shared between configure
11428 -# scripts and configure runs. It is not useful on other systems.
11429 -# If it contains results you don't want to keep, you may remove or edit it.
11430 +# scripts and configure runs, see configure's option --config-cache.
11431 +# It is not useful on other systems. If it contains results you don't
11432 +# want to keep, you may remove or edit it.
11433 #
11434 -# By default, configure uses ./config.cache as the cache file,
11435 -# creating it if it does not exist already. You can give configure
11436 -# the --cache-file=FILE option to use a different cache file; that is
11437 -# what configure does when it calls configure scripts in
11438 -# subdirectories, so they share the cache.
11439 -# Giving --cache-file=/dev/null disables caching, for debugging configure.
11440 -# config.status only pays attention to the cache file if you give it the
11441 -# --recheck option to rerun configure.
11442 +# config.status only pays attention to the cache file if you give it
11443 +# the --recheck option to rerun configure.
11444 #
11445 -EOF
11446 +# `ac_cv_env_foo' variables (set or unset) will be overridden when
11447 +# loading this file, other *unset* `ac_cv_foo' will be assigned the
11448 +# following values.
11449 +
11450 +_ACEOF
11451 +
11452 # The following way of writing the cache mishandles newlines in values,
11453 # but we know of no workaround that is simple, portable, and efficient.
11454 # So, don't put newlines in cache variables' values.
11455 # Ultrix sh set writes to stderr and can't be redirected directly,
11456 # and sets the high bit in the cache file unless we assign to the vars.
11457 -(set) 2>&1 |
11458 - case `(ac_space=' '; set | grep ac_space) 2>&1` in
11459 - *ac_space=\ *)
11460 - # `set' does not quote correctly, so add quotes (double-quote substitution
11461 - # turns \\\\ into \\, and sed turns \\ into \).
11462 - sed -n \
11463 - -e "s/'/'\\\\''/g" \
11464 - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
11465 - ;;
11466 - *)
11467 - # `set' quotes correctly as required by POSIX, so do not add quotes.
11468 - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
11469 - ;;
11470 - esac >> confcache
11471 -if cmp -s $cache_file confcache; then
11472 - :
11473 -else
11474 +{
11475 + (set) 2>&1 |
11476 + case `(ac_space=' '; set | grep ac_space) 2>&1` in
11477 + *ac_space=\ *)
11478 + # `set' does not quote correctly, so add quotes (double-quote
11479 + # substitution turns \\\\ into \\, and sed turns \\ into \).
11480 + sed -n \
11481 + "s/'/'\\\\''/g;
11482 + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
11483 + ;;
11484 + *)
11485 + # `set' quotes correctly as required by POSIX, so do not add quotes.
11486 + sed -n \
11487 + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
11488 + ;;
11489 + esac;
11490 +} |
11491 + sed '
11492 + t clear
11493 + : clear
11494 + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
11495 + t end
11496 + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
11497 + : end' >>confcache
11498 +if diff $cache_file confcache >/dev/null 2>&1; then :; else
11499 if test -w $cache_file; then
11500 - echo "updating cache $cache_file"
11501 - cat confcache > $cache_file
11502 + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
11503 + cat confcache >$cache_file
11504 else
11505 echo "not updating unwritable cache $cache_file"
11506 fi
11507 fi
11508 rm -f confcache
11509
11510 -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
11511 -
11512 test "x$prefix" = xNONE && prefix=$ac_default_prefix
11513 # Let make expand exec_prefix.
11514 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
11515
11516 -# Any assignment to VPATH causes Sun make to only execute
11517 -# the first set of double-colon rules, so remove it if not needed.
11518 -# If there is a colon in the path, we need to keep it.
11519 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
11520 +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
11521 +# trailing colons and then remove the whole line if VPATH becomes empty
11522 +# (actually we leave an empty line to preserve line numbers).
11523 if test "x$srcdir" = x.; then
11524 - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
11525 + ac_vpsub='/^[ ]*VPATH[ ]*=/{
11526 +s/:*\$(srcdir):*/:/;
11527 +s/:*\${srcdir}:*/:/;
11528 +s/:*@srcdir@:*/:/;
11529 +s/^\([^=]*=[ ]*\):*/\1/;
11530 +s/:*$//;
11531 +s/^[^=]*=[ ]*$//;
11532 +}'
11533 fi
11534
11535 -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
11536 -
11537 DEFS=-DHAVE_CONFIG_H
11538
11539 -# Without the "./", some shells look in PATH for config.status.
11540 -: ${CONFIG_STATUS=./config.status}
11541 +ac_libobjs=
11542 +ac_ltlibobjs=
11543 +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
11544 + # 1. Remove the extension, and $U if already installed.
11545 + ac_i=`echo "$ac_i" |
11546 + sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
11547 + # 2. Add them.
11548 + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
11549 + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
11550 +done
11551 +LIBOBJS=$ac_libobjs
11552
11553 -echo creating $CONFIG_STATUS
11554 -rm -f $CONFIG_STATUS
11555 -cat > $CONFIG_STATUS <<EOF
11556 -#! /bin/sh
11557 -# Generated automatically by configure.
11558 +LTLIBOBJS=$ac_ltlibobjs
11559 +
11560 +
11561 +
11562 +: ${CONFIG_STATUS=./config.status}
11563 +ac_clean_files_save=$ac_clean_files
11564 +ac_clean_files="$ac_clean_files $CONFIG_STATUS"
11565 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
11566 +echo "$as_me: creating $CONFIG_STATUS" >&6;}
11567 +cat >$CONFIG_STATUS <<_ACEOF
11568 +#! $SHELL
11569 +# Generated by $as_me.
11570 # Run this file to recreate the current configuration.
11571 -# This directory was configured as follows,
11572 -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
11573 -#
11574 -# $0 $ac_configure_args
11575 -#
11576 # Compiler output produced by configure, useful for debugging
11577 -# configure, is in ./config.log if it exists.
11578 +# configure, is in config.log if it exists.
11579
11580 -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
11581 -for ac_option
11582 +debug=false
11583 +ac_cs_recheck=false
11584 +ac_cs_silent=false
11585 +SHELL=\${CONFIG_SHELL-$SHELL}
11586 +_ACEOF
11587 +
11588 +cat >>$CONFIG_STATUS <<\_ACEOF
11589 +## --------------------- ##
11590 +## M4sh Initialization. ##
11591 +## --------------------- ##
11592 +
11593 +# Be Bourne compatible
11594 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
11595 + emulate sh
11596 + NULLCMD=:
11597 + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
11598 + # is contrary to our usage. Disable this feature.
11599 + alias -g '${1+"$@"}'='"$@"'
11600 +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
11601 + set -o posix
11602 +fi
11603 +
11604 +# Support unset when possible.
11605 +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
11606 + as_unset=unset
11607 +else
11608 + as_unset=false
11609 +fi
11610 +
11611 +
11612 +# Work around bugs in pre-3.0 UWIN ksh.
11613 +$as_unset ENV MAIL MAILPATH
11614 +PS1='$ '
11615 +PS2='> '
11616 +PS4='+ '
11617 +
11618 +# NLS nuisances.
11619 +for as_var in \
11620 + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
11621 + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
11622 + LC_TELEPHONE LC_TIME
11623 do
11624 - case "\$ac_option" in
11625 - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
11626 - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
11627 - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
11628 - -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
11629 - echo "$CONFIG_STATUS generated by autoconf version 2.13"
11630 - exit 0 ;;
11631 - -help | --help | --hel | --he | --h)
11632 - echo "\$ac_cs_usage"; exit 0 ;;
11633 - *) echo "\$ac_cs_usage"; exit 1 ;;
11634 + if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
11635 + eval $as_var=C; export $as_var
11636 + else
11637 + $as_unset $as_var
11638 + fi
11639 +done
11640 +
11641 +# Required to use basename.
11642 +if expr a : '\(a\)' >/dev/null 2>&1; then
11643 + as_expr=expr
11644 +else
11645 + as_expr=false
11646 +fi
11647 +
11648 +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
11649 + as_basename=basename
11650 +else
11651 + as_basename=false
11652 +fi
11653 +
11654 +
11655 +# Name of the executable.
11656 +as_me=`$as_basename "$0" ||
11657 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
11658 + X"$0" : 'X\(//\)$' \| \
11659 + X"$0" : 'X\(/\)$' \| \
11660 + . : '\(.\)' 2>/dev/null ||
11661 +echo X/"$0" |
11662 + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
11663 + /^X\/\(\/\/\)$/{ s//\1/; q; }
11664 + /^X\/\(\/\).*/{ s//\1/; q; }
11665 + s/.*/./; q'`
11666 +
11667 +
11668 +# PATH needs CR, and LINENO needs CR and PATH.
11669 +# Avoid depending upon Character Ranges.
11670 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
11671 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
11672 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
11673 +as_cr_digits='0123456789'
11674 +as_cr_alnum=$as_cr_Letters$as_cr_digits
11675 +
11676 +# The user is always right.
11677 +if test "${PATH_SEPARATOR+set}" != set; then
11678 + echo "#! /bin/sh" >conf$$.sh
11679 + echo "exit 0" >>conf$$.sh
11680 + chmod +x conf$$.sh
11681 + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
11682 + PATH_SEPARATOR=';'
11683 + else
11684 + PATH_SEPARATOR=:
11685 + fi
11686 + rm -f conf$$.sh
11687 +fi
11688 +
11689 +
11690 + as_lineno_1=$LINENO
11691 + as_lineno_2=$LINENO
11692 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
11693 + test "x$as_lineno_1" != "x$as_lineno_2" &&
11694 + test "x$as_lineno_3" = "x$as_lineno_2" || {
11695 + # Find who we are. Look in the path if we contain no path at all
11696 + # relative or not.
11697 + case $0 in
11698 + *[\\/]* ) as_myself=$0 ;;
11699 + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11700 +for as_dir in $PATH
11701 +do
11702 + IFS=$as_save_IFS
11703 + test -z "$as_dir" && as_dir=.
11704 + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
11705 +done
11706 +
11707 + ;;
11708 esac
11709 + # We did not find ourselves, most probably we were run as `sh COMMAND'
11710 + # in which case we are not to be found in the path.
11711 + if test "x$as_myself" = x; then
11712 + as_myself=$0
11713 + fi
11714 + if test ! -f "$as_myself"; then
11715 + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
11716 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
11717 + { (exit 1); exit 1; }; }
11718 + fi
11719 + case $CONFIG_SHELL in
11720 + '')
11721 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11722 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
11723 +do
11724 + IFS=$as_save_IFS
11725 + test -z "$as_dir" && as_dir=.
11726 + for as_base in sh bash ksh sh5; do
11727 + case $as_dir in
11728 + /*)
11729 + if ("$as_dir/$as_base" -c '
11730 + as_lineno_1=$LINENO
11731 + as_lineno_2=$LINENO
11732 + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
11733 + test "x$as_lineno_1" != "x$as_lineno_2" &&
11734 + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
11735 + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
11736 + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
11737 + CONFIG_SHELL=$as_dir/$as_base
11738 + export CONFIG_SHELL
11739 + exec "$CONFIG_SHELL" "$0" ${1+"$@"}
11740 + fi;;
11741 + esac
11742 + done
11743 done
11744 +;;
11745 + esac
11746
11747 -ac_given_srcdir=$srcdir
11748 -ac_given_INSTALL="$INSTALL"
11749 -
11750 -trap 'rm -fr `echo "Makefile \
11751 - doc/Makefile \
11752 - m4/Makefile \
11753 - src/Makefile \
11754 - src/include/Makefile \
11755 - src/lib/Makefile \
11756 - src/test/Makefile \
11757 - src/debug/Makefile \
11758 - src/qgen/Makefile \
11759 - src/saal/Makefile \
11760 - src/sigd/Makefile \
11761 - src/maint/Makefile \
11762 - src/arpd/Makefile \
11763 - src/ilmid/Makefile \
11764 - src/ilmid/asn1/Makefile \
11765 - src/man/Makefile \
11766 - src/led/Makefile \
11767 - src/lane/Makefile \
11768 - src/mpoad/Makefile \
11769 - src/switch/Makefile \
11770 - src/switch/debug/Makefile \
11771 - src/switch/tcp/Makefile \
11772 - src/config/Makefile \
11773 - src/config/init-redhat/Makefile \
11774 - src/extra/Makefile \
11775 - src/extra/linux-atm.spec \
11776 - src/extra/ANS/Makefile
11777 - config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
11778 -EOF
11779 -cat >> $CONFIG_STATUS <<EOF
11780 + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
11781 + # uniformly replaced by the line number. The first 'sed' inserts a
11782 + # line-number line before each line; the second 'sed' does the real
11783 + # work. The second script uses 'N' to pair each line-number line
11784 + # with the numbered line, and appends trailing '-' during
11785 + # substitution so that $LINENO is not a special case at line end.
11786 + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
11787 + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
11788 + sed '=' <$as_myself |
11789 + sed '
11790 + N
11791 + s,$,-,
11792 + : loop
11793 + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
11794 + t loop
11795 + s,-$,,
11796 + s,^['$as_cr_digits']*\n,,
11797 + ' >$as_me.lineno &&
11798 + chmod +x $as_me.lineno ||
11799 + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
11800 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
11801 + { (exit 1); exit 1; }; }
11802 +
11803 + # Don't try to exec as it changes $[0], causing all sort of problems
11804 + # (the dirname of $[0] is not the place where we might find the
11805 + # original and so on. Autoconf is especially sensible to this).
11806 + . ./$as_me.lineno
11807 + # Exit status is that of the last command.
11808 + exit
11809 +}
11810
11811 -# Protect against being on the right side of a sed subst in config.status.
11812 -sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
11813 - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
11814 -$ac_vpsub
11815 -$extrasub
11816 -s%@SHELL@%$SHELL%g
11817 -s%@CFLAGS@%$CFLAGS%g
11818 -s%@CPPFLAGS@%$CPPFLAGS%g
11819 -s%@CXXFLAGS@%$CXXFLAGS%g
11820 -s%@FFLAGS@%$FFLAGS%g
11821 -s%@DEFS@%$DEFS%g
11822 -s%@LDFLAGS@%$LDFLAGS%g
11823 -s%@LIBS@%$LIBS%g
11824 -s%@exec_prefix@%$exec_prefix%g
11825 -s%@prefix@%$prefix%g
11826 -s%@program_transform_name@%$program_transform_name%g
11827 -s%@bindir@%$bindir%g
11828 -s%@sbindir@%$sbindir%g
11829 -s%@libexecdir@%$libexecdir%g
11830 -s%@datadir@%$datadir%g
11831 -s%@sysconfdir@%$sysconfdir%g
11832 -s%@sharedstatedir@%$sharedstatedir%g
11833 -s%@localstatedir@%$localstatedir%g
11834 -s%@libdir@%$libdir%g
11835 -s%@includedir@%$includedir%g
11836 -s%@oldincludedir@%$oldincludedir%g
11837 -s%@infodir@%$infodir%g
11838 -s%@mandir@%$mandir%g
11839 -s%@host@%$host%g
11840 -s%@host_alias@%$host_alias%g
11841 -s%@host_cpu@%$host_cpu%g
11842 -s%@host_vendor@%$host_vendor%g
11843 -s%@host_os@%$host_os%g
11844 -s%@target@%$target%g
11845 -s%@target_alias@%$target_alias%g
11846 -s%@target_cpu@%$target_cpu%g
11847 -s%@target_vendor@%$target_vendor%g
11848 -s%@target_os@%$target_os%g
11849 -s%@build@%$build%g
11850 -s%@build_alias@%$build_alias%g
11851 -s%@build_cpu@%$build_cpu%g
11852 -s%@build_vendor@%$build_vendor%g
11853 -s%@build_os@%$build_os%g
11854 -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
11855 -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
11856 -s%@INSTALL_DATA@%$INSTALL_DATA%g
11857 -s%@PACKAGE@%$PACKAGE%g
11858 -s%@VERSION@%$VERSION%g
11859 -s%@ACLOCAL@%$ACLOCAL%g
11860 -s%@AUTOCONF@%$AUTOCONF%g
11861 -s%@AUTOMAKE@%$AUTOMAKE%g
11862 -s%@AUTOHEADER@%$AUTOHEADER%g
11863 -s%@MAKEINFO@%$MAKEINFO%g
11864 -s%@SET_MAKE@%$SET_MAKE%g
11865 -s%@LIBVER_CURRENT@%$LIBVER_CURRENT%g
11866 -s%@LIBVER_REVISION@%$LIBVER_REVISION%g
11867 -s%@LIBVER_AGE@%$LIBVER_AGE%g
11868 -s%@CC@%$CC%g
11869 -s%@LEX@%$LEX%g
11870 -s%@LEXLIB@%$LEXLIB%g
11871 -s%@CPP@%$CPP%g
11872 -s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g
11873 -s%@YACC@%$YACC%g
11874 -s%@LN_S@%$LN_S%g
11875 -s%@OBJEXT@%$OBJEXT%g
11876 -s%@EXEEXT@%$EXEEXT%g
11877 -s%@ECHO@%$ECHO%g
11878 -s%@RANLIB@%$RANLIB%g
11879 -s%@STRIP@%$STRIP%g
11880 -s%@LIBTOOL@%$LIBTOOL%g
11881 -s%@LIBTOOL_DEPS@%$LIBTOOL_DEPS%g
11882 -s%@PERL@%$PERL%g
11883
11884 -CEOF
11885 -EOF
11886 +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
11887 + *c*,-n*) ECHO_N= ECHO_C='
11888 +' ECHO_T=' ' ;;
11889 + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
11890 + *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
11891 +esac
11892
11893 -cat >> $CONFIG_STATUS <<\EOF
11894 +if expr a : '\(a\)' >/dev/null 2>&1; then
11895 + as_expr=expr
11896 +else
11897 + as_expr=false
11898 +fi
11899
11900 -# Split the substitutions into bite-sized pieces for seds with
11901 -# small command number limits, like on Digital OSF/1 and HP-UX.
11902 -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
11903 -ac_file=1 # Number of current file.
11904 -ac_beg=1 # First line for current file.
11905 -ac_end=$ac_max_sed_cmds # Line after last line for current file.
11906 -ac_more_lines=:
11907 -ac_sed_cmds=""
11908 -while $ac_more_lines; do
11909 - if test $ac_beg -gt 1; then
11910 - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
11911 - else
11912 - sed "${ac_end}q" conftest.subs > conftest.s$ac_file
11913 - fi
11914 - if test ! -s conftest.s$ac_file; then
11915 - ac_more_lines=false
11916 - rm -f conftest.s$ac_file
11917 +rm -f conf$$ conf$$.exe conf$$.file
11918 +echo >conf$$.file
11919 +if ln -s conf$$.file conf$$ 2>/dev/null; then
11920 + # We could just check for DJGPP; but this test a) works b) is more generic
11921 + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
11922 + if test -f conf$$.exe; then
11923 + # Don't use ln at all; we don't have any links
11924 + as_ln_s='cp -p'
11925 else
11926 - if test -z "$ac_sed_cmds"; then
11927 - ac_sed_cmds="sed -f conftest.s$ac_file"
11928 - else
11929 - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
11930 - fi
11931 - ac_file=`expr $ac_file + 1`
11932 - ac_beg=$ac_end
11933 - ac_end=`expr $ac_end + $ac_max_sed_cmds`
11934 + as_ln_s='ln -s'
11935 fi
11936 +elif ln conf$$.file conf$$ 2>/dev/null; then
11937 + as_ln_s=ln
11938 +else
11939 + as_ln_s='cp -p'
11940 +fi
11941 +rm -f conf$$ conf$$.exe conf$$.file
11942 +
11943 +if mkdir -p . 2>/dev/null; then
11944 + as_mkdir_p=:
11945 +else
11946 + as_mkdir_p=false
11947 +fi
11948 +
11949 +as_executable_p="test -f"
11950 +
11951 +# Sed expression to map a string onto a valid CPP name.
11952 +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
11953 +
11954 +# Sed expression to map a string onto a valid variable name.
11955 +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
11956 +
11957 +
11958 +# IFS
11959 +# We need space, tab and new line, in precisely that order.
11960 +as_nl='
11961 +'
11962 +IFS=" $as_nl"
11963 +
11964 +# CDPATH.
11965 +$as_unset CDPATH
11966 +
11967 +exec 6>&1
11968 +
11969 +# Open the log real soon, to keep \$[0] and so on meaningful, and to
11970 +# report actual input values of CONFIG_FILES etc. instead of their
11971 +# values after options handling. Logging --version etc. is OK.
11972 +exec 5>>config.log
11973 +{
11974 + echo
11975 + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
11976 +## Running $as_me. ##
11977 +_ASBOX
11978 +} >&5
11979 +cat >&5 <<_CSEOF
11980 +
11981 +This file was extended by $as_me, which was
11982 +generated by GNU Autoconf 2.57. Invocation command line was
11983 +
11984 + CONFIG_FILES = $CONFIG_FILES
11985 + CONFIG_HEADERS = $CONFIG_HEADERS
11986 + CONFIG_LINKS = $CONFIG_LINKS
11987 + CONFIG_COMMANDS = $CONFIG_COMMANDS
11988 + $ $0 $@
11989 +
11990 +_CSEOF
11991 +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
11992 +echo >&5
11993 +_ACEOF
11994 +
11995 +# Files that config.status was made for.
11996 +if test -n "$ac_config_files"; then
11997 + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
11998 +fi
11999 +
12000 +if test -n "$ac_config_headers"; then
12001 + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
12002 +fi
12003 +
12004 +if test -n "$ac_config_links"; then
12005 + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
12006 +fi
12007 +
12008 +if test -n "$ac_config_commands"; then
12009 + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
12010 +fi
12011 +
12012 +cat >>$CONFIG_STATUS <<\_ACEOF
12013 +
12014 +ac_cs_usage="\
12015 +\`$as_me' instantiates files from templates according to the
12016 +current configuration.
12017 +
12018 +Usage: $0 [OPTIONS] [FILE]...
12019 +
12020 + -h, --help print this help, then exit
12021 + -V, --version print version number, then exit
12022 + -q, --quiet do not print progress messages
12023 + -d, --debug don't remove temporary files
12024 + --recheck update $as_me by reconfiguring in the same conditions
12025 + --file=FILE[:TEMPLATE]
12026 + instantiate the configuration file FILE
12027 + --header=FILE[:TEMPLATE]
12028 + instantiate the configuration header FILE
12029 +
12030 +Configuration files:
12031 +$config_files
12032 +
12033 +Configuration headers:
12034 +$config_headers
12035 +
12036 +Configuration commands:
12037 +$config_commands
12038 +
12039 +Report bugs to <bug-autoconf@gnu.org>."
12040 +_ACEOF
12041 +
12042 +cat >>$CONFIG_STATUS <<_ACEOF
12043 +ac_cs_version="\\
12044 +config.status
12045 +configured by $0, generated by GNU Autoconf 2.57,
12046 + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
12047 +
12048 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
12049 +Free Software Foundation, Inc.
12050 +This config.status script is free software; the Free Software Foundation
12051 +gives unlimited permission to copy, distribute and modify it."
12052 +srcdir=$srcdir
12053 +INSTALL="$INSTALL"
12054 +_ACEOF
12055 +
12056 +cat >>$CONFIG_STATUS <<\_ACEOF
12057 +# If no file are specified by the user, then we need to provide default
12058 +# value. By we need to know if files were specified by the user.
12059 +ac_need_defaults=:
12060 +while test $# != 0
12061 +do
12062 + case $1 in
12063 + --*=*)
12064 + ac_option=`expr "x$1" : 'x\([^=]*\)='`
12065 + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
12066 + ac_shift=:
12067 + ;;
12068 + -*)
12069 + ac_option=$1
12070 + ac_optarg=$2
12071 + ac_shift=shift
12072 + ;;
12073 + *) # This is not an option, so the user has probably given explicit
12074 + # arguments.
12075 + ac_option=$1
12076 + ac_need_defaults=false;;
12077 + esac
12078 +
12079 + case $ac_option in
12080 + # Handling of the options.
12081 +_ACEOF
12082 +cat >>$CONFIG_STATUS <<\_ACEOF
12083 + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
12084 + ac_cs_recheck=: ;;
12085 + --version | --vers* | -V )
12086 + echo "$ac_cs_version"; exit 0 ;;
12087 + --he | --h)
12088 + # Conflict between --help and --header
12089 + { { echo "$as_me:$LINENO: error: ambiguous option: $1
12090 +Try \`$0 --help' for more information." >&5
12091 +echo "$as_me: error: ambiguous option: $1
12092 +Try \`$0 --help' for more information." >&2;}
12093 + { (exit 1); exit 1; }; };;
12094 + --help | --hel | -h )
12095 + echo "$ac_cs_usage"; exit 0 ;;
12096 + --debug | --d* | -d )
12097 + debug=: ;;
12098 + --file | --fil | --fi | --f )
12099 + $ac_shift
12100 + CONFIG_FILES="$CONFIG_FILES $ac_optarg"
12101 + ac_need_defaults=false;;
12102 + --header | --heade | --head | --hea )
12103 + $ac_shift
12104 + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
12105 + ac_need_defaults=false;;
12106 + -q | -quiet | --quiet | --quie | --qui | --qu | --q \
12107 + | -silent | --silent | --silen | --sile | --sil | --si | --s)
12108 + ac_cs_silent=: ;;
12109 +
12110 + # This is an error.
12111 + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
12112 +Try \`$0 --help' for more information." >&5
12113 +echo "$as_me: error: unrecognized option: $1
12114 +Try \`$0 --help' for more information." >&2;}
12115 + { (exit 1); exit 1; }; } ;;
12116 +
12117 + *) ac_config_targets="$ac_config_targets $1" ;;
12118 +
12119 + esac
12120 + shift
12121 +done
12122 +
12123 +ac_configure_extra_args=
12124 +
12125 +if $ac_cs_silent; then
12126 + exec 6>/dev/null
12127 + ac_configure_extra_args="$ac_configure_extra_args --silent"
12128 +fi
12129 +
12130 +_ACEOF
12131 +cat >>$CONFIG_STATUS <<_ACEOF
12132 +if \$ac_cs_recheck; then
12133 + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
12134 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
12135 +fi
12136 +
12137 +_ACEOF
12138 +
12139 +cat >>$CONFIG_STATUS <<_ACEOF
12140 +#
12141 +# INIT-COMMANDS section.
12142 +#
12143 +
12144 +
12145 +
12146 +_ACEOF
12147 +
12148 +
12149 +
12150 +cat >>$CONFIG_STATUS <<\_ACEOF
12151 +for ac_config_target in $ac_config_targets
12152 +do
12153 + case "$ac_config_target" in
12154 + # Handling of arguments.
12155 + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
12156 + "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
12157 + "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;;
12158 + "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
12159 + "src/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
12160 + "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
12161 + "src/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/test/Makefile" ;;
12162 + "src/debug/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/debug/Makefile" ;;
12163 + "src/qgen/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/qgen/Makefile" ;;
12164 + "src/saal/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/saal/Makefile" ;;
12165 + "src/sigd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/sigd/Makefile" ;;
12166 + "src/maint/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/maint/Makefile" ;;
12167 + "src/arpd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/arpd/Makefile" ;;
12168 + "src/ilmid/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/ilmid/Makefile" ;;
12169 + "src/ilmid/asn1/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/ilmid/asn1/Makefile" ;;
12170 + "src/man/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/man/Makefile" ;;
12171 + "src/led/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/led/Makefile" ;;
12172 + "src/lane/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lane/Makefile" ;;
12173 + "src/mpoad/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/mpoad/Makefile" ;;
12174 + "src/switch/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/switch/Makefile" ;;
12175 + "src/switch/debug/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/switch/debug/Makefile" ;;
12176 + "src/switch/tcp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/switch/tcp/Makefile" ;;
12177 + "src/config/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/config/Makefile" ;;
12178 + "src/config/init-redhat/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/config/init-redhat/Makefile" ;;
12179 + "src/extra/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/extra/Makefile" ;;
12180 + "src/extra/linux-atm.spec" ) CONFIG_FILES="$CONFIG_FILES src/extra/linux-atm.spec" ;;
12181 + "src/extra/ANS/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/extra/ANS/Makefile" ;;
12182 + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
12183 + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
12184 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
12185 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
12186 + { (exit 1); exit 1; }; };;
12187 + esac
12188 done
12189 -if test -z "$ac_sed_cmds"; then
12190 - ac_sed_cmds=cat
12191 +
12192 +# If the user did not use the arguments to specify the items to instantiate,
12193 +# then the envvar interface is used. Set only those that are not.
12194 +# We use the long form for the default assignment because of an extremely
12195 +# bizarre bug on SunOS 4.1.3.
12196 +if $ac_need_defaults; then
12197 + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
12198 + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
12199 + test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
12200 fi
12201 -EOF
12202
12203 -cat >> $CONFIG_STATUS <<EOF
12204 +# Have a temporary directory for convenience. Make it in the build tree
12205 +# simply because there is no reason to put it here, and in addition,
12206 +# creating and moving files from /tmp can sometimes cause problems.
12207 +# Create a temporary directory, and hook for its removal unless debugging.
12208 +$debug ||
12209 +{
12210 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
12211 + trap '{ (exit 1); exit 1; }' 1 2 13 15
12212 +}
12213
12214 -CONFIG_FILES=\${CONFIG_FILES-"Makefile \
12215 - doc/Makefile \
12216 - m4/Makefile \
12217 - src/Makefile \
12218 - src/include/Makefile \
12219 - src/lib/Makefile \
12220 - src/test/Makefile \
12221 - src/debug/Makefile \
12222 - src/qgen/Makefile \
12223 - src/saal/Makefile \
12224 - src/sigd/Makefile \
12225 - src/maint/Makefile \
12226 - src/arpd/Makefile \
12227 - src/ilmid/Makefile \
12228 - src/ilmid/asn1/Makefile \
12229 - src/man/Makefile \
12230 - src/led/Makefile \
12231 - src/lane/Makefile \
12232 - src/mpoad/Makefile \
12233 - src/switch/Makefile \
12234 - src/switch/debug/Makefile \
12235 - src/switch/tcp/Makefile \
12236 - src/config/Makefile \
12237 - src/config/init-redhat/Makefile \
12238 - src/extra/Makefile \
12239 - src/extra/linux-atm.spec \
12240 - src/extra/ANS/Makefile
12241 - "}
12242 -EOF
12243 -cat >> $CONFIG_STATUS <<\EOF
12244 -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
12245 +# Create a (secure) tmp directory for tmp files.
12246 +
12247 +{
12248 + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
12249 + test -n "$tmp" && test -d "$tmp"
12250 +} ||
12251 +{
12252 + tmp=./confstat$$-$RANDOM
12253 + (umask 077 && mkdir $tmp)
12254 +} ||
12255 +{
12256 + echo "$me: cannot create a temporary directory in ." >&2
12257 + { (exit 1); exit 1; }
12258 +}
12259 +
12260 +_ACEOF
12261 +
12262 +cat >>$CONFIG_STATUS <<_ACEOF
12263 +
12264 +#
12265 +# CONFIG_FILES section.
12266 +#
12267 +
12268 +# No need to generate the scripts if there are no CONFIG_FILES.
12269 +# This happens for instance when ./config.status config.h
12270 +if test -n "\$CONFIG_FILES"; then
12271 + # Protect against being on the right side of a sed subst in config.status.
12272 + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
12273 + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
12274 +s,@SHELL@,$SHELL,;t t
12275 +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
12276 +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
12277 +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
12278 +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
12279 +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
12280 +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
12281 +s,@exec_prefix@,$exec_prefix,;t t
12282 +s,@prefix@,$prefix,;t t
12283 +s,@program_transform_name@,$program_transform_name,;t t
12284 +s,@bindir@,$bindir,;t t
12285 +s,@sbindir@,$sbindir,;t t
12286 +s,@libexecdir@,$libexecdir,;t t
12287 +s,@datadir@,$datadir,;t t
12288 +s,@sysconfdir@,$sysconfdir,;t t
12289 +s,@sharedstatedir@,$sharedstatedir,;t t
12290 +s,@localstatedir@,$localstatedir,;t t
12291 +s,@libdir@,$libdir,;t t
12292 +s,@includedir@,$includedir,;t t
12293 +s,@oldincludedir@,$oldincludedir,;t t
12294 +s,@infodir@,$infodir,;t t
12295 +s,@mandir@,$mandir,;t t
12296 +s,@build_alias@,$build_alias,;t t
12297 +s,@host_alias@,$host_alias,;t t
12298 +s,@target_alias@,$target_alias,;t t
12299 +s,@DEFS@,$DEFS,;t t
12300 +s,@ECHO_C@,$ECHO_C,;t t
12301 +s,@ECHO_N@,$ECHO_N,;t t
12302 +s,@ECHO_T@,$ECHO_T,;t t
12303 +s,@LIBS@,$LIBS,;t t
12304 +s,@build@,$build,;t t
12305 +s,@build_cpu@,$build_cpu,;t t
12306 +s,@build_vendor@,$build_vendor,;t t
12307 +s,@build_os@,$build_os,;t t
12308 +s,@host@,$host,;t t
12309 +s,@host_cpu@,$host_cpu,;t t
12310 +s,@host_vendor@,$host_vendor,;t t
12311 +s,@host_os@,$host_os,;t t
12312 +s,@target@,$target,;t t
12313 +s,@target_cpu@,$target_cpu,;t t
12314 +s,@target_vendor@,$target_vendor,;t t
12315 +s,@target_os@,$target_os,;t t
12316 +s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
12317 +s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
12318 +s,@INSTALL_DATA@,$INSTALL_DATA,;t t
12319 +s,@PACKAGE@,$PACKAGE,;t t
12320 +s,@VERSION@,$VERSION,;t t
12321 +s,@ACLOCAL@,$ACLOCAL,;t t
12322 +s,@AUTOCONF@,$AUTOCONF,;t t
12323 +s,@AUTOMAKE@,$AUTOMAKE,;t t
12324 +s,@AUTOHEADER@,$AUTOHEADER,;t t
12325 +s,@MAKEINFO@,$MAKEINFO,;t t
12326 +s,@SET_MAKE@,$SET_MAKE,;t t
12327 +s,@LIBVER_CURRENT@,$LIBVER_CURRENT,;t t
12328 +s,@LIBVER_REVISION@,$LIBVER_REVISION,;t t
12329 +s,@LIBVER_AGE@,$LIBVER_AGE,;t t
12330 +s,@CC@,$CC,;t t
12331 +s,@CFLAGS@,$CFLAGS,;t t
12332 +s,@LDFLAGS@,$LDFLAGS,;t t
12333 +s,@CPPFLAGS@,$CPPFLAGS,;t t
12334 +s,@ac_ct_CC@,$ac_ct_CC,;t t
12335 +s,@EXEEXT@,$EXEEXT,;t t
12336 +s,@OBJEXT@,$OBJEXT,;t t
12337 +s,@LEX@,$LEX,;t t
12338 +s,@LEXLIB@,$LEXLIB,;t t
12339 +s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
12340 +s,@YACC@,$YACC,;t t
12341 +s,@LN_S@,$LN_S,;t t
12342 +s,@ECHO@,$ECHO,;t t
12343 +s,@RANLIB@,$RANLIB,;t t
12344 +s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
12345 +s,@STRIP@,$STRIP,;t t
12346 +s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
12347 +s,@CPP@,$CPP,;t t
12348 +s,@EGREP@,$EGREP,;t t
12349 +s,@LIBTOOL@,$LIBTOOL,;t t
12350 +s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
12351 +s,@PERL@,$PERL,;t t
12352 +s,@LIBOBJS@,$LIBOBJS,;t t
12353 +s,@LTLIBOBJS@,$LTLIBOBJS,;t t
12354 +CEOF
12355 +
12356 +_ACEOF
12357 +
12358 + cat >>$CONFIG_STATUS <<\_ACEOF
12359 + # Split the substitutions into bite-sized pieces for seds with
12360 + # small command number limits, like on Digital OSF/1 and HP-UX.
12361 + ac_max_sed_lines=48
12362 + ac_sed_frag=1 # Number of current file.
12363 + ac_beg=1 # First line for current file.
12364 + ac_end=$ac_max_sed_lines # Line after last line for current file.
12365 + ac_more_lines=:
12366 + ac_sed_cmds=
12367 + while $ac_more_lines; do
12368 + if test $ac_beg -gt 1; then
12369 + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
12370 + else
12371 + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
12372 + fi
12373 + if test ! -s $tmp/subs.frag; then
12374 + ac_more_lines=false
12375 + else
12376 + # The purpose of the label and of the branching condition is to
12377 + # speed up the sed processing (if there are no `@' at all, there
12378 + # is no need to browse any of the substitutions).
12379 + # These are the two extra sed commands mentioned above.
12380 + (echo ':t
12381 + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
12382 + if test -z "$ac_sed_cmds"; then
12383 + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
12384 + else
12385 + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
12386 + fi
12387 + ac_sed_frag=`expr $ac_sed_frag + 1`
12388 + ac_beg=$ac_end
12389 + ac_end=`expr $ac_end + $ac_max_sed_lines`
12390 + fi
12391 + done
12392 + if test -z "$ac_sed_cmds"; then
12393 + ac_sed_cmds=cat
12394 + fi
12395 +fi # test -n "$CONFIG_FILES"
12396 +
12397 +_ACEOF
12398 +cat >>$CONFIG_STATUS <<\_ACEOF
12399 +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
12400 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
12401 - case "$ac_file" in
12402 - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
12403 - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
12404 - *) ac_file_in="${ac_file}.in" ;;
12405 - esac
12406 -
12407 - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
12408 -
12409 - # Remove last slash and all that follows it. Not all systems have dirname.
12410 - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
12411 - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
12412 - # The file is in a subdirectory.
12413 - test ! -d "$ac_dir" && mkdir "$ac_dir"
12414 - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
12415 - # A "../" for each directory in $ac_dir_suffix.
12416 - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
12417 - else
12418 - ac_dir_suffix= ac_dots=
12419 - fi
12420 -
12421 - case "$ac_given_srcdir" in
12422 - .) srcdir=.
12423 - if test -z "$ac_dots"; then top_srcdir=.
12424 - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
12425 - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
12426 + case $ac_file in
12427 + - | *:- | *:-:* ) # input from stdin
12428 + cat >$tmp/stdin
12429 + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
12430 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
12431 + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
12432 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
12433 + * ) ac_file_in=$ac_file.in ;;
12434 + esac
12435 +
12436 + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
12437 + ac_dir=`(dirname "$ac_file") 2>/dev/null ||
12438 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12439 + X"$ac_file" : 'X\(//\)[^/]' \| \
12440 + X"$ac_file" : 'X\(//\)$' \| \
12441 + X"$ac_file" : 'X\(/\)' \| \
12442 + . : '\(.\)' 2>/dev/null ||
12443 +echo X"$ac_file" |
12444 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12445 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12446 + /^X\(\/\/\)$/{ s//\1/; q; }
12447 + /^X\(\/\).*/{ s//\1/; q; }
12448 + s/.*/./; q'`
12449 + { if $as_mkdir_p; then
12450 + mkdir -p "$ac_dir"
12451 + else
12452 + as_dir="$ac_dir"
12453 + as_dirs=
12454 + while test ! -d "$as_dir"; do
12455 + as_dirs="$as_dir $as_dirs"
12456 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
12457 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12458 + X"$as_dir" : 'X\(//\)[^/]' \| \
12459 + X"$as_dir" : 'X\(//\)$' \| \
12460 + X"$as_dir" : 'X\(/\)' \| \
12461 + . : '\(.\)' 2>/dev/null ||
12462 +echo X"$as_dir" |
12463 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12464 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12465 + /^X\(\/\/\)$/{ s//\1/; q; }
12466 + /^X\(\/\).*/{ s//\1/; q; }
12467 + s/.*/./; q'`
12468 + done
12469 + test ! -n "$as_dirs" || mkdir $as_dirs
12470 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
12471 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
12472 + { (exit 1); exit 1; }; }; }
12473 +
12474 + ac_builddir=.
12475 +
12476 +if test "$ac_dir" != .; then
12477 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
12478 + # A "../" for each directory in $ac_dir_suffix.
12479 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
12480 +else
12481 + ac_dir_suffix= ac_top_builddir=
12482 +fi
12483 +
12484 +case $srcdir in
12485 + .) # No --srcdir option. We are building in place.
12486 + ac_srcdir=.
12487 + if test -z "$ac_top_builddir"; then
12488 + ac_top_srcdir=.
12489 + else
12490 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
12491 + fi ;;
12492 + [\\/]* | ?:[\\/]* ) # Absolute path.
12493 + ac_srcdir=$srcdir$ac_dir_suffix;
12494 + ac_top_srcdir=$srcdir ;;
12495 *) # Relative path.
12496 - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
12497 - top_srcdir="$ac_dots$ac_given_srcdir" ;;
12498 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
12499 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
12500 +esac
12501 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
12502 +# absolute.
12503 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
12504 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
12505 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
12506 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
12507 +
12508 +
12509 + case $INSTALL in
12510 + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
12511 + *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
12512 esac
12513
12514 - case "$ac_given_INSTALL" in
12515 - [/$]*) INSTALL="$ac_given_INSTALL" ;;
12516 - *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
12517 - esac
12518 -
12519 - echo creating "$ac_file"
12520 - rm -f "$ac_file"
12521 - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
12522 - case "$ac_file" in
12523 - *Makefile*) ac_comsub="1i\\
12524 -# $configure_input" ;;
12525 - *) ac_comsub= ;;
12526 - esac
12527 -
12528 - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
12529 - sed -e "$ac_comsub
12530 -s%@configure_input@%$configure_input%g
12531 -s%@srcdir@%$srcdir%g
12532 -s%@top_srcdir@%$top_srcdir%g
12533 -s%@INSTALL@%$INSTALL%g
12534 -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
12535 -fi; done
12536 -rm -f conftest.s*
12537 + if test x"$ac_file" != x-; then
12538 + { echo "$as_me:$LINENO: creating $ac_file" >&5
12539 +echo "$as_me: creating $ac_file" >&6;}
12540 + rm -f "$ac_file"
12541 + fi
12542 + # Let's still pretend it is `configure' which instantiates (i.e., don't
12543 + # use $as_me), people would be surprised to read:
12544 + # /* config.h. Generated by config.status. */
12545 + if test x"$ac_file" = x-; then
12546 + configure_input=
12547 + else
12548 + configure_input="$ac_file. "
12549 + fi
12550 + configure_input=$configure_input"Generated from `echo $ac_file_in |
12551 + sed 's,.*/,,'` by configure."
12552 +
12553 + # First look for the input files in the build tree, otherwise in the
12554 + # src tree.
12555 + ac_file_inputs=`IFS=:
12556 + for f in $ac_file_in; do
12557 + case $f in
12558 + -) echo $tmp/stdin ;;
12559 + [\\/$]*)
12560 + # Absolute (can't be DOS-style, as IFS=:)
12561 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
12562 +echo "$as_me: error: cannot find input file: $f" >&2;}
12563 + { (exit 1); exit 1; }; }
12564 + echo $f;;
12565 + *) # Relative
12566 + if test -f "$f"; then
12567 + # Build tree
12568 + echo $f
12569 + elif test -f "$srcdir/$f"; then
12570 + # Source tree
12571 + echo $srcdir/$f
12572 + else
12573 + # /dev/null tree
12574 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
12575 +echo "$as_me: error: cannot find input file: $f" >&2;}
12576 + { (exit 1); exit 1; }; }
12577 + fi;;
12578 + esac
12579 + done` || { (exit 1); exit 1; }
12580 +_ACEOF
12581 +cat >>$CONFIG_STATUS <<_ACEOF
12582 + sed "$ac_vpsub
12583 +$extrasub
12584 +_ACEOF
12585 +cat >>$CONFIG_STATUS <<\_ACEOF
12586 +:t
12587 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
12588 +s,@configure_input@,$configure_input,;t t
12589 +s,@srcdir@,$ac_srcdir,;t t
12590 +s,@abs_srcdir@,$ac_abs_srcdir,;t t
12591 +s,@top_srcdir@,$ac_top_srcdir,;t t
12592 +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
12593 +s,@builddir@,$ac_builddir,;t t
12594 +s,@abs_builddir@,$ac_abs_builddir,;t t
12595 +s,@top_builddir@,$ac_top_builddir,;t t
12596 +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
12597 +s,@INSTALL@,$ac_INSTALL,;t t
12598 +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
12599 + rm -f $tmp/stdin
12600 + if test x"$ac_file" != x-; then
12601 + mv $tmp/out $ac_file
12602 + else
12603 + cat $tmp/out
12604 + rm -f $tmp/out
12605 + fi
12606 +
12607 +done
12608 +_ACEOF
12609 +cat >>$CONFIG_STATUS <<\_ACEOF
12610 +
12611 +#
12612 +# CONFIG_HEADER section.
12613 +#
12614
12615 # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
12616 # NAME is the cpp macro being defined and VALUE is the value it is being given.
12617 #
12618 # ac_d sets the value in "#define NAME VALUE" lines.
12619 -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
12620 -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
12621 -ac_dC='\3'
12622 -ac_dD='%g'
12623 -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
12624 -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
12625 -ac_uB='\([ ]\)%\1#\2define\3'
12626 +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
12627 +ac_dB='[ ].*$,\1#\2'
12628 +ac_dC=' '
12629 +ac_dD=',;t'
12630 +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
12631 +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
12632 +ac_uB='$,\1#\2define\3'
12633 ac_uC=' '
12634 -ac_uD='\4%g'
12635 -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
12636 -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
12637 -ac_eB='$%\1#\2define\3'
12638 -ac_eC=' '
12639 -ac_eD='%g'
12640 +ac_uD=',;t'
12641
12642 -if test "${CONFIG_HEADERS+set}" != set; then
12643 -EOF
12644 -cat >> $CONFIG_STATUS <<EOF
12645 - CONFIG_HEADERS="config.h"
12646 -EOF
12647 -cat >> $CONFIG_STATUS <<\EOF
12648 -fi
12649 -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
12650 +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
12651 # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
12652 - case "$ac_file" in
12653 - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
12654 - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
12655 - *) ac_file_in="${ac_file}.in" ;;
12656 + case $ac_file in
12657 + - | *:- | *:-:* ) # input from stdin
12658 + cat >$tmp/stdin
12659 + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
12660 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
12661 + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
12662 + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
12663 + * ) ac_file_in=$ac_file.in ;;
12664 esac
12665
12666 - echo creating $ac_file
12667 -
12668 - rm -f conftest.frag conftest.in conftest.out
12669 - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
12670 - cat $ac_file_inputs > conftest.in
12671 -
12672 -EOF
12673 + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
12674 +echo "$as_me: creating $ac_file" >&6;}
12675
12676 -# Transform confdefs.h into a sed script conftest.vals that substitutes
12677 -# the proper values into config.h.in to produce config.h. And first:
12678 -# Protect against being on the right side of a sed subst in config.status.
12679 -# Protect against being in an unquoted here document in config.status.
12680 -rm -f conftest.vals
12681 -cat > conftest.hdr <<\EOF
12682 -s/[\\&%]/\\&/g
12683 -s%[\\$`]%\\&%g
12684 -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
12685 -s%ac_d%ac_u%gp
12686 -s%ac_u%ac_e%gp
12687 -EOF
12688 -sed -n -f conftest.hdr confdefs.h > conftest.vals
12689 -rm -f conftest.hdr
12690 + # First look for the input files in the build tree, otherwise in the
12691 + # src tree.
12692 + ac_file_inputs=`IFS=:
12693 + for f in $ac_file_in; do
12694 + case $f in
12695 + -) echo $tmp/stdin ;;
12696 + [\\/$]*)
12697 + # Absolute (can't be DOS-style, as IFS=:)
12698 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
12699 +echo "$as_me: error: cannot find input file: $f" >&2;}
12700 + { (exit 1); exit 1; }; }
12701 + echo $f;;
12702 + *) # Relative
12703 + if test -f "$f"; then
12704 + # Build tree
12705 + echo $f
12706 + elif test -f "$srcdir/$f"; then
12707 + # Source tree
12708 + echo $srcdir/$f
12709 + else
12710 + # /dev/null tree
12711 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
12712 +echo "$as_me: error: cannot find input file: $f" >&2;}
12713 + { (exit 1); exit 1; }; }
12714 + fi;;
12715 + esac
12716 + done` || { (exit 1); exit 1; }
12717 + # Remove the trailing spaces.
12718 + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
12719 +
12720 +_ACEOF
12721 +
12722 +# Transform confdefs.h into two sed scripts, `conftest.defines' and
12723 +# `conftest.undefs', that substitutes the proper values into
12724 +# config.h.in to produce config.h. The first handles `#define'
12725 +# templates, and the second `#undef' templates.
12726 +# And first: Protect against being on the right side of a sed subst in
12727 +# config.status. Protect against being in an unquoted here document
12728 +# in config.status.
12729 +rm -f conftest.defines conftest.undefs
12730 +# Using a here document instead of a string reduces the quoting nightmare.
12731 +# Putting comments in sed scripts is not portable.
12732 +#
12733 +# `end' is used to avoid that the second main sed command (meant for
12734 +# 0-ary CPP macros) applies to n-ary macro definitions.
12735 +# See the Autoconf documentation for `clear'.
12736 +cat >confdef2sed.sed <<\_ACEOF
12737 +s/[\\&,]/\\&/g
12738 +s,[\\$`],\\&,g
12739 +t clear
12740 +: clear
12741 +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
12742 +t end
12743 +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
12744 +: end
12745 +_ACEOF
12746 +# If some macros were called several times there might be several times
12747 +# the same #defines, which is useless. Nevertheless, we may not want to
12748 +# sort them, since we want the *last* AC-DEFINE to be honored.
12749 +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
12750 +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
12751 +rm -f confdef2sed.sed
12752
12753 # This sed command replaces #undef with comments. This is necessary, for
12754 # example, in the case of _POSIX_SOURCE, which is predefined and required
12755 # on some systems where configure will not decide to define it.
12756 -cat >> conftest.vals <<\EOF
12757 -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
12758 -EOF
12759 -
12760 -# Break up conftest.vals because some shells have a limit on
12761 -# the size of here documents, and old seds have small limits too.
12762 -
12763 +cat >>conftest.undefs <<\_ACEOF
12764 +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
12765 +_ACEOF
12766 +
12767 +# Break up conftest.defines because some shells have a limit on the size
12768 +# of here documents, and old seds have small limits too (100 cmds).
12769 +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
12770 +echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
12771 +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
12772 +echo ' :' >>$CONFIG_STATUS
12773 +rm -f conftest.tail
12774 +while grep . conftest.defines >/dev/null
12775 +do
12776 + # Write a limited-size here document to $tmp/defines.sed.
12777 + echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
12778 + # Speed up: don't consider the non `#define' lines.
12779 + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
12780 + # Work around the forget-to-reset-the-flag bug.
12781 + echo 't clr' >>$CONFIG_STATUS
12782 + echo ': clr' >>$CONFIG_STATUS
12783 + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
12784 + echo 'CEOF
12785 + sed -f $tmp/defines.sed $tmp/in >$tmp/out
12786 + rm -f $tmp/in
12787 + mv $tmp/out $tmp/in
12788 +' >>$CONFIG_STATUS
12789 + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
12790 + rm -f conftest.defines
12791 + mv conftest.tail conftest.defines
12792 +done
12793 +rm -f conftest.defines
12794 +echo ' fi # grep' >>$CONFIG_STATUS
12795 +echo >>$CONFIG_STATUS
12796 +
12797 +# Break up conftest.undefs because some shells have a limit on the size
12798 +# of here documents, and old seds have small limits too (100 cmds).
12799 +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
12800 rm -f conftest.tail
12801 -while :
12802 +while grep . conftest.undefs >/dev/null
12803 do
12804 - ac_lines=`grep -c . conftest.vals`
12805 - # grep -c gives empty output for an empty file on some AIX systems.
12806 - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
12807 - # Write a limited-size here document to conftest.frag.
12808 - echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
12809 - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
12810 + # Write a limited-size here document to $tmp/undefs.sed.
12811 + echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
12812 + # Speed up: don't consider the non `#undef'
12813 + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
12814 + # Work around the forget-to-reset-the-flag bug.
12815 + echo 't clr' >>$CONFIG_STATUS
12816 + echo ': clr' >>$CONFIG_STATUS
12817 + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
12818 echo 'CEOF
12819 - sed -f conftest.frag conftest.in > conftest.out
12820 - rm -f conftest.in
12821 - mv conftest.out conftest.in
12822 -' >> $CONFIG_STATUS
12823 - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
12824 - rm -f conftest.vals
12825 - mv conftest.tail conftest.vals
12826 -done
12827 -rm -f conftest.vals
12828 -
12829 -cat >> $CONFIG_STATUS <<\EOF
12830 - rm -f conftest.frag conftest.h
12831 - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
12832 - cat conftest.in >> conftest.h
12833 - rm -f conftest.in
12834 - if cmp -s $ac_file conftest.h 2>/dev/null; then
12835 - echo "$ac_file is unchanged"
12836 - rm -f conftest.h
12837 - else
12838 - # Remove last slash and all that follows it. Not all systems have dirname.
12839 - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
12840 - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
12841 - # The file is in a subdirectory.
12842 - test ! -d "$ac_dir" && mkdir "$ac_dir"
12843 + sed -f $tmp/undefs.sed $tmp/in >$tmp/out
12844 + rm -f $tmp/in
12845 + mv $tmp/out $tmp/in
12846 +' >>$CONFIG_STATUS
12847 + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
12848 + rm -f conftest.undefs
12849 + mv conftest.tail conftest.undefs
12850 +done
12851 +rm -f conftest.undefs
12852 +
12853 +cat >>$CONFIG_STATUS <<\_ACEOF
12854 + # Let's still pretend it is `configure' which instantiates (i.e., don't
12855 + # use $as_me), people would be surprised to read:
12856 + # /* config.h. Generated by config.status. */
12857 + if test x"$ac_file" = x-; then
12858 + echo "/* Generated by configure. */" >$tmp/config.h
12859 + else
12860 + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
12861 + fi
12862 + cat $tmp/in >>$tmp/config.h
12863 + rm -f $tmp/in
12864 + if test x"$ac_file" != x-; then
12865 + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
12866 + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
12867 +echo "$as_me: $ac_file is unchanged" >&6;}
12868 + else
12869 + ac_dir=`(dirname "$ac_file") 2>/dev/null ||
12870 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12871 + X"$ac_file" : 'X\(//\)[^/]' \| \
12872 + X"$ac_file" : 'X\(//\)$' \| \
12873 + X"$ac_file" : 'X\(/\)' \| \
12874 + . : '\(.\)' 2>/dev/null ||
12875 +echo X"$ac_file" |
12876 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12877 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12878 + /^X\(\/\/\)$/{ s//\1/; q; }
12879 + /^X\(\/\).*/{ s//\1/; q; }
12880 + s/.*/./; q'`
12881 + { if $as_mkdir_p; then
12882 + mkdir -p "$ac_dir"
12883 + else
12884 + as_dir="$ac_dir"
12885 + as_dirs=
12886 + while test ! -d "$as_dir"; do
12887 + as_dirs="$as_dir $as_dirs"
12888 + as_dir=`(dirname "$as_dir") 2>/dev/null ||
12889 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12890 + X"$as_dir" : 'X\(//\)[^/]' \| \
12891 + X"$as_dir" : 'X\(//\)$' \| \
12892 + X"$as_dir" : 'X\(/\)' \| \
12893 + . : '\(.\)' 2>/dev/null ||
12894 +echo X"$as_dir" |
12895 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12896 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12897 + /^X\(\/\/\)$/{ s//\1/; q; }
12898 + /^X\(\/\).*/{ s//\1/; q; }
12899 + s/.*/./; q'`
12900 + done
12901 + test ! -n "$as_dirs" || mkdir $as_dirs
12902 + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
12903 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
12904 + { (exit 1); exit 1; }; }; }
12905 +
12906 + rm -f $ac_file
12907 + mv $tmp/config.h $ac_file
12908 fi
12909 - rm -f $ac_file
12910 - mv conftest.h $ac_file
12911 + else
12912 + cat $tmp/config.h
12913 + rm -f $tmp/config.h
12914 fi
12915 -fi; done
12916 +done
12917 +_ACEOF
12918 +cat >>$CONFIG_STATUS <<\_ACEOF
12919
12920 -EOF
12921 -cat >> $CONFIG_STATUS <<EOF
12922 +#
12923 +# CONFIG_COMMANDS section.
12924 +#
12925 +for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
12926 + ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
12927 + ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
12928 + ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
12929 +$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
12930 + X"$ac_dest" : 'X\(//\)[^/]' \| \
12931 + X"$ac_dest" : 'X\(//\)$' \| \
12932 + X"$ac_dest" : 'X\(/\)' \| \
12933 + . : '\(.\)' 2>/dev/null ||
12934 +echo X"$ac_dest" |
12935 + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
12936 + /^X\(\/\/\)[^/].*/{ s//\1/; q; }
12937 + /^X\(\/\/\)$/{ s//\1/; q; }
12938 + /^X\(\/\).*/{ s//\1/; q; }
12939 + s/.*/./; q'`
12940 + ac_builddir=.
12941 +
12942 +if test "$ac_dir" != .; then
12943 + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
12944 + # A "../" for each directory in $ac_dir_suffix.
12945 + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
12946 +else
12947 + ac_dir_suffix= ac_top_builddir=
12948 +fi
12949 +
12950 +case $srcdir in
12951 + .) # No --srcdir option. We are building in place.
12952 + ac_srcdir=.
12953 + if test -z "$ac_top_builddir"; then
12954 + ac_top_srcdir=.
12955 + else
12956 + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
12957 + fi ;;
12958 + [\\/]* | ?:[\\/]* ) # Absolute path.
12959 + ac_srcdir=$srcdir$ac_dir_suffix;
12960 + ac_top_srcdir=$srcdir ;;
12961 + *) # Relative path.
12962 + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
12963 + ac_top_srcdir=$ac_top_builddir$srcdir ;;
12964 +esac
12965 +# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
12966 +# absolute.
12967 +ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
12968 +ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
12969 +ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
12970 +ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
12971
12972
12973 -EOF
12974 -cat >> $CONFIG_STATUS <<\EOF
12975 -test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
12976 + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
12977 +echo "$as_me: executing $ac_dest commands" >&6;}
12978 + case $ac_dest in
12979 + default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
12980 + esac
12981 +done
12982 +_ACEOF
12983
12984 -exit 0
12985 -EOF
12986 +cat >>$CONFIG_STATUS <<\_ACEOF
12987 +
12988 +{ (exit 0); exit 0; }
12989 +_ACEOF
12990 chmod +x $CONFIG_STATUS
12991 -rm -fr confdefs* $ac_clean_files
12992 -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
12993 +ac_clean_files=$ac_clean_files_save
12994 +
12995 +
12996 +# configure is writing to config.log, and then calls config.status.
12997 +# config.status does its own redirection, appending to config.log.
12998 +# Unfortunately, on DOS this fails, as config.log is still kept open
12999 +# by configure, so config.status won't be able to write to it; its
13000 +# output is simply discarded. So we exec the FD to /dev/null,
13001 +# effectively closing config.log, so it can be properly (re)opened and
13002 +# appended to by config.status. When coming back to configure, we
13003 +# need to make the FD available again.
13004 +if test "$no_create" != yes; then
13005 + ac_cs_success=:
13006 + ac_config_status_args=
13007 + test "$silent" = yes &&
13008 + ac_config_status_args="$ac_config_status_args --quiet"
13009 + exec 5>/dev/null
13010 + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
13011 + exec 5>>config.log
13012 + # Use ||, not &&, to avoid exiting from the if with $? = 1, which
13013 + # would make configure fail if this is the last instruction.
13014 + $ac_cs_success || { (exit 1); exit 1; }
13015 +fi
13016
13017
13018 Index: linux-atm-2.4.1/ltmain.sh
13019 ===================================================================
13020 --- linux-atm-2.4.1.orig/ltmain.sh 2007-06-04 13:23:53.918537032 +0200
13021 +++ linux-atm-2.4.1/ltmain.sh 2007-06-04 13:23:54.479451760 +0200
13022 @@ -49,14 +49,14 @@
13023 fi
13024
13025 # The name of this program.
13026 -progname=`$echo "$0" | sed 's%^.*/%%'`
13027 +progname=`$echo "$0" | ${SED} 's%^.*/%%'`
13028 modename="$progname"
13029
13030 # Constants.
13031 PROGRAM=ltmain.sh
13032 PACKAGE=libtool
13033 -VERSION=1.4
13034 -TIMESTAMP=" (1.920 2001/04/24 23:26:18)"
13035 +VERSION=1.4.3
13036 +TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)"
13037
13038 default_mode=
13039 help="Try \`$progname --help' for more information."
13040 @@ -67,10 +67,19 @@
13041
13042 # Sed substitution that helps us do robust quoting. It backslashifies
13043 # metacharacters that are still active within double-quoted strings.
13044 -Xsed='sed -e 1s/^X//'
13045 +Xsed="${SED}"' -e 1s/^X//'
13046 sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
13047 -SP2NL='tr \040 \012'
13048 -NL2SP='tr \015\012 \040\040'
13049 +# test EBCDIC or ASCII
13050 +case `echo A|od -x` in
13051 + *[Cc]1*) # EBCDIC based system
13052 + SP2NL="tr '\100' '\n'"
13053 + NL2SP="tr '\r\n' '\100\100'"
13054 + ;;
13055 + *) # Assume ASCII based system
13056 + SP2NL="tr '\040' '\012'"
13057 + NL2SP="tr '\015\012' '\040\040'"
13058 + ;;
13059 +esac
13060
13061 # NLS nuisances.
13062 # Only set LANG and LC_ALL to C if already set.
13063 @@ -84,6 +93,9 @@
13064 save_LANG="$LANG"; LANG=C; export LANG
13065 fi
13066
13067 +# Make sure IFS has a sensible default
13068 +: ${IFS=" "}
13069 +
13070 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
13071 echo "$modename: not configured to build any kind of library" 1>&2
13072 echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
13073 @@ -141,7 +153,7 @@
13074 ;;
13075
13076 --config)
13077 - sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
13078 + ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
13079 exit 0
13080 ;;
13081
13082 @@ -174,6 +186,8 @@
13083 --mode) prevopt="--mode" prev=mode ;;
13084 --mode=*) mode="$optarg" ;;
13085
13086 + --preserve-dup-deps) duplicate_deps="yes" ;;
13087 +
13088 --quiet | --silent)
13089 show=:
13090 ;;
13091 @@ -202,12 +216,17 @@
13092 exit 1
13093 fi
13094
13095 +# If this variable is set in any of the actions, the command in it
13096 +# will be execed at the end. This prevents here-documents from being
13097 +# left over by shells.
13098 +exec_cmd=
13099 +
13100 if test -z "$show_help"; then
13101
13102 # Infer the operation mode.
13103 if test -z "$mode"; then
13104 case $nonopt in
13105 - *cc | *++ | gcc* | *-gcc*)
13106 + *cc | *++ | gcc* | *-gcc* | g++* | xlc*)
13107 mode=link
13108 for arg
13109 do
13110 @@ -329,7 +348,7 @@
13111 -Wc,*)
13112 args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
13113 lastarg=
13114 - IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
13115 + save_ifs="$IFS"; IFS=','
13116 for arg in $args; do
13117 IFS="$save_ifs"
13118
13119 @@ -615,6 +634,10 @@
13120 # Now arrange that obj and lo_libobj become the same file
13121 $show "(cd $xdir && $LN_S $baseobj $libobj)"
13122 if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
13123 + # Unlock the critical section if it was locked
13124 + if test "$need_locks" != no; then
13125 + $run $rm "$lockfile"
13126 + fi
13127 exit 0
13128 else
13129 error=$?
13130 @@ -745,6 +768,7 @@
13131 linker_flags=
13132 dllsearchpath=
13133 lib_search_path=`pwd`
13134 + inst_prefix_dir=
13135
13136 avoid_version=no
13137 dlfiles=
13138 @@ -875,6 +899,11 @@
13139 prev=
13140 continue
13141 ;;
13142 + inst_prefix)
13143 + inst_prefix_dir="$arg"
13144 + prev=
13145 + continue
13146 + ;;
13147 release)
13148 release="-$arg"
13149 prev=
13150 @@ -976,11 +1005,16 @@
13151 continue
13152 ;;
13153
13154 + -inst-prefix-dir)
13155 + prev=inst_prefix
13156 + continue
13157 + ;;
13158 +
13159 # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
13160 # so, if we see these flags be careful not to treat them like -L
13161 -L[A-Z][A-Z]*:*)
13162 case $with_gcc/$host in
13163 - no/*-*-irix*)
13164 + no/*-*-irix* | no/*-*-nonstopux*)
13165 compile_command="$compile_command $arg"
13166 finalize_command="$finalize_command $arg"
13167 ;;
13168 @@ -1031,6 +1065,17 @@
13169 # These systems don't actually have a C library (as such)
13170 test "X$arg" = "X-lc" && continue
13171 ;;
13172 + *-*-openbsd* | *-*-freebsd*)
13173 + # Do not include libc due to us having libc/libc_r.
13174 + test "X$arg" = "X-lc" && continue
13175 + ;;
13176 + esac
13177 + elif test "X$arg" = "X-lc_r"; then
13178 + case $host in
13179 + *-*-openbsd* | *-*-freebsd*)
13180 + # Do not include libc_r directly, use -pthread flag.
13181 + continue
13182 + ;;
13183 esac
13184 fi
13185 deplibs="$deplibs $arg"
13186 @@ -1122,7 +1167,7 @@
13187 -Wc,*)
13188 args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
13189 arg=
13190 - IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
13191 + save_ifs="$IFS"; IFS=','
13192 for flag in $args; do
13193 IFS="$save_ifs"
13194 case $flag in
13195 @@ -1140,7 +1185,7 @@
13196 -Wl,*)
13197 args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
13198 arg=
13199 - IFS="${IFS= }"; save_ifs="$IFS"; IFS=','
13200 + save_ifs="$IFS"; IFS=','
13201 for flag in $args; do
13202 IFS="$save_ifs"
13203 case $flag in
13204 @@ -1307,9 +1352,11 @@
13205 # Find all interdependent deplibs by searching for libraries
13206 # that are linked more than once (e.g. -la -lb -la)
13207 for deplib in $deplibs; do
13208 - case "$libs " in
13209 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13210 - esac
13211 + if test "X$duplicate_deps" = "Xyes" ; then
13212 + case "$libs " in
13213 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13214 + esac
13215 + fi
13216 libs="$libs $deplib"
13217 done
13218 deplibs=
13219 @@ -1343,7 +1390,7 @@
13220 ;;
13221 esac
13222 for pass in $passes; do
13223 - if test "$linkmode" = prog; then
13224 + if test $linkmode = prog; then
13225 # Determine which files to process
13226 case $pass in
13227 dlopen)
13228 @@ -1360,11 +1407,11 @@
13229 found=no
13230 case $deplib in
13231 -l*)
13232 - if test "$linkmode" = oldlib && test "$linkmode" = obj; then
13233 + if test $linkmode = oldlib && test $linkmode = obj; then
13234 $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
13235 continue
13236 fi
13237 - if test "$pass" = conv; then
13238 + if test $pass = conv; then
13239 deplibs="$deplib $deplibs"
13240 continue
13241 fi
13242 @@ -1384,7 +1431,7 @@
13243 finalize_deplibs="$deplib $finalize_deplibs"
13244 else
13245 deplibs="$deplib $deplibs"
13246 - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
13247 + test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
13248 fi
13249 continue
13250 fi
13251 @@ -1393,16 +1440,16 @@
13252 case $linkmode in
13253 lib)
13254 deplibs="$deplib $deplibs"
13255 - test "$pass" = conv && continue
13256 + test $pass = conv && continue
13257 newdependency_libs="$deplib $newdependency_libs"
13258 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
13259 ;;
13260 prog)
13261 - if test "$pass" = conv; then
13262 + if test $pass = conv; then
13263 deplibs="$deplib $deplibs"
13264 continue
13265 fi
13266 - if test "$pass" = scan; then
13267 + if test $pass = scan; then
13268 deplibs="$deplib $deplibs"
13269 newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
13270 else
13271 @@ -1417,7 +1464,7 @@
13272 continue
13273 ;; # -L
13274 -R*)
13275 - if test "$pass" = link; then
13276 + if test $pass = link; then
13277 dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
13278 # Make sure the xrpath contains only unique directories.
13279 case "$xrpath " in
13280 @@ -1430,7 +1477,7 @@
13281 ;;
13282 *.la) lib="$deplib" ;;
13283 *.$libext)
13284 - if test "$pass" = conv; then
13285 + if test $pass = conv; then
13286 deplibs="$deplib $deplibs"
13287 continue
13288 fi
13289 @@ -1438,10 +1485,12 @@
13290 lib)
13291 if test "$deplibs_check_method" != pass_all; then
13292 echo
13293 - echo "*** Warning: This library needs some functionality provided by $deplib."
13294 + echo "*** Warning: Trying to link with static lib archive $deplib."
13295 echo "*** I have the capability to make that library automatically link in when"
13296 echo "*** you link to this library. But I can only do this if you have a"
13297 - echo "*** shared version of the library, which you do not appear to have."
13298 + echo "*** shared version of the library, which you do not appear to have"
13299 + echo "*** because the file extensions .$libext of this argument makes me believe"
13300 + echo "*** that it is just a static archive that I should not used here."
13301 else
13302 echo
13303 echo "*** Warning: Linking the shared library $output against the"
13304 @@ -1451,7 +1500,7 @@
13305 continue
13306 ;;
13307 prog)
13308 - if test "$pass" != link; then
13309 + if test $pass != link; then
13310 deplibs="$deplib $deplibs"
13311 else
13312 compile_deplibs="$deplib $compile_deplibs"
13313 @@ -1462,7 +1511,7 @@
13314 esac # linkmode
13315 ;; # *.$libext
13316 *.lo | *.$objext)
13317 - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
13318 + if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
13319 # If there is no dlopen support or we're linking statically,
13320 # we need to preload.
13321 newdlprefiles="$newdlprefiles $deplib"
13322 @@ -1485,7 +1534,7 @@
13323 fi
13324
13325 # Check to see that this really is a libtool archive.
13326 - if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
13327 + if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
13328 else
13329 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
13330 exit 1
13331 @@ -1512,13 +1561,13 @@
13332
13333 if test "$linkmode,$pass" = "lib,link" ||
13334 test "$linkmode,$pass" = "prog,scan" ||
13335 - { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
13336 + { test $linkmode = oldlib && test $linkmode = obj; }; then
13337 # Add dl[pre]opened files of deplib
13338 test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
13339 test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
13340 fi
13341
13342 - if test "$pass" = conv; then
13343 + if test $pass = conv; then
13344 # Only check for convenience libraries
13345 deplibs="$lib $deplibs"
13346 if test -z "$libdir"; then
13347 @@ -1532,12 +1581,14 @@
13348 tmp_libs=
13349 for deplib in $dependency_libs; do
13350 deplibs="$deplib $deplibs"
13351 - case "$tmp_libs " in
13352 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13353 - esac
13354 + if test "X$duplicate_deps" = "Xyes" ; then
13355 + case "$tmp_libs " in
13356 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13357 + esac
13358 + fi
13359 tmp_libs="$tmp_libs $deplib"
13360 done
13361 - elif test "$linkmode" != prog && test "$linkmode" != lib; then
13362 + elif test $linkmode != prog && test $linkmode != lib; then
13363 $echo "$modename: \`$lib' is not a convenience library" 1>&2
13364 exit 1
13365 fi
13366 @@ -1555,7 +1606,7 @@
13367 fi
13368
13369 # This library was specified with -dlopen.
13370 - if test "$pass" = dlopen; then
13371 + if test $pass = dlopen; then
13372 if test -z "$libdir"; then
13373 $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
13374 exit 1
13375 @@ -1604,7 +1655,7 @@
13376 name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
13377
13378 # This library was specified with -dlpreopen.
13379 - if test "$pass" = dlpreopen; then
13380 + if test $pass = dlpreopen; then
13381 if test -z "$libdir"; then
13382 $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
13383 exit 1
13384 @@ -1623,7 +1674,7 @@
13385
13386 if test -z "$libdir"; then
13387 # Link the convenience library
13388 - if test "$linkmode" = lib; then
13389 + if test $linkmode = lib; then
13390 deplibs="$dir/$old_library $deplibs"
13391 elif test "$linkmode,$pass" = "prog,link"; then
13392 compile_deplibs="$dir/$old_library $compile_deplibs"
13393 @@ -1634,7 +1685,7 @@
13394 continue
13395 fi
13396
13397 - if test "$linkmode" = prog && test "$pass" != link; then
13398 + if test $linkmode = prog && test $pass != link; then
13399 newlib_search_path="$newlib_search_path $ladir"
13400 deplibs="$lib $deplibs"
13401
13402 @@ -1657,9 +1708,11 @@
13403 # or/and link against static libraries
13404 newdependency_libs="$deplib $newdependency_libs"
13405 fi
13406 - case "$tmp_libs " in
13407 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13408 - esac
13409 + if test "X$duplicate_deps" = "Xyes" ; then
13410 + case "$tmp_libs " in
13411 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13412 + esac
13413 + fi
13414 tmp_libs="$tmp_libs $deplib"
13415 done # for deplib
13416 continue
13417 @@ -1671,7 +1724,7 @@
13418 # Link against this shared library
13419
13420 if test "$linkmode,$pass" = "prog,link" ||
13421 - { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
13422 + { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
13423 # Hardcode the library path.
13424 # Skip directories that are in the system default run-time
13425 # search path.
13426 @@ -1693,7 +1746,7 @@
13427 esac
13428 ;;
13429 esac
13430 - if test "$linkmode" = prog; then
13431 + if test $linkmode = prog; then
13432 # We need to hardcode the library path
13433 if test -n "$shlibpath_var"; then
13434 # Make sure the rpath contains only unique directories.
13435 @@ -1743,14 +1796,14 @@
13436
13437 # Make a new name for the extract_expsyms_cmds to use
13438 soroot="$soname"
13439 - soname=`echo $soroot | sed -e 's/^.*\///'`
13440 - newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
13441 + soname=`echo $soroot | ${SED} -e 's/^.*\///'`
13442 + newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
13443
13444 # If the library has no export list, then create one now
13445 if test -f "$output_objdir/$soname-def"; then :
13446 else
13447 $show "extracting exported symbol list from \`$soname'"
13448 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13449 + save_ifs="$IFS"; IFS='~'
13450 eval cmds=\"$extract_expsyms_cmds\"
13451 for cmd in $cmds; do
13452 IFS="$save_ifs"
13453 @@ -1763,7 +1816,7 @@
13454 # Create $newlib
13455 if test -f "$output_objdir/$newlib"; then :; else
13456 $show "generating import library for \`$soname'"
13457 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13458 + save_ifs="$IFS"; IFS='~'
13459 eval cmds=\"$old_archive_from_expsyms_cmds\"
13460 for cmd in $cmds; do
13461 IFS="$save_ifs"
13462 @@ -1777,7 +1830,7 @@
13463 linklib=$newlib
13464 fi # test -n $old_archive_from_expsyms_cmds
13465
13466 - if test "$linkmode" = prog || test "$mode" != relink; then
13467 + if test $linkmode = prog || test "$mode" != relink; then
13468 add_shlibpath=
13469 add_dir=
13470 add=
13471 @@ -1804,6 +1857,14 @@
13472 add="$dir/$linklib"
13473 elif test "$hardcode_minus_L" = yes; then
13474 add_dir="-L$dir"
13475 + # Try looking first in the location we're being installed to.
13476 + if test -n "$inst_prefix_dir"; then
13477 + case "$libdir" in
13478 + [\/]*)
13479 + add_dir="-L$inst_prefix_dir$libdir $add_dir"
13480 + ;;
13481 + esac
13482 + fi
13483 add="-l$name"
13484 elif test "$hardcode_shlibpath_var" = yes; then
13485 add_shlibpath="$dir"
13486 @@ -1826,7 +1887,7 @@
13487 *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
13488 esac
13489 fi
13490 - if test "$linkmode" = prog; then
13491 + if test $linkmode = prog; then
13492 test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
13493 test -n "$add" && compile_deplibs="$add $compile_deplibs"
13494 else
13495 @@ -1843,7 +1904,7 @@
13496 fi
13497 fi
13498
13499 - if test "$linkmode" = prog || test "$mode" = relink; then
13500 + if test $linkmode = prog || test "$mode" = relink; then
13501 add_shlibpath=
13502 add_dir=
13503 add=
13504 @@ -1862,10 +1923,18 @@
13505 else
13506 # We cannot seem to hardcode it, guess we'll fake it.
13507 add_dir="-L$libdir"
13508 + # Try looking first in the location we're being installed to.
13509 + if test -n "$inst_prefix_dir"; then
13510 + case "$libdir" in
13511 + [\/]*)
13512 + add_dir="-L$inst_prefix_dir$libdir $add_dir"
13513 + ;;
13514 + esac
13515 + fi
13516 add="-l$name"
13517 fi
13518
13519 - if test "$linkmode" = prog; then
13520 + if test $linkmode = prog; then
13521 test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
13522 test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
13523 else
13524 @@ -1873,7 +1942,7 @@
13525 test -n "$add" && deplibs="$add $deplibs"
13526 fi
13527 fi
13528 - elif test "$linkmode" = prog; then
13529 + elif test $linkmode = prog; then
13530 if test "$alldeplibs" = yes &&
13531 { test "$deplibs_check_method" = pass_all ||
13532 { test "$build_libtool_libs" = yes &&
13533 @@ -1903,25 +1972,26 @@
13534 # Just print a warning and add the library to dependency_libs so
13535 # that the program can be linked against the static library.
13536 echo
13537 - echo "*** Warning: This library needs some functionality provided by $lib."
13538 + echo "*** Warning: This system can not link to static lib archive $lib."
13539 echo "*** I have the capability to make that library automatically link in when"
13540 echo "*** you link to this library. But I can only do this if you have a"
13541 echo "*** shared version of the library, which you do not appear to have."
13542 if test "$module" = yes; then
13543 - echo "*** Therefore, libtool will create a static module, that should work "
13544 - echo "*** as long as the dlopening application is linked with the -dlopen flag."
13545 + echo "*** But as you try to build a module library, libtool will still create "
13546 + echo "*** a static module, that should work as long as the dlopening application"
13547 + echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
13548 if test -z "$global_symbol_pipe"; then
13549 - echo
13550 - echo "*** However, this would only work if libtool was able to extract symbol"
13551 - echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
13552 - echo "*** not find such a program. So, this module is probably useless."
13553 - echo "*** \`nm' from GNU binutils and a full rebuild may help."
13554 + echo
13555 + echo "*** However, this would only work if libtool was able to extract symbol"
13556 + echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
13557 + echo "*** not find such a program. So, this module is probably useless."
13558 + echo "*** \`nm' from GNU binutils and a full rebuild may help."
13559 fi
13560 if test "$build_old_libs" = no; then
13561 - build_libtool_libs=module
13562 - build_old_libs=yes
13563 + build_libtool_libs=module
13564 + build_old_libs=yes
13565 else
13566 - build_libtool_libs=no
13567 + build_libtool_libs=no
13568 fi
13569 fi
13570 else
13571 @@ -1932,9 +2002,9 @@
13572 fi
13573 fi # link shared/static library?
13574
13575 - if test "$linkmode" = lib; then
13576 + if test $linkmode = lib; then
13577 if test -n "$dependency_libs" &&
13578 - { test "$hardcode_into_libs" != yes || test $build_old_libs = yes ||
13579 + { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
13580 test $link_static = yes; }; then
13581 # Extract -R from dependency_libs
13582 temp_deplibs=
13583 @@ -1958,13 +2028,15 @@
13584 tmp_libs=
13585 for deplib in $dependency_libs; do
13586 newdependency_libs="$deplib $newdependency_libs"
13587 - case "$tmp_libs " in
13588 - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13589 - esac
13590 + if test "X$duplicate_deps" = "Xyes" ; then
13591 + case "$tmp_libs " in
13592 + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
13593 + esac
13594 + fi
13595 tmp_libs="$tmp_libs $deplib"
13596 done
13597
13598 - if test "$link_all_deplibs" != no; then
13599 + if test $link_all_deplibs != no; then
13600 # Add the search paths of all dependency libraries
13601 for deplib in $dependency_libs; do
13602 case $deplib in
13603 @@ -1986,7 +2058,7 @@
13604 if grep "^installed=no" $deplib > /dev/null; then
13605 path="-L$absdir/$objdir"
13606 else
13607 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
13608 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
13609 if test -z "$libdir"; then
13610 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
13611 exit 1
13612 @@ -2007,15 +2079,15 @@
13613 fi # link_all_deplibs != no
13614 fi # linkmode = lib
13615 done # for deplib in $libs
13616 - if test "$pass" = dlpreopen; then
13617 + if test $pass = dlpreopen; then
13618 # Link the dlpreopened libraries before other libraries
13619 for deplib in $save_deplibs; do
13620 deplibs="$deplib $deplibs"
13621 done
13622 fi
13623 - if test "$pass" != dlopen; then
13624 - test "$pass" != scan && dependency_libs="$newdependency_libs"
13625 - if test "$pass" != conv; then
13626 + if test $pass != dlopen; then
13627 + test $pass != scan && dependency_libs="$newdependency_libs"
13628 + if test $pass != conv; then
13629 # Make sure lib_search_path contains only unique directories.
13630 lib_search_path=
13631 for dir in $newlib_search_path; do
13632 @@ -2073,7 +2145,7 @@
13633 deplibs=
13634 fi
13635 done # for pass
13636 - if test "$linkmode" = prog; then
13637 + if test $linkmode = prog; then
13638 dlfiles="$newdlfiles"
13639 dlprefiles="$newdlprefiles"
13640 fi
13641 @@ -2175,7 +2247,7 @@
13642 else
13643
13644 # Parse the version information argument.
13645 - IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
13646 + save_ifs="$IFS"; IFS=':'
13647 set dummy $vinfo 0 0 0
13648 IFS="$save_ifs"
13649
13650 @@ -2250,16 +2322,21 @@
13651 versuffix=".$current";
13652 ;;
13653
13654 - irix)
13655 + irix | nonstopux)
13656 major=`expr $current - $age + 1`
13657 - verstring="sgi$major.$revision"
13658 +
13659 + case $version_type in
13660 + nonstopux) verstring_prefix=nonstopux ;;
13661 + *) verstring_prefix=sgi ;;
13662 + esac
13663 + verstring="$verstring_prefix$major.$revision"
13664
13665 # Add in all the interfaces that we are compatible with.
13666 loop=$revision
13667 while test $loop != 0; do
13668 iface=`expr $revision - $loop`
13669 loop=`expr $loop - 1`
13670 - verstring="sgi$major.$iface:$verstring"
13671 + verstring="$verstring_prefix$major.$iface:$verstring"
13672 done
13673
13674 # Before this point, $major must not contain `.'.
13675 @@ -2273,7 +2350,7 @@
13676 ;;
13677
13678 osf)
13679 - major=`expr $current - $age`
13680 + major=.`expr $current - $age`
13681 versuffix=".$current.$age.$revision"
13682 verstring="$current.$age.$revision"
13683
13684 @@ -2312,6 +2389,16 @@
13685 if test -z "$vinfo" && test -n "$release"; then
13686 major=
13687 verstring="0.0"
13688 + case $version_type in
13689 + darwin)
13690 + # we can't check for "0.0" in archive_cmds due to quoting
13691 + # problems, so we reset it completely
13692 + verstring=""
13693 + ;;
13694 + *)
13695 + verstring="0.0"
13696 + ;;
13697 + esac
13698 if test "$need_version" = no; then
13699 versuffix=
13700 else
13701 @@ -2355,9 +2442,9 @@
13702
13703 # Eliminate all temporary directories.
13704 for path in $notinst_path; do
13705 - lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
13706 - deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
13707 - dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
13708 + lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
13709 + deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
13710 + dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
13711 done
13712
13713 if test -n "$xrpath"; then
13714 @@ -2408,9 +2495,12 @@
13715 *-*-netbsd*)
13716 # Don't link with libc until the a.out ld.so is fixed.
13717 ;;
13718 + *-*-openbsd* | *-*-freebsd*)
13719 + # Do not include libc due to us having libc/libc_r.
13720 + ;;
13721 *)
13722 # Add libc to deplibs on all other systems if necessary.
13723 - if test "$build_libtool_need_lc" = "yes"; then
13724 + if test $build_libtool_need_lc = "yes"; then
13725 deplibs="$deplibs -lc"
13726 fi
13727 ;;
13728 @@ -2466,18 +2556,20 @@
13729 else
13730 droppeddeps=yes
13731 echo
13732 - echo "*** Warning: This library needs some functionality provided by $i."
13733 + echo "*** Warning: dynamic linker does not accept needed library $i."
13734 echo "*** I have the capability to make that library automatically link in when"
13735 echo "*** you link to this library. But I can only do this if you have a"
13736 - echo "*** shared version of the library, which you do not appear to have."
13737 + echo "*** shared version of the library, which I believe you do not have"
13738 + echo "*** because a test_compile did reveal that the linker did not use it for"
13739 + echo "*** its dynamic dependency list that programs get resolved with at runtime."
13740 fi
13741 else
13742 newdeplibs="$newdeplibs $i"
13743 fi
13744 done
13745 else
13746 - # Error occured in the first compile. Let's try to salvage the situation:
13747 - # Compile a seperate program for each library.
13748 + # Error occured in the first compile. Let's try to salvage
13749 + # the situation: Compile a separate program for each library.
13750 for i in $deplibs; do
13751 name="`expr $i : '-l\(.*\)'`"
13752 # If $name is empty we are operating on a -L argument.
13753 @@ -2496,10 +2588,12 @@
13754 else
13755 droppeddeps=yes
13756 echo
13757 - echo "*** Warning: This library needs some functionality provided by $i."
13758 + echo "*** Warning: dynamic linker does not accept needed library $i."
13759 echo "*** I have the capability to make that library automatically link in when"
13760 echo "*** you link to this library. But I can only do this if you have a"
13761 - echo "*** shared version of the library, which you do not appear to have."
13762 + echo "*** shared version of the library, which you do not appear to have"
13763 + echo "*** because a test_compile did reveal that the linker did not use this one"
13764 + echo "*** as a dynamic dependency that programs can get resolved with at runtime."
13765 fi
13766 else
13767 droppeddeps=yes
13768 @@ -2538,14 +2632,14 @@
13769 # but so what?
13770 potlib="$potent_lib"
13771 while test -h "$potlib" 2>/dev/null; do
13772 - potliblink=`ls -ld $potlib | sed 's/.* -> //'`
13773 + potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
13774 case $potliblink in
13775 [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
13776 *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
13777 esac
13778 done
13779 if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
13780 - | sed 10q \
13781 + | ${SED} 10q \
13782 | egrep "$file_magic_regex" > /dev/null; then
13783 newdeplibs="$newdeplibs $a_deplib"
13784 a_deplib=""
13785 @@ -2556,10 +2650,17 @@
13786 if test -n "$a_deplib" ; then
13787 droppeddeps=yes
13788 echo
13789 - echo "*** Warning: This library needs some functionality provided by $a_deplib."
13790 + echo "*** Warning: linker path does not have real file for library $a_deplib."
13791 echo "*** I have the capability to make that library automatically link in when"
13792 echo "*** you link to this library. But I can only do this if you have a"
13793 - echo "*** shared version of the library, which you do not appear to have."
13794 + echo "*** shared version of the library, which you do not appear to have"
13795 + echo "*** because I did check the linker path looking for a file starting"
13796 + if test -z "$potlib" ; then
13797 + echo "*** with $libname but no candidates were found. (...for file magic test)"
13798 + else
13799 + echo "*** with $libname and none of the candidates passed a file format test"
13800 + echo "*** using a file magic. Last file checked: $potlib"
13801 + fi
13802 fi
13803 else
13804 # Add a -L argument.
13805 @@ -2578,8 +2679,9 @@
13806 for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
13807 potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
13808 for potent_lib in $potential_libs; do
13809 + potlib="$potent_lib" # see symlink-check below in file_magic test
13810 if eval echo \"$potent_lib\" 2>/dev/null \
13811 - | sed 10q \
13812 + | ${SED} 10q \
13813 | egrep "$match_pattern_regex" > /dev/null; then
13814 newdeplibs="$newdeplibs $a_deplib"
13815 a_deplib=""
13816 @@ -2590,10 +2692,17 @@
13817 if test -n "$a_deplib" ; then
13818 droppeddeps=yes
13819 echo
13820 - echo "*** Warning: This library needs some functionality provided by $a_deplib."
13821 + echo "*** Warning: linker path does not have real file for library $a_deplib."
13822 echo "*** I have the capability to make that library automatically link in when"
13823 echo "*** you link to this library. But I can only do this if you have a"
13824 - echo "*** shared version of the library, which you do not appear to have."
13825 + echo "*** shared version of the library, which you do not appear to have"
13826 + echo "*** because I did check the linker path looking for a file starting"
13827 + if test -z "$potlib" ; then
13828 + echo "*** with $libname but no candidates were found. (...for regex pattern test)"
13829 + else
13830 + echo "*** with $libname and none of the candidates passed a file format test"
13831 + echo "*** using a regex pattern. Last file checked: $potlib"
13832 + fi
13833 fi
13834 else
13835 # Add a -L argument.
13836 @@ -2683,7 +2792,7 @@
13837
13838 # Test again, we may have decided not to build it any more
13839 if test "$build_libtool_libs" = yes; then
13840 - if test "$hardcode_into_libs" = yes; then
13841 + if test $hardcode_into_libs = yes; then
13842 # Hardcode the library paths
13843 hardcode_libdirs=
13844 dep_rpath=
13845 @@ -2784,7 +2893,7 @@
13846 export_symbols="$output_objdir/$libname.exp"
13847 $run $rm $export_symbols
13848 eval cmds=\"$export_symbols_cmds\"
13849 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13850 + save_ifs="$IFS"; IFS='~'
13851 for cmd in $cmds; do
13852 IFS="$save_ifs"
13853 $show "$cmd"
13854 @@ -2858,9 +2967,20 @@
13855 if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
13856 eval cmds=\"$archive_expsym_cmds\"
13857 else
13858 + save_deplibs="$deplibs"
13859 + for conv in $convenience; do
13860 + tmp_deplibs=
13861 + for test_deplib in $deplibs; do
13862 + if test "$test_deplib" != "$conv"; then
13863 + tmp_deplibs="$tmp_deplibs $test_deplib"
13864 + fi
13865 + done
13866 + deplibs="$tmp_deplibs"
13867 + done
13868 eval cmds=\"$archive_cmds\"
13869 + deplibs="$save_deplibs"
13870 fi
13871 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13872 + save_ifs="$IFS"; IFS='~'
13873 for cmd in $cmds; do
13874 IFS="$save_ifs"
13875 $show "$cmd"
13876 @@ -2988,7 +3108,7 @@
13877
13878 output="$obj"
13879 eval cmds=\"$reload_cmds\"
13880 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13881 + save_ifs="$IFS"; IFS='~'
13882 for cmd in $cmds; do
13883 IFS="$save_ifs"
13884 $show "$cmd"
13885 @@ -3024,7 +3144,7 @@
13886 reload_objs="$libobjs $reload_conv_objs"
13887 output="$libobj"
13888 eval cmds=\"$reload_cmds\"
13889 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
13890 + save_ifs="$IFS"; IFS='~'
13891 for cmd in $cmds; do
13892 IFS="$save_ifs"
13893 $show "$cmd"
13894 @@ -3057,7 +3177,7 @@
13895
13896 prog)
13897 case $host in
13898 - *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
13899 + *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
13900 esac
13901 if test -n "$vinfo"; then
13902 $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
13903 @@ -3079,6 +3199,13 @@
13904 # On Rhapsody replace the C library is the System framework
13905 compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
13906 finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
13907 + case $host in
13908 + *darwin*)
13909 + # Don't allow lazy linking, it breaks C++ global constructors
13910 + compile_command="$compile_command ${wl}-bind_at_load"
13911 + finalize_command="$finalize_command ${wl}-bind_at_load"
13912 + ;;
13913 + esac
13914 ;;
13915 esac
13916
13917 @@ -3245,9 +3372,9 @@
13918 if test -z "$export_symbols"; then
13919 export_symbols="$output_objdir/$output.exp"
13920 $run $rm $export_symbols
13921 - $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
13922 + $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
13923 else
13924 - $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
13925 + $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
13926 $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
13927 $run eval 'mv "$nlist"T "$nlist"'
13928 fi
13929 @@ -3255,7 +3382,7 @@
13930
13931 for arg in $dlprefiles; do
13932 $show "extracting global C symbols from \`$arg'"
13933 - name=`echo "$arg" | sed -e 's%^.*/%%'`
13934 + name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
13935 $run eval 'echo ": $name " >> "$nlist"'
13936 $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
13937 done
13938 @@ -3270,7 +3397,13 @@
13939 fi
13940
13941 # Try sorting and uniquifying the output.
13942 - if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
13943 + if grep -v "^: " < "$nlist" |
13944 + if sort -k 3 </dev/null >/dev/null 2>&1; then
13945 + sort -k 3
13946 + else
13947 + sort +2
13948 + fi |
13949 + uniq > "$nlist"S; then
13950 :
13951 else
13952 grep -v "^: " < "$nlist" > "$nlist"S
13953 @@ -3287,27 +3420,25 @@
13954 #undef lt_preloaded_symbols
13955
13956 #if defined (__STDC__) && __STDC__
13957 -# define lt_ptr_t void *
13958 +# define lt_ptr void *
13959 #else
13960 -# define lt_ptr_t char *
13961 +# define lt_ptr char *
13962 # define const
13963 #endif
13964
13965 /* The mapping between symbol names and symbols. */
13966 const struct {
13967 const char *name;
13968 - lt_ptr_t address;
13969 + lt_ptr address;
13970 }
13971 lt_preloaded_symbols[] =
13972 {\
13973 "
13974
13975 - sed -n -e 's/^: \([^ ]*\) $/ {\"\1\", (lt_ptr_t) 0},/p' \
13976 - -e 's/^. \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr_t) \&\2},/p' \
13977 - < "$nlist" >> "$output_objdir/$dlsyms"
13978 + eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
13979
13980 $echo >> "$output_objdir/$dlsyms" "\
13981 - {0, (lt_ptr_t) 0}
13982 + {0, (lt_ptr) 0}
13983 };
13984
13985 /* This works around a problem in FreeBSD linker */
13986 @@ -3494,7 +3625,7 @@
13987 relink_command="$var=\"$var_value\"; export $var; $relink_command"
13988 fi
13989 done
13990 - relink_command="cd `pwd`; $relink_command"
13991 + relink_command="(cd `pwd`; $relink_command)"
13992 relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
13993 fi
13994
13995 @@ -3514,7 +3645,7 @@
13996 # win32 will think the script is a binary if it has
13997 # a .exe suffix, so we strip it off here.
13998 case $output in
13999 - *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
14000 + *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
14001 esac
14002 # test for cygwin because mv fails w/o .exe extensions
14003 case $host in
14004 @@ -3538,7 +3669,7 @@
14005
14006 # Sed substitution that helps us do robust quoting. It backslashifies
14007 # metacharacters that are still active within double-quoted strings.
14008 -Xsed='sed -e 1s/^X//'
14009 +Xsed="${SED}"' -e 1s/^X//'
14010 sed_quote_subst='$sed_quote_subst'
14011
14012 # The HP-UX ksh and POSIX shell print the target directory to stdout
14013 @@ -3576,7 +3707,7 @@
14014 test \"x\$thisdir\" = \"x\$file\" && thisdir=.
14015
14016 # Follow symbolic links until we get to the real thisdir.
14017 - file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
14018 + file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
14019 while test -n \"\$file\"; do
14020 destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
14021
14022 @@ -3589,7 +3720,7 @@
14023 fi
14024
14025 file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
14026 - file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
14027 + file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
14028 done
14029
14030 # Try to get the absolute directory name.
14031 @@ -3603,7 +3734,7 @@
14032 progdir=\"\$thisdir/$objdir\"
14033
14034 if test ! -f \"\$progdir/\$program\" || \\
14035 - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
14036 + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
14037 test \"X\$file\" != \"X\$progdir/\$program\"; }; then
14038
14039 file=\"\$\$-\$program\"
14040 @@ -3618,8 +3749,9 @@
14041
14042 # relink executable if necessary
14043 if test -n \"\$relink_command\"; then
14044 - if (eval \$relink_command); then :
14045 + if relink_command_output=\`eval \$relink_command 2>&1\`; then :
14046 else
14047 + $echo \"\$relink_command_output\" >&2
14048 $rm \"\$progdir/\$file\"
14049 exit 1
14050 fi
14051 @@ -3648,7 +3780,7 @@
14052 $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
14053
14054 # Some systems cannot cope with colon-terminated $shlibpath_var
14055 - # The second colon is a workaround for a bug in BeOS R4 sed
14056 + # The second colon is a workaround for a bug in BeOS R4 ${SED}
14057 $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
14058
14059 export $shlibpath_var
14060 @@ -3790,7 +3922,7 @@
14061
14062 eval cmds=\"$old_archive_cmds\"
14063 fi
14064 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14065 + save_ifs="$IFS"; IFS='~'
14066 for cmd in $cmds; do
14067 IFS="$save_ifs"
14068 $show "$cmd"
14069 @@ -3823,7 +3955,7 @@
14070 fi
14071 done
14072 # Quote the link command for shipping.
14073 - relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
14074 + relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
14075 relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
14076
14077 # Only create the output if not a dry run.
14078 @@ -3840,7 +3972,7 @@
14079 case $deplib in
14080 *.la)
14081 name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
14082 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
14083 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
14084 if test -z "$libdir"; then
14085 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
14086 exit 1
14087 @@ -3854,7 +3986,7 @@
14088 newdlfiles=
14089 for lib in $dlfiles; do
14090 name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
14091 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
14092 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
14093 if test -z "$libdir"; then
14094 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
14095 exit 1
14096 @@ -3865,7 +3997,7 @@
14097 newdlprefiles=
14098 for lib in $dlprefiles; do
14099 name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
14100 - eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
14101 + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
14102 if test -z "$libdir"; then
14103 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
14104 exit 1
14105 @@ -4089,7 +4221,7 @@
14106
14107 *.la)
14108 # Check to see that this really is a libtool archive.
14109 - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
14110 + if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
14111 else
14112 $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
14113 $echo "$help" 1>&2
14114 @@ -4124,12 +4256,30 @@
14115 dir="$dir$objdir"
14116
14117 if test -n "$relink_command"; then
14118 + # Determine the prefix the user has applied to our future dir.
14119 + inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
14120 +
14121 + # Don't allow the user to place us outside of our expected
14122 + # location b/c this prevents finding dependent libraries that
14123 + # are installed to the same prefix.
14124 + if test "$inst_prefix_dir" = "$destdir"; then
14125 + $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
14126 + exit 1
14127 + fi
14128 +
14129 + if test -n "$inst_prefix_dir"; then
14130 + # Stick the inst_prefix_dir data into the link command.
14131 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
14132 + else
14133 + relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
14134 + fi
14135 +
14136 $echo "$modename: warning: relinking \`$file'" 1>&2
14137 $show "$relink_command"
14138 if $run eval "$relink_command"; then :
14139 else
14140 $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
14141 - continue
14142 + exit 1
14143 fi
14144 fi
14145
14146 @@ -4165,7 +4315,7 @@
14147 # Do each command in the postinstall commands.
14148 lib="$destdir/$realname"
14149 eval cmds=\"$postinstall_cmds\"
14150 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14151 + save_ifs="$IFS"; IFS='~'
14152 for cmd in $cmds; do
14153 IFS="$save_ifs"
14154 $show "$cmd"
14155 @@ -4238,19 +4388,27 @@
14156 fi
14157
14158 # Do a test to see if this is really a libtool program.
14159 - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14160 + case $host in
14161 + *cygwin*|*mingw*)
14162 + wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
14163 + ;;
14164 + *)
14165 + wrapper=$file
14166 + ;;
14167 + esac
14168 + if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
14169 notinst_deplibs=
14170 relink_command=
14171
14172 # If there is no directory component, then add one.
14173 case $file in
14174 - */* | *\\*) . $file ;;
14175 - *) . ./$file ;;
14176 + */* | *\\*) . $wrapper ;;
14177 + *) . ./$wrapper ;;
14178 esac
14179
14180 # Check the variables that should have been set.
14181 if test -z "$notinst_deplibs"; then
14182 - $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
14183 + $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
14184 exit 1
14185 fi
14186
14187 @@ -4275,8 +4433,8 @@
14188 relink_command=
14189 # If there is no directory component, then add one.
14190 case $file in
14191 - */* | *\\*) . $file ;;
14192 - *) . ./$file ;;
14193 + */* | *\\*) . $wrapper ;;
14194 + *) . ./$wrapper ;;
14195 esac
14196
14197 outputname=
14198 @@ -4324,7 +4482,7 @@
14199 destfile=$destfile.exe
14200 ;;
14201 *:*.exe)
14202 - destfile=`echo $destfile | sed -e 's,.exe$,,'`
14203 + destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
14204 ;;
14205 esac
14206 ;;
14207 @@ -4352,7 +4510,7 @@
14208
14209 # Do each command in the postinstall commands.
14210 eval cmds=\"$old_postinstall_cmds\"
14211 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14212 + save_ifs="$IFS"; IFS='~'
14213 for cmd in $cmds; do
14214 IFS="$save_ifs"
14215 $show "$cmd"
14216 @@ -4368,11 +4526,10 @@
14217 if test -n "$current_libdirs"; then
14218 # Maybe just do a dry run.
14219 test -n "$run" && current_libdirs=" -n$current_libdirs"
14220 - exec $SHELL $0 --finish$current_libdirs
14221 - exit 1
14222 + exec_cmd='$SHELL $0 --finish$current_libdirs'
14223 + else
14224 + exit 0
14225 fi
14226 -
14227 - exit 0
14228 ;;
14229
14230 # libtool finish mode
14231 @@ -4391,7 +4548,7 @@
14232 if test -n "$finish_cmds"; then
14233 # Do each command in the finish commands.
14234 eval cmds=\"$finish_cmds\"
14235 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14236 + save_ifs="$IFS"; IFS='~'
14237 for cmd in $cmds; do
14238 IFS="$save_ifs"
14239 $show "$cmd"
14240 @@ -4473,7 +4630,7 @@
14241 case $file in
14242 *.la)
14243 # Check to see that this really is a libtool archive.
14244 - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
14245 + if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
14246 else
14247 $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
14248 $echo "$help" 1>&2
14249 @@ -4544,7 +4701,7 @@
14250 -*) ;;
14251 *)
14252 # Do a test to see if this is really a libtool program.
14253 - if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14254 + if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14255 # If there is no directory component, then add one.
14256 case $file in
14257 */* | *\\*) . $file ;;
14258 @@ -4575,11 +4732,8 @@
14259 LANG="$save_LANG"; export LANG
14260 fi
14261
14262 - # Now actually exec the command.
14263 - eval "exec \$cmd$args"
14264 -
14265 - $echo "$modename: cannot exec \$cmd$args"
14266 - exit 1
14267 + # Now prepare to actually exec the command.
14268 + exec_cmd="\$cmd$args"
14269 else
14270 # Display what would be done.
14271 if test -n "$shlibpath_var"; then
14272 @@ -4641,14 +4795,14 @@
14273
14274 # Don't error if the file doesn't exist and rm -f was used.
14275 if (test -L "$file") >/dev/null 2>&1 \
14276 - || (test -h "$file") >/dev/null 2>&1 \
14277 + || (test -h "$file") >/dev/null 2>&1 \
14278 || test -f "$file"; then
14279 - :
14280 + :
14281 elif test -d "$file"; then
14282 - exit_status=1
14283 + exit_status=1
14284 continue
14285 elif test "$rmforce" = yes; then
14286 - continue
14287 + continue
14288 fi
14289
14290 rmfiles="$file"
14291 @@ -4656,7 +4810,7 @@
14292 case $name in
14293 *.la)
14294 # Possibly a libtool archive, so verify it.
14295 - if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14296 + if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14297 . $dir/$name
14298
14299 # Delete the libtool libraries and symlinks.
14300 @@ -4670,7 +4824,7 @@
14301 if test -n "$library_names"; then
14302 # Do each command in the postuninstall commands.
14303 eval cmds=\"$postuninstall_cmds\"
14304 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14305 + save_ifs="$IFS"; IFS='~'
14306 for cmd in $cmds; do
14307 IFS="$save_ifs"
14308 $show "$cmd"
14309 @@ -4685,7 +4839,7 @@
14310 if test -n "$old_library"; then
14311 # Do each command in the old_postuninstall commands.
14312 eval cmds=\"$old_postuninstall_cmds\"
14313 - IFS="${IFS= }"; save_ifs="$IFS"; IFS='~'
14314 + save_ifs="$IFS"; IFS='~'
14315 for cmd in $cmds; do
14316 IFS="$save_ifs"
14317 $show "$cmd"
14318 @@ -4711,7 +4865,7 @@
14319 *)
14320 # Do a test to see if this is a libtool program.
14321 if test $mode = clean &&
14322 - (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14323 + (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
14324 relink_command=
14325 . $dir/$file
14326
14327 @@ -4744,11 +4898,18 @@
14328 ;;
14329 esac
14330
14331 - $echo "$modename: invalid operation mode \`$mode'" 1>&2
14332 - $echo "$generic_help" 1>&2
14333 - exit 1
14334 + if test -z "$exec_cmd"; then
14335 + $echo "$modename: invalid operation mode \`$mode'" 1>&2
14336 + $echo "$generic_help" 1>&2
14337 + exit 1
14338 + fi
14339 fi # test -z "$show_help"
14340
14341 +if test -n "$exec_cmd"; then
14342 + eval exec $exec_cmd
14343 + exit 1
14344 +fi
14345 +
14346 # We need to display help for each of the modes.
14347 case $mode in
14348 "") $echo \
14349 Index: linux-atm-2.4.1/m4/Makefile.in
14350 ===================================================================
14351 --- linux-atm-2.4.1.orig/m4/Makefile.in 2007-06-04 13:23:53.924536120 +0200
14352 +++ linux-atm-2.4.1/m4/Makefile.in 2007-06-04 13:23:54.480451608 +0200
14353 @@ -1,4 +1,4 @@
14354 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14355 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14356
14357 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14358 # This Makefile.in is free software; the Free Software Foundation
14359 @@ -92,14 +92,14 @@
14360
14361 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14362
14363 -TAR = gtar
14364 +TAR = tar
14365 GZIP_ENV = --best
14366 all: all-redirect
14367 .SUFFIXES:
14368 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14369 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps m4/Makefile
14370 + cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile
14371
14372 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14373 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14374 cd $(top_builddir) \
14375 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14376
14377 @@ -112,6 +112,11 @@
14378 subdir = m4
14379
14380 distdir: $(DISTFILES)
14381 + here=`cd $(top_builddir) && pwd`; \
14382 + top_distdir=`cd $(top_distdir) && pwd`; \
14383 + distdir=`cd $(distdir) && pwd`; \
14384 + cd $(top_srcdir) \
14385 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu m4/Makefile
14386 @for file in $(DISTFILES); do \
14387 d=$(srcdir); \
14388 if test -d $$d/$$file; then \
14389 Index: linux-atm-2.4.1/src/Makefile.in
14390 ===================================================================
14391 --- linux-atm-2.4.1.orig/src/Makefile.in 2007-06-04 13:23:53.930535208 +0200
14392 +++ linux-atm-2.4.1/src/Makefile.in 2007-06-04 13:23:54.480451608 +0200
14393 @@ -1,4 +1,4 @@
14394 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14395 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14396
14397 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14398 # This Makefile.in is free software; the Free Software Foundation
14399 @@ -85,8 +85,7 @@
14400 VERSION = @VERSION@
14401 YACC = @YACC@
14402
14403 -SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \
14404 - mpoad switch config extra
14405 +SUBDIRS = include lib
14406
14407 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14408 CONFIG_HEADER = ../config.h
14409 @@ -96,14 +95,14 @@
14410
14411 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14412
14413 -TAR = gtar
14414 +TAR = tar
14415 GZIP_ENV = --best
14416 all: all-redirect
14417 .SUFFIXES:
14418 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14419 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
14420 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
14421
14422 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14423 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14424 cd $(top_builddir) \
14425 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14426
14427 @@ -186,7 +185,7 @@
14428 awk ' { files[$$0] = 1; } \
14429 END { for (i in files) print i; }'`; \
14430 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
14431 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
14432 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
14433
14434 mostlyclean-tags:
14435
14436 @@ -202,6 +201,11 @@
14437 subdir = src
14438
14439 distdir: $(DISTFILES)
14440 + here=`cd $(top_builddir) && pwd`; \
14441 + top_distdir=`cd $(top_distdir) && pwd`; \
14442 + distdir=`cd $(distdir) && pwd`; \
14443 + cd $(top_srcdir) \
14444 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
14445 @for file in $(DISTFILES); do \
14446 d=$(srcdir); \
14447 if test -d $$d/$$file; then \
14448 Index: linux-atm-2.4.1/src/include/Makefile.in
14449 ===================================================================
14450 --- linux-atm-2.4.1.orig/src/include/Makefile.in 2007-06-04 13:23:53.936534296 +0200
14451 +++ linux-atm-2.4.1/src/include/Makefile.in 2007-06-04 13:23:54.481451456 +0200
14452 @@ -1,4 +1,4 @@
14453 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14454 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14455
14456 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14457 # This Makefile.in is free software; the Free Software Foundation
14458 @@ -97,14 +97,14 @@
14459
14460 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14461
14462 -TAR = gtar
14463 +TAR = tar
14464 GZIP_ENV = --best
14465 all: all-redirect
14466 .SUFFIXES:
14467 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14468 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/include/Makefile
14469 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/include/Makefile
14470
14471 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14472 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14473 cd $(top_builddir) \
14474 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14475
14476 @@ -142,7 +142,7 @@
14477 awk ' { files[$$0] = 1; } \
14478 END { for (i in files) print i; }'`; \
14479 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
14480 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
14481 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
14482
14483 mostlyclean-tags:
14484
14485 @@ -158,6 +158,11 @@
14486 subdir = src/include
14487
14488 distdir: $(DISTFILES)
14489 + here=`cd $(top_builddir) && pwd`; \
14490 + top_distdir=`cd $(top_distdir) && pwd`; \
14491 + distdir=`cd $(distdir) && pwd`; \
14492 + cd $(top_srcdir) \
14493 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/include/Makefile
14494 @for file in $(DISTFILES); do \
14495 d=$(srcdir); \
14496 if test -d $$d/$$file; then \
14497 Index: linux-atm-2.4.1/src/include/atmd.h
14498 ===================================================================
14499 --- linux-atm-2.4.1.orig/src/include/atmd.h 2007-06-04 13:23:53.942533384 +0200
14500 +++ linux-atm-2.4.1/src/include/atmd.h 2007-06-04 13:23:54.481451456 +0200
14501 @@ -24,6 +24,10 @@
14502 (i)->prev = (b)->prev; if ((b)->prev) (b)->prev->next = i; else r = i; \
14503 (b)->prev = i; } else { (i)->next = r; (i)->prev = NULL; \
14504 if (r) (r)->prev = i; r = i; } })
14505 +#define Q_INSERT_BEFORE_TYPED(r,t,i,b) ({ if (b) { (i)->next = b; \
14506 + (i)->prev = (b)->prev; if ((b)->prev) (b)->prev->next = i; else r = i; \
14507 + (b)->prev = i; } else { (i)->next = t r; (i)->prev = NULL; \
14508 + if (t r) (t r)->prev = i; r = i; } })
14509 #define Q_REMOVE(r,i) ({ if ((i)->next) (i)->next->prev = (i)->prev; \
14510 if ((i)->prev) (i)->prev->next = (i)->next; else r = (i)->next; })
14511
14512 Index: linux-atm-2.4.1/src/lib/Makefile.in
14513 ===================================================================
14514 --- linux-atm-2.4.1.orig/src/lib/Makefile.in 2007-06-04 13:23:53.948532472 +0200
14515 +++ linux-atm-2.4.1/src/lib/Makefile.in 2007-06-04 13:23:54.481451456 +0200
14516 @@ -1,4 +1,4 @@
14517 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14518 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14519
14520 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14521 # This Makefile.in is free software; the Free Software Foundation
14522 @@ -92,16 +92,10 @@
14523 # ATMLIBS_VERSION comes from configure.in in the toplevel directory
14524 LDFLAGS = -version-info @LIBVER_CURRENT@:@LIBVER_REVISION@:@LIBVER_AGE@
14525
14526 -libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c \
14527 - qos2text.c qosequal.c sap2text.c text2sap.c sapequal.c \
14528 - misc.c atmres.h ans.c \
14529 - common.c diag.c kptr.c text2ip.c timer.c unix.c
14530 +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
14531
14532 libatm_la_LIBADD = -lresolv
14533 -libatm_la_DEPENDENCIES = $(top_builddir)/src/include/atm.h \
14534 - $(top_builddir)/src/include/atmsap.h \
14535 - $(top_builddir)/src/include/stdint.h \
14536 - $(top_builddir)/src/include/atmd.h
14537 +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
14538
14539 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
14540 CONFIG_HEADER = ../../config.h
14541 @@ -126,8 +120,13 @@
14542
14543 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14544
14545 -TAR = gtar
14546 +TAR = tar
14547 GZIP_ENV = --best
14548 +DEP_FILES = .deps/ans.P .deps/atm2text.P .deps/atmequal.P \
14549 +.deps/common.P .deps/diag.P .deps/kptr.P .deps/misc.P .deps/qos2text.P \
14550 +.deps/qosequal.P .deps/sap2text.P .deps/sapequal.P .deps/sdu2cell.P \
14551 +.deps/text2atm.P .deps/text2ip.P .deps/text2qos.P .deps/text2sap.P \
14552 +.deps/timer.P .deps/unix.P
14553 SOURCES = $(libatm_la_SOURCES)
14554 OBJECTS = $(libatm_la_OBJECTS)
14555
14556 @@ -135,9 +134,9 @@
14557 .SUFFIXES:
14558 .SUFFIXES: .S .c .lo .o .obj .s
14559 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14560 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/lib/Makefile
14561 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lib/Makefile
14562
14563 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14564 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14565 cd $(top_builddir) \
14566 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14567
14568 @@ -167,9 +166,6 @@
14569 $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
14570 done
14571
14572 -.c.o:
14573 - $(COMPILE) -c $<
14574 -
14575 # FIXME: We should only use cygpath when building on Windows,
14576 # and only if it is available.
14577 .c.obj:
14578 @@ -192,9 +188,6 @@
14579
14580 maintainer-clean-compile:
14581
14582 -.c.lo:
14583 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
14584 -
14585 .s.lo:
14586 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
14587
14588 @@ -232,7 +225,7 @@
14589 awk ' { files[$$0] = 1; } \
14590 END { for (i in files) print i; }'`; \
14591 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
14592 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
14593 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
14594
14595 mostlyclean-tags:
14596
14597 @@ -248,6 +241,11 @@
14598 subdir = src/lib
14599
14600 distdir: $(DISTFILES)
14601 + here=`cd $(top_builddir) && pwd`; \
14602 + top_distdir=`cd $(top_distdir) && pwd`; \
14603 + distdir=`cd $(distdir) && pwd`; \
14604 + cd $(top_srcdir) \
14605 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/lib/Makefile
14606 @for file in $(DISTFILES); do \
14607 d=$(srcdir); \
14608 if test -d $$d/$$file; then \
14609 @@ -258,48 +256,38 @@
14610 || cp -p $$d/$$file $(distdir)/$$file || :; \
14611 fi; \
14612 done
14613 -ans.lo ans.o : ans.c ../../config.h ../../src/include/stdint.h \
14614 - ../../src/include/atm.h atmres.h
14615 -atm2text.lo atm2text.o : atm2text.c ../../config.h \
14616 - ../../src/include/atm.h ../../src/include/stdint.h atmres.h
14617 -atmequal.lo atmequal.o : atmequal.c ../../config.h \
14618 - ../../src/include/atm.h ../../src/include/stdint.h
14619 -common.lo common.o : common.c ../../config.h ../../src/include/stdint.h \
14620 - ../../src/include/atmd.h ../../src/include/atm.h
14621 -diag.lo diag.o : diag.c ../../config.h ../../src/include/atmd.h \
14622 - ../../src/include/stdint.h ../../src/include/atm.h
14623 -kptr.lo kptr.o : kptr.c ../../config.h ../../src/include/atm.h \
14624 - ../../src/include/stdint.h ../../src/include/atmd.h
14625 -misc.lo misc.o : misc.c ../../config.h ../../src/include/stdint.h \
14626 - ../../src/include/atm.h ../../src/include/atmsap.h
14627 -qos2text.lo qos2text.o : qos2text.c ../../config.h \
14628 - ../../src/include/atm.h ../../src/include/stdint.h
14629 -qosequal.lo qosequal.o : qosequal.c ../../config.h \
14630 - ../../src/include/atm.h ../../src/include/stdint.h
14631 -sap2text.lo sap2text.o : sap2text.c ../../config.h \
14632 - ../../src/include/atmsap.h ../../src/include/stdint.h \
14633 - ../../src/include/atm.h
14634 -sapequal.lo sapequal.o : sapequal.c ../../config.h \
14635 - ../../src/include/atm.h ../../src/include/stdint.h \
14636 - ../../src/include/atmsap.h
14637 -sdu2cell.lo sdu2cell.o : sdu2cell.c ../../config.h \
14638 - ../../src/include/atm.h ../../src/include/stdint.h
14639 -text2atm.lo text2atm.o : text2atm.c ../../config.h \
14640 - ../../src/include/atm.h ../../src/include/stdint.h \
14641 - ../../src/include/atmsap.h atmres.h
14642 -text2ip.lo text2ip.o : text2ip.c ../../config.h \
14643 - ../../src/include/stdint.h ../../src/include/atm.h \
14644 - ../../src/include/atmd.h
14645 -text2qos.lo text2qos.o : text2qos.c ../../config.h \
14646 - ../../src/include/atm.h ../../src/include/stdint.h
14647 -text2sap.lo text2sap.o : text2sap.c ../../config.h \
14648 - ../../src/include/atmsap.h ../../src/include/stdint.h \
14649 - ../../src/include/atm.h
14650 -timer.lo timer.o : timer.c ../../config.h ../../src/include/atmd.h \
14651 - ../../src/include/stdint.h ../../src/include/atm.h
14652 -unix.lo unix.o : unix.c ../../config.h ../../src/include/atmd.h \
14653 - ../../src/include/stdint.h ../../src/include/atm.h
14654
14655 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
14656 +
14657 +-include $(DEP_FILES)
14658 +
14659 +mostlyclean-depend:
14660 +
14661 +clean-depend:
14662 +
14663 +distclean-depend:
14664 + -rm -rf .deps
14665 +
14666 +maintainer-clean-depend:
14667 +
14668 +%.o: %.c
14669 + @echo '$(COMPILE) -c $<'; \
14670 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14671 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
14672 + tr ' ' '\012' < .deps/$(*F).pp \
14673 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14674 + >> .deps/$(*F).P; \
14675 + rm .deps/$(*F).pp
14676 +
14677 +%.lo: %.c
14678 + @echo '$(LTCOMPILE) -c $<'; \
14679 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14680 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
14681 + < .deps/$(*F).pp > .deps/$(*F).P; \
14682 + tr ' ' '\012' < .deps/$(*F).pp \
14683 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14684 + >> .deps/$(*F).P; \
14685 + rm -f .deps/$(*F).pp
14686 info-am:
14687 info: info-am
14688 dvi-am:
14689 @@ -337,27 +325,27 @@
14690
14691 maintainer-clean-generic:
14692 mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
14693 - mostlyclean-libtool mostlyclean-tags \
14694 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
14695 mostlyclean-generic
14696
14697 mostlyclean: mostlyclean-am
14698
14699 clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
14700 - clean-generic mostlyclean-am
14701 + clean-depend clean-generic mostlyclean-am
14702
14703 clean: clean-am
14704
14705 distclean-am: distclean-libLTLIBRARIES distclean-compile \
14706 - distclean-libtool distclean-tags distclean-generic \
14707 - clean-am
14708 + distclean-libtool distclean-tags distclean-depend \
14709 + distclean-generic clean-am
14710 -rm -f libtool
14711
14712 distclean: distclean-am
14713
14714 maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
14715 maintainer-clean-compile maintainer-clean-libtool \
14716 - maintainer-clean-tags maintainer-clean-generic \
14717 - distclean-am
14718 + maintainer-clean-tags maintainer-clean-depend \
14719 + maintainer-clean-generic distclean-am
14720 @echo "This command is intended for maintainers to use;"
14721 @echo "it deletes files that may require special tools to rebuild."
14722
14723 @@ -369,12 +357,13 @@
14724 distclean-compile clean-compile maintainer-clean-compile \
14725 mostlyclean-libtool distclean-libtool clean-libtool \
14726 maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
14727 -clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
14728 -check-am installcheck-am installcheck install-exec-am install-exec \
14729 -install-data-am install-data install-am install uninstall-am uninstall \
14730 -all-redirect all-am all installdirs mostlyclean-generic \
14731 -distclean-generic clean-generic maintainer-clean-generic clean \
14732 -mostlyclean distclean maintainer-clean
14733 +clean-tags maintainer-clean-tags distdir mostlyclean-depend \
14734 +distclean-depend clean-depend maintainer-clean-depend info-am info \
14735 +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
14736 +install-exec install-data-am install-data install-am install \
14737 +uninstall-am uninstall all-redirect all-am all installdirs \
14738 +mostlyclean-generic distclean-generic clean-generic \
14739 +maintainer-clean-generic clean mostlyclean distclean maintainer-clean
14740
14741
14742 #libatm_la_SOURCES = text2atm.c atm2text.c atmequal.c sdu2cell.c text2qos.c \
14743 Index: linux-atm-2.4.1/src/lib/sapequal.c
14744 ===================================================================
14745 --- linux-atm-2.4.1.orig/src/lib/sapequal.c 2007-06-04 13:23:53.954531560 +0200
14746 +++ linux-atm-2.4.1/src/lib/sapequal.c 2007-06-04 13:23:54.482451304 +0200
14747 @@ -65,6 +65,7 @@
14748 CHECK(l2.itu.window,a.l2.itu.window > b.l2.itu.window);
14749 break;
14750 default:
14751 + break;
14752 }
14753 switch (a.l3_proto) {
14754 case ATM_L3_X25:
14755 @@ -83,6 +84,7 @@
14756 if (a.l3.user != b.l3.user) return 0;
14757 break;
14758 default:
14759 + break;
14760 }
14761 return 1;
14762 }
14763 Index: linux-atm-2.4.1/src/test/Makefile.in
14764 ===================================================================
14765 --- linux-atm-2.4.1.orig/src/test/Makefile.in 2007-06-04 13:23:53.959530800 +0200
14766 +++ linux-atm-2.4.1/src/test/Makefile.in 2007-06-04 13:23:54.482451304 +0200
14767 @@ -1,4 +1,4 @@
14768 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
14769 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
14770
14771 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
14772 # This Makefile.in is free software; the Free Software Foundation
14773 @@ -168,8 +168,11 @@
14774
14775 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
14776
14777 -TAR = gtar
14778 +TAR = tar
14779 GZIP_ENV = --best
14780 +DEP_FILES = .deps/align.P .deps/aping.P .deps/aread.P .deps/awrite.P \
14781 +.deps/br.P .deps/bw.P .deps/isp.P .deps/ispl_l.P .deps/ispl_y.P \
14782 +.deps/ttcp.P .deps/window.P
14783 SOURCES = $(aread_SOURCES) $(awrite_SOURCES) $(ttcp_atm_SOURCES) $(align_SOURCES) $(aping_SOURCES) $(br_SOURCES) $(bw_SOURCES) $(isp_SOURCES) $(window_SOURCES)
14784 OBJECTS = $(aread_OBJECTS) $(awrite_OBJECTS) $(ttcp_atm_OBJECTS) $(align_OBJECTS) $(aping_OBJECTS) $(br_OBJECTS) $(bw_OBJECTS) $(isp_OBJECTS) $(window_OBJECTS)
14785
14786 @@ -177,9 +180,9 @@
14787 .SUFFIXES:
14788 .SUFFIXES: .S .c .l .lo .o .obj .s .y
14789 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
14790 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/test/Makefile
14791 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/test/Makefile
14792
14793 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
14794 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
14795 cd $(top_builddir) \
14796 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
14797
14798 @@ -218,9 +221,6 @@
14799
14800 maintainer-clean-noinstPROGRAMS:
14801
14802 -.c.o:
14803 - $(COMPILE) -c $<
14804 -
14805 # FIXME: We should only use cygpath when building on Windows,
14806 # and only if it is available.
14807 .c.obj:
14808 @@ -243,9 +243,6 @@
14809
14810 maintainer-clean-compile:
14811
14812 -.c.lo:
14813 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
14814 -
14815 .s.lo:
14816 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
14817
14818 @@ -325,7 +322,7 @@
14819 awk ' { files[$$0] = 1; } \
14820 END { for (i in files) print i; }'`; \
14821 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
14822 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
14823 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
14824
14825 mostlyclean-tags:
14826
14827 @@ -341,6 +338,11 @@
14828 subdir = src/test
14829
14830 distdir: $(DISTFILES)
14831 + here=`cd $(top_builddir) && pwd`; \
14832 + top_distdir=`cd $(top_distdir) && pwd`; \
14833 + distdir=`cd $(distdir) && pwd`; \
14834 + cd $(top_srcdir) \
14835 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/test/Makefile
14836 @for file in $(DISTFILES); do \
14837 d=$(srcdir); \
14838 if test -d $$d/$$file; then \
14839 @@ -351,30 +353,38 @@
14840 || cp -p $$d/$$file $(distdir)/$$file || :; \
14841 fi; \
14842 done
14843 -align.o: align.c ../../config.h ../../src/include/atm.h \
14844 - ../../src/include/stdint.h
14845 -aping.o: aping.c ../../config.h ../../src/include/atm.h \
14846 - ../../src/include/stdint.h
14847 -aread.o: aread.c ../../config.h ../../src/include/atm.h \
14848 - ../../src/include/stdint.h
14849 -awrite.o: awrite.c ../../config.h ../../src/include/atm.h \
14850 - ../../src/include/stdint.h
14851 -br.o: br.c ../../config.h ../../src/include/atm.h \
14852 - ../../src/include/stdint.h
14853 -bw.o: bw.c ../../config.h ../../src/include/atm.h \
14854 - ../../src/include/stdint.h
14855 -isp.o: isp.c ../../config.h ../../src/include/atm.h \
14856 - ../../src/include/stdint.h ../../src/include/atmd.h isp.h \
14857 - errnos.inc
14858 -ispl_l.o: ispl_l.c ../../config.h ../../src/include/stdint.h isp.h \
14859 - ../../src/include/atm.h ispl_y.h
14860 -ispl_y.o: ispl_y.c ../../config.h ../../src/include/atm.h \
14861 - ../../src/include/stdint.h isp.h
14862 -ttcp.o: ttcp.c ../../config.h ../../src/include/stdint.h \
14863 - ../../src/include/atm.h ../../src/include/atmsap.h
14864 -window.o: window.c ../../config.h ../../src/include/atm.h \
14865 - ../../src/include/stdint.h
14866
14867 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
14868 +
14869 +-include $(DEP_FILES)
14870 +
14871 +mostlyclean-depend:
14872 +
14873 +clean-depend:
14874 +
14875 +distclean-depend:
14876 + -rm -rf .deps
14877 +
14878 +maintainer-clean-depend:
14879 +
14880 +%.o: %.c
14881 + @echo '$(COMPILE) -c $<'; \
14882 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14883 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
14884 + tr ' ' '\012' < .deps/$(*F).pp \
14885 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14886 + >> .deps/$(*F).P; \
14887 + rm .deps/$(*F).pp
14888 +
14889 +%.lo: %.c
14890 + @echo '$(LTCOMPILE) -c $<'; \
14891 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
14892 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
14893 + < .deps/$(*F).pp > .deps/$(*F).P; \
14894 + tr ' ' '\012' < .deps/$(*F).pp \
14895 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
14896 + >> .deps/$(*F).P; \
14897 + rm -f .deps/$(*F).pp
14898 info-am:
14899 info: info-am
14900 dvi-am:
14901 @@ -412,21 +422,22 @@
14902 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
14903
14904 maintainer-clean-generic:
14905 - -test -z "ispl_llispl_yhispl_yc" || rm -f ispl_ll ispl_yh ispl_yc
14906 + -test -z "ispl_lcispl_yhispl_yc" || rm -f ispl_lc ispl_yh ispl_yc
14907 mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
14908 mostlyclean-compile mostlyclean-libtool \
14909 - mostlyclean-tags mostlyclean-generic
14910 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
14911
14912 mostlyclean: mostlyclean-am
14913
14914 clean-am: clean-binPROGRAMS clean-noinstPROGRAMS clean-compile \
14915 - clean-libtool clean-tags clean-generic mostlyclean-am
14916 + clean-libtool clean-tags clean-depend clean-generic \
14917 + mostlyclean-am
14918
14919 clean: clean-am
14920
14921 distclean-am: distclean-binPROGRAMS distclean-noinstPROGRAMS \
14922 distclean-compile distclean-libtool distclean-tags \
14923 - distclean-generic clean-am
14924 + distclean-depend distclean-generic clean-am
14925 -rm -f libtool
14926
14927 distclean: distclean-am
14928 @@ -434,8 +445,8 @@
14929 maintainer-clean-am: maintainer-clean-binPROGRAMS \
14930 maintainer-clean-noinstPROGRAMS \
14931 maintainer-clean-compile maintainer-clean-libtool \
14932 - maintainer-clean-tags maintainer-clean-generic \
14933 - distclean-am
14934 + maintainer-clean-tags maintainer-clean-depend \
14935 + maintainer-clean-generic distclean-am
14936 @echo "This command is intended for maintainers to use;"
14937 @echo "it deletes files that may require special tools to rebuild."
14938
14939 @@ -448,19 +459,22 @@
14940 mostlyclean-compile distclean-compile clean-compile \
14941 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
14942 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
14943 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
14944 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
14945 -install-exec install-data-am install-data install-am install \
14946 -uninstall-am uninstall all-redirect all-am all installdirs \
14947 -mostlyclean-generic distclean-generic clean-generic \
14948 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
14949 +distclean-tags clean-tags maintainer-clean-tags distdir \
14950 +mostlyclean-depend distclean-depend clean-depend \
14951 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
14952 +installcheck-am installcheck install-exec-am install-exec \
14953 +install-data-am install-data install-am install uninstall-am uninstall \
14954 +all-redirect all-am all installdirs mostlyclean-generic \
14955 +distclean-generic clean-generic maintainer-clean-generic clean \
14956 +mostlyclean distclean maintainer-clean
14957
14958
14959 isp.o: errnos.inc
14960
14961 errnos.inc: mkerrnos.pl
14962 - @PERL@ ./mkerrnos.pl </usr/include/asm/errno.h \
14963 - >errnos.inc || { rm -f errnos.inc; exit 1; }
14964 + cpp -I/usr/include/ -dM /usr/include/asm/errno.h | grep "^#define E" \
14965 + | @PERL@ ./mkerrnos.pl | grep -v EMAXERRNO >errnos.inc \
14966 + || { rm -f errnos.inc; exit 1; }
14967
14968 # Tell versions [3.59,3.63) of GNU make to not export all variables.
14969 # Otherwise a system limit (for SysV at least) may be exceeded.
14970 Index: linux-atm-2.4.1/src/test/Makefile.am
14971 ===================================================================
14972 --- linux-atm-2.4.1.orig/src/test/Makefile.am 2007-06-04 13:23:53.965529888 +0200
14973 +++ linux-atm-2.4.1/src/test/Makefile.am 2007-06-04 13:23:54.483451152 +0200
14974 @@ -26,6 +26,7 @@
14975 isp.o: errnos.inc
14976
14977 errnos.inc: mkerrnos.pl
14978 - @PERL@ ./mkerrnos.pl </usr/include/asm/errno.h \
14979 - >errnos.inc || { rm -f errnos.inc; exit 1; }
14980 -
14981 + cpp -I/usr/include/ -dM /usr/include/asm/errno.h | grep "^#define E" \
14982 + | @PERL@ ./mkerrnos.pl | grep -v EMAXERRNO >errnos.inc \
14983 + || { rm -f errnos.inc; exit 1; }
14984 +
14985 Index: linux-atm-2.4.1/src/test/ttcp.c
14986 ===================================================================
14987 --- linux-atm-2.4.1.orig/src/test/ttcp.c 2007-06-04 13:23:53.971528976 +0200
14988 +++ linux-atm-2.4.1/src/test/ttcp.c 2007-06-04 13:23:54.483451152 +0200
14989 @@ -55,6 +55,8 @@
14990 /* #define SYSV */ /* required on SGI IRIX releases before 3.3 */
14991
14992 #include <stdio.h>
14993 +#include <stdlib.h>
14994 +#include <string.h>
14995 #include <signal.h>
14996 #include <ctype.h>
14997 #include <errno.h>
14998 @@ -67,6 +69,7 @@
14999 #include <sys/time.h> /* struct timeval */
15000 #include <atm.h>
15001 #include <atmsap.h>
15002 +#include <unistd.h>
15003
15004 #if defined(SYSV)
15005 #include <sys/times.h>
15006 @@ -85,7 +88,8 @@
15007 struct sockaddr_atmsvc satm;
15008 struct atm_qos qos;
15009
15010 -int domain, fromlen;
15011 +int domain;
15012 +socklen_t fromlen;
15013 int fd; /* fd of network socket */
15014
15015 int buflen = 8 * 1024; /* length of buffer */
15016 @@ -120,7 +124,6 @@
15017 static struct rusage ru0; /* Resource utilization at the start */
15018
15019 struct hostent *addr;
15020 -extern int errno;
15021 extern int optind;
15022 extern char *optarg;
15023
15024 @@ -158,23 +161,21 @@
15025 unsigned long numCalls; /* # of I/O system calls */
15026 double cput, realt; /* user, real time (seconds) */
15027
15028 -void err();
15029 -void mes();
15030 -int pattern();
15031 -void prep_timer();
15032 -double read_timer();
15033 -int Nread();
15034 -int Nwrite();
15035 -void delay();
15036 -int mread();
15037 -char *outfmt();
15038 -static void prusage();
15039 -static void tvadd();
15040 -static void tvsub();
15041 -static void psecs();
15042 +void err(const char *s);
15043 +void mes(const char *s);
15044 +void prep_timer(void);
15045 +void pattern(char *cp, int cnt);
15046 +int Nread(int nfd, char *Nbuf, int count);
15047 +int Nwrite(int nfd, char *Nbuf, int count);
15048 +void delay(int us);
15049 +int mread(int mfd, char *bufp, unsigned n);
15050 +char *outfmt(double b);
15051 +static void prusage(struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp);
15052 +static void tvadd(struct timeval *tsum, struct timeval *t0, struct timeval *t1);
15053 +static void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0);
15054 +static void psecs(long l, char *cp);
15055
15056 -void
15057 -sigpipe()
15058 +void sigpipe(int unused)
15059 {
15060 }
15061
15062 @@ -183,16 +184,14 @@
15063 * main -
15064 *-------------------------------------------------------------------------
15065 */
15066 -main(argc,argv)
15067 -int argc;
15068 -char **argv;
15069 +int main(int argc,char **argv)
15070 {
15071 struct timeval td;
15072 unsigned long addr_tmp;
15073 const char *port_name = NULL,*tos = NULL;
15074 int c;
15075 double mbps;
15076 -int no_check = 0;
15077 + int no_check = 0;
15078
15079 if (argc < 2) goto usage;
15080
15081 @@ -275,7 +274,7 @@
15082 }
15083 }
15084
15085 - if (port_name)
15086 + if (port_name) {
15087 if (atm) goto usage;
15088 else {
15089 struct servent *se;
15090 @@ -283,13 +282,13 @@
15091 se = getservbyname(port_name,udp ? "udp" : "tcp");
15092 if (se) port = ntohs(se->s_port);
15093 else {
15094 - const char *end;
15095 + char *end;
15096
15097 port = strtoul(port_name,&end,0);
15098 if (*end) goto usage;
15099 }
15100 }
15101 -
15102 + }
15103 host = argv[optind];
15104
15105 if (atm) {
15106 @@ -435,9 +434,9 @@
15107 #endif
15108
15109 if (!atm || satm.sas_family == AF_ATMPVC || !trans)
15110 - if (bind(fd, atm ? &satm : &sinme, atm ? satm.sas_family == AF_ATMPVC ?
15111 - sizeof(struct sockaddr_atmpvc) : sizeof(struct sockaddr_atmsvc) :
15112 - sizeof(sinme)) < 0)
15113 + if (bind(fd, atm ?
15114 + (struct sockaddr *)&satm : (struct sockaddr *)&sinme,
15115 + atm ? satm.sas_family == AF_ATMPVC ? sizeof(struct sockaddr_atmpvc) : sizeof(struct sockaddr_atmsvc) : sizeof(sinme)) < 0)
15116 err("bind");
15117
15118 if (!udp || (atm && satm.sas_family == AF_ATMSVC)) {
15119 @@ -453,8 +452,8 @@
15120 err("setsockopt");
15121 }
15122
15123 - if (connect(fd, atm ? &satm : &sinhim, atm ? sizeof(satm) :
15124 - sizeof(sinhim)) < 0)
15125 + if (connect(fd,
15126 + atm ? (struct sockaddr *)&satm : (struct sockaddr *)&sinhim, atm ? sizeof(satm) : sizeof(sinhim)) < 0)
15127 err("connect");
15128
15129 mes("connect");
15130 @@ -482,13 +481,13 @@
15131 fromlen = sizeof(frominet);
15132 domain = AF_INET;
15133
15134 - if ((fd=accept(fd, &frominet, &fromlen) ) < 0)
15135 + if ((fd=accept(fd, (struct sockaddr *)&frominet, &fromlen) ) < 0)
15136 err("accept");
15137
15138 {
15139 struct sockaddr_atmsvc peer;
15140 int peerlen = sizeof(peer);
15141 - if (getpeername(fd, (struct sockaddr_in *) &peer,
15142 + if (getpeername(fd, (struct sockaddr *) &peer,
15143 &peerlen) < 0) {
15144 err("getpeername");
15145 }
15146 @@ -638,13 +637,13 @@
15147 nbytes, cput, outfmt((double)nbytes/cput));
15148
15149 fprintf(stdout,
15150 - "ttcp%s: %d I/O calls, msec/call = %.2f, calls/sec = %.2f\n",
15151 + "ttcp%s: %lu I/O calls, msec/call = %.2f, calls/sec = %.2f\n",
15152 trans?"-t":"-r",
15153 numCalls,
15154 1000.0 * realt/((double)numCalls),
15155 ((double)numCalls)/realt);
15156 fprintf(stdout,
15157 - "ttcp%s: buffer address %#x\n",
15158 + "ttcp%s: buffer address %p\n",
15159 trans?"-t":"-r",
15160 buf);
15161 }
15162 @@ -656,8 +655,7 @@
15163 }
15164
15165 void
15166 -err(s)
15167 -char *s;
15168 +err(const char *s)
15169 {
15170 int en = errno;
15171
15172 @@ -670,8 +668,7 @@
15173 }
15174
15175 void
15176 -mes(s)
15177 -char *s;
15178 +mes(const char *s)
15179 {
15180 fprintf(stderr,"ttcp%s: %s\n", trans?"-t":"-r", s);
15181 }
15182 @@ -681,9 +678,7 @@
15183 * pattern -
15184 *-------------------------------------------------------------------------
15185 */
15186 -pattern(cp, cnt)
15187 -register char *cp;
15188 -register int cnt;
15189 +void pattern(char *cp, int cnt)
15190 {
15191 register char c;
15192 c = 0;
15193 @@ -694,9 +689,7 @@
15194 }
15195
15196
15197 -char *
15198 -outfmt(b)
15199 -double b;
15200 +char *outfmt(double b)
15201 {
15202 static char obuf[50];
15203 switch (fmt) {
15204 @@ -758,7 +751,7 @@
15205 * P R E P _ T I M E R
15206 */
15207 void
15208 -prep_timer()
15209 +prep_timer(void)
15210 {
15211 gettimeofday(&start_time, (struct timezone *)0);
15212 getrusage(RUSAGE_SELF, &ru0);
15213 @@ -768,8 +761,7 @@
15214 * read_timer -
15215 *-------------------------------------------------------------------------
15216 */
15217 -double read_timer(str,len)
15218 -char *str;
15219 +double read_timer(char *str,int len)
15220 {
15221 struct rusage ru1;
15222 struct timeval tend, tstart, td;
15223 @@ -788,15 +780,11 @@
15224 return( cput );
15225 }
15226
15227 -static void
15228 -prusage(r0, r1, e, b, outp)
15229 - register struct rusage *r0, *r1;
15230 - struct timeval *e, *b;
15231 - char *outp;
15232 +static void prusage(struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp)
15233 {
15234 struct timeval tdiff;
15235 register time_t t;
15236 - register char *cp;
15237 + register const char *cp;
15238 register int i;
15239 int ms;
15240
15241 @@ -823,13 +811,13 @@
15242
15243 case 'U':
15244 tvsub(&tdiff, &r1->ru_utime, &r0->ru_utime);
15245 - sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000);
15246 + sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000);
15247 END(outp);
15248 break;
15249
15250 case 'S':
15251 tvsub(&tdiff, &r1->ru_stime, &r0->ru_stime);
15252 - sprintf(outp,"%d.%01d", tdiff.tv_sec, tdiff.tv_usec/100000);
15253 + sprintf(outp,"%ld.%01ld", tdiff.tv_sec, tdiff.tv_usec/100000);
15254 END(outp);
15255 break;
15256
15257 @@ -851,49 +839,49 @@
15258 break;
15259
15260 case 'X':
15261 - sprintf(outp,"%d", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
15262 + sprintf(outp,"%ld", t == 0 ? 0 : (r1->ru_ixrss-r0->ru_ixrss)/t);
15263 END(outp);
15264 break;
15265
15266 case 'D':
15267 - sprintf(outp,"%d", t == 0 ? 0 :
15268 + sprintf(outp,"%ld", t == 0 ? 0 :
15269 (r1->ru_idrss+r1->ru_isrss-(r0->ru_idrss+r0->ru_isrss))/t);
15270 END(outp);
15271 break;
15272
15273 case 'K':
15274 - sprintf(outp,"%d", t == 0 ? 0 :
15275 + sprintf(outp,"%ld", t == 0 ? 0 :
15276 ((r1->ru_ixrss+r1->ru_isrss+r1->ru_idrss) -
15277 (r0->ru_ixrss+r0->ru_idrss+r0->ru_isrss))/t);
15278 END(outp);
15279 break;
15280
15281 case 'M':
15282 - sprintf(outp,"%d", r1->ru_maxrss/2);
15283 + sprintf(outp,"%ld", r1->ru_maxrss/2);
15284 END(outp);
15285 break;
15286
15287 case 'F':
15288 - sprintf(outp,"%d", r1->ru_majflt-r0->ru_majflt);
15289 + sprintf(outp,"%ld", r1->ru_majflt-r0->ru_majflt);
15290 END(outp);
15291 break;
15292
15293 case 'R':
15294 - sprintf(outp,"%d", r1->ru_minflt-r0->ru_minflt);
15295 + sprintf(outp,"%ld", r1->ru_minflt-r0->ru_minflt);
15296 END(outp);
15297 break;
15298
15299 case 'I':
15300 - sprintf(outp,"%d", r1->ru_inblock-r0->ru_inblock);
15301 + sprintf(outp,"%ld", r1->ru_inblock-r0->ru_inblock);
15302 END(outp);
15303 break;
15304
15305 case 'O':
15306 - sprintf(outp,"%d", r1->ru_oublock-r0->ru_oublock);
15307 + sprintf(outp,"%ld", r1->ru_oublock-r0->ru_oublock);
15308 END(outp);
15309 break;
15310 case 'C':
15311 - sprintf(outp,"%d+%d", r1->ru_nvcsw-r0->ru_nvcsw,
15312 + sprintf(outp,"%ld+%ld", r1->ru_nvcsw-r0->ru_nvcsw,
15313 r1->ru_nivcsw-r0->ru_nivcsw );
15314 END(outp);
15315 break;
15316 @@ -903,9 +891,7 @@
15317 *outp = '\0';
15318 }
15319
15320 -static void
15321 -tvadd(tsum, t0, t1)
15322 - struct timeval *tsum, *t0, *t1;
15323 +static void tvadd(struct timeval *tsum, struct timeval *t0, struct timeval *t1)
15324 {
15325
15326 tsum->tv_sec = t0->tv_sec + t1->tv_sec;
15327 @@ -919,8 +905,7 @@
15328 * tvsub - tdiff = t1 - t0
15329 *-------------------------------------------------------------------------
15330 */
15331 -static void tvsub(tdiff, t1, t0)
15332 - struct timeval *tdiff, *t1, *t0;
15333 +static void tvsub(struct timeval *tdiff, struct timeval *t1, struct timeval *t0)
15334 {
15335
15336 tdiff->tv_sec = t1->tv_sec - t0->tv_sec;
15337 @@ -931,10 +916,7 @@
15338 }
15339 }
15340
15341 -static void
15342 -psecs(l,cp)
15343 -long l;
15344 -register char *cp;
15345 +static void psecs(long l, char *cp)
15346 {
15347 register int i;
15348
15349 @@ -958,26 +940,23 @@
15350 /*
15351 * N R E A D
15352 */
15353 -Nread( fd, buf, count )
15354 -int fd;
15355 -char *buf;
15356 -int count;
15357 +int Nread( int nfd, char *Nbuf, int count )
15358 {
15359 struct sockaddr_in from;
15360 int len = sizeof(from);
15361 register int cnt;
15362 if( udp ) {
15363 #if 0
15364 - cnt = recvfrom( fd, buf, count, 0, &from, &len );
15365 + cnt = recvfrom( nfd, Nbuf, count, 0, &from, &len );
15366 #else
15367 - cnt = recv( fd, buf, count, 0);
15368 + cnt = recv( nfd, Nbuf, count, 0);
15369 #endif
15370 numCalls++;
15371 } else {
15372 if( b_flag )
15373 - cnt = mread( fd, buf, count ); /* fill buf */
15374 + cnt = mread( nfd, Nbuf, count ); /* fill buf */
15375 else {
15376 - cnt = read( fd, buf, count );
15377 + cnt = read( nfd, Nbuf, count );
15378 numCalls++;
15379 }
15380 if (touchdata && cnt > 0) {
15381 @@ -994,17 +973,15 @@
15382 * Nwrite -
15383 *-------------------------------------------------------------------------
15384 */
15385 -Nwrite(fd, buf, count)
15386 -int fd;
15387 -char *buf;
15388 -int count;
15389 +int Nwrite(int nfd, char *Nbuf, int count)
15390 {
15391 register int cnt;
15392
15393 if (udp) {
15394 again:
15395 - if (atm) cnt = write(fd, buf, count);
15396 - else cnt = sendto(fd, buf, count, 0, &sinhim, sizeof(sinhim));
15397 + if (atm) cnt = write(nfd, Nbuf, count);
15398 + else cnt = sendto(nfd, Nbuf, count, 0, (struct sockaddr *)&sinhim,
15399 + sizeof(sinhim));
15400 numCalls++;
15401 if ( cnt<0 && errno == ENOBUFS ) {
15402 delay(18000);
15403 @@ -1012,7 +989,7 @@
15404 goto again;
15405 }
15406 } else {
15407 - cnt = write(fd, buf, count);
15408 + cnt = write(nfd, Nbuf, count);
15409 numCalls++;
15410 }
15411 if (cnt < 0) perror("WA:write");
15412 @@ -1020,13 +997,13 @@
15413 }
15414
15415 void
15416 -delay(us)
15417 +delay(int us)
15418 {
15419 struct timeval tv;
15420
15421 tv.tv_sec = 0;
15422 tv.tv_usec = us;
15423 - (void)select( 1, (char *)0, (char *)0, (char *)0, &tv );
15424 + (void)select( 1, NULL, NULL, NULL, &tv );
15425 }
15426
15427 /*
15428 @@ -1038,17 +1015,13 @@
15429 * network connections don't deliver data with the same
15430 * grouping as it is written with. Written by Robert S. Miles, BRL.
15431 */
15432 -int
15433 -mread(fd, bufp, n)
15434 -int fd;
15435 -register char *bufp;
15436 -unsigned n;
15437 +int mread(int mfd, char *bufp, unsigned n)
15438 {
15439 register unsigned count = 0;
15440 register int nread;
15441
15442 do {
15443 - nread = read(fd, bufp, n-count);
15444 + nread = read(mfd, bufp, n-count);
15445 numCalls++;
15446 if(nread < 0) {
15447 perror("ttcp_mread");
15448 Index: linux-atm-2.4.1/src/debug/Makefile.in
15449 ===================================================================
15450 --- linux-atm-2.4.1.orig/src/debug/Makefile.in 2007-06-04 13:23:53.977528064 +0200
15451 +++ linux-atm-2.4.1/src/debug/Makefile.in 2007-06-04 13:23:54.484451000 +0200
15452 @@ -1,4 +1,4 @@
15453 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
15454 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
15455
15456 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
15457 # This Makefile.in is free software; the Free Software Foundation
15458 @@ -129,8 +129,9 @@
15459
15460 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
15461
15462 -TAR = gtar
15463 +TAR = tar
15464 GZIP_ENV = --best
15465 +DEP_FILES = .deps/delay.P .deps/svctor.P
15466 SOURCES = $(delay_SOURCES) $(svctor_SOURCES)
15467 OBJECTS = $(delay_OBJECTS) $(svctor_OBJECTS)
15468
15469 @@ -138,9 +139,9 @@
15470 .SUFFIXES:
15471 .SUFFIXES: .S .c .lo .o .obj .s
15472 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
15473 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/debug/Makefile
15474 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/debug/Makefile
15475
15476 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15477 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
15478 cd $(top_builddir) \
15479 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
15480
15481 @@ -154,9 +155,6 @@
15482
15483 maintainer-clean-noinstPROGRAMS:
15484
15485 -.c.o:
15486 - $(COMPILE) -c $<
15487 -
15488 # FIXME: We should only use cygpath when building on Windows,
15489 # and only if it is available.
15490 .c.obj:
15491 @@ -179,9 +177,6 @@
15492
15493 maintainer-clean-compile:
15494
15495 -.c.lo:
15496 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
15497 -
15498 .s.lo:
15499 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
15500
15501 @@ -224,7 +219,7 @@
15502 awk ' { files[$$0] = 1; } \
15503 END { for (i in files) print i; }'`; \
15504 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
15505 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
15506 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
15507
15508 mostlyclean-tags:
15509
15510 @@ -240,6 +235,11 @@
15511 subdir = src/debug
15512
15513 distdir: $(DISTFILES)
15514 + here=`cd $(top_builddir) && pwd`; \
15515 + top_distdir=`cd $(top_distdir) && pwd`; \
15516 + distdir=`cd $(distdir) && pwd`; \
15517 + cd $(top_srcdir) \
15518 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/debug/Makefile
15519 @for file in $(DISTFILES); do \
15520 d=$(srcdir); \
15521 if test -d $$d/$$file; then \
15522 @@ -250,11 +250,38 @@
15523 || cp -p $$d/$$file $(distdir)/$$file || :; \
15524 fi; \
15525 done
15526 -delay.o: delay.c ../../config.h ../../src/include/atm.h \
15527 - ../../src/include/stdint.h
15528 -svctor.o: svctor.c ../../config.h ../../src/include/atm.h \
15529 - ../../src/include/stdint.h
15530
15531 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
15532 +
15533 +-include $(DEP_FILES)
15534 +
15535 +mostlyclean-depend:
15536 +
15537 +clean-depend:
15538 +
15539 +distclean-depend:
15540 + -rm -rf .deps
15541 +
15542 +maintainer-clean-depend:
15543 +
15544 +%.o: %.c
15545 + @echo '$(COMPILE) -c $<'; \
15546 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
15547 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
15548 + tr ' ' '\012' < .deps/$(*F).pp \
15549 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
15550 + >> .deps/$(*F).P; \
15551 + rm .deps/$(*F).pp
15552 +
15553 +%.lo: %.c
15554 + @echo '$(LTCOMPILE) -c $<'; \
15555 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
15556 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
15557 + < .deps/$(*F).pp > .deps/$(*F).P; \
15558 + tr ' ' '\012' < .deps/$(*F).pp \
15559 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
15560 + >> .deps/$(*F).P; \
15561 + rm -f .deps/$(*F).pp
15562 info-am:
15563 info: info-am
15564 dvi-am:
15565 @@ -291,27 +318,27 @@
15566
15567 maintainer-clean-generic:
15568 mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \
15569 - mostlyclean-libtool mostlyclean-tags \
15570 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
15571 mostlyclean-generic
15572
15573 mostlyclean: mostlyclean-am
15574
15575 clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
15576 - clean-generic mostlyclean-am
15577 + clean-depend clean-generic mostlyclean-am
15578
15579 clean: clean-am
15580
15581 distclean-am: distclean-noinstPROGRAMS distclean-compile \
15582 - distclean-libtool distclean-tags distclean-generic \
15583 - clean-am
15584 + distclean-libtool distclean-tags distclean-depend \
15585 + distclean-generic clean-am
15586 -rm -f libtool
15587
15588 distclean: distclean-am
15589
15590 maintainer-clean-am: maintainer-clean-noinstPROGRAMS \
15591 maintainer-clean-compile maintainer-clean-libtool \
15592 - maintainer-clean-tags maintainer-clean-generic \
15593 - distclean-am
15594 + maintainer-clean-tags maintainer-clean-depend \
15595 + maintainer-clean-generic distclean-am
15596 @echo "This command is intended for maintainers to use;"
15597 @echo "it deletes files that may require special tools to rebuild."
15598
15599 @@ -322,12 +349,14 @@
15600 mostlyclean-compile distclean-compile clean-compile \
15601 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
15602 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
15603 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
15604 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
15605 -install-exec install-data-am install-data install-am install \
15606 -uninstall-am uninstall all-redirect all-am all installdirs \
15607 -mostlyclean-generic distclean-generic clean-generic \
15608 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
15609 +distclean-tags clean-tags maintainer-clean-tags distdir \
15610 +mostlyclean-depend distclean-depend clean-depend \
15611 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
15612 +installcheck-am installcheck install-exec-am install-exec \
15613 +install-data-am install-data install-am install uninstall-am uninstall \
15614 +all-redirect all-am all installdirs mostlyclean-generic \
15615 +distclean-generic clean-generic maintainer-clean-generic clean \
15616 +mostlyclean distclean maintainer-clean
15617
15618
15619 # Tell versions [3.59,3.63) of GNU make to not export all variables.
15620 Index: linux-atm-2.4.1/src/qgen/Makefile.in
15621 ===================================================================
15622 --- linux-atm-2.4.1.orig/src/qgen/Makefile.in 2007-06-04 13:23:53.983527152 +0200
15623 +++ linux-atm-2.4.1/src/qgen/Makefile.in 2007-06-04 13:23:54.484451000 +0200
15624 @@ -1,4 +1,4 @@
15625 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
15626 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
15627
15628 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
15629 # This Makefile.in is free software; the Free Software Foundation
15630 @@ -88,8 +88,7 @@
15631 noinst_PROGRAMS = qgen q.dump # q40.out.o
15632 check_PROGRAMS = q.test
15633
15634 -qgen_SOURCES = common.c common.h file.c file.h first.c ql_y.y ql_l.l qgen.c \
15635 - qgen.h second.c third.c
15636 +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
15637
15638 qgen_LDADD = -lfl
15639
15640 @@ -108,17 +107,10 @@
15641
15642 EXTRA_DIST = ql_y.h incl.pl mknl.pl msg.fmt TODO
15643
15644 -CLEANFILES = q.out.h q.out.c q.test.c qd.out.h qd.out.c qd.dump.c qd.test.c \
15645 - default.nl # q40.out.h q40.out.c q40.test.c
15646 +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
15647
15648
15649 -NLS = atm_ai_msg atm_ai_ie atm_loc atm_cv atm_pu atm_na atm_cond atm_ie \
15650 - atm_msg atm_np atm_ton atm_sat atm_prs atm_scrn atm_vpa atm_poe \
15651 - q2931_cs atm_td atm_bc atm_tc atm_stc atm_upcc q2931_proto atm_flag \
15652 - atm_aalp atm_fd atm_tag atm_l2 atm_l3 atm_tt atm_mc atm_hl atm_imd \
15653 - atm_tdl atm_tni atm_nip atm_shi atm_oci atm_unfm atm_ofi atm_irs \
15654 - atm_it atm_lit atm_lsi atm_tcs atm_css atm_eqo atm_eqp atm_aap \
15655 - atm_asp atm_tor
15656 +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
15657
15658 SYMFILES = uni.h $(shell @PERL@ incl.pl $(CFLAGS) linux/atmsap.h)
15659 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
15660 @@ -155,8 +147,11 @@
15661
15662 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
15663
15664 -TAR = gtar
15665 +TAR = tar
15666 GZIP_ENV = --best
15667 +DEP_FILES = .deps/common.P .deps/file.P .deps/first.P .deps/qgen.P \
15668 +.deps/ql_l.P .deps/ql_y.P .deps/qlib.P .deps/qtest.P .deps/second.P \
15669 +.deps/third.P
15670 SOURCES = $(q_test_SOURCES) $(qgen_SOURCES) $(q_dump_SOURCES) $(EXTRA_q_dump_SOURCES)
15671 OBJECTS = $(q_test_OBJECTS) $(qgen_OBJECTS) $(q_dump_OBJECTS)
15672
15673 @@ -164,9 +159,9 @@
15674 .SUFFIXES:
15675 .SUFFIXES: .S .c .l .lo .o .obj .s .y
15676 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
15677 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/qgen/Makefile
15678 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/qgen/Makefile
15679
15680 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
15681 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
15682 cd $(top_builddir) \
15683 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
15684
15685 @@ -189,9 +184,6 @@
15686
15687 maintainer-clean-noinstPROGRAMS:
15688
15689 -.c.o:
15690 - $(COMPILE) -c $<
15691 -
15692 # FIXME: We should only use cygpath when building on Windows,
15693 # and only if it is available.
15694 .c.obj:
15695 @@ -214,9 +206,6 @@
15696
15697 maintainer-clean-compile:
15698
15699 -.c.lo:
15700 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
15701 -
15702 .s.lo:
15703 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
15704
15705 @@ -272,7 +261,7 @@
15706 awk ' { files[$$0] = 1; } \
15707 END { for (i in files) print i; }'`; \
15708 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
15709 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
15710 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
15711
15712 mostlyclean-tags:
15713
15714 @@ -288,6 +277,11 @@
15715 subdir = src/qgen
15716
15717 distdir: $(DISTFILES)
15718 + here=`cd $(top_builddir) && pwd`; \
15719 + top_distdir=`cd $(top_distdir) && pwd`; \
15720 + distdir=`cd $(distdir) && pwd`; \
15721 + cd $(top_srcdir) \
15722 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/qgen/Makefile
15723 @for file in $(DISTFILES); do \
15724 d=$(srcdir); \
15725 if test -d $$d/$$file; then \
15726 @@ -298,15 +292,38 @@
15727 || cp -p $$d/$$file $(distdir)/$$file || :; \
15728 fi; \
15729 done
15730 -common.o: common.c ../../config.h common.h
15731 -file.o: file.c ../../config.h common.h file.h
15732 -first.o: first.c ../../config.h common.h qgen.h file.h
15733 -qgen.o: qgen.c ../../config.h common.h file.h qgen.h
15734 -ql_l.o: ql_l.c ../../config.h common.h qgen.h ql_y.h
15735 -ql_y.o: ql_y.c ../../config.h common.h qgen.h file.h
15736 -second.o: second.c ../../config.h common.h qgen.h file.h
15737 -third.o: third.c ../../config.h common.h qgen.h file.h
15738
15739 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
15740 +
15741 +-include $(DEP_FILES)
15742 +
15743 +mostlyclean-depend:
15744 +
15745 +clean-depend:
15746 +
15747 +distclean-depend:
15748 + -rm -rf .deps
15749 +
15750 +maintainer-clean-depend:
15751 +
15752 +%.o: %.c
15753 + @echo '$(COMPILE) -c $<'; \
15754 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
15755 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
15756 + tr ' ' '\012' < .deps/$(*F).pp \
15757 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
15758 + >> .deps/$(*F).P; \
15759 + rm .deps/$(*F).pp
15760 +
15761 +%.lo: %.c
15762 + @echo '$(LTCOMPILE) -c $<'; \
15763 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
15764 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
15765 + < .deps/$(*F).pp > .deps/$(*F).P; \
15766 + tr ' ' '\012' < .deps/$(*F).pp \
15767 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
15768 + >> .deps/$(*F).P; \
15769 + rm -f .deps/$(*F).pp
15770 info-am:
15771 info: info-am
15772 dvi-am:
15773 @@ -344,21 +361,22 @@
15774 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
15775
15776 maintainer-clean-generic:
15777 - -test -z "ql_llql_yhql_yc" || rm -f ql_ll ql_yh ql_yc
15778 + -test -z "ql_lcql_yhql_yc" || rm -f ql_lc ql_yh ql_yc
15779 mostlyclean-am: mostlyclean-checkPROGRAMS mostlyclean-noinstPROGRAMS \
15780 mostlyclean-compile mostlyclean-libtool \
15781 - mostlyclean-tags mostlyclean-generic
15782 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
15783
15784 mostlyclean: mostlyclean-am
15785
15786 clean-am: clean-checkPROGRAMS clean-noinstPROGRAMS clean-compile \
15787 - clean-libtool clean-tags clean-generic mostlyclean-am
15788 + clean-libtool clean-tags clean-depend clean-generic \
15789 + mostlyclean-am
15790
15791 clean: clean-am
15792
15793 distclean-am: distclean-checkPROGRAMS distclean-noinstPROGRAMS \
15794 distclean-compile distclean-libtool distclean-tags \
15795 - distclean-generic clean-am
15796 + distclean-depend distclean-generic clean-am
15797 -rm -f libtool
15798
15799 distclean: distclean-am
15800 @@ -366,8 +384,8 @@
15801 maintainer-clean-am: maintainer-clean-checkPROGRAMS \
15802 maintainer-clean-noinstPROGRAMS \
15803 maintainer-clean-compile maintainer-clean-libtool \
15804 - maintainer-clean-tags maintainer-clean-generic \
15805 - distclean-am
15806 + maintainer-clean-tags maintainer-clean-depend \
15807 + maintainer-clean-generic distclean-am
15808 @echo "This command is intended for maintainers to use;"
15809 @echo "it deletes files that may require special tools to rebuild."
15810
15811 @@ -380,12 +398,14 @@
15812 mostlyclean-compile distclean-compile clean-compile \
15813 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
15814 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
15815 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
15816 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
15817 -install-exec install-data-am install-data install-am install \
15818 -uninstall-am uninstall all-redirect all-am all installdirs \
15819 -mostlyclean-generic distclean-generic clean-generic \
15820 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
15821 +distclean-tags clean-tags maintainer-clean-tags distdir \
15822 +mostlyclean-depend distclean-depend clean-depend \
15823 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
15824 +installcheck-am installcheck install-exec-am install-exec \
15825 +install-data-am install-data install-am install uninstall-am uninstall \
15826 +all-redirect all-am all installdirs mostlyclean-generic \
15827 +distclean-generic clean-generic maintainer-clean-generic clean \
15828 +mostlyclean distclean maintainer-clean
15829
15830
15831 default.nl: mknl.pl $(SYMFILES)
15832 Index: linux-atm-2.4.1/src/qgen/ql_l.c
15833 ===================================================================
15834 --- linux-atm-2.4.1.orig/src/qgen/ql_l.c 2007-06-04 13:23:53.988526392 +0200
15835 +++ linux-atm-2.4.1/src/qgen/ql_l.c 2007-06-04 13:23:54.486450696 +0200
15836 @@ -1,32 +1,85 @@
15837 -/* A lexical scanner generated by flex */
15838
15839 -/* Scanner skeleton version:
15840 - * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
15841 - */
15842 +#line 3 "lex.yy.c"
15843 +
15844 +#define YY_INT_ALIGNED short int
15845 +
15846 +/* A lexical scanner generated by flex */
15847
15848 #define FLEX_SCANNER
15849 #define YY_FLEX_MAJOR_VERSION 2
15850 #define YY_FLEX_MINOR_VERSION 5
15851 +#define YY_FLEX_SUBMINOR_VERSION 31
15852 +#if YY_FLEX_SUBMINOR_VERSION > 0
15853 +#define FLEX_BETA
15854 +#endif
15855
15856 +/* First, we deal with platform-specific or compiler-specific issues. */
15857 +
15858 +/* begin standard C headers. */
15859 #include <stdio.h>
15860 -#include <unistd.h>
15861 +#include <string.h>
15862 +#include <errno.h>
15863 +#include <stdlib.h>
15864
15865 +/* end standard C headers. */
15866
15867 -/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
15868 -#ifdef c_plusplus
15869 -#ifndef __cplusplus
15870 -#define __cplusplus
15871 +/* flex integer type definitions */
15872 +
15873 +#ifndef FLEXINT_H
15874 +#define FLEXINT_H
15875 +
15876 +/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
15877 +
15878 +#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
15879 +#include <inttypes.h>
15880 +typedef int8_t flex_int8_t;
15881 +typedef uint8_t flex_uint8_t;
15882 +typedef int16_t flex_int16_t;
15883 +typedef uint16_t flex_uint16_t;
15884 +typedef int32_t flex_int32_t;
15885 +typedef uint32_t flex_uint32_t;
15886 +#else
15887 +typedef signed char flex_int8_t;
15888 +typedef short int flex_int16_t;
15889 +typedef int flex_int32_t;
15890 +typedef unsigned char flex_uint8_t;
15891 +typedef unsigned short int flex_uint16_t;
15892 +typedef unsigned int flex_uint32_t;
15893 +#endif /* ! C99 */
15894 +
15895 +/* Limits of integral types. */
15896 +#ifndef INT8_MIN
15897 +#define INT8_MIN (-128)
15898 +#endif
15899 +#ifndef INT16_MIN
15900 +#define INT16_MIN (-32767-1)
15901 +#endif
15902 +#ifndef INT32_MIN
15903 +#define INT32_MIN (-2147483647-1)
15904 #endif
15905 +#ifndef INT8_MAX
15906 +#define INT8_MAX (127)
15907 +#endif
15908 +#ifndef INT16_MAX
15909 +#define INT16_MAX (32767)
15910 +#endif
15911 +#ifndef INT32_MAX
15912 +#define INT32_MAX (2147483647)
15913 +#endif
15914 +#ifndef UINT8_MAX
15915 +#define UINT8_MAX (255U)
15916 +#endif
15917 +#ifndef UINT16_MAX
15918 +#define UINT16_MAX (65535U)
15919 +#endif
15920 +#ifndef UINT32_MAX
15921 +#define UINT32_MAX (4294967295U)
15922 #endif
15923
15924 +#endif /* ! FLEXINT_H */
15925
15926 #ifdef __cplusplus
15927
15928 -#include <stdlib.h>
15929 -
15930 -/* Use prototypes in function declarations. */
15931 -#define YY_USE_PROTOS
15932 -
15933 /* The "const" storage-class-modifier is valid. */
15934 #define YY_USE_CONST
15935
15936 @@ -34,34 +87,17 @@
15937
15938 #if __STDC__
15939
15940 -#define YY_USE_PROTOS
15941 #define YY_USE_CONST
15942
15943 #endif /* __STDC__ */
15944 #endif /* ! __cplusplus */
15945
15946 -#ifdef __TURBOC__
15947 - #pragma warn -rch
15948 - #pragma warn -use
15949 -#include <io.h>
15950 -#include <stdlib.h>
15951 -#define YY_USE_CONST
15952 -#define YY_USE_PROTOS
15953 -#endif
15954 -
15955 #ifdef YY_USE_CONST
15956 #define yyconst const
15957 #else
15958 #define yyconst
15959 #endif
15960
15961 -
15962 -#ifdef YY_USE_PROTOS
15963 -#define YY_PROTO(proto) proto
15964 -#else
15965 -#define YY_PROTO(proto) ()
15966 -#endif
15967 -
15968 /* Returned upon end-of-file. */
15969 #define YY_NULL 0
15970
15971 @@ -76,71 +112,71 @@
15972 * but we do it the disgusting crufty way forced on us by the ()-less
15973 * definition of BEGIN.
15974 */
15975 -#define BEGIN yy_start = 1 + 2 *
15976 +#define BEGIN (yy_start) = 1 + 2 *
15977
15978 /* Translate the current start state into a value that can be later handed
15979 * to BEGIN to return to the state. The YYSTATE alias is for lex
15980 * compatibility.
15981 */
15982 -#define YY_START ((yy_start - 1) / 2)
15983 +#define YY_START (((yy_start) - 1) / 2)
15984 #define YYSTATE YY_START
15985
15986 /* Action number for EOF rule of a given start state. */
15987 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
15988
15989 /* Special action meaning "start processing a new file". */
15990 -#define YY_NEW_FILE yyrestart( yyin )
15991 +#define YY_NEW_FILE yyrestart(yyin )
15992
15993 #define YY_END_OF_BUFFER_CHAR 0
15994
15995 /* Size of default input buffer. */
15996 +#ifndef YY_BUF_SIZE
15997 #define YY_BUF_SIZE 16384
15998 +#endif
15999
16000 +#ifndef YY_TYPEDEF_YY_BUFFER_STATE
16001 +#define YY_TYPEDEF_YY_BUFFER_STATE
16002 typedef struct yy_buffer_state *YY_BUFFER_STATE;
16003 +#endif
16004
16005 extern int yyleng;
16006 +
16007 extern FILE *yyin, *yyout;
16008
16009 #define EOB_ACT_CONTINUE_SCAN 0
16010 #define EOB_ACT_END_OF_FILE 1
16011 #define EOB_ACT_LAST_MATCH 2
16012
16013 -/* The funky do-while in the following #define is used to turn the definition
16014 - * int a single C statement (which needs a semi-colon terminator). This
16015 - * avoids problems with code like:
16016 - *
16017 - * if ( condition_holds )
16018 - * yyless( 5 );
16019 - * else
16020 - * do_something_else();
16021 - *
16022 - * Prior to using the do-while the compiler would get upset at the
16023 - * "else" because it interpreted the "if" statement as being all
16024 - * done when it reached the ';' after the yyless() call.
16025 - */
16026 -
16027 -/* Return all but the first 'n' matched characters back to the input stream. */
16028 -
16029 + #define YY_LESS_LINENO(n)
16030 +
16031 +/* Return all but the first "n" matched characters back to the input stream. */
16032 #define yyless(n) \
16033 do \
16034 { \
16035 /* Undo effects of setting up yytext. */ \
16036 - *yy_cp = yy_hold_char; \
16037 + int yyless_macro_arg = (n); \
16038 + YY_LESS_LINENO(yyless_macro_arg);\
16039 + *yy_cp = (yy_hold_char); \
16040 YY_RESTORE_YY_MORE_OFFSET \
16041 - yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
16042 + (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
16043 YY_DO_BEFORE_ACTION; /* set up yytext again */ \
16044 } \
16045 while ( 0 )
16046
16047 -#define unput(c) yyunput( c, yytext_ptr )
16048 +#define unput(c) yyunput( c, (yytext_ptr) )
16049
16050 /* The following is because we cannot portably get our hands on size_t
16051 * (without autoconf's help, which isn't available because we want
16052 * flex-generated scanners to compile on their own).
16053 */
16054 -typedef unsigned int yy_size_t;
16055
16056 +#ifndef YY_TYPEDEF_YY_SIZE_T
16057 +#define YY_TYPEDEF_YY_SIZE_T
16058 +typedef unsigned int yy_size_t;
16059 +#endif
16060
16061 +#ifndef YY_STRUCT_YY_BUFFER_STATE
16062 +#define YY_STRUCT_YY_BUFFER_STATE
16063 struct yy_buffer_state
16064 {
16065 FILE *yy_input_file;
16066 @@ -177,12 +213,16 @@
16067 */
16068 int yy_at_bol;
16069
16070 + int yy_bs_lineno; /**< The line count. */
16071 + int yy_bs_column; /**< The column count. */
16072 +
16073 /* Whether to try to fill the input buffer when we reach the
16074 * end of it.
16075 */
16076 int yy_fill_buffer;
16077
16078 int yy_buffer_status;
16079 +
16080 #define YY_BUFFER_NEW 0
16081 #define YY_BUFFER_NORMAL 1
16082 /* When an EOF's been seen but there's still some text to process
16083 @@ -196,23 +236,33 @@
16084 * just pointing yyin at a new input file.
16085 */
16086 #define YY_BUFFER_EOF_PENDING 2
16087 +
16088 };
16089 +#endif /* !YY_STRUCT_YY_BUFFER_STATE */
16090
16091 -static YY_BUFFER_STATE yy_current_buffer = 0;
16092 +/* Stack of input buffers. */
16093 +static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
16094 +static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
16095 +static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
16096
16097 /* We provide macros for accessing buffer states in case in the
16098 * future we want to put the buffer states in a more general
16099 * "scanner state".
16100 + *
16101 + * Returns the top of the stack, or NULL.
16102 */
16103 -#define YY_CURRENT_BUFFER yy_current_buffer
16104 +#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
16105 + ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
16106 + : NULL)
16107
16108 +/* Same as previous macro, but useful when we know that the buffer stack is not
16109 + * NULL or when we need an lvalue. For internal use only.
16110 + */
16111 +#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
16112
16113 /* yy_hold_char holds the character lost when yytext is formed. */
16114 static char yy_hold_char;
16115 -
16116 static int yy_n_chars; /* number of characters read into yy_ch_buf */
16117 -
16118 -
16119 int yyleng;
16120
16121 /* Points to current character in buffer. */
16122 @@ -225,66 +275,92 @@
16123 */
16124 static int yy_did_buffer_switch_on_eof;
16125
16126 -void yyrestart YY_PROTO(( FILE *input_file ));
16127 -
16128 -void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
16129 -void yy_load_buffer_state YY_PROTO(( void ));
16130 -YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
16131 -void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
16132 -void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
16133 -void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
16134 -#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
16135 -
16136 -YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
16137 -YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
16138 -YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
16139 -
16140 -static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
16141 -static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));
16142 -static void yy_flex_free YY_PROTO(( void * ));
16143 +void yyrestart (FILE *input_file );
16144 +void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer );
16145 +YY_BUFFER_STATE yy_create_buffer (FILE *file,int size );
16146 +void yy_delete_buffer (YY_BUFFER_STATE b );
16147 +void yy_flush_buffer (YY_BUFFER_STATE b );
16148 +void yypush_buffer_state (YY_BUFFER_STATE new_buffer );
16149 +void yypop_buffer_state (void );
16150 +
16151 +static void yyensure_buffer_stack (void );
16152 +static void yy_load_buffer_state (void );
16153 +static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
16154 +
16155 +#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
16156 +
16157 +YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size );
16158 +YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str );
16159 +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len );
16160 +
16161 +void *yyalloc (yy_size_t );
16162 +void *yyrealloc (void *,yy_size_t );
16163 +void yyfree (void * );
16164
16165 #define yy_new_buffer yy_create_buffer
16166
16167 #define yy_set_interactive(is_interactive) \
16168 { \
16169 - if ( ! yy_current_buffer ) \
16170 - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
16171 - yy_current_buffer->yy_is_interactive = is_interactive; \
16172 + if ( ! YY_CURRENT_BUFFER ){ \
16173 + yyensure_buffer_stack (); \
16174 + YY_CURRENT_BUFFER_LVALUE = \
16175 + yy_create_buffer(yyin,YY_BUF_SIZE ); \
16176 + } \
16177 + YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
16178 }
16179
16180 #define yy_set_bol(at_bol) \
16181 { \
16182 - if ( ! yy_current_buffer ) \
16183 - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
16184 - yy_current_buffer->yy_at_bol = at_bol; \
16185 + if ( ! YY_CURRENT_BUFFER ){\
16186 + yyensure_buffer_stack (); \
16187 + YY_CURRENT_BUFFER_LVALUE = \
16188 + yy_create_buffer(yyin,YY_BUF_SIZE ); \
16189 + } \
16190 + YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
16191 }
16192
16193 -#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
16194 +#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
16195 +
16196 +/* Begin user sect3 */
16197
16198 typedef unsigned char YY_CHAR;
16199 +
16200 FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
16201 +
16202 typedef int yy_state_type;
16203 +
16204 +extern int yylineno;
16205 +
16206 +int yylineno = 1;
16207 +
16208 extern char *yytext;
16209 #define yytext_ptr yytext
16210
16211 -static yy_state_type yy_get_previous_state YY_PROTO(( void ));
16212 -static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
16213 -static int yy_get_next_buffer YY_PROTO(( void ));
16214 -static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
16215 +static yy_state_type yy_get_previous_state (void );
16216 +static yy_state_type yy_try_NUL_trans (yy_state_type current_state );
16217 +static int yy_get_next_buffer (void );
16218 +static void yy_fatal_error (yyconst char msg[] );
16219
16220 /* Done after the current pattern has been matched and before the
16221 * corresponding action - sets up yytext.
16222 */
16223 #define YY_DO_BEFORE_ACTION \
16224 - yytext_ptr = yy_bp; \
16225 - yyleng = (int) (yy_cp - yy_bp); \
16226 - yy_hold_char = *yy_cp; \
16227 + (yytext_ptr) = yy_bp; \
16228 + yyleng = (size_t) (yy_cp - yy_bp); \
16229 + (yy_hold_char) = *yy_cp; \
16230 *yy_cp = '\0'; \
16231 - yy_c_buf_p = yy_cp;
16232 + (yy_c_buf_p) = yy_cp;
16233
16234 #define YY_NUM_RULES 16
16235 #define YY_END_OF_BUFFER 17
16236 -static yyconst short int yy_accept[70] =
16237 +/* This struct is not used in this scanner,
16238 + but its presence is necessary. */
16239 +struct yy_trans_info
16240 + {
16241 + flex_int32_t yy_verify;
16242 + flex_int32_t yy_nxt;
16243 + };
16244 +static yyconst flex_int16_t yy_accept[70] =
16245 { 0,
16246 10, 10, 17, 15, 10, 10, 15, 15, 9, 9,
16247 9, 9, 9, 9, 9, 9, 9, 10, 0, 0,
16248 @@ -295,7 +371,7 @@
16249 7, 0, 0, 0, 0, 0, 11, 12, 0
16250 } ;
16251
16252 -static yyconst int yy_ec[256] =
16253 +static yyconst flex_int32_t yy_ec[256] =
16254 { 0,
16255 1, 1, 1, 1, 1, 1, 1, 1, 2, 3,
16256 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
16257 @@ -327,14 +403,14 @@
16258 1, 1, 1, 1, 1
16259 } ;
16260
16261 -static yyconst int yy_meta[29] =
16262 +static yyconst flex_int32_t yy_meta[29] =
16263 { 0,
16264 1, 2, 2, 1, 3, 1, 4, 5, 5, 4,
16265 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
16266 4, 4, 4, 4, 4, 4, 4, 4
16267 } ;
16268
16269 -static yyconst short int yy_base[75] =
16270 +static yyconst flex_int16_t yy_base[75] =
16271 { 0,
16272 0, 0, 99, 100, 27, 28, 0, 95, 0, 86,
16273 72, 85, 80, 71, 78, 64, 76, 31, 84, 85,
16274 @@ -346,7 +422,7 @@
16275 48, 34, 53, 58
16276 } ;
16277
16278 -static yyconst short int yy_def[75] =
16279 +static yyconst flex_int16_t yy_def[75] =
16280 { 0,
16281 69, 1, 69, 69, 69, 69, 70, 71, 72, 72,
16282 72, 72, 72, 72, 72, 72, 72, 69, 70, 71,
16283 @@ -358,7 +434,7 @@
16284 69, 69, 69, 69
16285 } ;
16286
16287 -static yyconst short int yy_nxt[129] =
16288 +static yyconst flex_int16_t yy_nxt[129] =
16289 { 0,
16290 4, 5, 6, 5, 7, 8, 9, 4, 4, 10,
16291 11, 12, 13, 9, 9, 9, 9, 14, 9, 15,
16292 @@ -376,7 +452,7 @@
16293 69, 69, 69, 69, 69, 69, 69, 69
16294 } ;
16295
16296 -static yyconst short int yy_chk[129] =
16297 +static yyconst flex_int16_t yy_chk[129] =
16298 { 0,
16299 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
16300 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
16301 @@ -397,6 +473,9 @@
16302 static yy_state_type yy_last_accepting_state;
16303 static char *yy_last_accepting_cpos;
16304
16305 +extern int yy_flex_debug;
16306 +int yy_flex_debug = 0;
16307 +
16308 /* The intent behind this definition is that it'll catch
16309 * any uses of REJECT which flex missed.
16310 */
16311 @@ -406,7 +485,6 @@
16312 #define YY_RESTORE_YY_MORE_OFFSET
16313 char *yytext;
16314 #line 1 "ql_l.l"
16315 -#define INITIAL 0
16316 #line 2 "ql_l.l"
16317 /* ql.l - Q.2931 data structures description language */
16318
16319 @@ -451,7 +529,21 @@
16320 return (*walk)->str;
16321 }
16322
16323 -#line 455 "lex.yy.c"
16324 +#line 533 "lex.yy.c"
16325 +
16326 +#define INITIAL 0
16327 +
16328 +#ifndef YY_NO_UNISTD_H
16329 +/* Special case for "unistd.h", since it is non-ANSI. We include it way
16330 + * down here because we want the user's section 1 to have been scanned first.
16331 + * The user has a chance to override it with an option.
16332 + */
16333 +#include <unistd.h>
16334 +#endif
16335 +
16336 +#ifndef YY_EXTRA_TYPE
16337 +#define YY_EXTRA_TYPE void *
16338 +#endif
16339
16340 /* Macros after this point can all be overridden by user definitions in
16341 * section 1.
16342 @@ -459,65 +551,30 @@
16343
16344 #ifndef YY_SKIP_YYWRAP
16345 #ifdef __cplusplus
16346 -extern "C" int yywrap YY_PROTO(( void ));
16347 +extern "C" int yywrap (void );
16348 #else
16349 -extern int yywrap YY_PROTO(( void ));
16350 +extern int yywrap (void );
16351 #endif
16352 #endif
16353
16354 -#ifndef YY_NO_UNPUT
16355 -static void yyunput YY_PROTO(( int c, char *buf_ptr ));
16356 -#endif
16357 -
16358 + static void yyunput (int c,char *buf_ptr );
16359 +
16360 #ifndef yytext_ptr
16361 -static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
16362 +static void yy_flex_strncpy (char *,yyconst char *,int );
16363 #endif
16364
16365 #ifdef YY_NEED_STRLEN
16366 -static int yy_flex_strlen YY_PROTO(( yyconst char * ));
16367 +static int yy_flex_strlen (yyconst char * );
16368 #endif
16369
16370 #ifndef YY_NO_INPUT
16371 +
16372 #ifdef __cplusplus
16373 -static int yyinput YY_PROTO(( void ));
16374 +static int yyinput (void );
16375 #else
16376 -static int input YY_PROTO(( void ));
16377 -#endif
16378 -#endif
16379 -
16380 -#if YY_STACK_USED
16381 -static int yy_start_stack_ptr = 0;
16382 -static int yy_start_stack_depth = 0;
16383 -static int *yy_start_stack = 0;
16384 -#ifndef YY_NO_PUSH_STATE
16385 -static void yy_push_state YY_PROTO(( int new_state ));
16386 -#endif
16387 -#ifndef YY_NO_POP_STATE
16388 -static void yy_pop_state YY_PROTO(( void ));
16389 -#endif
16390 -#ifndef YY_NO_TOP_STATE
16391 -static int yy_top_state YY_PROTO(( void ));
16392 +static int input (void );
16393 #endif
16394
16395 -#else
16396 -#define YY_NO_PUSH_STATE 1
16397 -#define YY_NO_POP_STATE 1
16398 -#define YY_NO_TOP_STATE 1
16399 -#endif
16400 -
16401 -#ifdef YY_MALLOC_DECL
16402 -YY_MALLOC_DECL
16403 -#else
16404 -#if __STDC__
16405 -#ifndef __cplusplus
16406 -#include <stdlib.h>
16407 -#endif
16408 -#else
16409 -/* Just try to get by without declaring the routines. This will fail
16410 - * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
16411 - * or sizeof(void*) != sizeof(int).
16412 - */
16413 -#endif
16414 #endif
16415
16416 /* Amount of stuff to slurp up with each read. */
16417 @@ -526,7 +583,6 @@
16418 #endif
16419
16420 /* Copy whatever the last rule matched to the standard output. */
16421 -
16422 #ifndef ECHO
16423 /* This used to be an fputs(), but since the string might contain NUL's,
16424 * we now use fwrite().
16425 @@ -539,9 +595,10 @@
16426 */
16427 #ifndef YY_INPUT
16428 #define YY_INPUT(buf,result,max_size) \
16429 - if ( yy_current_buffer->yy_is_interactive ) \
16430 + if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
16431 { \
16432 - int c = '*', n; \
16433 + int c = '*'; \
16434 + size_t n; \
16435 for ( n = 0; n < max_size && \
16436 (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
16437 buf[n] = (char) c; \
16438 @@ -551,9 +608,22 @@
16439 YY_FATAL_ERROR( "input in flex scanner failed" ); \
16440 result = n; \
16441 } \
16442 - else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
16443 - && ferror( yyin ) ) \
16444 - YY_FATAL_ERROR( "input in flex scanner failed" );
16445 + else \
16446 + { \
16447 + errno=0; \
16448 + while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
16449 + { \
16450 + if( errno != EINTR) \
16451 + { \
16452 + YY_FATAL_ERROR( "input in flex scanner failed" ); \
16453 + break; \
16454 + } \
16455 + errno=0; \
16456 + clearerr(yyin); \
16457 + } \
16458 + }\
16459 +\
16460 +
16461 #endif
16462
16463 /* No semi-colon after return; correct usage is to write "yyterminate();" -
16464 @@ -574,12 +644,18 @@
16465 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
16466 #endif
16467
16468 +/* end tables serialization structures and prototypes */
16469 +
16470 /* Default declaration of generated scanner - a define so the user can
16471 * easily add parameters.
16472 */
16473 #ifndef YY_DECL
16474 -#define YY_DECL int yylex YY_PROTO(( void ))
16475 -#endif
16476 +#define YY_DECL_IS_OURS 1
16477 +
16478 +extern int yylex (void);
16479 +
16480 +#define YY_DECL int yylex (void)
16481 +#endif /* !YY_DECL */
16482
16483 /* Code executed at the beginning of each rule, after yytext and yyleng
16484 * have been set up.
16485 @@ -596,27 +672,29 @@
16486 #define YY_RULE_SETUP \
16487 YY_USER_ACTION
16488
16489 +/** The main scanner function which does all the work.
16490 + */
16491 YY_DECL
16492 - {
16493 +{
16494 register yy_state_type yy_current_state;
16495 - register char *yy_cp = NULL, *yy_bp = NULL;
16496 + register char *yy_cp, *yy_bp;
16497 register int yy_act;
16498 -
16499 +
16500 #line 47 "ql_l.l"
16501
16502
16503 -#line 609 "lex.yy.c"
16504 +#line 687 "lex.yy.c"
16505
16506 - if ( yy_init )
16507 + if ( (yy_init) )
16508 {
16509 - yy_init = 0;
16510 + (yy_init) = 0;
16511
16512 #ifdef YY_USER_INIT
16513 YY_USER_INIT;
16514 #endif
16515
16516 - if ( ! yy_start )
16517 - yy_start = 1; /* first start state */
16518 + if ( ! (yy_start) )
16519 + (yy_start) = 1; /* first start state */
16520
16521 if ( ! yyin )
16522 yyin = stdin;
16523 @@ -624,34 +702,36 @@
16524 if ( ! yyout )
16525 yyout = stdout;
16526
16527 - if ( ! yy_current_buffer )
16528 - yy_current_buffer =
16529 - yy_create_buffer( yyin, YY_BUF_SIZE );
16530 + if ( ! YY_CURRENT_BUFFER ) {
16531 + yyensure_buffer_stack ();
16532 + YY_CURRENT_BUFFER_LVALUE =
16533 + yy_create_buffer(yyin,YY_BUF_SIZE );
16534 + }
16535
16536 - yy_load_buffer_state();
16537 + yy_load_buffer_state( );
16538 }
16539
16540 while ( 1 ) /* loops until end-of-file is reached */
16541 {
16542 - yy_cp = yy_c_buf_p;
16543 + yy_cp = (yy_c_buf_p);
16544
16545 /* Support of yytext. */
16546 - *yy_cp = yy_hold_char;
16547 + *yy_cp = (yy_hold_char);
16548
16549 /* yy_bp points to the position in yy_ch_buf of the start of
16550 * the current run.
16551 */
16552 yy_bp = yy_cp;
16553
16554 - yy_current_state = yy_start;
16555 + yy_current_state = (yy_start);
16556 yy_match:
16557 do
16558 {
16559 register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
16560 if ( yy_accept[yy_current_state] )
16561 {
16562 - yy_last_accepting_state = yy_current_state;
16563 - yy_last_accepting_cpos = yy_cp;
16564 + (yy_last_accepting_state) = yy_current_state;
16565 + (yy_last_accepting_cpos) = yy_cp;
16566 }
16567 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
16568 {
16569 @@ -668,24 +748,22 @@
16570 yy_act = yy_accept[yy_current_state];
16571 if ( yy_act == 0 )
16572 { /* have to back up */
16573 - yy_cp = yy_last_accepting_cpos;
16574 - yy_current_state = yy_last_accepting_state;
16575 + yy_cp = (yy_last_accepting_cpos);
16576 + yy_current_state = (yy_last_accepting_state);
16577 yy_act = yy_accept[yy_current_state];
16578 }
16579
16580 YY_DO_BEFORE_ACTION;
16581
16582 -
16583 do_action: /* This label is used only to access EOF actions. */
16584
16585 -
16586 switch ( yy_act )
16587 { /* beginning of action switch */
16588 case 0: /* must back up */
16589 /* undo the effects of YY_DO_BEFORE_ACTION */
16590 - *yy_cp = yy_hold_char;
16591 - yy_cp = yy_last_accepting_cpos;
16592 - yy_current_state = yy_last_accepting_state;
16593 + *yy_cp = (yy_hold_char);
16594 + yy_cp = (yy_last_accepting_cpos);
16595 + yy_current_state = (yy_last_accepting_state);
16596 goto yy_find_action;
16597
16598 case 1:
16599 @@ -735,6 +813,7 @@
16600 return TOK_ID; }
16601 YY_BREAK
16602 case 10:
16603 +/* rule 10 can match eol */
16604 YY_RULE_SETUP
16605 #line 59 "ql_l.l"
16606 lineno += *yytext == '\n';
16607 @@ -755,6 +834,7 @@
16608 return TOK_STRING; }
16609 YY_BREAK
16610 case 14:
16611 +/* rule 14 can match eol */
16612 YY_RULE_SETUP
16613 #line 66 "ql_l.l"
16614 lineno++;
16615 @@ -769,33 +849,33 @@
16616 #line 69 "ql_l.l"
16617 ECHO;
16618 YY_BREAK
16619 -#line 773 "lex.yy.c"
16620 +#line 853 "lex.yy.c"
16621 case YY_STATE_EOF(INITIAL):
16622 yyterminate();
16623
16624 case YY_END_OF_BUFFER:
16625 {
16626 /* Amount of text matched not including the EOB char. */
16627 - int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
16628 + int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
16629
16630 /* Undo the effects of YY_DO_BEFORE_ACTION. */
16631 - *yy_cp = yy_hold_char;
16632 + *yy_cp = (yy_hold_char);
16633 YY_RESTORE_YY_MORE_OFFSET
16634
16635 - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
16636 + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
16637 {
16638 /* We're scanning a new file or input source. It's
16639 * possible that this happened because the user
16640 * just pointed yyin at a new source and called
16641 * yylex(). If so, then we have to assure
16642 - * consistency between yy_current_buffer and our
16643 + * consistency between YY_CURRENT_BUFFER and our
16644 * globals. Here is the right place to do so, because
16645 * this is the first action (other than possibly a
16646 * back-up) that will match for the new input source.
16647 */
16648 - yy_n_chars = yy_current_buffer->yy_n_chars;
16649 - yy_current_buffer->yy_input_file = yyin;
16650 - yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
16651 + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
16652 + YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
16653 + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
16654 }
16655
16656 /* Note that here we test for yy_c_buf_p "<=" to the position
16657 @@ -805,13 +885,13 @@
16658 * end-of-buffer state). Contrast this with the test
16659 * in input().
16660 */
16661 - if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
16662 + if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
16663 { /* This was really a NUL. */
16664 yy_state_type yy_next_state;
16665
16666 - yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
16667 + (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
16668
16669 - yy_current_state = yy_get_previous_state();
16670 + yy_current_state = yy_get_previous_state( );
16671
16672 /* Okay, we're now positioned to make the NUL
16673 * transition. We couldn't have
16674 @@ -824,30 +904,30 @@
16675
16676 yy_next_state = yy_try_NUL_trans( yy_current_state );
16677
16678 - yy_bp = yytext_ptr + YY_MORE_ADJ;
16679 + yy_bp = (yytext_ptr) + YY_MORE_ADJ;
16680
16681 if ( yy_next_state )
16682 {
16683 /* Consume the NUL. */
16684 - yy_cp = ++yy_c_buf_p;
16685 + yy_cp = ++(yy_c_buf_p);
16686 yy_current_state = yy_next_state;
16687 goto yy_match;
16688 }
16689
16690 else
16691 {
16692 - yy_cp = yy_c_buf_p;
16693 + yy_cp = (yy_c_buf_p);
16694 goto yy_find_action;
16695 }
16696 }
16697
16698 - else switch ( yy_get_next_buffer() )
16699 + else switch ( yy_get_next_buffer( ) )
16700 {
16701 case EOB_ACT_END_OF_FILE:
16702 {
16703 - yy_did_buffer_switch_on_eof = 0;
16704 + (yy_did_buffer_switch_on_eof) = 0;
16705
16706 - if ( yywrap() )
16707 + if ( yywrap( ) )
16708 {
16709 /* Note: because we've taken care in
16710 * yy_get_next_buffer() to have set up
16711 @@ -858,7 +938,7 @@
16712 * YY_NULL, it'll still work - another
16713 * YY_NULL will get returned.
16714 */
16715 - yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
16716 + (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
16717
16718 yy_act = YY_STATE_EOF(YY_START);
16719 goto do_action;
16720 @@ -866,30 +946,30 @@
16721
16722 else
16723 {
16724 - if ( ! yy_did_buffer_switch_on_eof )
16725 + if ( ! (yy_did_buffer_switch_on_eof) )
16726 YY_NEW_FILE;
16727 }
16728 break;
16729 }
16730
16731 case EOB_ACT_CONTINUE_SCAN:
16732 - yy_c_buf_p =
16733 - yytext_ptr + yy_amount_of_matched_text;
16734 + (yy_c_buf_p) =
16735 + (yytext_ptr) + yy_amount_of_matched_text;
16736
16737 - yy_current_state = yy_get_previous_state();
16738 + yy_current_state = yy_get_previous_state( );
16739
16740 - yy_cp = yy_c_buf_p;
16741 - yy_bp = yytext_ptr + YY_MORE_ADJ;
16742 + yy_cp = (yy_c_buf_p);
16743 + yy_bp = (yytext_ptr) + YY_MORE_ADJ;
16744 goto yy_match;
16745
16746 case EOB_ACT_LAST_MATCH:
16747 - yy_c_buf_p =
16748 - &yy_current_buffer->yy_ch_buf[yy_n_chars];
16749 + (yy_c_buf_p) =
16750 + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
16751
16752 - yy_current_state = yy_get_previous_state();
16753 + yy_current_state = yy_get_previous_state( );
16754
16755 - yy_cp = yy_c_buf_p;
16756 - yy_bp = yytext_ptr + YY_MORE_ADJ;
16757 + yy_cp = (yy_c_buf_p);
16758 + yy_bp = (yytext_ptr) + YY_MORE_ADJ;
16759 goto yy_find_action;
16760 }
16761 break;
16762 @@ -900,8 +980,7 @@
16763 "fatal flex scanner internal error--no action found" );
16764 } /* end of action switch */
16765 } /* end of scanning one token */
16766 - } /* end of yylex */
16767 -
16768 +} /* end of yylex */
16769
16770 /* yy_get_next_buffer - try to read in a new buffer
16771 *
16772 @@ -910,21 +989,20 @@
16773 * EOB_ACT_CONTINUE_SCAN - continue scanning from current position
16774 * EOB_ACT_END_OF_FILE - end of file
16775 */
16776 -
16777 -static int yy_get_next_buffer()
16778 - {
16779 - register char *dest = yy_current_buffer->yy_ch_buf;
16780 - register char *source = yytext_ptr;
16781 +static int yy_get_next_buffer (void)
16782 +{
16783 + register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
16784 + register char *source = (yytext_ptr);
16785 register int number_to_move, i;
16786 int ret_val;
16787
16788 - if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
16789 + if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
16790 YY_FATAL_ERROR(
16791 "fatal flex scanner internal error--end of buffer missed" );
16792
16793 - if ( yy_current_buffer->yy_fill_buffer == 0 )
16794 + if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
16795 { /* Don't try to fill the buffer, so this is an EOF. */
16796 - if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
16797 + if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
16798 {
16799 /* We matched a single character, the EOB, so
16800 * treat this as a final EOF.
16801 @@ -944,34 +1022,30 @@
16802 /* Try to read more data. */
16803
16804 /* First move last chars to start of buffer. */
16805 - number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
16806 + number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
16807
16808 for ( i = 0; i < number_to_move; ++i )
16809 *(dest++) = *(source++);
16810
16811 - if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
16812 + if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
16813 /* don't do the read, it's not guaranteed to return an EOF,
16814 * just force an EOF
16815 */
16816 - yy_current_buffer->yy_n_chars = yy_n_chars = 0;
16817 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
16818
16819 else
16820 {
16821 - int num_to_read =
16822 - yy_current_buffer->yy_buf_size - number_to_move - 1;
16823 + size_t num_to_read =
16824 + YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
16825
16826 while ( num_to_read <= 0 )
16827 { /* Not enough room in the buffer - grow it. */
16828 -#ifdef YY_USES_REJECT
16829 - YY_FATAL_ERROR(
16830 -"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
16831 -#else
16832
16833 /* just a shorter name for the current buffer */
16834 - YY_BUFFER_STATE b = yy_current_buffer;
16835 + YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
16836
16837 int yy_c_buf_p_offset =
16838 - (int) (yy_c_buf_p - b->yy_ch_buf);
16839 + (int) ((yy_c_buf_p) - b->yy_ch_buf);
16840
16841 if ( b->yy_is_our_buffer )
16842 {
16843 @@ -984,8 +1058,7 @@
16844
16845 b->yy_ch_buf = (char *)
16846 /* Include room in for 2 EOB chars. */
16847 - yy_flex_realloc( (void *) b->yy_ch_buf,
16848 - b->yy_buf_size + 2 );
16849 + yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2 );
16850 }
16851 else
16852 /* Can't grow it, we don't own it. */
16853 @@ -995,35 +1068,35 @@
16854 YY_FATAL_ERROR(
16855 "fatal error - scanner input buffer overflow" );
16856
16857 - yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
16858 + (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
16859
16860 - num_to_read = yy_current_buffer->yy_buf_size -
16861 + num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
16862 number_to_move - 1;
16863 -#endif
16864 +
16865 }
16866
16867 if ( num_to_read > YY_READ_BUF_SIZE )
16868 num_to_read = YY_READ_BUF_SIZE;
16869
16870 /* Read in more data. */
16871 - YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
16872 - yy_n_chars, num_to_read );
16873 + YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
16874 + (yy_n_chars), num_to_read );
16875
16876 - yy_current_buffer->yy_n_chars = yy_n_chars;
16877 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
16878 }
16879
16880 - if ( yy_n_chars == 0 )
16881 + if ( (yy_n_chars) == 0 )
16882 {
16883 if ( number_to_move == YY_MORE_ADJ )
16884 {
16885 ret_val = EOB_ACT_END_OF_FILE;
16886 - yyrestart( yyin );
16887 + yyrestart(yyin );
16888 }
16889
16890 else
16891 {
16892 ret_val = EOB_ACT_LAST_MATCH;
16893 - yy_current_buffer->yy_buffer_status =
16894 + YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
16895 YY_BUFFER_EOF_PENDING;
16896 }
16897 }
16898 @@ -1031,32 +1104,31 @@
16899 else
16900 ret_val = EOB_ACT_CONTINUE_SCAN;
16901
16902 - yy_n_chars += number_to_move;
16903 - yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
16904 - yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
16905 + (yy_n_chars) += number_to_move;
16906 + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
16907 + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
16908
16909 - yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
16910 + (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
16911
16912 return ret_val;
16913 - }
16914 -
16915 +}
16916
16917 /* yy_get_previous_state - get the state just before the EOB char was reached */
16918
16919 -static yy_state_type yy_get_previous_state()
16920 - {
16921 + static yy_state_type yy_get_previous_state (void)
16922 +{
16923 register yy_state_type yy_current_state;
16924 register char *yy_cp;
16925 +
16926 + yy_current_state = (yy_start);
16927
16928 - yy_current_state = yy_start;
16929 -
16930 - for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
16931 + for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
16932 {
16933 register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
16934 if ( yy_accept[yy_current_state] )
16935 {
16936 - yy_last_accepting_state = yy_current_state;
16937 - yy_last_accepting_cpos = yy_cp;
16938 + (yy_last_accepting_state) = yy_current_state;
16939 + (yy_last_accepting_cpos) = yy_cp;
16940 }
16941 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
16942 {
16943 @@ -1068,30 +1140,23 @@
16944 }
16945
16946 return yy_current_state;
16947 - }
16948 -
16949 +}
16950
16951 /* yy_try_NUL_trans - try to make a transition on the NUL character
16952 *
16953 * synopsis
16954 * next_state = yy_try_NUL_trans( current_state );
16955 */
16956 -
16957 -#ifdef YY_USE_PROTOS
16958 -static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
16959 -#else
16960 -static yy_state_type yy_try_NUL_trans( yy_current_state )
16961 -yy_state_type yy_current_state;
16962 -#endif
16963 - {
16964 + static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
16965 +{
16966 register int yy_is_jam;
16967 - register char *yy_cp = yy_c_buf_p;
16968 + register char *yy_cp = (yy_c_buf_p);
16969
16970 register YY_CHAR yy_c = 1;
16971 if ( yy_accept[yy_current_state] )
16972 {
16973 - yy_last_accepting_state = yy_current_state;
16974 - yy_last_accepting_cpos = yy_cp;
16975 + (yy_last_accepting_state) = yy_current_state;
16976 + (yy_last_accepting_cpos) = yy_cp;
16977 }
16978 while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
16979 {
16980 @@ -1103,80 +1168,73 @@
16981 yy_is_jam = (yy_current_state == 69);
16982
16983 return yy_is_jam ? 0 : yy_current_state;
16984 - }
16985 -
16986 +}
16987
16988 -#ifndef YY_NO_UNPUT
16989 -#ifdef YY_USE_PROTOS
16990 -static void yyunput( int c, register char *yy_bp )
16991 -#else
16992 -static void yyunput( c, yy_bp )
16993 -int c;
16994 -register char *yy_bp;
16995 -#endif
16996 - {
16997 - register char *yy_cp = yy_c_buf_p;
16998 + static void yyunput (int c, register char * yy_bp )
16999 +{
17000 + register char *yy_cp;
17001 +
17002 + yy_cp = (yy_c_buf_p);
17003
17004 /* undo effects of setting up yytext */
17005 - *yy_cp = yy_hold_char;
17006 + *yy_cp = (yy_hold_char);
17007
17008 - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
17009 + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
17010 { /* need to shift things up to make room */
17011 /* +2 for EOB chars. */
17012 - register int number_to_move = yy_n_chars + 2;
17013 - register char *dest = &yy_current_buffer->yy_ch_buf[
17014 - yy_current_buffer->yy_buf_size + 2];
17015 + register int number_to_move = (yy_n_chars) + 2;
17016 + register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
17017 + YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
17018 register char *source =
17019 - &yy_current_buffer->yy_ch_buf[number_to_move];
17020 + &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
17021
17022 - while ( source > yy_current_buffer->yy_ch_buf )
17023 + while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
17024 *--dest = *--source;
17025
17026 yy_cp += (int) (dest - source);
17027 yy_bp += (int) (dest - source);
17028 - yy_current_buffer->yy_n_chars =
17029 - yy_n_chars = yy_current_buffer->yy_buf_size;
17030 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
17031 + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
17032
17033 - if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
17034 + if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
17035 YY_FATAL_ERROR( "flex scanner push-back overflow" );
17036 }
17037
17038 *--yy_cp = (char) c;
17039
17040 + (yytext_ptr) = yy_bp;
17041 + (yy_hold_char) = *yy_cp;
17042 + (yy_c_buf_p) = yy_cp;
17043 +}
17044
17045 - yytext_ptr = yy_bp;
17046 - yy_hold_char = *yy_cp;
17047 - yy_c_buf_p = yy_cp;
17048 - }
17049 -#endif /* ifndef YY_NO_UNPUT */
17050 -
17051 -
17052 +#ifndef YY_NO_INPUT
17053 #ifdef __cplusplus
17054 -static int yyinput()
17055 + static int yyinput (void)
17056 #else
17057 -static int input()
17058 + static int input (void)
17059 #endif
17060 - {
17061 - int c;
17062
17063 - *yy_c_buf_p = yy_hold_char;
17064 +{
17065 + int c;
17066 +
17067 + *(yy_c_buf_p) = (yy_hold_char);
17068
17069 - if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
17070 + if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
17071 {
17072 /* yy_c_buf_p now points to the character we want to return.
17073 * If this occurs *before* the EOB characters, then it's a
17074 * valid NUL; if not, then we've hit the end of the buffer.
17075 */
17076 - if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
17077 + if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
17078 /* This was really a NUL. */
17079 - *yy_c_buf_p = '\0';
17080 + *(yy_c_buf_p) = '\0';
17081
17082 else
17083 { /* need more input */
17084 - int offset = yy_c_buf_p - yytext_ptr;
17085 - ++yy_c_buf_p;
17086 + int offset = (yy_c_buf_p) - (yytext_ptr);
17087 + ++(yy_c_buf_p);
17088
17089 - switch ( yy_get_next_buffer() )
17090 + switch ( yy_get_next_buffer( ) )
17091 {
17092 case EOB_ACT_LAST_MATCH:
17093 /* This happens because yy_g_n_b()
17094 @@ -1190,16 +1248,16 @@
17095 */
17096
17097 /* Reset buffer status. */
17098 - yyrestart( yyin );
17099 + yyrestart(yyin );
17100
17101 - /* fall through */
17102 + /*FALLTHROUGH*/
17103
17104 case EOB_ACT_END_OF_FILE:
17105 {
17106 - if ( yywrap() )
17107 + if ( yywrap( ) )
17108 return EOF;
17109
17110 - if ( ! yy_did_buffer_switch_on_eof )
17111 + if ( ! (yy_did_buffer_switch_on_eof) )
17112 YY_NEW_FILE;
17113 #ifdef __cplusplus
17114 return yyinput();
17115 @@ -1209,90 +1267,92 @@
17116 }
17117
17118 case EOB_ACT_CONTINUE_SCAN:
17119 - yy_c_buf_p = yytext_ptr + offset;
17120 + (yy_c_buf_p) = (yytext_ptr) + offset;
17121 break;
17122 }
17123 }
17124 }
17125
17126 - c = *(unsigned char *) yy_c_buf_p; /* cast for 8-bit char's */
17127 - *yy_c_buf_p = '\0'; /* preserve yytext */
17128 - yy_hold_char = *++yy_c_buf_p;
17129 -
17130 + c = *(unsigned char *) (yy_c_buf_p); /* cast for 8-bit char's */
17131 + *(yy_c_buf_p) = '\0'; /* preserve yytext */
17132 + (yy_hold_char) = *++(yy_c_buf_p);
17133
17134 return c;
17135 - }
17136 -
17137 -
17138 -#ifdef YY_USE_PROTOS
17139 -void yyrestart( FILE *input_file )
17140 -#else
17141 -void yyrestart( input_file )
17142 -FILE *input_file;
17143 -#endif
17144 - {
17145 - if ( ! yy_current_buffer )
17146 - yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
17147 +}
17148 +#endif /* ifndef YY_NO_INPUT */
17149
17150 - yy_init_buffer( yy_current_buffer, input_file );
17151 - yy_load_buffer_state();
17152 +/** Immediately switch to a different input stream.
17153 + * @param input_file A readable stream.
17154 + *
17155 + * @note This function does not reset the start condition to @c INITIAL .
17156 + */
17157 + void yyrestart (FILE * input_file )
17158 +{
17159 +
17160 + if ( ! YY_CURRENT_BUFFER ){
17161 + yyensure_buffer_stack ();
17162 + YY_CURRENT_BUFFER_LVALUE =
17163 + yy_create_buffer(yyin,YY_BUF_SIZE );
17164 }
17165
17166 + yy_init_buffer(YY_CURRENT_BUFFER,input_file );
17167 + yy_load_buffer_state( );
17168 +}
17169
17170 -#ifdef YY_USE_PROTOS
17171 -void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
17172 -#else
17173 -void yy_switch_to_buffer( new_buffer )
17174 -YY_BUFFER_STATE new_buffer;
17175 -#endif
17176 - {
17177 - if ( yy_current_buffer == new_buffer )
17178 +/** Switch to a different input buffer.
17179 + * @param new_buffer The new input buffer.
17180 + *
17181 + */
17182 + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer )
17183 +{
17184 +
17185 + /* TODO. We should be able to replace this entire function body
17186 + * with
17187 + * yypop_buffer_state();
17188 + * yypush_buffer_state(new_buffer);
17189 + */
17190 + yyensure_buffer_stack ();
17191 + if ( YY_CURRENT_BUFFER == new_buffer )
17192 return;
17193
17194 - if ( yy_current_buffer )
17195 + if ( YY_CURRENT_BUFFER )
17196 {
17197 /* Flush out information for old buffer. */
17198 - *yy_c_buf_p = yy_hold_char;
17199 - yy_current_buffer->yy_buf_pos = yy_c_buf_p;
17200 - yy_current_buffer->yy_n_chars = yy_n_chars;
17201 + *(yy_c_buf_p) = (yy_hold_char);
17202 + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
17203 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
17204 }
17205
17206 - yy_current_buffer = new_buffer;
17207 - yy_load_buffer_state();
17208 + YY_CURRENT_BUFFER_LVALUE = new_buffer;
17209 + yy_load_buffer_state( );
17210
17211 /* We don't actually know whether we did this switch during
17212 * EOF (yywrap()) processing, but the only time this flag
17213 * is looked at is after yywrap() is called, so it's safe
17214 * to go ahead and always set it.
17215 */
17216 - yy_did_buffer_switch_on_eof = 1;
17217 - }
17218 -
17219 -
17220 -#ifdef YY_USE_PROTOS
17221 -void yy_load_buffer_state( void )
17222 -#else
17223 -void yy_load_buffer_state()
17224 -#endif
17225 - {
17226 - yy_n_chars = yy_current_buffer->yy_n_chars;
17227 - yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
17228 - yyin = yy_current_buffer->yy_input_file;
17229 - yy_hold_char = *yy_c_buf_p;
17230 - }
17231 + (yy_did_buffer_switch_on_eof) = 1;
17232 +}
17233
17234 +static void yy_load_buffer_state (void)
17235 +{
17236 + (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
17237 + (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
17238 + yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
17239 + (yy_hold_char) = *(yy_c_buf_p);
17240 +}
17241
17242 -#ifdef YY_USE_PROTOS
17243 -YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
17244 -#else
17245 -YY_BUFFER_STATE yy_create_buffer( file, size )
17246 -FILE *file;
17247 -int size;
17248 -#endif
17249 - {
17250 +/** Allocate and initialize an input buffer state.
17251 + * @param file A readable stream.
17252 + * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
17253 + *
17254 + * @return the allocated buffer state.
17255 + */
17256 + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size )
17257 +{
17258 YY_BUFFER_STATE b;
17259 -
17260 - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
17261 +
17262 + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
17263 if ( ! b )
17264 YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
17265
17266 @@ -1301,75 +1361,75 @@
17267 /* yy_ch_buf has to be 2 characters longer than the size given because
17268 * we need to put in 2 end-of-buffer characters.
17269 */
17270 - b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
17271 + b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2 );
17272 if ( ! b->yy_ch_buf )
17273 YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
17274
17275 b->yy_is_our_buffer = 1;
17276
17277 - yy_init_buffer( b, file );
17278 + yy_init_buffer(b,file );
17279
17280 return b;
17281 - }
17282 -
17283 +}
17284
17285 -#ifdef YY_USE_PROTOS
17286 -void yy_delete_buffer( YY_BUFFER_STATE b )
17287 -#else
17288 -void yy_delete_buffer( b )
17289 -YY_BUFFER_STATE b;
17290 -#endif
17291 - {
17292 +/** Destroy the buffer.
17293 + * @param b a buffer created with yy_create_buffer()
17294 + *
17295 + */
17296 + void yy_delete_buffer (YY_BUFFER_STATE b )
17297 +{
17298 +
17299 if ( ! b )
17300 return;
17301
17302 - if ( b == yy_current_buffer )
17303 - yy_current_buffer = (YY_BUFFER_STATE) 0;
17304 + if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
17305 + YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
17306
17307 if ( b->yy_is_our_buffer )
17308 - yy_flex_free( (void *) b->yy_ch_buf );
17309 + yyfree((void *) b->yy_ch_buf );
17310
17311 - yy_flex_free( (void *) b );
17312 - }
17313 -
17314 -
17315 -
17316 -#ifdef YY_USE_PROTOS
17317 -void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
17318 -#else
17319 -void yy_init_buffer( b, file )
17320 -YY_BUFFER_STATE b;
17321 -FILE *file;
17322 -#endif
17323 + yyfree((void *) b );
17324 +}
17325
17326 +#ifndef __cplusplus
17327 +extern int isatty (int );
17328 +#endif /* __cplusplus */
17329 +
17330 +/* Initializes or reinitializes a buffer.
17331 + * This function is sometimes called more than once on the same buffer,
17332 + * such as during a yyrestart() or at EOF.
17333 + */
17334 + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file )
17335
17336 - {
17337 - yy_flush_buffer( b );
17338 +{
17339 + int oerrno = errno;
17340 +
17341 + yy_flush_buffer(b );
17342
17343 b->yy_input_file = file;
17344 b->yy_fill_buffer = 1;
17345
17346 -#if YY_ALWAYS_INTERACTIVE
17347 - b->yy_is_interactive = 1;
17348 -#else
17349 -#if YY_NEVER_INTERACTIVE
17350 - b->yy_is_interactive = 0;
17351 -#else
17352 - b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
17353 -#endif
17354 -#endif
17355 - }
17356 -
17357 + /* If b is the current buffer, then yy_init_buffer was _probably_
17358 + * called from yyrestart() or through yy_get_next_buffer.
17359 + * In that case, we don't want to reset the lineno or column.
17360 + */
17361 + if (b != YY_CURRENT_BUFFER){
17362 + b->yy_bs_lineno = 1;
17363 + b->yy_bs_column = 0;
17364 + }
17365
17366 -#ifdef YY_USE_PROTOS
17367 -void yy_flush_buffer( YY_BUFFER_STATE b )
17368 -#else
17369 -void yy_flush_buffer( b )
17370 -YY_BUFFER_STATE b;
17371 -#endif
17372 + b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
17373 +
17374 + errno = oerrno;
17375 +}
17376
17377 - {
17378 - if ( ! b )
17379 +/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
17380 + * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
17381 + *
17382 + */
17383 + void yy_flush_buffer (YY_BUFFER_STATE b )
17384 +{
17385 + if ( ! b )
17386 return;
17387
17388 b->yy_n_chars = 0;
17389 @@ -1386,29 +1446,121 @@
17390 b->yy_at_bol = 1;
17391 b->yy_buffer_status = YY_BUFFER_NEW;
17392
17393 - if ( b == yy_current_buffer )
17394 - yy_load_buffer_state();
17395 + if ( b == YY_CURRENT_BUFFER )
17396 + yy_load_buffer_state( );
17397 +}
17398 +
17399 +/** Pushes the new state onto the stack. The new state becomes
17400 + * the current state. This function will allocate the stack
17401 + * if necessary.
17402 + * @param new_buffer The new state.
17403 + *
17404 + */
17405 +void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
17406 +{
17407 + if (new_buffer == NULL)
17408 + return;
17409 +
17410 + yyensure_buffer_stack();
17411 +
17412 + /* This block is copied from yy_switch_to_buffer. */
17413 + if ( YY_CURRENT_BUFFER )
17414 + {
17415 + /* Flush out information for old buffer. */
17416 + *(yy_c_buf_p) = (yy_hold_char);
17417 + YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
17418 + YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
17419 + }
17420 +
17421 + /* Only push if top exists. Otherwise, replace top. */
17422 + if (YY_CURRENT_BUFFER)
17423 + (yy_buffer_stack_top)++;
17424 + YY_CURRENT_BUFFER_LVALUE = new_buffer;
17425 +
17426 + /* copied from yy_switch_to_buffer. */
17427 + yy_load_buffer_state( );
17428 + (yy_did_buffer_switch_on_eof) = 1;
17429 +}
17430 +
17431 +/** Removes and deletes the top of the stack, if present.
17432 + * The next element becomes the new top.
17433 + *
17434 + */
17435 +void yypop_buffer_state (void)
17436 +{
17437 + if (!YY_CURRENT_BUFFER)
17438 + return;
17439 +
17440 + yy_delete_buffer(YY_CURRENT_BUFFER );
17441 + YY_CURRENT_BUFFER_LVALUE = NULL;
17442 + if ((yy_buffer_stack_top) > 0)
17443 + --(yy_buffer_stack_top);
17444 +
17445 + if (YY_CURRENT_BUFFER) {
17446 + yy_load_buffer_state( );
17447 + (yy_did_buffer_switch_on_eof) = 1;
17448 }
17449 +}
17450
17451 +/* Allocates the stack if it does not exist.
17452 + * Guarantees space for at least one push.
17453 + */
17454 +static void yyensure_buffer_stack (void)
17455 +{
17456 + int num_to_alloc;
17457 +
17458 + if (!(yy_buffer_stack)) {
17459 +
17460 + /* First allocation is just for 2 elements, since we don't know if this
17461 + * scanner will even need a stack. We use 2 instead of 1 to avoid an
17462 + * immediate realloc on the next call.
17463 + */
17464 + num_to_alloc = 1;
17465 + (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
17466 + (num_to_alloc * sizeof(struct yy_buffer_state*)
17467 + );
17468 +
17469 + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
17470 +
17471 + (yy_buffer_stack_max) = num_to_alloc;
17472 + (yy_buffer_stack_top) = 0;
17473 + return;
17474 + }
17475
17476 -#ifndef YY_NO_SCAN_BUFFER
17477 -#ifdef YY_USE_PROTOS
17478 -YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
17479 -#else
17480 -YY_BUFFER_STATE yy_scan_buffer( base, size )
17481 -char *base;
17482 -yy_size_t size;
17483 -#endif
17484 - {
17485 - YY_BUFFER_STATE b;
17486 + if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
17487 +
17488 + /* Increase the buffer to prepare for a possible push. */
17489 + int grow_size = 8 /* arbitrary grow size */;
17490
17491 + num_to_alloc = (yy_buffer_stack_max) + grow_size;
17492 + (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
17493 + ((yy_buffer_stack),
17494 + num_to_alloc * sizeof(struct yy_buffer_state*)
17495 + );
17496 +
17497 + /* zero only the new slots.*/
17498 + memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
17499 + (yy_buffer_stack_max) = num_to_alloc;
17500 + }
17501 +}
17502 +
17503 +/** Setup the input buffer state to scan directly from a user-specified character buffer.
17504 + * @param base the character buffer
17505 + * @param size the size in bytes of the character buffer
17506 + *
17507 + * @return the newly allocated buffer state object.
17508 + */
17509 +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size )
17510 +{
17511 + YY_BUFFER_STATE b;
17512 +
17513 if ( size < 2 ||
17514 base[size-2] != YY_END_OF_BUFFER_CHAR ||
17515 base[size-1] != YY_END_OF_BUFFER_CHAR )
17516 /* They forgot to leave room for the EOB's. */
17517 return 0;
17518
17519 - b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
17520 + b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state ) );
17521 if ( ! b )
17522 YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
17523
17524 @@ -1422,47 +1574,42 @@
17525 b->yy_fill_buffer = 0;
17526 b->yy_buffer_status = YY_BUFFER_NEW;
17527
17528 - yy_switch_to_buffer( b );
17529 + yy_switch_to_buffer(b );
17530
17531 return b;
17532 - }
17533 -#endif
17534 -
17535 -
17536 -#ifndef YY_NO_SCAN_STRING
17537 -#ifdef YY_USE_PROTOS
17538 -YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
17539 -#else
17540 -YY_BUFFER_STATE yy_scan_string( yy_str )
17541 -yyconst char *yy_str;
17542 -#endif
17543 - {
17544 - int len;
17545 - for ( len = 0; yy_str[len]; ++len )
17546 - ;
17547 -
17548 - return yy_scan_bytes( yy_str, len );
17549 - }
17550 -#endif
17551 +}
17552
17553 +/** Setup the input buffer state to scan a string. The next call to yylex() will
17554 + * scan from a @e copy of @a str.
17555 + * @param str a NUL-terminated string to scan
17556 + *
17557 + * @return the newly allocated buffer state object.
17558 + * @note If you want to scan bytes that may contain NUL values, then use
17559 + * yy_scan_bytes() instead.
17560 + */
17561 +YY_BUFFER_STATE yy_scan_string (yyconst char * yy_str )
17562 +{
17563 +
17564 + return yy_scan_bytes(yy_str,strlen(yy_str) );
17565 +}
17566
17567 -#ifndef YY_NO_SCAN_BYTES
17568 -#ifdef YY_USE_PROTOS
17569 -YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
17570 -#else
17571 -YY_BUFFER_STATE yy_scan_bytes( bytes, len )
17572 -yyconst char *bytes;
17573 -int len;
17574 -#endif
17575 - {
17576 +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
17577 + * scan from a @e copy of @a bytes.
17578 + * @param bytes the byte buffer to scan
17579 + * @param len the number of bytes in the buffer pointed to by @a bytes.
17580 + *
17581 + * @return the newly allocated buffer state object.
17582 + */
17583 +YY_BUFFER_STATE yy_scan_bytes (yyconst char * bytes, int len )
17584 +{
17585 YY_BUFFER_STATE b;
17586 char *buf;
17587 yy_size_t n;
17588 int i;
17589 -
17590 +
17591 /* Get memory for full buffer, including space for trailing EOB's. */
17592 n = len + 2;
17593 - buf = (char *) yy_flex_alloc( n );
17594 + buf = (char *) yyalloc(n );
17595 if ( ! buf )
17596 YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
17597
17598 @@ -1471,7 +1618,7 @@
17599
17600 buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
17601
17602 - b = yy_scan_buffer( buf, n );
17603 + b = yy_scan_buffer(buf,n );
17604 if ( ! b )
17605 YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
17606
17607 @@ -1481,148 +1628,164 @@
17608 b->yy_is_our_buffer = 1;
17609
17610 return b;
17611 - }
17612 -#endif
17613 -
17614 +}
17615
17616 -#ifndef YY_NO_PUSH_STATE
17617 -#ifdef YY_USE_PROTOS
17618 -static void yy_push_state( int new_state )
17619 -#else
17620 -static void yy_push_state( new_state )
17621 -int new_state;
17622 +#ifndef YY_EXIT_FAILURE
17623 +#define YY_EXIT_FAILURE 2
17624 #endif
17625 - {
17626 - if ( yy_start_stack_ptr >= yy_start_stack_depth )
17627 - {
17628 - yy_size_t new_size;
17629
17630 - yy_start_stack_depth += YY_START_STACK_INCR;
17631 - new_size = yy_start_stack_depth * sizeof( int );
17632 +static void yy_fatal_error (yyconst char* msg )
17633 +{
17634 + (void) fprintf( stderr, "%s\n", msg );
17635 + exit( YY_EXIT_FAILURE );
17636 +}
17637
17638 - if ( ! yy_start_stack )
17639 - yy_start_stack = (int *) yy_flex_alloc( new_size );
17640 +/* Redefine yyless() so it works in section 3 code. */
17641
17642 - else
17643 - yy_start_stack = (int *) yy_flex_realloc(
17644 - (void *) yy_start_stack, new_size );
17645 +#undef yyless
17646 +#define yyless(n) \
17647 + do \
17648 + { \
17649 + /* Undo effects of setting up yytext. */ \
17650 + int yyless_macro_arg = (n); \
17651 + YY_LESS_LINENO(yyless_macro_arg);\
17652 + yytext[yyleng] = (yy_hold_char); \
17653 + (yy_c_buf_p) = yytext + yyless_macro_arg; \
17654 + (yy_hold_char) = *(yy_c_buf_p); \
17655 + *(yy_c_buf_p) = '\0'; \
17656 + yyleng = yyless_macro_arg; \
17657 + } \
17658 + while ( 0 )
17659
17660 - if ( ! yy_start_stack )
17661 - YY_FATAL_ERROR(
17662 - "out of memory expanding start-condition stack" );
17663 - }
17664 +/* Accessor methods (get/set functions) to struct members. */
17665
17666 - yy_start_stack[yy_start_stack_ptr++] = YY_START;
17667 +/** Get the current line number.
17668 + *
17669 + */
17670 +int yyget_lineno (void)
17671 +{
17672 +
17673 + return yylineno;
17674 +}
17675
17676 - BEGIN(new_state);
17677 - }
17678 -#endif
17679 +/** Get the input stream.
17680 + *
17681 + */
17682 +FILE *yyget_in (void)
17683 +{
17684 + return yyin;
17685 +}
17686
17687 +/** Get the output stream.
17688 + *
17689 + */
17690 +FILE *yyget_out (void)
17691 +{
17692 + return yyout;
17693 +}
17694
17695 -#ifndef YY_NO_POP_STATE
17696 -static void yy_pop_state()
17697 - {
17698 - if ( --yy_start_stack_ptr < 0 )
17699 - YY_FATAL_ERROR( "start-condition stack underflow" );
17700 +/** Get the length of the current token.
17701 + *
17702 + */
17703 +int yyget_leng (void)
17704 +{
17705 + return yyleng;
17706 +}
17707
17708 - BEGIN(yy_start_stack[yy_start_stack_ptr]);
17709 - }
17710 -#endif
17711 +/** Get the current token.
17712 + *
17713 + */
17714
17715 +char *yyget_text (void)
17716 +{
17717 + return yytext;
17718 +}
17719
17720 -#ifndef YY_NO_TOP_STATE
17721 -static int yy_top_state()
17722 - {
17723 - return yy_start_stack[yy_start_stack_ptr - 1];
17724 - }
17725 -#endif
17726 +/** Set the current line number.
17727 + * @param line_number
17728 + *
17729 + */
17730 +void yyset_lineno (int line_number )
17731 +{
17732 +
17733 + yylineno = line_number;
17734 +}
17735
17736 -#ifndef YY_EXIT_FAILURE
17737 -#define YY_EXIT_FAILURE 2
17738 -#endif
17739 +/** Set the input stream. This does not discard the current
17740 + * input buffer.
17741 + * @param in_str A readable stream.
17742 + *
17743 + * @see yy_switch_to_buffer
17744 + */
17745 +void yyset_in (FILE * in_str )
17746 +{
17747 + yyin = in_str ;
17748 +}
17749
17750 -#ifdef YY_USE_PROTOS
17751 -static void yy_fatal_error( yyconst char msg[] )
17752 -#else
17753 -static void yy_fatal_error( msg )
17754 -char msg[];
17755 -#endif
17756 - {
17757 - (void) fprintf( stderr, "%s\n", msg );
17758 - exit( YY_EXIT_FAILURE );
17759 - }
17760 +void yyset_out (FILE * out_str )
17761 +{
17762 + yyout = out_str ;
17763 +}
17764
17765 +int yyget_debug (void)
17766 +{
17767 + return yy_flex_debug;
17768 +}
17769
17770 +void yyset_debug (int bdebug )
17771 +{
17772 + yy_flex_debug = bdebug ;
17773 +}
17774
17775 -/* Redefine yyless() so it works in section 3 code. */
17776 +/* yylex_destroy is for both reentrant and non-reentrant scanners. */
17777 +int yylex_destroy (void)
17778 +{
17779 +
17780 + /* Pop the buffer stack, destroying each element. */
17781 + while(YY_CURRENT_BUFFER){
17782 + yy_delete_buffer(YY_CURRENT_BUFFER );
17783 + YY_CURRENT_BUFFER_LVALUE = NULL;
17784 + yypop_buffer_state();
17785 + }
17786
17787 -#undef yyless
17788 -#define yyless(n) \
17789 - do \
17790 - { \
17791 - /* Undo effects of setting up yytext. */ \
17792 - yytext[yyleng] = yy_hold_char; \
17793 - yy_c_buf_p = yytext + n; \
17794 - yy_hold_char = *yy_c_buf_p; \
17795 - *yy_c_buf_p = '\0'; \
17796 - yyleng = n; \
17797 - } \
17798 - while ( 0 )
17799 + /* Destroy the stack itself. */
17800 + yyfree((yy_buffer_stack) );
17801 + (yy_buffer_stack) = NULL;
17802
17803 + return 0;
17804 +}
17805
17806 -/* Internal utility routines. */
17807 +/*
17808 + * Internal utility routines.
17809 + */
17810
17811 #ifndef yytext_ptr
17812 -#ifdef YY_USE_PROTOS
17813 -static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
17814 -#else
17815 -static void yy_flex_strncpy( s1, s2, n )
17816 -char *s1;
17817 -yyconst char *s2;
17818 -int n;
17819 -#endif
17820 - {
17821 +static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
17822 +{
17823 register int i;
17824 - for ( i = 0; i < n; ++i )
17825 + for ( i = 0; i < n; ++i )
17826 s1[i] = s2[i];
17827 - }
17828 +}
17829 #endif
17830
17831 #ifdef YY_NEED_STRLEN
17832 -#ifdef YY_USE_PROTOS
17833 -static int yy_flex_strlen( yyconst char *s )
17834 -#else
17835 -static int yy_flex_strlen( s )
17836 -yyconst char *s;
17837 -#endif
17838 - {
17839 +static int yy_flex_strlen (yyconst char * s )
17840 +{
17841 register int n;
17842 - for ( n = 0; s[n]; ++n )
17843 + for ( n = 0; s[n]; ++n )
17844 ;
17845
17846 return n;
17847 - }
17848 +}
17849 #endif
17850
17851 -
17852 -#ifdef YY_USE_PROTOS
17853 -static void *yy_flex_alloc( yy_size_t size )
17854 -#else
17855 -static void *yy_flex_alloc( size )
17856 -yy_size_t size;
17857 -#endif
17858 - {
17859 +void *yyalloc (yy_size_t size )
17860 +{
17861 return (void *) malloc( size );
17862 - }
17863 +}
17864
17865 -#ifdef YY_USE_PROTOS
17866 -static void *yy_flex_realloc( void *ptr, yy_size_t size )
17867 -#else
17868 -static void *yy_flex_realloc( ptr, size )
17869 -void *ptr;
17870 -yy_size_t size;
17871 -#endif
17872 - {
17873 +void *yyrealloc (void * ptr, yy_size_t size )
17874 +{
17875 /* The cast to (char *) in the following accommodates both
17876 * implementations that use char* generic pointers, and those
17877 * that use void* generic pointers. It works with the latter
17878 @@ -1631,30 +1794,34 @@
17879 * as though doing an assignment.
17880 */
17881 return (void *) realloc( (char *) ptr, size );
17882 - }
17883 +}
17884
17885 -#ifdef YY_USE_PROTOS
17886 -static void yy_flex_free( void *ptr )
17887 -#else
17888 -static void yy_flex_free( ptr )
17889 -void *ptr;
17890 -#endif
17891 - {
17892 - free( ptr );
17893 - }
17894 +void yyfree (void * ptr )
17895 +{
17896 + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */
17897 +}
17898
17899 -#if YY_MAIN
17900 -int main()
17901 - {
17902 - yylex();
17903 - return 0;
17904 - }
17905 +#define YYTABLES_NAME "yytables"
17906 +
17907 +#undef YY_NEW_FILE
17908 +#undef YY_FLUSH_BUFFER
17909 +#undef yy_set_bol
17910 +#undef yy_new_buffer
17911 +#undef yy_set_interactive
17912 +#undef yytext_ptr
17913 +#undef YY_DO_BEFORE_ACTION
17914 +
17915 +#ifdef YY_DECL_IS_OURS
17916 +#undef YY_DECL_IS_OURS
17917 +#undef YY_DECL
17918 #endif
17919 #line 69 "ql_l.l"
17920
17921
17922 -void yyerror(char *s)
17923 +
17924 +void yyerror(const char *s)
17925 {
17926 fprintf(stderr,"line %d: %s near \"%s\"\n",lineno,s,yytext);
17927 exit(1);
17928 }
17929 +
17930 Index: linux-atm-2.4.1/src/qgen/ql_y.c
17931 ===================================================================
17932 --- linux-atm-2.4.1.orig/src/qgen/ql_y.c 2007-06-04 13:23:53.994525480 +0200
17933 +++ linux-atm-2.4.1/src/qgen/ql_y.c 2007-06-04 13:23:54.488450392 +0200
17934 @@ -1,21 +1,87 @@
17935 +/* A Bison parser, made by GNU Bison 1.875d. */
17936
17937 -/* A Bison parser, made from ql_y.y
17938 - by GNU Bison version 1.28 */
17939 +/* Skeleton parser for Yacc-like parsing with Bison,
17940 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
17941
17942 -#define YYBISON 1 /* Identify Bison output. */
17943 + This program is free software; you can redistribute it and/or modify
17944 + it under the terms of the GNU General Public License as published by
17945 + the Free Software Foundation; either version 2, or (at your option)
17946 + any later version.
17947
17948 -#define TOK_BREAK 257
17949 -#define TOK_CASE 258
17950 -#define TOK_DEF 259
17951 -#define TOK_DEFAULT 260
17952 -#define TOK_LENGTH 261
17953 -#define TOK_MULTI 262
17954 -#define TOK_RECOVER 263
17955 -#define TOK_ABORT 264
17956 -#define TOK_ID 265
17957 -#define TOK_INCLUDE 266
17958 -#define TOK_STRING 267
17959 + This program is distributed in the hope that it will be useful,
17960 + but WITHOUT ANY WARRANTY; without even the implied warranty of
17961 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17962 + GNU General Public License for more details.
17963
17964 + You should have received a copy of the GNU General Public License
17965 + along with this program; if not, write to the Free Software
17966 + Foundation, Inc., 59 Temple Place - Suite 330,
17967 + Boston, MA 02111-1307, USA. */
17968 +
17969 +/* As a special exception, when this file is copied by Bison into a
17970 + Bison output file, you may use that output file without restriction.
17971 + This special exception was added by the Free Software Foundation
17972 + in version 1.24 of Bison. */
17973 +
17974 +/* Written by Richard Stallman by simplifying the original so called
17975 + ``semantic'' parser. */
17976 +
17977 +/* All symbols defined below should begin with yy or YY, to avoid
17978 + infringing on user name space. This should be done even for local
17979 + variables, as they might otherwise be expanded by user macros.
17980 + There are some unavoidable exceptions within include files to
17981 + define necessary library symbols; they are noted "INFRINGES ON
17982 + USER NAME SPACE" below. */
17983 +
17984 +/* Identify Bison output. */
17985 +#define YYBISON 1
17986 +
17987 +/* Skeleton name. */
17988 +#define YYSKELETON_NAME "yacc.c"
17989 +
17990 +/* Pure parsers. */
17991 +#define YYPURE 0
17992 +
17993 +/* Using locations. */
17994 +#define YYLSP_NEEDED 0
17995 +
17996 +
17997 +
17998 +/* Tokens. */
17999 +#ifndef YYTOKENTYPE
18000 +# define YYTOKENTYPE
18001 + /* Put the tokens into the symbol table, so that GDB and other debuggers
18002 + know about them. */
18003 + enum yytokentype {
18004 + TOK_BREAK = 258,
18005 + TOK_CASE = 259,
18006 + TOK_DEF = 260,
18007 + TOK_DEFAULT = 261,
18008 + TOK_LENGTH = 262,
18009 + TOK_MULTI = 263,
18010 + TOK_RECOVER = 264,
18011 + TOK_ABORT = 265,
18012 + TOK_ID = 266,
18013 + TOK_INCLUDE = 267,
18014 + TOK_STRING = 268
18015 + };
18016 +#endif
18017 +#define TOK_BREAK 258
18018 +#define TOK_CASE 259
18019 +#define TOK_DEF 260
18020 +#define TOK_DEFAULT 261
18021 +#define TOK_LENGTH 262
18022 +#define TOK_MULTI 263
18023 +#define TOK_RECOVER 264
18024 +#define TOK_ABORT 265
18025 +#define TOK_ID 266
18026 +#define TOK_INCLUDE 267
18027 +#define TOK_STRING 268
18028 +
18029 +
18030 +
18031 +
18032 +/* Copy the first part of user declarations. */
18033 #line 1 "ql_y.y"
18034
18035 /* ql.y - Q.2931 data structures description language */
18036 @@ -36,6 +102,8 @@
18037 #include "qgen.h"
18038 #include "file.h"
18039
18040 +extern void yyerror(const char *s);
18041 +
18042
18043 #define MAX_TOKEN 256
18044 #define DEFAULT_NAMELIST_FILE "default.nl"
18045 @@ -77,9 +145,10 @@
18046 for (walk = strchr(start,0)-1; walk > start && isspace(*walk); walk--)
18047 *walk = 0;
18048 if (*start == ':') {
18049 - if (!(searching = strcmp(start+1,name)))
18050 + if (!(searching = strcmp(start+1,name))) {
18051 if (found) yyerror("multiple entries");
18052 else found = 1;
18053 + }
18054 continue;
18055 }
18056 if (searching) continue;
18057 @@ -154,8 +223,23 @@
18058
18059
18060
18061 -#line 139 "ql_y.y"
18062 -typedef union {
18063 +
18064 +/* Enabling traces. */
18065 +#ifndef YYDEBUG
18066 +# define YYDEBUG 0
18067 +#endif
18068 +
18069 +/* Enabling verbose error messages. */
18070 +#ifdef YYERROR_VERBOSE
18071 +# undef YYERROR_VERBOSE
18072 +# define YYERROR_VERBOSE 1
18073 +#else
18074 +# define YYERROR_VERBOSE 0
18075 +#endif
18076 +
18077 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
18078 +#line 142 "ql_y.y"
18079 +typedef union YYSTYPE {
18080 const char *str;
18081 int num;
18082 FIELD *field;
18083 @@ -164,470 +248,762 @@
18084 TAG *tag;
18085 NAME_LIST *nlist;
18086 } YYSTYPE;
18087 -#include <stdio.h>
18088 +/* Line 191 of yacc.c. */
18089 +#line 253 "y.tab.c"
18090 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
18091 +# define YYSTYPE_IS_DECLARED 1
18092 +# define YYSTYPE_IS_TRIVIAL 1
18093 +#endif
18094 +
18095 +
18096 +
18097 +/* Copy the second part of user declarations. */
18098 +
18099 +
18100 +/* Line 214 of yacc.c. */
18101 +#line 265 "y.tab.c"
18102 +
18103 +#if ! defined (yyoverflow) || YYERROR_VERBOSE
18104 +
18105 +# ifndef YYFREE
18106 +# define YYFREE free
18107 +# endif
18108 +# ifndef YYMALLOC
18109 +# define YYMALLOC malloc
18110 +# endif
18111 +
18112 +/* The parser invokes alloca or malloc; define the necessary symbols. */
18113 +
18114 +# ifdef YYSTACK_USE_ALLOCA
18115 +# if YYSTACK_USE_ALLOCA
18116 +# define YYSTACK_ALLOC alloca
18117 +# endif
18118 +# else
18119 +# if defined (alloca) || defined (_ALLOCA_H)
18120 +# define YYSTACK_ALLOC alloca
18121 +# else
18122 +# ifdef __GNUC__
18123 +# define YYSTACK_ALLOC __builtin_alloca
18124 +# endif
18125 +# endif
18126 +# endif
18127 +
18128 +# ifdef YYSTACK_ALLOC
18129 + /* Pacify GCC's `empty if-body' warning. */
18130 +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
18131 +# else
18132 +# if defined (__STDC__) || defined (__cplusplus)
18133 +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
18134 +# define YYSIZE_T size_t
18135 +# endif
18136 +# define YYSTACK_ALLOC YYMALLOC
18137 +# define YYSTACK_FREE YYFREE
18138 +# endif
18139 +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
18140 +
18141 +
18142 +#if (! defined (yyoverflow) \
18143 + && (! defined (__cplusplus) \
18144 + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
18145 +
18146 +/* A type that is properly aligned for any stack member. */
18147 +union yyalloc
18148 +{
18149 + short int yyss;
18150 + YYSTYPE yyvs;
18151 + };
18152 +
18153 +/* The size of the maximum gap between one aligned stack and the next. */
18154 +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
18155 +
18156 +/* The size of an array large to enough to hold all stacks, each with
18157 + N elements. */
18158 +# define YYSTACK_BYTES(N) \
18159 + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
18160 + + YYSTACK_GAP_MAXIMUM)
18161 +
18162 +/* Copy COUNT objects from FROM to TO. The source and destination do
18163 + not overlap. */
18164 +# ifndef YYCOPY
18165 +# if defined (__GNUC__) && 1 < __GNUC__
18166 +# define YYCOPY(To, From, Count) \
18167 + __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
18168 +# else
18169 +# define YYCOPY(To, From, Count) \
18170 + do \
18171 + { \
18172 + register YYSIZE_T yyi; \
18173 + for (yyi = 0; yyi < (Count); yyi++) \
18174 + (To)[yyi] = (From)[yyi]; \
18175 + } \
18176 + while (0)
18177 +# endif
18178 +# endif
18179 +
18180 +/* Relocate STACK from its old location to the new one. The
18181 + local variables YYSIZE and YYSTACKSIZE give the old and new number of
18182 + elements in the stack, and YYPTR gives the new location of the
18183 + stack. Advance YYPTR to a properly aligned location for the next
18184 + stack. */
18185 +# define YYSTACK_RELOCATE(Stack) \
18186 + do \
18187 + { \
18188 + YYSIZE_T yynewbytes; \
18189 + YYCOPY (&yyptr->Stack, Stack, yysize); \
18190 + Stack = &yyptr->Stack; \
18191 + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
18192 + yyptr += yynewbytes / sizeof (*yyptr); \
18193 + } \
18194 + while (0)
18195
18196 -#ifndef __cplusplus
18197 -#ifndef __STDC__
18198 -#define const
18199 -#endif
18200 #endif
18201
18202 +#if defined (__STDC__) || defined (__cplusplus)
18203 + typedef signed char yysigned_char;
18204 +#else
18205 + typedef short int yysigned_char;
18206 +#endif
18207
18208 -
18209 -#define YYFINAL 86
18210 -#define YYFLAG -32768
18211 -#define YYNTBASE 23
18212 -
18213 -#define YYTRANSLATE(x) ((unsigned)(x) <= 267 ? yytranslate[x] : 47)
18214 -
18215 -static const char yytranslate[] = { 0,
18216 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18217 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18218 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18219 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18220 - 2, 2, 2, 21, 18, 2, 2, 2, 2, 2,
18221 - 2, 2, 2, 2, 2, 2, 2, 22, 2, 17,
18222 - 14, 19, 2, 20, 2, 2, 2, 2, 2, 2,
18223 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18224 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18225 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18226 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18227 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18228 - 2, 2, 15, 2, 16, 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, 2, 2, 2, 2, 2, 2,
18232 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18233 - 2, 2, 2, 2, 2, 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, 2, 2, 2, 2, 2, 2, 2,
18240 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18241 - 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
18242 - 7, 8, 9, 10, 11, 12, 13
18243 +/* YYFINAL -- State number of the termination state. */
18244 +#define YYFINAL 5
18245 +/* YYLAST -- Last index in YYTABLE. */
18246 +#define YYLAST 65
18247 +
18248 +/* YYNTOKENS -- Number of terminals. */
18249 +#define YYNTOKENS 23
18250 +/* YYNNTS -- Number of nonterminals. */
18251 +#define YYNNTS 25
18252 +/* YYNRULES -- Number of rules. */
18253 +#define YYNRULES 46
18254 +/* YYNRULES -- Number of states. */
18255 +#define YYNSTATES 86
18256 +
18257 +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
18258 +#define YYUNDEFTOK 2
18259 +#define YYMAXUTOK 268
18260 +
18261 +#define YYTRANSLATE(YYX) \
18262 + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
18263 +
18264 +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
18265 +static const unsigned char yytranslate[] =
18266 +{
18267 + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18268 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18269 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18270 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18271 + 2, 2, 2, 2, 21, 18, 2, 2, 2, 2,
18272 + 2, 2, 2, 2, 2, 2, 2, 2, 22, 2,
18273 + 17, 14, 19, 2, 20, 2, 2, 2, 2, 2,
18274 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18275 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18276 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18277 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18278 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18279 + 2, 2, 2, 15, 2, 16, 2, 2, 2, 2,
18280 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18281 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18282 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18283 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18284 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18285 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18286 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18287 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18288 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18289 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18290 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18291 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
18292 + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
18293 + 5, 6, 7, 8, 9, 10, 11, 12, 13
18294 };
18295
18296 -#if YYDEBUG != 0
18297 -static const short yyprhs[] = { 0,
18298 - 0, 4, 5, 8, 9, 12, 17, 18, 21, 23,
18299 - 27, 30, 31, 34, 40, 41, 43, 47, 53, 54,
18300 - 57, 59, 60, 63, 64, 67, 69, 74, 79, 83,
18301 - 84, 87, 88, 90, 91, 97, 98, 105, 106, 112,
18302 - 113, 120, 121, 124, 125
18303 +#if YYDEBUG
18304 +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
18305 + YYRHS. */
18306 +static const unsigned char yyprhs[] =
18307 +{
18308 + 0, 0, 3, 7, 8, 11, 12, 15, 20, 21,
18309 + 24, 26, 30, 33, 34, 37, 43, 44, 46, 50,
18310 + 56, 57, 60, 62, 63, 66, 67, 70, 72, 77,
18311 + 82, 86, 87, 90, 91, 93, 94, 100, 101, 108,
18312 + 109, 115, 116, 123, 124, 127, 128
18313 };
18314
18315 -static const short yyrhs[] = { 24,
18316 - 25, 29, 0, 0, 12, 24, 0, 0, 25, 26,
18317 - 0, 5, 11, 14, 29, 0, 0, 28, 29, 0,
18318 - 11, 0, 15, 30, 16, 0, 10, 11, 0, 0,
18319 - 31, 30, 0, 32, 11, 40, 17, 33, 0, 0,
18320 - 3, 0, 18, 35, 19, 0, 35, 34, 36, 19,
18321 - 37, 0, 0, 20, 35, 0, 11, 0, 0, 21,
18322 - 11, 0, 0, 14, 38, 0, 11, 0, 4, 15,
18323 - 41, 16, 0, 8, 15, 43, 16, 0, 39, 7,
18324 - 29, 0, 0, 9, 11, 0, 0, 13, 0, 0,
18325 - 6, 11, 45, 46, 29, 0, 0, 11, 45, 46,
18326 - 29, 42, 41, 0, 0, 6, 11, 45, 46, 27,
18327 - 0, 0, 11, 45, 46, 27, 44, 43, 0, 0,
18328 - 22, 11, 0, 0, 21, 11, 46, 0
18329 +/* YYRHS -- A `-1'-separated list of the rules' RHS. */
18330 +static const yysigned_char yyrhs[] =
18331 +{
18332 + 24, 0, -1, 25, 26, 30, -1, -1, 12, 25,
18333 + -1, -1, 26, 27, -1, 5, 11, 14, 30, -1,
18334 + -1, 29, 30, -1, 11, -1, 15, 31, 16, -1,
18335 + 10, 11, -1, -1, 32, 31, -1, 33, 11, 41,
18336 + 17, 34, -1, -1, 3, -1, 18, 36, 19, -1,
18337 + 36, 35, 37, 19, 38, -1, -1, 20, 36, -1,
18338 + 11, -1, -1, 21, 11, -1, -1, 14, 39, -1,
18339 + 11, -1, 4, 15, 42, 16, -1, 8, 15, 44,
18340 + 16, -1, 40, 7, 30, -1, -1, 9, 11, -1,
18341 + -1, 13, -1, -1, 6, 11, 46, 47, 30, -1,
18342 + -1, 11, 46, 47, 30, 43, 42, -1, -1, 6,
18343 + 11, 46, 47, 28, -1, -1, 11, 46, 47, 28,
18344 + 45, 44, -1, -1, 22, 11, -1, -1, 21, 11,
18345 + 47, -1
18346 };
18347
18348 -#endif
18349 -
18350 -#if YYDEBUG != 0
18351 -static const short yyrline[] = { 0,
18352 - 163, 175, 176, 184, 185, 188, 202, 207, 212, 231,
18353 - 236, 243, 247, 254, 278, 282, 288, 301, 318, 322,
18354 - 329, 339, 343, 350, 354, 360, 367, 374, 380, 390,
18355 - 394, 400, 404, 410, 414, 431, 437, 454, 458, 474,
18356 - 480, 497, 501, 507, 511
18357 +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
18358 +static const unsigned short int yyrline[] =
18359 +{
18360 + 0, 167, 167, 178, 179, 187, 188, 192, 206, 206,
18361 + 216, 234, 239, 247, 250, 258, 282, 285, 292, 304,
18362 + 323, 326, 334, 344, 347, 355, 358, 365, 371, 378,
18363 + 384, 395, 398, 405, 408, 415, 418, 436, 435, 459,
18364 + 462, 479, 478, 502, 505, 512, 515
18365 };
18366 #endif
18367
18368 -
18369 -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
18370 -
18371 -static const char * const yytname[] = { "$","error","$undefined.","TOK_BREAK",
18372 -"TOK_CASE","TOK_DEF","TOK_DEFAULT","TOK_LENGTH","TOK_MULTI","TOK_RECOVER","TOK_ABORT",
18373 -"TOK_ID","TOK_INCLUDE","TOK_STRING","'='","'{'","'}'","'<'","'-'","'>'","'@'",
18374 -"','","':'","all","includes","structures","structure","rep_block","@1","block",
18375 -"fields","field","opt_break","field_cont","opt_pos","decimal","opt_more","opt_val",
18376 -"value","opt_recover","opt_name_list","tags","@2","rep_tags","@3","opt_id","list", NULL
18377 +#if YYDEBUG || YYERROR_VERBOSE
18378 +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
18379 + First, the terminals, then, starting at YYNTOKENS, nonterminals. */
18380 +static const char *const yytname[] =
18381 +{
18382 + "$end", "error", "$undefined", "TOK_BREAK", "TOK_CASE", "TOK_DEF",
18383 + "TOK_DEFAULT", "TOK_LENGTH", "TOK_MULTI", "TOK_RECOVER", "TOK_ABORT",
18384 + "TOK_ID", "TOK_INCLUDE", "TOK_STRING", "'='", "'{'", "'}'", "'<'", "'-'",
18385 + "'>'", "'@'", "','", "':'", "$accept", "all", "includes", "structures",
18386 + "structure", "rep_block", "@1", "block", "fields", "field", "opt_break",
18387 + "field_cont", "opt_pos", "decimal", "opt_more", "opt_val", "value",
18388 + "opt_recover", "opt_name_list", "tags", "@2", "rep_tags", "@3", "opt_id",
18389 + "list", 0
18390 };
18391 #endif
18392
18393 -static const short yyr1[] = { 0,
18394 - 23, 24, 24, 25, 25, 26, 28, 27, 29, 29,
18395 - 29, 30, 30, 31, 32, 32, 33, 33, 34, 34,
18396 - 35, 36, 36, 37, 37, 38, 38, 38, 38, 39,
18397 - 39, 40, 40, 41, 41, 42, 41, 43, 43, 44,
18398 - 43, 45, 45, 46, 46
18399 +# ifdef YYPRINT
18400 +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
18401 + token YYLEX-NUM. */
18402 +static const unsigned short int yytoknum[] =
18403 +{
18404 + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
18405 + 265, 266, 267, 268, 61, 123, 125, 60, 45, 62,
18406 + 64, 44, 58
18407 };
18408 +# endif
18409
18410 -static const short yyr2[] = { 0,
18411 - 3, 0, 2, 0, 2, 4, 0, 2, 1, 3,
18412 - 2, 0, 2, 5, 0, 1, 3, 5, 0, 2,
18413 - 1, 0, 2, 0, 2, 1, 4, 4, 3, 0,
18414 - 2, 0, 1, 0, 5, 0, 6, 0, 5, 0,
18415 - 6, 0, 2, 0, 3
18416 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
18417 +static const unsigned char yyr1[] =
18418 +{
18419 + 0, 23, 24, 25, 25, 26, 26, 27, 29, 28,
18420 + 30, 30, 30, 31, 31, 32, 33, 33, 34, 34,
18421 + 35, 35, 36, 37, 37, 38, 38, 39, 39, 39,
18422 + 39, 40, 40, 41, 41, 42, 42, 43, 42, 44,
18423 + 44, 45, 44, 46, 46, 47, 47
18424 };
18425
18426 -static const short yydefact[] = { 2,
18427 - 2, 4, 3, 0, 0, 0, 9, 12, 5, 1,
18428 - 0, 11, 16, 0, 12, 0, 0, 10, 13, 32,
18429 - 6, 33, 0, 0, 21, 0, 14, 19, 0, 0,
18430 - 22, 17, 20, 0, 0, 23, 24, 30, 18, 0,
18431 - 0, 0, 26, 25, 0, 34, 38, 31, 0, 0,
18432 - 42, 0, 0, 42, 0, 29, 42, 0, 44, 27,
18433 - 42, 44, 28, 44, 43, 0, 0, 44, 7, 0,
18434 - 44, 36, 7, 40, 0, 35, 45, 34, 39, 38,
18435 - 8, 37, 41, 0, 0, 0
18436 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
18437 +static const unsigned char yyr2[] =
18438 +{
18439 + 0, 2, 3, 0, 2, 0, 2, 4, 0, 2,
18440 + 1, 3, 2, 0, 2, 5, 0, 1, 3, 5,
18441 + 0, 2, 1, 0, 2, 0, 2, 1, 4, 4,
18442 + 3, 0, 2, 0, 1, 0, 5, 0, 6, 0,
18443 + 5, 0, 6, 0, 2, 0, 3
18444 };
18445
18446 -static const short yydefgoto[] = { 84,
18447 - 2, 4, 9, 74, 75, 10, 14, 15, 16, 27,
18448 - 31, 28, 35, 39, 44, 45, 23, 52, 78, 55,
18449 - 80, 59, 67
18450 +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
18451 + STATE-NUM when YYTABLE doesn't specify something else to do. Zero
18452 + means the default is an error. */
18453 +static const unsigned char yydefact[] =
18454 +{
18455 + 3, 3, 0, 5, 4, 1, 0, 0, 0, 10,
18456 + 13, 6, 2, 0, 12, 17, 0, 13, 0, 0,
18457 + 11, 14, 33, 7, 34, 0, 0, 22, 0, 15,
18458 + 20, 0, 0, 23, 18, 21, 0, 0, 24, 25,
18459 + 31, 19, 0, 0, 0, 27, 26, 0, 35, 39,
18460 + 32, 0, 0, 43, 0, 0, 43, 0, 30, 43,
18461 + 0, 45, 28, 43, 45, 29, 45, 44, 0, 0,
18462 + 45, 8, 0, 45, 37, 8, 41, 0, 36, 46,
18463 + 35, 40, 39, 9, 38, 42
18464 };
18465
18466 -static const short yypact[] = { -8,
18467 - -8,-32768,-32768, -4, 3, 17,-32768, -1,-32768,-32768,
18468 - 20,-32768,-32768, 21, -1, 22, 11,-32768,-32768, 23,
18469 --32768,-32768, 24, -3,-32768, 27,-32768, 15, 25, 27,
18470 - 26,-32768,-32768, 28, 29,-32768, 31, 9,-32768, 34,
18471 - 36, 32,-32768,-32768, 33, 18, 19,-32768, 11, 35,
18472 - 30, 38, 44, 30, 40,-32768, 30, 46, 39,-32768,
18473 - 30, 39,-32768, 39,-32768, 48, 11, 39,-32768, 11,
18474 - 39,-32768,-32768,-32768, 11,-32768,-32768, 18,-32768, 19,
18475 --32768,-32768,-32768, 42, 61,-32768
18476 +/* YYDEFGOTO[NTERM-NUM]. */
18477 +static const yysigned_char yydefgoto[] =
18478 +{
18479 + -1, 2, 3, 6, 11, 76, 77, 12, 16, 17,
18480 + 18, 29, 33, 30, 37, 41, 46, 47, 25, 54,
18481 + 80, 57, 82, 61, 69
18482 };
18483
18484 -static const short yypgoto[] = {-32768,
18485 - 62,-32768,-32768, -11,-32768, -17, 49,-32768,-32768,-32768,
18486 --32768, 1,-32768,-32768,-32768,-32768,-32768, -13,-32768, -14,
18487 --32768, -38, -59
18488 +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
18489 + STATE-NUM. */
18490 +#define YYPACT_NINF -62
18491 +static const yysigned_char yypact[] =
18492 +{
18493 + -8, -8, 14, -62, -62, -62, -4, 16, 17, -62,
18494 + -1, -62, -62, 20, -62, -62, 21, -1, 22, 11,
18495 + -62, -62, 23, -62, -62, 24, -3, -62, 27, -62,
18496 + 25, 28, 27, 30, -62, -62, 29, 33, -62, 32,
18497 + 9, -62, 34, 39, 31, -62, -62, 36, 18, 19,
18498 + -62, 11, 37, 35, 40, 44, 35, 43, -62, 35,
18499 + 49, 41, -62, 35, 41, -62, 41, -62, 50, 11,
18500 + 41, -62, 11, 41, -62, -62, -62, 11, -62, -62,
18501 + 18, -62, 19, -62, -62, -62
18502 };
18503
18504 -
18505 -#define YYLAST 66
18506 -
18507 -
18508 -static const short yytable[] = { 21,
18509 - 5, 13, 69, 1, 70, 6, 7, 25, 73, -15,
18510 - 8, 77, 40, 11, 26, 62, 41, 42, 64, 43,
18511 - 6, 7, 68, 50, 53, 8, 29, 12, 51, 54,
18512 - 33, 56, 20, 17, 30, 22, 18, 25, 36, 49,
18513 - 24, 85, 48, 32, 38, 57, 34, 37, 46, 72,
18514 - 47, 58, 76, 60, 61, 63, 65, 81, 71, 66,
18515 - 86, 79, 3, 19, 82, 83
18516 +/* YYPGOTO[NTERM-NUM]. */
18517 +static const yysigned_char yypgoto[] =
18518 +{
18519 + -62, -62, 38, -62, -62, -31, -62, -19, 46, -62,
18520 + -62, -62, -62, 3, -62, -62, -62, -62, -62, -16,
18521 + -62, -17, -62, -40, -61
18522 };
18523
18524 -static const short yycheck[] = { 17,
18525 - 5, 3, 62, 12, 64, 10, 11, 11, 68, 11,
18526 - 15, 71, 4, 11, 18, 54, 8, 9, 57, 11,
18527 - 10, 11, 61, 6, 6, 15, 26, 11, 11, 11,
18528 - 30, 49, 11, 14, 20, 13, 16, 11, 11, 7,
18529 - 17, 0, 11, 19, 14, 11, 21, 19, 15, 67,
18530 - 15, 22, 70, 16, 11, 16, 11, 75, 11, 21,
18531 - 0, 73, 1, 15, 78, 80
18532 +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
18533 + positive, shift that token. If negative, reduce the rule which
18534 + number is the opposite. If zero, do what YYDEFACT says.
18535 + If YYTABLE_NINF, syntax error. */
18536 +#define YYTABLE_NINF -17
18537 +static const yysigned_char yytable[] =
18538 +{
18539 + 23, 7, 15, 71, 1, 72, 8, 9, 27, 75,
18540 + -16, 10, 79, 42, 5, 28, 64, 43, 44, 66,
18541 + 45, 8, 9, 70, 52, 55, 10, 13, 14, 53,
18542 + 56, 31, 58, 22, 19, 35, 24, 20, 27, 4,
18543 + 38, 26, 50, 51, 81, 32, 40, 34, 59, 48,
18544 + 74, 36, 39, 78, 49, 63, 62, 60, 83, 65,
18545 + 67, 73, 68, 21, 84, 85
18546 };
18547 -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
18548 -#line 3 "/usr/lib/bison.simple"
18549 -/* This file comes from bison-1.28. */
18550
18551 -/* Skeleton output parser for bison,
18552 - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
18553 -
18554 - This program is free software; you can redistribute it and/or modify
18555 - it under the terms of the GNU General Public License as published by
18556 - the Free Software Foundation; either version 2, or (at your option)
18557 - any later version.
18558 -
18559 - This program is distributed in the hope that it will be useful,
18560 - but WITHOUT ANY WARRANTY; without even the implied warranty of
18561 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18562 - GNU General Public License for more details.
18563 -
18564 - You should have received a copy of the GNU General Public License
18565 - along with this program; if not, write to the Free Software
18566 - Foundation, Inc., 59 Temple Place - Suite 330,
18567 - Boston, MA 02111-1307, USA. */
18568 -
18569 -/* As a special exception, when this file is copied by Bison into a
18570 - Bison output file, you may use that output file without restriction.
18571 - This special exception was added by the Free Software Foundation
18572 - in version 1.24 of Bison. */
18573 +static const unsigned char yycheck[] =
18574 +{
18575 + 19, 5, 3, 64, 12, 66, 10, 11, 11, 70,
18576 + 11, 15, 73, 4, 0, 18, 56, 8, 9, 59,
18577 + 11, 10, 11, 63, 6, 6, 15, 11, 11, 11,
18578 + 11, 28, 51, 11, 14, 32, 13, 16, 11, 1,
18579 + 11, 17, 11, 7, 75, 20, 14, 19, 11, 15,
18580 + 69, 21, 19, 72, 15, 11, 16, 22, 77, 16,
18581 + 11, 11, 21, 17, 80, 82
18582 +};
18583
18584 -/* This is the parser code that is written into each bison parser
18585 - when the %semantic_parser declaration is not specified in the grammar.
18586 - It was written by Richard Stallman by simplifying the hairy parser
18587 - used when %semantic_parser is specified. */
18588 -
18589 -#ifndef YYSTACK_USE_ALLOCA
18590 -#ifdef alloca
18591 -#define YYSTACK_USE_ALLOCA
18592 -#else /* alloca not defined */
18593 -#ifdef __GNUC__
18594 -#define YYSTACK_USE_ALLOCA
18595 -#define alloca __builtin_alloca
18596 -#else /* not GNU C. */
18597 -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
18598 -#define YYSTACK_USE_ALLOCA
18599 -#include <alloca.h>
18600 -#else /* not sparc */
18601 -/* We think this test detects Watcom and Microsoft C. */
18602 -/* This used to test MSDOS, but that is a bad idea
18603 - since that symbol is in the user namespace. */
18604 -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
18605 -#if 0 /* No need for malloc.h, which pollutes the namespace;
18606 - instead, just don't use alloca. */
18607 -#include <malloc.h>
18608 -#endif
18609 -#else /* not MSDOS, or __TURBOC__ */
18610 -#if defined(_AIX)
18611 -/* I don't know what this was needed for, but it pollutes the namespace.
18612 - So I turned it off. rms, 2 May 1997. */
18613 -/* #include <malloc.h> */
18614 - #pragma alloca
18615 -#define YYSTACK_USE_ALLOCA
18616 -#else /* not MSDOS, or __TURBOC__, or _AIX */
18617 -#if 0
18618 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
18619 - and on HPUX 10. Eventually we can turn this on. */
18620 -#define YYSTACK_USE_ALLOCA
18621 -#define alloca __builtin_alloca
18622 -#endif /* __hpux */
18623 -#endif
18624 -#endif /* not _AIX */
18625 -#endif /* not MSDOS, or __TURBOC__ */
18626 -#endif /* not sparc */
18627 -#endif /* not GNU C */
18628 -#endif /* alloca not defined */
18629 -#endif /* YYSTACK_USE_ALLOCA not defined */
18630 +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
18631 + symbol of state STATE-NUM. */
18632 +static const unsigned char yystos[] =
18633 +{
18634 + 0, 12, 24, 25, 25, 0, 26, 5, 10, 11,
18635 + 15, 27, 30, 11, 11, 3, 31, 32, 33, 14,
18636 + 16, 31, 11, 30, 13, 41, 17, 11, 18, 34,
18637 + 36, 36, 20, 35, 19, 36, 21, 37, 11, 19,
18638 + 14, 38, 4, 8, 9, 11, 39, 40, 15, 15,
18639 + 11, 7, 6, 11, 42, 6, 11, 44, 30, 11,
18640 + 22, 46, 16, 11, 46, 16, 46, 11, 21, 47,
18641 + 46, 47, 47, 11, 30, 47, 28, 29, 30, 47,
18642 + 43, 28, 45, 30, 42, 44
18643 +};
18644
18645 -#ifdef YYSTACK_USE_ALLOCA
18646 -#define YYSTACK_ALLOC alloca
18647 -#else
18648 -#define YYSTACK_ALLOC malloc
18649 +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
18650 +# define YYSIZE_T __SIZE_TYPE__
18651 +#endif
18652 +#if ! defined (YYSIZE_T) && defined (size_t)
18653 +# define YYSIZE_T size_t
18654 +#endif
18655 +#if ! defined (YYSIZE_T)
18656 +# if defined (__STDC__) || defined (__cplusplus)
18657 +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
18658 +# define YYSIZE_T size_t
18659 +# endif
18660 +#endif
18661 +#if ! defined (YYSIZE_T)
18662 +# define YYSIZE_T unsigned int
18663 #endif
18664 -
18665 -/* Note: there must be only one dollar sign in this file.
18666 - It is replaced by the list of actions, each action
18667 - as one case of the switch. */
18668
18669 #define yyerrok (yyerrstatus = 0)
18670 #define yyclearin (yychar = YYEMPTY)
18671 -#define YYEMPTY -2
18672 +#define YYEMPTY (-2)
18673 #define YYEOF 0
18674 +
18675 #define YYACCEPT goto yyacceptlab
18676 -#define YYABORT goto yyabortlab
18677 -#define YYERROR goto yyerrlab1
18678 -/* Like YYERROR except do call yyerror.
18679 - This remains here temporarily to ease the
18680 - transition to the new meaning of YYERROR, for GCC.
18681 +#define YYABORT goto yyabortlab
18682 +#define YYERROR goto yyerrorlab
18683 +
18684 +
18685 +/* Like YYERROR except do call yyerror. This remains here temporarily
18686 + to ease the transition to the new meaning of YYERROR, for GCC.
18687 Once GCC version 2 has supplanted version 1, this can go. */
18688 +
18689 #define YYFAIL goto yyerrlab
18690 +
18691 #define YYRECOVERING() (!!yyerrstatus)
18692 -#define YYBACKUP(token, value) \
18693 +
18694 +#define YYBACKUP(Token, Value) \
18695 do \
18696 if (yychar == YYEMPTY && yylen == 1) \
18697 - { yychar = (token), yylval = (value); \
18698 - yychar1 = YYTRANSLATE (yychar); \
18699 + { \
18700 + yychar = (Token); \
18701 + yylval = (Value); \
18702 + yytoken = YYTRANSLATE (yychar); \
18703 YYPOPSTACK; \
18704 goto yybackup; \
18705 } \
18706 else \
18707 - { yyerror ("syntax error: cannot back up"); YYERROR; } \
18708 + { \
18709 + yyerror ("syntax error: cannot back up");\
18710 + YYERROR; \
18711 + } \
18712 while (0)
18713
18714 #define YYTERROR 1
18715 #define YYERRCODE 256
18716
18717 -#ifndef YYPURE
18718 -#define YYLEX yylex()
18719 -#endif
18720 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions
18721 + are run). */
18722
18723 -#ifdef YYPURE
18724 -#ifdef YYLSP_NEEDED
18725 -#ifdef YYLEX_PARAM
18726 -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
18727 -#else
18728 -#define YYLEX yylex(&yylval, &yylloc)
18729 +#ifndef YYLLOC_DEFAULT
18730 +# define YYLLOC_DEFAULT(Current, Rhs, N) \
18731 + ((Current).first_line = (Rhs)[1].first_line, \
18732 + (Current).first_column = (Rhs)[1].first_column, \
18733 + (Current).last_line = (Rhs)[N].last_line, \
18734 + (Current).last_column = (Rhs)[N].last_column)
18735 #endif
18736 -#else /* not YYLSP_NEEDED */
18737 +
18738 +/* YYLEX -- calling `yylex' with the right arguments. */
18739 +
18740 #ifdef YYLEX_PARAM
18741 -#define YYLEX yylex(&yylval, YYLEX_PARAM)
18742 +# define YYLEX yylex (YYLEX_PARAM)
18743 #else
18744 -#define YYLEX yylex(&yylval)
18745 -#endif
18746 -#endif /* not YYLSP_NEEDED */
18747 +# define YYLEX yylex ()
18748 #endif
18749
18750 -/* If nonreentrant, generate the variables here */
18751 +/* Enable debugging if requested. */
18752 +#if YYDEBUG
18753
18754 -#ifndef YYPURE
18755 +# ifndef YYFPRINTF
18756 +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
18757 +# define YYFPRINTF fprintf
18758 +# endif
18759 +
18760 +# define YYDPRINTF(Args) \
18761 +do { \
18762 + if (yydebug) \
18763 + YYFPRINTF Args; \
18764 +} while (0)
18765 +
18766 +# define YYDSYMPRINT(Args) \
18767 +do { \
18768 + if (yydebug) \
18769 + yysymprint Args; \
18770 +} while (0)
18771 +
18772 +# define YYDSYMPRINTF(Title, Token, Value, Location) \
18773 +do { \
18774 + if (yydebug) \
18775 + { \
18776 + YYFPRINTF (stderr, "%s ", Title); \
18777 + yysymprint (stderr, \
18778 + Token, Value); \
18779 + YYFPRINTF (stderr, "\n"); \
18780 + } \
18781 +} while (0)
18782
18783 -int yychar; /* the lookahead symbol */
18784 -YYSTYPE yylval; /* the semantic value of the */
18785 - /* lookahead symbol */
18786 +/*------------------------------------------------------------------.
18787 +| yy_stack_print -- Print the state stack from its BOTTOM up to its |
18788 +| TOP (included). |
18789 +`------------------------------------------------------------------*/
18790
18791 -#ifdef YYLSP_NEEDED
18792 -YYLTYPE yylloc; /* location data for the lookahead */
18793 - /* symbol */
18794 +#if defined (__STDC__) || defined (__cplusplus)
18795 +static void
18796 +yy_stack_print (short int *bottom, short int *top)
18797 +#else
18798 +static void
18799 +yy_stack_print (bottom, top)
18800 + short int *bottom;
18801 + short int *top;
18802 #endif
18803 +{
18804 + YYFPRINTF (stderr, "Stack now");
18805 + for (/* Nothing. */; bottom <= top; ++bottom)
18806 + YYFPRINTF (stderr, " %d", *bottom);
18807 + YYFPRINTF (stderr, "\n");
18808 +}
18809
18810 -int yynerrs; /* number of parse errors so far */
18811 -#endif /* not YYPURE */
18812 +# define YY_STACK_PRINT(Bottom, Top) \
18813 +do { \
18814 + if (yydebug) \
18815 + yy_stack_print ((Bottom), (Top)); \
18816 +} while (0)
18817
18818 -#if YYDEBUG != 0
18819 -int yydebug; /* nonzero means print parse trace */
18820 -/* Since this is uninitialized, it does not stop multiple parsers
18821 - from coexisting. */
18822 +
18823 +/*------------------------------------------------.
18824 +| Report that the YYRULE is going to be reduced. |
18825 +`------------------------------------------------*/
18826 +
18827 +#if defined (__STDC__) || defined (__cplusplus)
18828 +static void
18829 +yy_reduce_print (int yyrule)
18830 +#else
18831 +static void
18832 +yy_reduce_print (yyrule)
18833 + int yyrule;
18834 #endif
18835 +{
18836 + int yyi;
18837 + unsigned int yylno = yyrline[yyrule];
18838 + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
18839 + yyrule - 1, yylno);
18840 + /* Print the symbols being reduced, and their result. */
18841 + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
18842 + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
18843 + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
18844 +}
18845
18846 -/* YYINITDEPTH indicates the initial size of the parser's stacks */
18847 +# define YY_REDUCE_PRINT(Rule) \
18848 +do { \
18849 + if (yydebug) \
18850 + yy_reduce_print (Rule); \
18851 +} while (0)
18852 +
18853 +/* Nonzero means print parse trace. It is left uninitialized so that
18854 + multiple parsers can coexist. */
18855 +int yydebug;
18856 +#else /* !YYDEBUG */
18857 +# define YYDPRINTF(Args)
18858 +# define YYDSYMPRINT(Args)
18859 +# define YYDSYMPRINTF(Title, Token, Value, Location)
18860 +# define YY_STACK_PRINT(Bottom, Top)
18861 +# define YY_REDUCE_PRINT(Rule)
18862 +#endif /* !YYDEBUG */
18863
18864 +
18865 +/* YYINITDEPTH -- initial size of the parser's stacks. */
18866 #ifndef YYINITDEPTH
18867 -#define YYINITDEPTH 200
18868 +# define YYINITDEPTH 200
18869 #endif
18870
18871 -/* YYMAXDEPTH is the maximum size the stacks can grow to
18872 - (effective only if the built-in stack extension method is used). */
18873 +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
18874 + if the built-in stack extension method is used).
18875 +
18876 + Do not make this value too large; the results are undefined if
18877 + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
18878 + evaluated with infinite-precision integer arithmetic. */
18879
18880 -#if YYMAXDEPTH == 0
18881 -#undef YYMAXDEPTH
18882 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
18883 +# undef YYMAXDEPTH
18884 #endif
18885
18886 #ifndef YYMAXDEPTH
18887 -#define YYMAXDEPTH 10000
18888 +# define YYMAXDEPTH 10000
18889 #endif
18890 +
18891 \f
18892 -/* Define __yy_memcpy. Note that the size argument
18893 - should be passed with type unsigned int, because that is what the non-GCC
18894 - definitions require. With GCC, __builtin_memcpy takes an arg
18895 - of type size_t, but it can handle unsigned int. */
18896 -
18897 -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
18898 -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
18899 -#else /* not GNU C or C++ */
18900 -#ifndef __cplusplus
18901
18902 -/* This is the most reliable way to avoid incompatibilities
18903 - in available built-in functions on various systems. */
18904 -static void
18905 -__yy_memcpy (to, from, count)
18906 - char *to;
18907 - char *from;
18908 - unsigned int count;
18909 -{
18910 - register char *f = from;
18911 - register char *t = to;
18912 - register int i = count;
18913 +#if YYERROR_VERBOSE
18914 +
18915 +# ifndef yystrlen
18916 +# if defined (__GLIBC__) && defined (_STRING_H)
18917 +# define yystrlen strlen
18918 +# else
18919 +/* Return the length of YYSTR. */
18920 +static YYSIZE_T
18921 +# if defined (__STDC__) || defined (__cplusplus)
18922 +yystrlen (const char *yystr)
18923 +# else
18924 +yystrlen (yystr)
18925 + const char *yystr;
18926 +# endif
18927 +{
18928 + register const char *yys = yystr;
18929 +
18930 + while (*yys++ != '\0')
18931 + continue;
18932
18933 - while (i-- > 0)
18934 - *t++ = *f++;
18935 + return yys - yystr - 1;
18936 }
18937 +# endif
18938 +# endif
18939
18940 -#else /* __cplusplus */
18941 +# ifndef yystpcpy
18942 +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
18943 +# define yystpcpy stpcpy
18944 +# else
18945 +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
18946 + YYDEST. */
18947 +static char *
18948 +# if defined (__STDC__) || defined (__cplusplus)
18949 +yystpcpy (char *yydest, const char *yysrc)
18950 +# else
18951 +yystpcpy (yydest, yysrc)
18952 + char *yydest;
18953 + const char *yysrc;
18954 +# endif
18955 +{
18956 + register char *yyd = yydest;
18957 + register const char *yys = yysrc;
18958 +
18959 + while ((*yyd++ = *yys++) != '\0')
18960 + continue;
18961 +
18962 + return yyd - 1;
18963 +}
18964 +# endif
18965 +# endif
18966 +
18967 +#endif /* !YYERROR_VERBOSE */
18968 +
18969 +\f
18970 +
18971 +#if YYDEBUG
18972 +/*--------------------------------.
18973 +| Print this symbol on YYOUTPUT. |
18974 +`--------------------------------*/
18975
18976 -/* This is the most reliable way to avoid incompatibilities
18977 - in available built-in functions on various systems. */
18978 +#if defined (__STDC__) || defined (__cplusplus)
18979 static void
18980 -__yy_memcpy (char *to, char *from, unsigned int count)
18981 +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
18982 +#else
18983 +static void
18984 +yysymprint (yyoutput, yytype, yyvaluep)
18985 + FILE *yyoutput;
18986 + int yytype;
18987 + YYSTYPE *yyvaluep;
18988 +#endif
18989 {
18990 - register char *t = to;
18991 - register char *f = from;
18992 - register int i = count;
18993 + /* Pacify ``unused variable'' warnings. */
18994 + (void) yyvaluep;
18995 +
18996 + if (yytype < YYNTOKENS)
18997 + {
18998 + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
18999 +# ifdef YYPRINT
19000 + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
19001 +# endif
19002 + }
19003 + else
19004 + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
19005
19006 - while (i-- > 0)
19007 - *t++ = *f++;
19008 + switch (yytype)
19009 + {
19010 + default:
19011 + break;
19012 + }
19013 + YYFPRINTF (yyoutput, ")");
19014 }
19015
19016 +#endif /* ! YYDEBUG */
19017 +/*-----------------------------------------------.
19018 +| Release the memory associated to this symbol. |
19019 +`-----------------------------------------------*/
19020 +
19021 +#if defined (__STDC__) || defined (__cplusplus)
19022 +static void
19023 +yydestruct (int yytype, YYSTYPE *yyvaluep)
19024 +#else
19025 +static void
19026 +yydestruct (yytype, yyvaluep)
19027 + int yytype;
19028 + YYSTYPE *yyvaluep;
19029 #endif
19030 -#endif
19031 +{
19032 + /* Pacify ``unused variable'' warnings. */
19033 + (void) yyvaluep;
19034 +
19035 + switch (yytype)
19036 + {
19037 +
19038 + default:
19039 + break;
19040 + }
19041 +}
19042 \f
19043 -#line 217 "/usr/lib/bison.simple"
19044
19045 -/* The user can define YYPARSE_PARAM as the name of an argument to be passed
19046 - into yyparse. The argument should have type void *.
19047 - It should actually point to an object.
19048 - Grammar actions can access the variable by casting it
19049 - to the proper pointer type. */
19050 +/* Prevent warnings from -Wmissing-prototypes. */
19051
19052 #ifdef YYPARSE_PARAM
19053 -#ifdef __cplusplus
19054 -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
19055 -#define YYPARSE_PARAM_DECL
19056 -#else /* not __cplusplus */
19057 -#define YYPARSE_PARAM_ARG YYPARSE_PARAM
19058 -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
19059 -#endif /* not __cplusplus */
19060 -#else /* not YYPARSE_PARAM */
19061 -#define YYPARSE_PARAM_ARG
19062 -#define YYPARSE_PARAM_DECL
19063 -#endif /* not YYPARSE_PARAM */
19064 +# if defined (__STDC__) || defined (__cplusplus)
19065 +int yyparse (void *YYPARSE_PARAM);
19066 +# else
19067 +int yyparse ();
19068 +# endif
19069 +#else /* ! YYPARSE_PARAM */
19070 +#if defined (__STDC__) || defined (__cplusplus)
19071 +int yyparse (void);
19072 +#else
19073 +int yyparse ();
19074 +#endif
19075 +#endif /* ! YYPARSE_PARAM */
19076 +
19077 +
19078 +
19079 +/* The lookahead symbol. */
19080 +int yychar;
19081 +
19082 +/* The semantic value of the lookahead symbol. */
19083 +YYSTYPE yylval;
19084 +
19085 +/* Number of syntax errors so far. */
19086 +int yynerrs;
19087 +
19088 +
19089 +
19090 +/*----------.
19091 +| yyparse. |
19092 +`----------*/
19093
19094 -/* Prevent warning if -Wstrict-prototypes. */
19095 -#ifdef __GNUC__
19096 #ifdef YYPARSE_PARAM
19097 -int yyparse (void *);
19098 +# if defined (__STDC__) || defined (__cplusplus)
19099 +int yyparse (void *YYPARSE_PARAM)
19100 +# else
19101 +int yyparse (YYPARSE_PARAM)
19102 + void *YYPARSE_PARAM;
19103 +# endif
19104 +#else /* ! YYPARSE_PARAM */
19105 +#if defined (__STDC__) || defined (__cplusplus)
19106 +int
19107 +yyparse (void)
19108 #else
19109 -int yyparse (void);
19110 +int
19111 +yyparse ()
19112 +
19113 #endif
19114 #endif
19115 -
19116 -int
19117 -yyparse(YYPARSE_PARAM_ARG)
19118 - YYPARSE_PARAM_DECL
19119 {
19120 +
19121 register int yystate;
19122 register int yyn;
19123 - register short *yyssp;
19124 + int yyresult;
19125 + /* Number of tokens to shift before error messages enabled. */
19126 + int yyerrstatus;
19127 + /* Lookahead token as an internal (translated) token number. */
19128 + int yytoken = 0;
19129 +
19130 + /* Three stacks and their tools:
19131 + `yyss': related to states,
19132 + `yyvs': related to semantic values,
19133 + `yyls': related to locations.
19134 +
19135 + Refer to the stacks thru separate pointers, to allow yyoverflow
19136 + to reallocate them elsewhere. */
19137 +
19138 + /* The state stack. */
19139 + short int yyssa[YYINITDEPTH];
19140 + short int *yyss = yyssa;
19141 + register short int *yyssp;
19142 +
19143 + /* The semantic value stack. */
19144 + YYSTYPE yyvsa[YYINITDEPTH];
19145 + YYSTYPE *yyvs = yyvsa;
19146 register YYSTYPE *yyvsp;
19147 - int yyerrstatus; /* number of tokens to shift before error messages enabled */
19148 - int yychar1 = 0; /* lookahead token as an internal (translated) token number */
19149
19150 - short yyssa[YYINITDEPTH]; /* the state stack */
19151 - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */
19152
19153 - short *yyss = yyssa; /* refer to the stacks thru separate pointers */
19154 - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */
19155
19156 -#ifdef YYLSP_NEEDED
19157 - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */
19158 - YYLTYPE *yyls = yylsa;
19159 - YYLTYPE *yylsp;
19160 -
19161 -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
19162 -#else
19163 #define YYPOPSTACK (yyvsp--, yyssp--)
19164 -#endif
19165
19166 - int yystacksize = YYINITDEPTH;
19167 - int yyfree_stacks = 0;
19168 + YYSIZE_T yystacksize = YYINITDEPTH;
19169
19170 -#ifdef YYPURE
19171 - int yychar;
19172 - YYSTYPE yylval;
19173 - int yynerrs;
19174 -#ifdef YYLSP_NEEDED
19175 - YYLTYPE yylloc;
19176 -#endif
19177 -#endif
19178 + /* The variables used to return semantic value and location from the
19179 + action routines. */
19180 + YYSTYPE yyval;
19181
19182 - YYSTYPE yyval; /* the variable used to return */
19183 - /* semantic values from the action */
19184 - /* routines */
19185
19186 + /* When reducing, the number of symbols on the RHS of the reduced
19187 + rule. */
19188 int yylen;
19189
19190 -#if YYDEBUG != 0
19191 - if (yydebug)
19192 - fprintf(stderr, "Starting parse\n");
19193 -#endif
19194 + YYDPRINTF ((stderr, "Starting parse\n"));
19195
19196 yystate = 0;
19197 yyerrstatus = 0;
19198 @@ -639,110 +1015,97 @@
19199 so that they stay on the same level as the state stack.
19200 The wasted elements are never initialized. */
19201
19202 - yyssp = yyss - 1;
19203 + yyssp = yyss;
19204 yyvsp = yyvs;
19205 -#ifdef YYLSP_NEEDED
19206 - yylsp = yyls;
19207 -#endif
19208
19209 -/* Push a new state, which is found in yystate . */
19210 -/* In all cases, when you get here, the value and location stacks
19211 - have just been pushed. so pushing a state here evens the stacks. */
19212 -yynewstate:
19213
19214 - *++yyssp = yystate;
19215 + goto yysetstate;
19216
19217 - if (yyssp >= yyss + yystacksize - 1)
19218 - {
19219 - /* Give user a chance to reallocate the stack */
19220 - /* Use copies of these so that the &'s don't force the real ones into memory. */
19221 - YYSTYPE *yyvs1 = yyvs;
19222 - short *yyss1 = yyss;
19223 -#ifdef YYLSP_NEEDED
19224 - YYLTYPE *yyls1 = yyls;
19225 -#endif
19226 +/*------------------------------------------------------------.
19227 +| yynewstate -- Push a new state, which is found in yystate. |
19228 +`------------------------------------------------------------*/
19229 + yynewstate:
19230 + /* In all cases, when you get here, the value and location stacks
19231 + have just been pushed. so pushing a state here evens the stacks.
19232 + */
19233 + yyssp++;
19234
19235 + yysetstate:
19236 + *yyssp = yystate;
19237 +
19238 + if (yyss + yystacksize - 1 <= yyssp)
19239 + {
19240 /* Get the current used size of the three stacks, in elements. */
19241 - int size = yyssp - yyss + 1;
19242 + YYSIZE_T yysize = yyssp - yyss + 1;
19243
19244 #ifdef yyoverflow
19245 - /* Each stack pointer address is followed by the size of
19246 - the data in use in that stack, in bytes. */
19247 -#ifdef YYLSP_NEEDED
19248 - /* This used to be a conditional around just the two extra args,
19249 - but that might be undefined if yyoverflow is a macro. */
19250 - yyoverflow("parser stack overflow",
19251 - &yyss1, size * sizeof (*yyssp),
19252 - &yyvs1, size * sizeof (*yyvsp),
19253 - &yyls1, size * sizeof (*yylsp),
19254 - &yystacksize);
19255 -#else
19256 - yyoverflow("parser stack overflow",
19257 - &yyss1, size * sizeof (*yyssp),
19258 - &yyvs1, size * sizeof (*yyvsp),
19259 - &yystacksize);
19260 -#endif
19261 -
19262 - yyss = yyss1; yyvs = yyvs1;
19263 -#ifdef YYLSP_NEEDED
19264 - yyls = yyls1;
19265 -#endif
19266 + {
19267 + /* Give user a chance to reallocate the stack. Use copies of
19268 + these so that the &'s don't force the real ones into
19269 + memory. */
19270 + YYSTYPE *yyvs1 = yyvs;
19271 + short int *yyss1 = yyss;
19272 +
19273 +
19274 + /* Each stack pointer address is followed by the size of the
19275 + data in use in that stack, in bytes. This used to be a
19276 + conditional around just the two extra args, but that might
19277 + be undefined if yyoverflow is a macro. */
19278 + yyoverflow ("parser stack overflow",
19279 + &yyss1, yysize * sizeof (*yyssp),
19280 + &yyvs1, yysize * sizeof (*yyvsp),
19281 +
19282 + &yystacksize);
19283 +
19284 + yyss = yyss1;
19285 + yyvs = yyvs1;
19286 + }
19287 #else /* no yyoverflow */
19288 +# ifndef YYSTACK_RELOCATE
19289 + goto yyoverflowlab;
19290 +# else
19291 /* Extend the stack our own way. */
19292 - if (yystacksize >= YYMAXDEPTH)
19293 - {
19294 - yyerror("parser stack overflow");
19295 - if (yyfree_stacks)
19296 - {
19297 - free (yyss);
19298 - free (yyvs);
19299 -#ifdef YYLSP_NEEDED
19300 - free (yyls);
19301 -#endif
19302 - }
19303 - return 2;
19304 - }
19305 + if (YYMAXDEPTH <= yystacksize)
19306 + goto yyoverflowlab;
19307 yystacksize *= 2;
19308 - if (yystacksize > YYMAXDEPTH)
19309 + if (YYMAXDEPTH < yystacksize)
19310 yystacksize = YYMAXDEPTH;
19311 -#ifndef YYSTACK_USE_ALLOCA
19312 - yyfree_stacks = 1;
19313 -#endif
19314 - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
19315 - __yy_memcpy ((char *)yyss, (char *)yyss1,
19316 - size * (unsigned int) sizeof (*yyssp));
19317 - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
19318 - __yy_memcpy ((char *)yyvs, (char *)yyvs1,
19319 - size * (unsigned int) sizeof (*yyvsp));
19320 -#ifdef YYLSP_NEEDED
19321 - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
19322 - __yy_memcpy ((char *)yyls, (char *)yyls1,
19323 - size * (unsigned int) sizeof (*yylsp));
19324 -#endif
19325 +
19326 + {
19327 + short int *yyss1 = yyss;
19328 + union yyalloc *yyptr =
19329 + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
19330 + if (! yyptr)
19331 + goto yyoverflowlab;
19332 + YYSTACK_RELOCATE (yyss);
19333 + YYSTACK_RELOCATE (yyvs);
19334 +
19335 +# undef YYSTACK_RELOCATE
19336 + if (yyss1 != yyssa)
19337 + YYSTACK_FREE (yyss1);
19338 + }
19339 +# endif
19340 #endif /* no yyoverflow */
19341
19342 - yyssp = yyss + size - 1;
19343 - yyvsp = yyvs + size - 1;
19344 -#ifdef YYLSP_NEEDED
19345 - yylsp = yyls + size - 1;
19346 -#endif
19347 + yyssp = yyss + yysize - 1;
19348 + yyvsp = yyvs + yysize - 1;
19349
19350 -#if YYDEBUG != 0
19351 - if (yydebug)
19352 - fprintf(stderr, "Stack size increased to %d\n", yystacksize);
19353 -#endif
19354
19355 - if (yyssp >= yyss + yystacksize - 1)
19356 + YYDPRINTF ((stderr, "Stack size increased to %lu\n",
19357 + (unsigned long int) yystacksize));
19358 +
19359 + if (yyss + yystacksize - 1 <= yyssp)
19360 YYABORT;
19361 }
19362
19363 -#if YYDEBUG != 0
19364 - if (yydebug)
19365 - fprintf(stderr, "Entering state %d\n", yystate);
19366 -#endif
19367 + YYDPRINTF ((stderr, "Entering state %d\n", yystate));
19368
19369 goto yybackup;
19370 - yybackup:
19371 +
19372 +/*-----------.
19373 +| yybackup. |
19374 +`-----------*/
19375 +yybackup:
19376
19377 /* Do appropriate processing given the current state. */
19378 /* Read a lookahead token if we need one and don't already have one. */
19379 @@ -751,154 +1114,120 @@
19380 /* First try to decide what to do without reference to lookahead token. */
19381
19382 yyn = yypact[yystate];
19383 - if (yyn == YYFLAG)
19384 + if (yyn == YYPACT_NINF)
19385 goto yydefault;
19386
19387 /* Not known => get a lookahead token if don't already have one. */
19388
19389 - /* yychar is either YYEMPTY or YYEOF
19390 - or a valid token in external form. */
19391 -
19392 + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
19393 if (yychar == YYEMPTY)
19394 {
19395 -#if YYDEBUG != 0
19396 - if (yydebug)
19397 - fprintf(stderr, "Reading a token: ");
19398 -#endif
19399 + YYDPRINTF ((stderr, "Reading a token: "));
19400 yychar = YYLEX;
19401 }
19402
19403 - /* Convert token to internal form (in yychar1) for indexing tables with */
19404 -
19405 - if (yychar <= 0) /* This means end of input. */
19406 + if (yychar <= YYEOF)
19407 {
19408 - yychar1 = 0;
19409 - yychar = YYEOF; /* Don't call YYLEX any more */
19410 -
19411 -#if YYDEBUG != 0
19412 - if (yydebug)
19413 - fprintf(stderr, "Now at end of input.\n");
19414 -#endif
19415 + yychar = yytoken = YYEOF;
19416 + YYDPRINTF ((stderr, "Now at end of input.\n"));
19417 }
19418 else
19419 {
19420 - yychar1 = YYTRANSLATE(yychar);
19421 -
19422 -#if YYDEBUG != 0
19423 - if (yydebug)
19424 - {
19425 - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
19426 - /* Give the individual parser a way to print the precise meaning
19427 - of a token, for further debugging info. */
19428 -#ifdef YYPRINT
19429 - YYPRINT (stderr, yychar, yylval);
19430 -#endif
19431 - fprintf (stderr, ")\n");
19432 - }
19433 -#endif
19434 + yytoken = YYTRANSLATE (yychar);
19435 + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
19436 }
19437
19438 - yyn += yychar1;
19439 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
19440 + /* If the proper action on seeing token YYTOKEN is to reduce or to
19441 + detect an error, take that action. */
19442 + yyn += yytoken;
19443 + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
19444 goto yydefault;
19445 -
19446 yyn = yytable[yyn];
19447 -
19448 - /* yyn is what to do for this token type in this state.
19449 - Negative => reduce, -yyn is rule number.
19450 - Positive => shift, yyn is new state.
19451 - New state is final state => don't bother to shift,
19452 - just return success.
19453 - 0, or most negative number => error. */
19454 -
19455 - if (yyn < 0)
19456 + if (yyn <= 0)
19457 {
19458 - if (yyn == YYFLAG)
19459 + if (yyn == 0 || yyn == YYTABLE_NINF)
19460 goto yyerrlab;
19461 yyn = -yyn;
19462 goto yyreduce;
19463 }
19464 - else if (yyn == 0)
19465 - goto yyerrlab;
19466
19467 if (yyn == YYFINAL)
19468 YYACCEPT;
19469
19470 /* Shift the lookahead token. */
19471 -
19472 -#if YYDEBUG != 0
19473 - if (yydebug)
19474 - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
19475 -#endif
19476 + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
19477
19478 /* Discard the token being shifted unless it is eof. */
19479 if (yychar != YYEOF)
19480 yychar = YYEMPTY;
19481
19482 *++yyvsp = yylval;
19483 -#ifdef YYLSP_NEEDED
19484 - *++yylsp = yylloc;
19485 -#endif
19486
19487 - /* count tokens shifted since error; after three, turn off error status. */
19488 - if (yyerrstatus) yyerrstatus--;
19489 +
19490 + /* Count tokens shifted since error; after three, turn off error
19491 + status. */
19492 + if (yyerrstatus)
19493 + yyerrstatus--;
19494
19495 yystate = yyn;
19496 goto yynewstate;
19497
19498 -/* Do the default action for the current state. */
19499 -yydefault:
19500
19501 +/*-----------------------------------------------------------.
19502 +| yydefault -- do the default action for the current state. |
19503 +`-----------------------------------------------------------*/
19504 +yydefault:
19505 yyn = yydefact[yystate];
19506 if (yyn == 0)
19507 goto yyerrlab;
19508 + goto yyreduce;
19509
19510 -/* Do a reduction. yyn is the number of a rule to reduce with. */
19511 +
19512 +/*-----------------------------.
19513 +| yyreduce -- Do a reduction. |
19514 +`-----------------------------*/
19515 yyreduce:
19516 + /* yyn is the number of a rule to reduce with. */
19517 yylen = yyr2[yyn];
19518 - if (yylen > 0)
19519 - yyval = yyvsp[1-yylen]; /* implement default value of the action */
19520
19521 -#if YYDEBUG != 0
19522 - if (yydebug)
19523 - {
19524 - int i;
19525 + /* If YYLEN is nonzero, implement the default value of the action:
19526 + `$$ = $1'.
19527
19528 - fprintf (stderr, "Reducing via rule %d (line %d), ",
19529 - yyn, yyrline[yyn]);
19530 + Otherwise, the following line sets YYVAL to garbage.
19531 + This behavior is undocumented and Bison
19532 + users should not rely upon it. Assigning to YYVAL
19533 + unconditionally makes the parser a bit smaller, and it avoids a
19534 + GCC warning that YYVAL may be used uninitialized. */
19535 + yyval = yyvsp[1-yylen];
19536
19537 - /* Print the symbols being reduced, and their result. */
19538 - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
19539 - fprintf (stderr, "%s ", yytname[yyrhs[i]]);
19540 - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
19541 - }
19542 -#endif
19543
19544 -
19545 - switch (yyn) {
19546 -
19547 -case 1:
19548 -#line 165 "ql_y.y"
19549 -{
19550 + YY_REDUCE_PRINT (yyn);
19551 + switch (yyn)
19552 + {
19553 + case 2:
19554 +#line 168 "ql_y.y"
19555 + {
19556 STRUCTURE *walk;
19557
19558 def = yyvsp[0].field;
19559 for (walk = structures; walk; walk = walk->next)
19560 if (!walk->instances)
19561 fprintf(stderr,"unused structure: %s\n",walk->id);
19562 - ;
19563 - break;}
19564 -case 3:
19565 -#line 177 "ql_y.y"
19566 -{
19567 + }
19568 + break;
19569 +
19570 + case 4:
19571 +#line 180 "ql_y.y"
19572 + {
19573 to_c("#%s\n",yyvsp[-1].str);
19574 to_test("#%s\n",yyvsp[-1].str);
19575 if (dump) to_dump("#%s\n",yyvsp[-1].str);
19576 - ;
19577 - break;}
19578 -case 6:
19579 -#line 190 "ql_y.y"
19580 -{
19581 + }
19582 + break;
19583 +
19584 + case 7:
19585 +#line 193 "ql_y.y"
19586 + {
19587 STRUCTURE *n;
19588
19589 n = alloc_t(STRUCTURE);
19590 @@ -907,23 +1236,26 @@
19591 n->instances = 0;
19592 n->next = structures;
19593 structures = n;
19594 - ;
19595 - break;}
19596 -case 7:
19597 -#line 203 "ql_y.y"
19598 -{
19599 + }
19600 + break;
19601 +
19602 + case 8:
19603 +#line 206 "ql_y.y"
19604 + {
19605 abort_id = NULL;
19606 - ;
19607 - break;}
19608 -case 8:
19609 -#line 207 "ql_y.y"
19610 -{
19611 + }
19612 + break;
19613 +
19614 + case 9:
19615 +#line 210 "ql_y.y"
19616 + {
19617 yyval.field = yyvsp[0].field;
19618 - ;
19619 - break;}
19620 -case 9:
19621 -#line 214 "ql_y.y"
19622 -{
19623 + }
19624 + break;
19625 +
19626 + case 10:
19627 +#line 217 "ql_y.y"
19628 + {
19629 STRUCTURE *walk;
19630
19631 for (walk = structures; walk; walk = walk->next)
19632 @@ -939,38 +1271,43 @@
19633 yyval.field->my_block = copy_block(walk->block);
19634 yyval.field->next = NULL;
19635 abort_id = NULL;
19636 - ;
19637 - break;}
19638 -case 10:
19639 -#line 232 "ql_y.y"
19640 -{
19641 + }
19642 + break;
19643 +
19644 + case 11:
19645 +#line 235 "ql_y.y"
19646 + {
19647 yyval.field = yyvsp[-1].field;
19648 abort_id = NULL;
19649 - ;
19650 - break;}
19651 -case 11:
19652 -#line 237 "ql_y.y"
19653 -{
19654 + }
19655 + break;
19656 +
19657 + case 12:
19658 +#line 240 "ql_y.y"
19659 + {
19660 yyval.field = NULL;
19661 abort_id = yyvsp[0].str;
19662 - ;
19663 - break;}
19664 -case 12:
19665 -#line 244 "ql_y.y"
19666 -{
19667 + }
19668 + break;
19669 +
19670 + case 13:
19671 +#line 247 "ql_y.y"
19672 + {
19673 yyval.field = NULL;
19674 - ;
19675 - break;}
19676 -case 13:
19677 -#line 248 "ql_y.y"
19678 -{
19679 + }
19680 + break;
19681 +
19682 + case 14:
19683 +#line 251 "ql_y.y"
19684 + {
19685 yyval.field = yyvsp[-1].field;
19686 yyvsp[-1].field->next = yyvsp[0].field;
19687 - ;
19688 - break;}
19689 -case 14:
19690 -#line 256 "ql_y.y"
19691 -{
19692 + }
19693 + break;
19694 +
19695 + case 15:
19696 +#line 259 "ql_y.y"
19697 + {
19698 TAG *walk;
19699
19700 yyval.field = yyvsp[0].field;
19701 @@ -989,23 +1326,26 @@
19702 "selections");
19703 if (*yyval.field->id != '_' && yyval.field->value && yyval.field->value->type == vt_multi)
19704 yyerror("multi selectors must be unnamed");
19705 - ;
19706 - break;}
19707 -case 15:
19708 -#line 279 "ql_y.y"
19709 -{
19710 + }
19711 + break;
19712 +
19713 + case 16:
19714 +#line 282 "ql_y.y"
19715 + {
19716 yyval.num = 0;
19717 - ;
19718 - break;}
19719 -case 16:
19720 -#line 283 "ql_y.y"
19721 -{
19722 + }
19723 + break;
19724 +
19725 + case 17:
19726 +#line 286 "ql_y.y"
19727 + {
19728 yyval.num = 1;
19729 - ;
19730 - break;}
19731 -case 17:
19732 -#line 290 "ql_y.y"
19733 -{
19734 + }
19735 + break;
19736 +
19737 + case 18:
19738 +#line 293 "ql_y.y"
19739 + {
19740 yyval.field = alloc_t(FIELD);
19741 yyval.field->size = yyvsp[-1].num;
19742 yyval.field->var_len = -2; /* hack */
19743 @@ -1015,140 +1355,159 @@
19744 yyval.field->value = NULL;
19745 yyval.field->structure = NULL;
19746 yyval.field->next = NULL;
19747 - ;
19748 - break;}
19749 -case 18:
19750 -#line 302 "ql_y.y"
19751 -{
19752 + }
19753 + break;
19754 +
19755 + case 19:
19756 +#line 305 "ql_y.y"
19757 + {
19758 yyval.field = alloc_t(FIELD);
19759 yyval.field->size = yyvsp[-4].num;
19760 yyval.field->var_len = -1;
19761 yyval.field->pos = yyvsp[-3].num;
19762 yyval.field->flush = !yyvsp[-2].num;
19763 - if (yyval.field->pos == -1)
19764 + if (yyval.field->pos == -1) {
19765 if (yyval.field->size & 7)
19766 yyerror("position required for small fields");
19767 else yyval.field->pos = 0;
19768 + }
19769 yyval.field->value = yyvsp[0].value;
19770 yyval.field->structure = NULL;
19771 yyval.field->next = NULL;
19772 - ;
19773 - break;}
19774 -case 19:
19775 -#line 319 "ql_y.y"
19776 -{
19777 - yyval.num = -1;
19778 - ;
19779 - break;}
19780 -case 20:
19781 + }
19782 + break;
19783 +
19784 + case 20:
19785 #line 323 "ql_y.y"
19786 -{
19787 + {
19788 + yyval.num = -1;
19789 + }
19790 + break;
19791 +
19792 + case 21:
19793 +#line 327 "ql_y.y"
19794 + {
19795 yyval.num = yyvsp[0].num-1;
19796 if (yyval.num < 0 || yyval.num > 7) yyerror("invalid position");
19797 - ;
19798 - break;}
19799 -case 21:
19800 -#line 331 "ql_y.y"
19801 -{
19802 + }
19803 + break;
19804 +
19805 + case 22:
19806 +#line 335 "ql_y.y"
19807 + {
19808 char *end;
19809
19810 yyval.num = strtoul(yyvsp[0].str,&end,10);
19811 if (*end) yyerror("no a decimal number");
19812 - ;
19813 - break;}
19814 -case 22:
19815 -#line 340 "ql_y.y"
19816 -{
19817 - yyval.num = 0;
19818 - ;
19819 - break;}
19820 -case 23:
19821 + }
19822 + break;
19823 +
19824 + case 23:
19825 #line 344 "ql_y.y"
19826 -{
19827 + {
19828 + yyval.num = 0;
19829 + }
19830 + break;
19831 +
19832 + case 24:
19833 +#line 348 "ql_y.y"
19834 + {
19835 if (strcmp(yyvsp[0].str,"more")) yyerror("\"more\" expected");
19836 yyval.num = 1;
19837 - ;
19838 - break;}
19839 -case 24:
19840 -#line 351 "ql_y.y"
19841 -{
19842 - yyval.value = NULL;
19843 - ;
19844 - break;}
19845 -case 25:
19846 + }
19847 + break;
19848 +
19849 + case 25:
19850 #line 355 "ql_y.y"
19851 -{
19852 + {
19853 + yyval.value = NULL;
19854 + }
19855 + break;
19856 +
19857 + case 26:
19858 +#line 359 "ql_y.y"
19859 + {
19860 yyval.value = yyvsp[0].value;
19861 - ;
19862 - break;}
19863 -case 26:
19864 -#line 362 "ql_y.y"
19865 -{
19866 + }
19867 + break;
19868 +
19869 + case 27:
19870 +#line 366 "ql_y.y"
19871 + {
19872 yyval.value = alloc_t(VALUE);
19873 yyval.value->type = vt_id;
19874 yyval.value->id = yyvsp[0].str;
19875 - ;
19876 - break;}
19877 -case 27:
19878 -#line 368 "ql_y.y"
19879 -{
19880 + }
19881 + break;
19882 +
19883 + case 28:
19884 +#line 372 "ql_y.y"
19885 + {
19886 yyval.value = alloc_t(VALUE);
19887 yyval.value->type = vt_case;
19888 yyval.value->id = NULL;
19889 yyval.value->tags = yyvsp[-1].tag;
19890 - ;
19891 - break;}
19892 -case 28:
19893 -#line 375 "ql_y.y"
19894 -{
19895 + }
19896 + break;
19897 +
19898 + case 29:
19899 +#line 379 "ql_y.y"
19900 + {
19901 yyval.value = alloc_t(VALUE);
19902 yyval.value->type = vt_multi;
19903 yyval.value->tags = yyvsp[-1].tag;
19904 - ;
19905 - break;}
19906 -case 29:
19907 -#line 381 "ql_y.y"
19908 -{
19909 + }
19910 + break;
19911 +
19912 + case 30:
19913 +#line 385 "ql_y.y"
19914 + {
19915 yyval.value = alloc_t(VALUE);
19916 yyval.value->type = vt_length;
19917 yyval.value->recovery = yyvsp[-2].str;
19918 yyval.value->block = yyvsp[0].field;
19919 yyval.value->abort_id = abort_id;
19920 - ;
19921 - break;}
19922 -case 30:
19923 -#line 391 "ql_y.y"
19924 -{
19925 - yyval.str = NULL;
19926 - ;
19927 - break;}
19928 -case 31:
19929 + }
19930 + break;
19931 +
19932 + case 31:
19933 #line 395 "ql_y.y"
19934 -{
19935 + {
19936 + yyval.str = NULL;
19937 + }
19938 + break;
19939 +
19940 + case 32:
19941 +#line 399 "ql_y.y"
19942 + {
19943 yyval.str = yyvsp[0].str;
19944 - ;
19945 - break;}
19946 -case 32:
19947 -#line 401 "ql_y.y"
19948 -{
19949 - yyval.nlist = NULL;
19950 - ;
19951 - break;}
19952 -case 33:
19953 + }
19954 + break;
19955 +
19956 + case 33:
19957 #line 405 "ql_y.y"
19958 -{
19959 + {
19960 + yyval.nlist = NULL;
19961 + }
19962 + break;
19963 +
19964 + case 34:
19965 +#line 409 "ql_y.y"
19966 + {
19967 yyval.nlist = get_name_list(yyvsp[0].str);
19968 - ;
19969 - break;}
19970 -case 34:
19971 -#line 411 "ql_y.y"
19972 -{
19973 - yyval.tag = NULL;
19974 - ;
19975 - break;}
19976 -case 35:
19977 + }
19978 + break;
19979 +
19980 + case 35:
19981 #line 415 "ql_y.y"
19982 -{
19983 + {
19984 + yyval.tag = NULL;
19985 + }
19986 + break;
19987 +
19988 + case 36:
19989 +#line 419 "ql_y.y"
19990 + {
19991 yyval.tag = alloc_t(TAG);
19992 yyval.tag->deflt = 1;
19993 if (yyvsp[-2].str) {
19994 @@ -1163,18 +1522,20 @@
19995 yyval.tag->block = yyvsp[0].field;
19996 yyval.tag->next = NULL;
19997 yyval.tag->abort_id = abort_id;
19998 - ;
19999 - break;}
20000 -case 36:
20001 -#line 432 "ql_y.y"
20002 -{
20003 + }
20004 + break;
20005 +
20006 + case 37:
20007 +#line 436 "ql_y.y"
20008 + {
20009 yyval.tag = alloc_t(TAG);
20010 yyval.tag->abort_id = abort_id;
20011 - ;
20012 - break;}
20013 -case 37:
20014 -#line 437 "ql_y.y"
20015 -{
20016 + }
20017 + break;
20018 +
20019 + case 38:
20020 +#line 441 "ql_y.y"
20021 + {
20022 yyval.tag = yyvsp[-1].tag;
20023 yyval.tag->deflt = 0;
20024 if (yyvsp[-4].str) {
20025 @@ -1188,17 +1549,19 @@
20026 yyval.tag->more = yyvsp[-3].list;
20027 yyval.tag->block = yyvsp[-2].field;
20028 yyval.tag->next = yyvsp[0].tag;
20029 - ;
20030 - break;}
20031 -case 38:
20032 -#line 455 "ql_y.y"
20033 -{
20034 - yyval.tag = NULL;
20035 - ;
20036 - break;}
20037 -case 39:
20038 + }
20039 + break;
20040 +
20041 + case 39:
20042 #line 459 "ql_y.y"
20043 -{
20044 + {
20045 + yyval.tag = NULL;
20046 + }
20047 + break;
20048 +
20049 + case 40:
20050 +#line 463 "ql_y.y"
20051 + {
20052 yyval.tag = alloc_t(TAG);
20053 yyval.tag->deflt = 1;
20054 if (yyvsp[-2].str) {
20055 @@ -1212,18 +1575,20 @@
20056 yyval.tag->more = yyvsp[-1].list;
20057 yyval.tag->block = yyvsp[0].field;
20058 yyval.tag->next = NULL;
20059 - ;
20060 - break;}
20061 -case 40:
20062 -#line 475 "ql_y.y"
20063 -{
20064 + }
20065 + break;
20066 +
20067 + case 41:
20068 +#line 479 "ql_y.y"
20069 + {
20070 yyval.tag = alloc_t(TAG);
20071 yyval.tag->abort_id = abort_id;
20072 - ;
20073 - break;}
20074 -case 41:
20075 -#line 480 "ql_y.y"
20076 -{
20077 + }
20078 + break;
20079 +
20080 + case 42:
20081 +#line 484 "ql_y.y"
20082 + {
20083 yyval.tag = yyvsp[-1].tag;
20084 yyval.tag->deflt = 0;
20085 if (yyvsp[-4].str) {
20086 @@ -1237,254 +1602,266 @@
20087 yyval.tag->more = yyvsp[-3].list;
20088 yyval.tag->block = yyvsp[-2].field;
20089 yyval.tag->next = yyvsp[0].tag;
20090 - ;
20091 - break;}
20092 -case 42:
20093 -#line 498 "ql_y.y"
20094 -{
20095 - yyval.str = NULL;
20096 - ;
20097 - break;}
20098 -case 43:
20099 + }
20100 + break;
20101 +
20102 + case 43:
20103 #line 502 "ql_y.y"
20104 -{
20105 + {
20106 + yyval.str = NULL;
20107 + }
20108 + break;
20109 +
20110 + case 44:
20111 +#line 506 "ql_y.y"
20112 + {
20113 yyval.str = yyvsp[0].str;
20114 - ;
20115 - break;}
20116 -case 44:
20117 -#line 508 "ql_y.y"
20118 -{
20119 - yyval.list = NULL;
20120 - ;
20121 - break;}
20122 -case 45:
20123 + }
20124 + break;
20125 +
20126 + case 45:
20127 #line 512 "ql_y.y"
20128 -{
20129 + {
20130 + yyval.list = NULL;
20131 + }
20132 + break;
20133 +
20134 + case 46:
20135 +#line 516 "ql_y.y"
20136 + {
20137 yyval.list = alloc_t(VALUE_LIST);
20138 yyval.list->value = yyvsp[-1].str;
20139 yyval.list->next = yyvsp[0].list;
20140 - ;
20141 - break;}
20142 -}
20143 - /* the action file gets copied in in place of this dollarsign */
20144 -#line 543 "/usr/lib/bison.simple"
20145 + }
20146 + break;
20147 +
20148 +
20149 + }
20150 +
20151 +/* Line 1010 of yacc.c. */
20152 +#line 1643 "y.tab.c"
20153 \f
20154 yyvsp -= yylen;
20155 yyssp -= yylen;
20156 -#ifdef YYLSP_NEEDED
20157 - yylsp -= yylen;
20158 -#endif
20159
20160 -#if YYDEBUG != 0
20161 - if (yydebug)
20162 - {
20163 - short *ssp1 = yyss - 1;
20164 - fprintf (stderr, "state stack now");
20165 - while (ssp1 != yyssp)
20166 - fprintf (stderr, " %d", *++ssp1);
20167 - fprintf (stderr, "\n");
20168 - }
20169 -#endif
20170 +
20171 + YY_STACK_PRINT (yyss, yyssp);
20172
20173 *++yyvsp = yyval;
20174
20175 -#ifdef YYLSP_NEEDED
20176 - yylsp++;
20177 - if (yylen == 0)
20178 - {
20179 - yylsp->first_line = yylloc.first_line;
20180 - yylsp->first_column = yylloc.first_column;
20181 - yylsp->last_line = (yylsp-1)->last_line;
20182 - yylsp->last_column = (yylsp-1)->last_column;
20183 - yylsp->text = 0;
20184 - }
20185 - else
20186 - {
20187 - yylsp->last_line = (yylsp+yylen-1)->last_line;
20188 - yylsp->last_column = (yylsp+yylen-1)->last_column;
20189 - }
20190 -#endif
20191
20192 - /* Now "shift" the result of the reduction.
20193 - Determine what state that goes to,
20194 - based on the state we popped back to
20195 - and the rule number reduced by. */
20196 + /* Now `shift' the result of the reduction. Determine what state
20197 + that goes to, based on the state we popped back to and the rule
20198 + number reduced by. */
20199
20200 yyn = yyr1[yyn];
20201
20202 - yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
20203 - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
20204 + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
20205 + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
20206 yystate = yytable[yystate];
20207 else
20208 - yystate = yydefgoto[yyn - YYNTBASE];
20209 + yystate = yydefgoto[yyn - YYNTOKENS];
20210
20211 goto yynewstate;
20212
20213 -yyerrlab: /* here on detecting error */
20214
20215 - if (! yyerrstatus)
20216 - /* If not already recovering from an error, report this error. */
20217 +/*------------------------------------.
20218 +| yyerrlab -- here on detecting error |
20219 +`------------------------------------*/
20220 +yyerrlab:
20221 + /* If not already recovering from an error, report this error. */
20222 + if (!yyerrstatus)
20223 {
20224 ++yynerrs;
20225 -
20226 -#ifdef YYERROR_VERBOSE
20227 +#if YYERROR_VERBOSE
20228 yyn = yypact[yystate];
20229
20230 - if (yyn > YYFLAG && yyn < YYLAST)
20231 + if (YYPACT_NINF < yyn && yyn < YYLAST)
20232 {
20233 - int size = 0;
20234 - char *msg;
20235 - int x, count;
20236 -
20237 - count = 0;
20238 - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
20239 - for (x = (yyn < 0 ? -yyn : 0);
20240 - x < (sizeof(yytname) / sizeof(char *)); x++)
20241 - if (yycheck[x + yyn] == x)
20242 - size += strlen(yytname[x]) + 15, count++;
20243 - msg = (char *) malloc(size + 15);
20244 - if (msg != 0)
20245 + YYSIZE_T yysize = 0;
20246 + int yytype = YYTRANSLATE (yychar);
20247 + const char* yyprefix;
20248 + char *yymsg;
20249 + int yyx;
20250 +
20251 + /* Start YYX at -YYN if negative to avoid negative indexes in
20252 + YYCHECK. */
20253 + int yyxbegin = yyn < 0 ? -yyn : 0;
20254 +
20255 + /* Stay within bounds of both yycheck and yytname. */
20256 + int yychecklim = YYLAST - yyn;
20257 + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
20258 + int yycount = 0;
20259 +
20260 + yyprefix = ", expecting ";
20261 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
20262 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
20263 + {
20264 + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
20265 + yycount += 1;
20266 + if (yycount == 5)
20267 + {
20268 + yysize = 0;
20269 + break;
20270 + }
20271 + }
20272 + yysize += (sizeof ("syntax error, unexpected ")
20273 + + yystrlen (yytname[yytype]));
20274 + yymsg = (char *) YYSTACK_ALLOC (yysize);
20275 + if (yymsg != 0)
20276 {
20277 - strcpy(msg, "parse error");
20278 + char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
20279 + yyp = yystpcpy (yyp, yytname[yytype]);
20280
20281 - if (count < 5)
20282 + if (yycount < 5)
20283 {
20284 - count = 0;
20285 - for (x = (yyn < 0 ? -yyn : 0);
20286 - x < (sizeof(yytname) / sizeof(char *)); x++)
20287 - if (yycheck[x + yyn] == x)
20288 + yyprefix = ", expecting ";
20289 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
20290 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
20291 {
20292 - strcat(msg, count == 0 ? ", expecting `" : " or `");
20293 - strcat(msg, yytname[x]);
20294 - strcat(msg, "'");
20295 - count++;
20296 + yyp = yystpcpy (yyp, yyprefix);
20297 + yyp = yystpcpy (yyp, yytname[yyx]);
20298 + yyprefix = " or ";
20299 }
20300 }
20301 - yyerror(msg);
20302 - free(msg);
20303 + yyerror (yymsg);
20304 + YYSTACK_FREE (yymsg);
20305 }
20306 else
20307 - yyerror ("parse error; also virtual memory exceeded");
20308 + yyerror ("syntax error; also virtual memory exhausted");
20309 }
20310 else
20311 #endif /* YYERROR_VERBOSE */
20312 - yyerror("parse error");
20313 + yyerror ("syntax error");
20314 }
20315
20316 - goto yyerrlab1;
20317 -yyerrlab1: /* here on error raised explicitly by an action */
20318 +
20319
20320 if (yyerrstatus == 3)
20321 {
20322 - /* if just tried and failed to reuse lookahead token after an error, discard it. */
20323 + /* If just tried and failed to reuse lookahead token after an
20324 + error, discard it. */
20325
20326 - /* return failure if at end of input */
20327 - if (yychar == YYEOF)
20328 - YYABORT;
20329 -
20330 -#if YYDEBUG != 0
20331 - if (yydebug)
20332 - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
20333 -#endif
20334 + if (yychar <= YYEOF)
20335 + {
20336 + /* If at end of input, pop the error token,
20337 + then the rest of the stack, then return failure. */
20338 + if (yychar == YYEOF)
20339 + for (;;)
20340 + {
20341 + YYPOPSTACK;
20342 + if (yyssp == yyss)
20343 + YYABORT;
20344 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
20345 + yydestruct (yystos[*yyssp], yyvsp);
20346 + }
20347 + }
20348 + else
20349 + {
20350 + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
20351 + yydestruct (yytoken, &yylval);
20352 + yychar = YYEMPTY;
20353
20354 - yychar = YYEMPTY;
20355 + }
20356 }
20357
20358 - /* Else will try to reuse lookahead token
20359 - after shifting the error token. */
20360 -
20361 - yyerrstatus = 3; /* Each real token shifted decrements this */
20362 + /* Else will try to reuse lookahead token after shifting the error
20363 + token. */
20364 + goto yyerrlab1;
20365
20366 - goto yyerrhandle;
20367
20368 -yyerrdefault: /* current state does not do anything special for the error token. */
20369 +/*---------------------------------------------------.
20370 +| yyerrorlab -- error raised explicitly by YYERROR. |
20371 +`---------------------------------------------------*/
20372 +yyerrorlab:
20373
20374 -#if 0
20375 - /* This is wrong; only states that explicitly want error tokens
20376 - should shift them. */
20377 - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/
20378 - if (yyn) goto yydefault;
20379 +#ifdef __GNUC__
20380 + /* Pacify GCC when the user code never invokes YYERROR and the label
20381 + yyerrorlab therefore never appears in user code. */
20382 + if (0)
20383 + goto yyerrorlab;
20384 #endif
20385
20386 -yyerrpop: /* pop the current state because it cannot handle the error token */
20387 -
20388 - if (yyssp == yyss) YYABORT;
20389 - yyvsp--;
20390 - yystate = *--yyssp;
20391 -#ifdef YYLSP_NEEDED
20392 - yylsp--;
20393 -#endif
20394 + yyvsp -= yylen;
20395 + yyssp -= yylen;
20396 + yystate = *yyssp;
20397 + goto yyerrlab1;
20398
20399 -#if YYDEBUG != 0
20400 - if (yydebug)
20401 - {
20402 - short *ssp1 = yyss - 1;
20403 - fprintf (stderr, "Error: state stack now");
20404 - while (ssp1 != yyssp)
20405 - fprintf (stderr, " %d", *++ssp1);
20406 - fprintf (stderr, "\n");
20407 - }
20408 -#endif
20409
20410 -yyerrhandle:
20411 +/*-------------------------------------------------------------.
20412 +| yyerrlab1 -- common code for both syntax error and YYERROR. |
20413 +`-------------------------------------------------------------*/
20414 +yyerrlab1:
20415 + yyerrstatus = 3; /* Each real token shifted decrements this. */
20416
20417 - yyn = yypact[yystate];
20418 - if (yyn == YYFLAG)
20419 - goto yyerrdefault;
20420 + for (;;)
20421 + {
20422 + yyn = yypact[yystate];
20423 + if (yyn != YYPACT_NINF)
20424 + {
20425 + yyn += YYTERROR;
20426 + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
20427 + {
20428 + yyn = yytable[yyn];
20429 + if (0 < yyn)
20430 + break;
20431 + }
20432 + }
20433
20434 - yyn += YYTERROR;
20435 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
20436 - goto yyerrdefault;
20437 + /* Pop the current state because it cannot handle the error token. */
20438 + if (yyssp == yyss)
20439 + YYABORT;
20440
20441 - yyn = yytable[yyn];
20442 - if (yyn < 0)
20443 - {
20444 - if (yyn == YYFLAG)
20445 - goto yyerrpop;
20446 - yyn = -yyn;
20447 - goto yyreduce;
20448 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
20449 + yydestruct (yystos[yystate], yyvsp);
20450 + YYPOPSTACK;
20451 + yystate = *yyssp;
20452 + YY_STACK_PRINT (yyss, yyssp);
20453 }
20454 - else if (yyn == 0)
20455 - goto yyerrpop;
20456
20457 if (yyn == YYFINAL)
20458 YYACCEPT;
20459
20460 -#if YYDEBUG != 0
20461 - if (yydebug)
20462 - fprintf(stderr, "Shifting error token, ");
20463 -#endif
20464 + YYDPRINTF ((stderr, "Shifting error token, "));
20465
20466 *++yyvsp = yylval;
20467 -#ifdef YYLSP_NEEDED
20468 - *++yylsp = yylloc;
20469 -#endif
20470 +
20471
20472 yystate = yyn;
20473 goto yynewstate;
20474
20475 - yyacceptlab:
20476 - /* YYACCEPT comes here. */
20477 - if (yyfree_stacks)
20478 - {
20479 - free (yyss);
20480 - free (yyvs);
20481 -#ifdef YYLSP_NEEDED
20482 - free (yyls);
20483 -#endif
20484 - }
20485 - return 0;
20486
20487 - yyabortlab:
20488 - /* YYABORT comes here. */
20489 - if (yyfree_stacks)
20490 - {
20491 - free (yyss);
20492 - free (yyvs);
20493 -#ifdef YYLSP_NEEDED
20494 - free (yyls);
20495 +/*-------------------------------------.
20496 +| yyacceptlab -- YYACCEPT comes here. |
20497 +`-------------------------------------*/
20498 +yyacceptlab:
20499 + yyresult = 0;
20500 + goto yyreturn;
20501 +
20502 +/*-----------------------------------.
20503 +| yyabortlab -- YYABORT comes here. |
20504 +`-----------------------------------*/
20505 +yyabortlab:
20506 + yyresult = 1;
20507 + goto yyreturn;
20508 +
20509 +#ifndef yyoverflow
20510 +/*----------------------------------------------.
20511 +| yyoverflowlab -- parser overflow comes here. |
20512 +`----------------------------------------------*/
20513 +yyoverflowlab:
20514 + yyerror ("parser stack overflow");
20515 + yyresult = 2;
20516 + /* Fall through. */
20517 +#endif
20518 +
20519 +yyreturn:
20520 +#ifndef yyoverflow
20521 + if (yyss != yyssa)
20522 + YYSTACK_FREE (yyss);
20523 #endif
20524 - }
20525 - return 1;
20526 + return yyresult;
20527 }
20528 -#line 518 "ql_y.y"
20529 +
20530 +
20531 +
20532 Index: linux-atm-2.4.1/src/qgen/ql_y.y
20533 ===================================================================
20534 --- linux-atm-2.4.1.orig/src/qgen/ql_y.y 2007-06-04 13:23:53.999524720 +0200
20535 +++ linux-atm-2.4.1/src/qgen/ql_y.y 2007-06-04 13:23:54.488450392 +0200
20536 @@ -17,6 +17,8 @@
20537 #include "qgen.h"
20538 #include "file.h"
20539
20540 +extern void yyerror(const char *s);
20541 +
20542
20543 #define MAX_TOKEN 256
20544 #define DEFAULT_NAMELIST_FILE "default.nl"
20545 @@ -58,9 +60,10 @@
20546 for (walk = strchr(start,0)-1; walk > start && isspace(*walk); walk--)
20547 *walk = 0;
20548 if (*start == ':') {
20549 - if (!(searching = strcmp(start+1,name)))
20550 + if (!(searching = strcmp(start+1,name))) {
20551 if (found) yyerror("multiple entries");
20552 else found = 1;
20553 + }
20554 continue;
20555 }
20556 if (searching) continue;
20557 @@ -305,10 +308,11 @@
20558 $$->var_len = -1;
20559 $$->pos = $2;
20560 $$->flush = !$3;
20561 - if ($$->pos == -1)
20562 + if ($$->pos == -1) {
20563 if ($$->size & 7)
20564 yyerror("position required for small fields");
20565 else $$->pos = 0;
20566 + }
20567 $$->value = $5;
20568 $$->structure = NULL;
20569 $$->next = NULL;
20570 Index: linux-atm-2.4.1/src/qgen/ql_l.l
20571 ===================================================================
20572 --- linux-atm-2.4.1.orig/src/qgen/ql_l.l 2007-06-04 13:23:54.005523808 +0200
20573 +++ linux-atm-2.4.1/src/qgen/ql_l.l 2007-06-04 13:23:54.489450240 +0200
20574 @@ -68,7 +68,7 @@
20575
20576 %%
20577
20578 -void yyerror(char *s)
20579 +void yyerror(const char *s)
20580 {
20581 fprintf(stderr,"line %d: %s near \"%s\"\n",lineno,s,yytext);
20582 exit(1);
20583 Index: linux-atm-2.4.1/src/qgen/qlib.c
20584 ===================================================================
20585 --- linux-atm-2.4.1.orig/src/qgen/qlib.c 2007-06-04 13:23:54.010523048 +0200
20586 +++ linux-atm-2.4.1/src/qgen/qlib.c 2007-06-04 13:23:54.489450240 +0200
20587 @@ -26,14 +26,14 @@
20588 #include "op.h"
20589
20590
20591 -static int debug = 0;
20592 +static int q_debug = 0;
20593
20594
20595 void PREFIX(report)(int severity,const char *msg,...)
20596 {
20597 va_list ap;
20598
20599 - if (!debug && severity > Q_ERROR) return;
20600 + if (!q_debug && severity > Q_ERROR) return;
20601 va_start(ap,msg);
20602 vprintf(msg,ap);
20603 printf("\n");
20604 @@ -836,7 +836,7 @@
20605 Q_DSC dsc;
20606 int len,c;
20607
20608 - debug = argc != 1;
20609 + q_debug = argc != 1;
20610 len = 0;
20611 while (scanf("%x",&c) == 1) msg[len++] = c;
20612 qd_start();
20613 Index: linux-atm-2.4.1/src/qgen/qlib.h
20614 ===================================================================
20615 --- linux-atm-2.4.1.orig/src/qgen/qlib.h 2007-06-04 13:23:54.016522136 +0200
20616 +++ linux-atm-2.4.1/src/qgen/qlib.h 2007-06-04 13:23:54.489450240 +0200
20617 @@ -23,7 +23,9 @@
20618 #define Q_FATAL -1
20619
20620
20621 +#ifndef DUMP_MODE
20622 extern int q_dump;
20623 +#endif
20624 extern void q_report(int severity,const char *msg,...);
20625
20626 #ifdef DUMP_MODE
20627 Index: linux-atm-2.4.1/src/qgen/ql_y.h
20628 ===================================================================
20629 --- linux-atm-2.4.1.orig/src/qgen/ql_y.h 2007-06-04 13:23:54.021521376 +0200
20630 +++ linux-atm-2.4.1/src/qgen/ql_y.h 2007-06-04 13:23:54.490450088 +0200
20631 @@ -1,4 +1,65 @@
20632 -typedef union {
20633 +/* A Bison parser, made by GNU Bison 1.875d. */
20634 +
20635 +/* Skeleton parser for Yacc-like parsing with Bison,
20636 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
20637 +
20638 + This program is free software; you can redistribute it and/or modify
20639 + it under the terms of the GNU General Public License as published by
20640 + the Free Software Foundation; either version 2, or (at your option)
20641 + any later version.
20642 +
20643 + This program is distributed in the hope that it will be useful,
20644 + but WITHOUT ANY WARRANTY; without even the implied warranty of
20645 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20646 + GNU General Public License for more details.
20647 +
20648 + You should have received a copy of the GNU General Public License
20649 + along with this program; if not, write to the Free Software
20650 + Foundation, Inc., 59 Temple Place - Suite 330,
20651 + Boston, MA 02111-1307, USA. */
20652 +
20653 +/* As a special exception, when this file is copied by Bison into a
20654 + Bison output file, you may use that output file without restriction.
20655 + This special exception was added by the Free Software Foundation
20656 + in version 1.24 of Bison. */
20657 +
20658 +/* Tokens. */
20659 +#ifndef YYTOKENTYPE
20660 +# define YYTOKENTYPE
20661 + /* Put the tokens into the symbol table, so that GDB and other debuggers
20662 + know about them. */
20663 + enum yytokentype {
20664 + TOK_BREAK = 258,
20665 + TOK_CASE = 259,
20666 + TOK_DEF = 260,
20667 + TOK_DEFAULT = 261,
20668 + TOK_LENGTH = 262,
20669 + TOK_MULTI = 263,
20670 + TOK_RECOVER = 264,
20671 + TOK_ABORT = 265,
20672 + TOK_ID = 266,
20673 + TOK_INCLUDE = 267,
20674 + TOK_STRING = 268
20675 + };
20676 +#endif
20677 +#define TOK_BREAK 258
20678 +#define TOK_CASE 259
20679 +#define TOK_DEF 260
20680 +#define TOK_DEFAULT 261
20681 +#define TOK_LENGTH 262
20682 +#define TOK_MULTI 263
20683 +#define TOK_RECOVER 264
20684 +#define TOK_ABORT 265
20685 +#define TOK_ID 266
20686 +#define TOK_INCLUDE 267
20687 +#define TOK_STRING 268
20688 +
20689 +
20690 +
20691 +
20692 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
20693 +#line 142 "ql_y.y"
20694 +typedef union YYSTYPE {
20695 const char *str;
20696 int num;
20697 FIELD *field;
20698 @@ -7,17 +68,14 @@
20699 TAG *tag;
20700 NAME_LIST *nlist;
20701 } YYSTYPE;
20702 -#define TOK_BREAK 257
20703 -#define TOK_CASE 258
20704 -#define TOK_DEF 259
20705 -#define TOK_DEFAULT 260
20706 -#define TOK_LENGTH 261
20707 -#define TOK_MULTI 262
20708 -#define TOK_RECOVER 263
20709 -#define TOK_ABORT 264
20710 -#define TOK_ID 265
20711 -#define TOK_INCLUDE 266
20712 -#define TOK_STRING 267
20713 -
20714 +/* Line 1285 of yacc.c. */
20715 +#line 73 "y.tab.h"
20716 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
20717 +# define YYSTYPE_IS_DECLARED 1
20718 +# define YYSTYPE_IS_TRIVIAL 1
20719 +#endif
20720
20721 extern YYSTYPE yylval;
20722 +
20723 +
20724 +
20725 Index: linux-atm-2.4.1/src/qgen/incl.pl
20726 ===================================================================
20727 --- linux-atm-2.4.1.orig/src/qgen/incl.pl 2007-06-04 13:23:54.027520464 +0200
20728 +++ linux-atm-2.4.1/src/qgen/incl.pl 2007-06-04 13:23:54.490450088 +0200
20729 @@ -24,7 +24,7 @@
20730 }
20731 die "no include file specified" unless defined $last;
20732 for (@STD,@USR) {
20733 - next unless defined stat $_."/".$last;
20734 + next unless -e "$_/$last";
20735 print $_."/".$last."\n" || die "print STDOUT: $!";
20736 exit 0;
20737 }
20738 Index: linux-atm-2.4.1/src/qgen/msg.fmt
20739 ===================================================================
20740 --- linux-atm-2.4.1.orig/src/qgen/msg.fmt 2007-06-04 13:23:54.034519400 +0200
20741 +++ linux-atm-2.4.1/src/qgen/msg.fmt 2007-06-04 13:23:54.490450088 +0200
20742 @@ -53,7 +53,7 @@
20743 ATM_TD_FW_PCR_0 { p##fw_pcr_0 <24> } \
20744 ATM_TD_BW_PCR_0 { p##bw_pcr_0 <24> } \
20745 ATM_TD_FW_PCR_01 { p##fw_pcr_01 <24> } \
20746 - ATM_TD_BW_PCR_01 { p##bw_pcr_01 <24> } \
20747 + ATM_TD_BW_PCR_01 { p##bw_pcr_01 <24> }
20748
20749 #define TRAFFIC_DESCRIPTOR_VBR(p) \
20750 ATM_TD_FW_SCR_0 { p##fw_scr_0 <24> } \
20751 @@ -63,15 +63,15 @@
20752 ATM_TD_FW_MBS_0 { p##fw_mbs_0 <24> } \
20753 ATM_TD_BW_MBS_0 { p##bw_mbs_0 <24> } \
20754 ATM_TD_FW_MBS_01 { p##fw_mbs_01 <24> } \
20755 - ATM_TD_BW_MBS_01 { p##bw_mbs_01 <24> } \
20756 + ATM_TD_BW_MBS_01 { p##bw_mbs_01 <24> }
20757
20758 #define TRAFFIC_DESCRIPTOR_BE(p) \
20759 - ATM_TD_BEST_EFFORT { p##best_effort <0> } \
20760 + ATM_TD_BEST_EFFORT { p##best_effort <0> }
20761
20762 #if defined(UNI40) || defined(DYNAMIC_UNI)
20763 #define TRAFFIC_DESCRIPTOR_ABR(p) \
20764 ATM_TD_FW_MCR_01 { p##fw_mcr_01 <24> } \
20765 - ATM_TD_BW_MCR_01 { p##bw_mcr_01 <24> } \
20766 + ATM_TD_BW_MCR_01 { p##bw_mcr_01 <24> }
20767
20768 #else
20769 #define TRAFFIC_DESCRIPTOR_ABR(p) /* not yet */
20770 Index: linux-atm-2.4.1/src/qgen/output
20771 ===================================================================
20772 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
20773 +++ linux-atm-2.4.1/src/qgen/output 2007-06-04 13:23:54.491449936 +0200
20774 @@ -0,0 +1,704 @@
20775 +# 1 "<stdin>"
20776 +# 1 "<built-in>"
20777 +# 1 "<command line>"
20778 +# 1 "<stdin>"
20779 +
20780 +
20781 +
20782 +
20783 +
20784 +# 1 "../../config.h" 1
20785 +# 7 "<stdin>" 2
20786 +
20787 +
20788 +
20789 +
20790 +include "atmsap.h"
20791 +include "uni.h"
20792 +# 26 "<stdin>"
20793 +def ie_aal = {
20794 + _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 {
20795 + aal_type <8> = case {
20796 + 5 {
20797 + _id "atm_aalp" <8> = multi {
20798 + ATM_AALP_FW_MAX_SDU {
20799 + fw_max_sdu <16>
20800 + }
20801 + ATM_AALP_BW_MAX_SDU {
20802 + bw_max_sdu <16>
20803 + }
20804 +
20805 + ATM_AALP_AAL_MODE {
20806 + aal_mode <8> # UNI 3.0 only
20807 + }
20808 +
20809 + ATM_AALP_SSCS {
20810 + sscs_type <8>
20811 + }
20812 + }
20813 + }
20814 + }
20815 + }
20816 +}
20817 +# 90 "<stdin>"
20818 +def ie_td = { # UNI 3.0 calls this "User Cell Rate"
20819 + _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 {
20820 + _id "atm_td" <8> = multi {
20821 + 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> }
20822 +# 104 "<stdin>"
20823 + ATM_TD_TM_OPT { # @@@ should this also go into the TD macro ?
20824 +
20825 + fw_fdisc "atm_fd" <1@8,more> = ATM_FD_NO
20826 + bw_fdisc "atm_fd" <1@7,more> = ATM_FD_NO
20827 +
20828 + bw_tag "atm_tag" <1@2,more> = ATM_TAG_NO
20829 + fw_tag "atm_tag" <1@1> = ATM_TAG_NO
20830 + }
20831 + }
20832 + }
20833 +}
20834 +
20835 +
20836 +def ie_bbcap = {
20837 + _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 {
20838 + bearer_class "atm_bc" <5@1,more>
20839 + _ext <1@8> = case {
20840 + 0 {
20841 + _ext <1@8,more> = 1
20842 + trans_cap "atm_tc" <7@1>
20843 + }
20844 + default 1 {}
20845 + }
20846 + _ext <1@8,more> = 1
20847 + susc_clip "atm_stc" <2@6,more> = ATM_STC_NO
20848 + upcc "atm_upcc" <2@1> = ATM_UPCC_P2P
20849 + }
20850 +}
20851 +
20852 +
20853 +def ie_bhli = {
20854 + _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 {
20855 + _ext <1@8,more> = 1
20856 + hli_type <7@1> = case {
20857 +
20858 +
20859 + 0 { # ISO
20860 + iso_hli <-64>
20861 + }
20862 + 1 { # User Specific
20863 + user_hli <-64>
20864 + }
20865 +
20866 + 2 { # High layer profile - UNI 3.0 only
20867 + hlp <32>
20868 + }
20869 +
20870 + 3 { # Vendor-Specific Application identifier
20871 + hli_oui <24>
20872 + app_id <32>
20873 + }
20874 +
20875 + 4 { # Reference to ITU-T SG 1 B-ISDN Teleservice Recommendation
20876 + tobedefined <8>
20877 + }
20878 +
20879 + }
20880 + }
20881 +}
20882 +
20883 +
20884 +def ie_blli = {
20885 + _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 {
20886 + _lid <2@6,more> = multi {
20887 + 1 {
20888 + _ext <1@8,more> = 1
20889 + uil1_proto <5@1>
20890 + }
20891 + 2 {
20892 + uil2_proto "atm_l2" <5@1,more> = case {
20893 + ATM_L2_X25_LL,ATM_L2_X25_ML,ATM_L2_HDLC_ARM,
20894 + ATM_L2_HDLC_NRM,ATM_L2_HDLC_ABM,ATM_L2_Q922,
20895 + ATM_L2_ISO7776 { # CCITT encoding
20896 + _ext <1@8> = case {
20897 + 0 {
20898 + l2_mode "atm_imd" <2@6,more> = ATM_IMD_NORMAL
20899 + q933 <2@1,more> = 0
20900 + _ext <1@8> = case {
20901 + 0 {
20902 + window_size <7@1,more>
20903 + _ext <1@8> = 1
20904 + }
20905 + default 1 {}
20906 + }
20907 + }
20908 + default 1 {}
20909 + }
20910 + }
20911 + ATM_L2_USER { # User specified
20912 + _ext <1@8> = 0
20913 + user_l2 <7@1,more>
20914 + _ext <1@8> = 1
20915 + }
20916 + default ATM_L2_ISO1745,ATM_L2_Q291,ATM_L2_LAPB,
20917 + ATM_L2_ISO8802,ATM_L2_X75 { # No additional data
20918 + _ext <1@8> = 1
20919 + }
20920 + }
20921 + }
20922 + 3 {
20923 + uil3_proto "atm_l3" <5@1,more> = case {
20924 + ATM_L3_X25,ATM_L3_ISO8208,ATM_L3_X223 { # CCITT coding
20925 + _ext <1@8> = case {
20926 + 0 {
20927 + l3_mode "atm_imd" <2@6,more> = ATM_IMD_NORMAL
20928 + _ext <1@8> = case {
20929 + 0 {
20930 + def_pck_size <4@1,more>
20931 + _ext <1@8> = case {
20932 + 0 {
20933 + _ext <1@8> = 1
20934 + pck_win_size <7@1>
20935 + }
20936 + default 1 {}
20937 + }
20938 + }
20939 + default 1 {}
20940 + }
20941 + }
20942 + default 1 {}
20943 + }
20944 + }
20945 +
20946 + ATM_L3_H310 { # ITU-T Rec. H.310
20947 + _ext <1@8> = case {
20948 + 0 {
20949 + term_type "atm_tt" <4@1,more> = ATM_TT_RXTX
20950 + _ext <1@8> = case {
20951 + 0 {
20952 + _ext <1@8,more> = 1
20953 + fw_mpx_cap "atm_mc" <3@4,more> =
20954 + ATM_MC_NONE
20955 + bw_mpx_cap "atm_mc" <3@1> = ATM_MC_NONE
20956 + }
20957 + default 1 {}
20958 + }
20959 + }
20960 + default 1 {}
20961 + }
20962 + }
20963 +
20964 + ATM_L3_TR9577 { # ISO/IEC TR9577
20965 + _ext <1@8> = case {
20966 + 0 {
20967 + _ext <1@8,more> = 0
20968 + ipi_high <7@1> = case {
20969 + 0x40 { # SNAP hack
20970 + _ext <1@8,more> = 1
20971 + _ipi_low <1@7> = case { # ugly
20972 + 0 {
20973 + _ext <1@8,more> = 1
20974 + _snap_id <2@6> = 0
20975 + oui <24>
20976 + pid <16>
20977 + }
20978 + default 1 {}
20979 + }
20980 + }
20981 + default 0x0 { # ugly
20982 + _ext <1@8,more> = 1
20983 + ipi_low <1@7>
20984 + }
20985 + }
20986 + }
20987 + default 1 {}
20988 + }
20989 + }
20990 + ATM_L3_USER { # User specified
20991 + _ext <1@8> = 0
20992 + user_l3 <7@1,more>
20993 + _ext <1@8> = 1
20994 + }
20995 + }
20996 + }
20997 + }
20998 + }
20999 +}
21000 +
21001 +
21002 +def ie_call_state = {
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 + call_state <6@1>
21005 + }
21006 +}
21007 +
21008 +
21009 +def ie_cdpn = {
21010 + _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 {
21011 + _ext <1@8,more> = 1
21012 + _plan "atm_np" <4@1,more> = case {
21013 + ATM_NP_E164 {
21014 + _type "atm_ton" <3@5> = ATM_TON_INTRNTNL
21015 + cdpn_e164 <-96>
21016 + }
21017 + ATM_NP_AEA { # ATM Endsystem Address
21018 + _type "atm_ton" <3@5> = ATM_TON_UNKNOWN
21019 + cdpn_esa <-160>
21020 + }
21021 + }
21022 + }
21023 +}
21024 +
21025 +
21026 +def ie_cdps = {
21027 + _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 {
21028 + _ext <1@8,more> = 1
21029 +
21030 +
21031 +
21032 +
21033 + cdps_type "atm_sat" <3@5,more> = ATM_SAT_AEA
21034 +
21035 + _oddeven <1@4> = 0
21036 + cdps <-160>
21037 + }
21038 +}
21039 +
21040 +
21041 +def ie_cgpn = { # @@@ extend language to allow same trick as for cdpn
21042 + _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 {
21043 + cgpn_plan "atm_np" <4@1,more>
21044 + cgpn_type "atm_ton" <3@5,more>
21045 + _ext <1@8> = case {
21046 + 0 {
21047 + _ext <1@8,more> = 1
21048 + pres_ind "atm_prs" <2@6,more> = ATM_PRS_ALLOW
21049 + scr_ind "atm_scrn" <2@1> = ATM_SCRN_UP_NS
21050 + }
21051 + default 1 {}
21052 + }
21053 + cgpn <-160>
21054 + }
21055 +}
21056 +
21057 +
21058 +def ie_cgps = {
21059 + _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 {
21060 + _ext <1@8,more> = 1
21061 +
21062 +
21063 +
21064 +
21065 + cgps_type "atm_sat" <3@5,more> = ATM_SAT_AEA
21066 +
21067 + _oddeven <1@4> = 0
21068 + cgps <-160>
21069 + }
21070 +}
21071 +
21072 +
21073 +def ie_cause = {
21074 + _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 {
21075 + _ext <1@8,more> = 1
21076 + location "atm_loc" <4@1> = ATM_LOC_USER
21077 + _ext <1@8,more> = 1
21078 + cause "atm_cv" <7@1> = case {
21079 + ATM_CV_UNALLOC,ATM_CV_NO_ROUTE_DEST,ATM_CV_QOS_UNAVAIL { # Note 2
21080 + break
21081 + _ext <1@8,more> = 1
21082 + pu "atm_pu" <1@4,more> = ATM_PU_USER
21083 + na "atm_na" <1@3,more> = ATM_NA_NORMAL
21084 + cond2 "atm_cond" <2@1> = ATM_COND_UNKNOWN
21085 + }
21086 + ATM_CV_CALL_REJ { # Note 3
21087 + break
21088 + _ext <1@8,more> = 1
21089 + cond3 "atm_cond" <2@1,more> = ATM_COND_UNKNOWN
21090 + reason <5@3> = case {
21091 + ATM_RSN_USER {
21092 + user_diag <-216>
21093 + }
21094 + ATM_RSN_IE_MISS,ATM_RSN_IE_INSUFF {
21095 + ie_id3 "atm_ie" <8>
21096 + }
21097 + }
21098 + }
21099 + ATM_CV_NUM_CHANGED { # Note 4
21100 + break
21101 + new_dest <-224> # good luck ...
21102 + }
21103 + ATM_CV_REJ_CLIR { # Note 5
21104 + break
21105 + invalid <8> # not supported
21106 + }
21107 + ATM_CV_ACC_INF_DISC,ATM_CV_INCOMP_DEST,ATM_CV_MAND_IE_MISSING,
21108 + ATM_CV_UNKNOWN_IE,ATM_CV_INVALID_IE { # Note 6
21109 + break
21110 + ie_id6 <-224>
21111 + }
21112 +
21113 + ATM_CV_UCR_UNAVAIL_OLD,ATM_CV_UCR_UNAVAIL_NEW { # Note 8
21114 +
21115 +
21116 +
21117 +
21118 +
21119 +
21120 +
21121 + break
21122 + ucr_id <-224>
21123 + }
21124 + ATM_CV_NO_SUCH_CHAN { # Note 9
21125 + break
21126 + unav_vpci <16>
21127 + unav_vci <16>
21128 + }
21129 + ATM_CV_UNKNOWN_MSG_TYPE,ATM_CV_INCOMP_MSG { # Note 10
21130 + break
21131 + bad_msg_type "atm_msg" <8>
21132 + }
21133 + ATM_CV_TIMER_EXP { # Note 11
21134 + break
21135 + timer <24>
21136 + }
21137 + default 0 {}
21138 + }
21139 + }
21140 +}
21141 +
21142 +
21143 +def ie_conn_id = {
21144 + _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 {
21145 + _ext <1@8,more> = 1
21146 + _vp_ass "atm_vpa" <2@4,more> = ATM_VPA_EXPL
21147 + _pref_exc "atm_poe" <3@1> = 0
21148 + vpi <16>
21149 + vci <16>
21150 + }
21151 +}
21152 +
21153 +
21154 +
21155 +
21156 +def ie_e2e_tdl = {
21157 + _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 {
21158 + _id "atm_tdl" <8> = multi {
21159 + ATM_TDL_CUM {
21160 + cum_delay <16>
21161 + }
21162 + ATM_TDL_E2EMAX {
21163 + max_delay <16>
21164 + }
21165 + ATM_TDL_NGI {}
21166 + }
21167 +
21168 + }
21169 +}
21170 +
21171 +
21172 +
21173 +
21174 +def ie_qos = {
21175 +# 467 "<stdin>"
21176 + _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 {
21177 +
21178 + qos_fw <8> = 0
21179 + qos_bw <8> = 0
21180 + }
21181 +}
21182 +
21183 +
21184 +def ie_bbrep = {
21185 + _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 {
21186 + _ext <1@8,more> = 1
21187 + rep_ind <4@1> = 2
21188 + }
21189 +}
21190 +
21191 +
21192 +def ie_restart = {
21193 + _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 {
21194 + _ext <1@8,more> = 1
21195 + rst_class <3@1>
21196 + }
21197 +}
21198 +
21199 +
21200 +def ie_bbs_comp = {
21201 + _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 {
21202 + _ext <1@8,more> = 1
21203 + bbsc_ind <7@1> = 0x21
21204 + }
21205 +}
21206 +
21207 +
21208 +def ie_tns = {
21209 + _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 {
21210 + _ext <1@8,more> = 1
21211 + _net_type "atm_tni" <3@5,more> = ATM_TNI_NNI
21212 + _carrier_id "atm_nip" <4@1> = ATM_NIP_CARRIER
21213 + net_id <-32>
21214 + }
21215 +}
21216 +
21217 +
21218 +
21219 +
21220 +def ie_notify = {
21221 + _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 {
21222 + notification <-32> # @@@ how many actually ?
21223 + }
21224 +}
21225 +
21226 +
21227 +def ie_oam_td = {
21228 + _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 {
21229 + _ext <1@8,more> = 1
21230 + shaping "atm_shi" <2@6,more> = ATM_SHI_NONE
21231 + compliance "atm_oci" <1@5,more> = ATM_OCI_OPT
21232 + fault "atm_unfm" <3@1> = ATM_UNFM_NONE
21233 + _ext <1@8,more> = 1
21234 + fwd_ofi "atm_ofi" <3@5,more> = ATM_OFI_0_0
21235 + bwd_ofi "atm_ofi" <3@1> = ATM_OFI_0_0
21236 + }
21237 +}
21238 +
21239 +
21240 +def ie_git = {
21241 + _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
21242 + _dummy <1@8> = 0 # bit is "spare", although not indicated in spec
21243 + id_std_app "atm_irs" <7@1> = case {
21244 + ATM_IRS_DSMCC,ATM_IRS_H245 {
21245 + _type "atm_it" <8> = ATM_IT_SESSION
21246 + _length <8> = length {
21247 + session_id <-160>
21248 + }
21249 + _type "atm_it" <8> = ATM_IT_RESOURCE
21250 + _length <8> = length {
21251 + resource_id <-32>
21252 + }
21253 + }
21254 + default 0 {
21255 + unrecognized_git_identifiers <-224> # 33-5 bytes
21256 + }
21257 + }
21258 + }
21259 +}
21260 +
21261 +
21262 +def ie_lij_id = {
21263 + _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
21264 + _ext <1@8,more> = 1
21265 + lij_id_type "atm_lit" <7@1> = ATM_LIT_ROOT
21266 + lij_id <32>
21267 + }
21268 +}
21269 +
21270 +
21271 +def ie_lij_prm = {
21272 + _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
21273 + _ext <1@8,more> = 1
21274 + lij_scr_ind "atm_lsi" <2@1>
21275 + }
21276 +}
21277 +
21278 +
21279 +def ie_leaf_sn = {
21280 + _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
21281 + leaf_sn <32>
21282 + }
21283 +}
21284 +
21285 +
21286 +def ie_scope_sel = {
21287 + _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
21288 + _ext <1@8,more> = 1
21289 + scope_type "atm_tcs" <4@1> = ATM_TCS_ORGANIZATIONAL
21290 + scope_sel "atm_css" <8>
21291 + }
21292 +}
21293 +
21294 +
21295 +def ie_alt_td = {
21296 + _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 {
21297 + _id "atm_td" <8> = multi {
21298 + 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> }
21299 + }
21300 + }
21301 +}
21302 +
21303 +
21304 +def ie_min_td = {
21305 + _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
21306 + _id "atm_td" <8> = multi {
21307 + 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> }
21308 + ATM_TD_FW_MCR_01 { minfw_mcr_01 <24> } ATM_TD_BW_MCR_01 { minbw_mcr_01 <24> }
21309 + }
21310 + }
21311 +}
21312 +
21313 +
21314 +def ie_eqos = {
21315 + _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 {
21316 + eqos_origin "atm_eqo" <8>
21317 + _id "atm_eqp" <8> = multi {
21318 + ATM_EQP_ACC_FW_CDV {
21319 + acc_fw_cdv <24>
21320 + }
21321 + ATM_EQP_ACC_BW_CDV {
21322 + acc_bw_cdv <24>
21323 + }
21324 + ATM_EQP_CUM_FW_CDV {
21325 + cum_fw_cdv <24>
21326 + }
21327 + ATM_EQP_CUM_BW_CDV {
21328 + cum_bw_cdv <24>
21329 + }
21330 + ATM_EQP_ACC_FW_CLR {
21331 + acc_fw_clr <8>
21332 + }
21333 + ATM_EQP_ACC_BW_CLR {
21334 + acc_bw_clr <8>
21335 + }
21336 + }
21337 + }
21338 +}
21339 +
21340 +
21341 +def ie_abr_add_prm = {
21342 + _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 {
21343 + _id "atm_aap" <8> = multi {
21344 + ATM_AAP_FW_REC {
21345 + abr_fw_add_rec <32>
21346 + }
21347 + ATM_AAP_BW_REC {
21348 + abr_bw_add_rec <32>
21349 + }
21350 + }
21351 + }
21352 +}
21353 +
21354 +
21355 +def ie_abr_set_prm = {
21356 + _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
21357 + _id "atm_asp" <8> = multi {
21358 + ATM_ASP_FW_ICR {
21359 + abr_fw_icr <24>
21360 + }
21361 + ATM_ASP_BW_ICR {
21362 + abr_bw_icr <24>
21363 + }
21364 + ATM_ASP_FW_TBE {
21365 + abr_fw_tbe <24>
21366 + }
21367 + ATM_ASP_BW_TBE {
21368 + abr_bw_tbe <24>
21369 + }
21370 + ATM_ASP_CRF_RTT {
21371 + atm_crf_rtt <24>
21372 + }
21373 + ATM_ASP_FW_RIF {
21374 + atm_fw_rif <8>
21375 + }
21376 + ATM_ASP_BW_RIF {
21377 + atm_bw_rif <8>
21378 + }
21379 + ATM_ASP_FW_RDF {
21380 + atm_fw_rdf <8>
21381 + }
21382 + ATM_ASP_BW_RDF {
21383 + atm_bw_rdf <8>
21384 + }
21385 + }
21386 + }
21387 +}
21388 +
21389 +
21390 +
21391 +
21392 +def ie_ep_ref = {
21393 + _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 {
21394 + _ep_type <8> = 0
21395 + ep_ref <16>
21396 + }
21397 +}
21398 +
21399 +
21400 +def ie_ep_state = {
21401 + _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 {
21402 + ep_state <6@1>
21403 + }
21404 +}
21405 +
21406 +
21407 +
21408 +
21409 +def ie_bbrt = {
21410 + _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 {
21411 + type_of_report "atm_tor" <8>
21412 + }
21413 +}
21414 +
21415 +
21416 +
21417 +
21418 +{
21419 + _pdsc "q2931_proto" <8> = Q2931_PROTO_DSC
21420 + _cr_len <8> = 3
21421 + call_ref <24>
21422 + msg_type "atm_msg" <8>
21423 + _ext <1@8,more> = 1
21424 + _flag "atm_flag" <1@5,more> = ATM_FLAG_NO
21425 + _action_ind "atm_ai_msg" <2@1> = 0
21426 + msg_len <16> = length {
21427 + _ie_id "atm_ie" <8> = multi {
21428 + aal: ATM_IE_AAL ie_aal
21429 + td: ATM_IE_TD ie_td
21430 + bbcap: ATM_IE_BBCAP ie_bbcap
21431 + bhli: ATM_IE_BHLI ie_bhli
21432 + blli1: ATM_IE_BLLI ie_blli
21433 + blli2: ATM_IE_BLLI ie_blli
21434 + blli3: ATM_IE_BLLI ie_blli
21435 + call_state: ATM_IE_CALL_STATE ie_call_state
21436 + cdpn: ATM_IE_CDPN ie_cdpn
21437 + cdps: ATM_IE_CDPS ie_cdps
21438 + cgpn: ATM_IE_CGPN ie_cgpn
21439 + cgps: ATM_IE_CGPS ie_cgps
21440 + cause: ATM_IE_CAUSE ie_cause
21441 + cause2: ATM_IE_CAUSE ie_cause
21442 + conn_id: ATM_IE_CONN_ID ie_conn_id
21443 +
21444 + e2e_tdl: ATM_IE_E2E_TDL ie_e2e_tdl
21445 +
21446 + qos: ATM_IE_QOS ie_qos
21447 + bbrep: ATM_IE_BBREP ie_bbrep
21448 + restart: ATM_IE_RESTART ie_restart
21449 + bbs_comp: ATM_IE_BBS_COMP ie_bbs_comp
21450 + tns: ATM_IE_TNS ie_tns
21451 +
21452 + notify: ATM_IE_NOTIFY ie_notify
21453 + oam_td: ATM_IE_OAM_TD ie_oam_td
21454 + git: ATM_IE_GIT ie_git
21455 + git2: ATM_IE_GIT ie_git
21456 + git3: ATM_IE_GIT ie_git
21457 + lij_id: ATM_IE_LIJ_ID ie_lij_id
21458 + lij_prm: ATM_IE_LIJ_PRM ie_lij_prm
21459 + leaf_sn: ATM_IE_LEAF_SN ie_leaf_sn
21460 + scope_sel: ATM_IE_SCOPE_SEL ie_scope_sel
21461 + alt_td: ATM_IE_ALT_TD ie_alt_td
21462 + min_td: ATM_IE_MIN_TD ie_min_td
21463 + eqos: ATM_IE_EQOS ie_eqos
21464 + abr_add_prm:ATM_IE_ABR_ADD_PRM ie_abr_add_prm
21465 + abr_set_prm:ATM_IE_ABR_SET_PRM ie_abr_set_prm
21466 +
21467 + ep_ref: ATM_IE_EPR ie_ep_ref
21468 + ep_state: ATM_IE_EP_STATE ie_ep_state
21469 +
21470 + bbrt: ATM_IE_BBRT ie_bbrt
21471 +
21472 + default 0 {
21473 + _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
21474 + abort RECOV_ASE_UNKNOWN_IE
21475 + }
21476 + }
21477 + }
21478 +}
21479 Index: linux-atm-2.4.1/src/saal/Makefile.in
21480 ===================================================================
21481 --- linux-atm-2.4.1.orig/src/saal/Makefile.in 2007-06-04 13:23:54.046517576 +0200
21482 +++ linux-atm-2.4.1/src/saal/Makefile.in 2007-06-04 13:23:54.492449784 +0200
21483 @@ -1,4 +1,4 @@
21484 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
21485 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
21486
21487 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
21488 # This Makefile.in is free software; the Free Software Foundation
21489 @@ -87,8 +87,7 @@
21490
21491 noinst_LIBRARIES = libsaal.a
21492
21493 -libsaal_a_SOURCES = pdu.h queue.h saal.h sscf.h sscop.h pdu.c queue.c saal.c \
21494 - sscf.c sscop.c
21495 +libsaal_a_SOURCES = pdu.h queue.h saal.h sscf.h sscop.h pdu.c queue.c saal.c sscf.c sscop.c
21496
21497 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
21498 CONFIG_HEADER = ../../config.h
21499 @@ -114,8 +113,10 @@
21500
21501 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
21502
21503 -TAR = gtar
21504 +TAR = tar
21505 GZIP_ENV = --best
21506 +DEP_FILES = .deps/pdu.P .deps/queue.P .deps/saal.P .deps/sscf.P \
21507 +.deps/sscop.P
21508 SOURCES = $(libsaal_a_SOURCES)
21509 OBJECTS = $(libsaal_a_OBJECTS)
21510
21511 @@ -123,9 +124,9 @@
21512 .SUFFIXES:
21513 .SUFFIXES: .S .c .lo .o .obj .s
21514 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
21515 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/saal/Makefile
21516 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/saal/Makefile
21517
21518 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
21519 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
21520 cd $(top_builddir) \
21521 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
21522
21523 @@ -139,9 +140,6 @@
21524
21525 maintainer-clean-noinstLIBRARIES:
21526
21527 -.c.o:
21528 - $(COMPILE) -c $<
21529 -
21530 # FIXME: We should only use cygpath when building on Windows,
21531 # and only if it is available.
21532 .c.obj:
21533 @@ -164,9 +162,6 @@
21534
21535 maintainer-clean-compile:
21536
21537 -.c.lo:
21538 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
21539 -
21540 .s.lo:
21541 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
21542
21543 @@ -206,7 +201,7 @@
21544 awk ' { files[$$0] = 1; } \
21545 END { for (i in files) print i; }'`; \
21546 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
21547 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
21548 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
21549
21550 mostlyclean-tags:
21551
21552 @@ -222,6 +217,11 @@
21553 subdir = src/saal
21554
21555 distdir: $(DISTFILES)
21556 + here=`cd $(top_builddir) && pwd`; \
21557 + top_distdir=`cd $(top_distdir) && pwd`; \
21558 + distdir=`cd $(distdir) && pwd`; \
21559 + cd $(top_srcdir) \
21560 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/saal/Makefile
21561 @for file in $(DISTFILES); do \
21562 d=$(srcdir); \
21563 if test -d $$d/$$file; then \
21564 @@ -232,20 +232,38 @@
21565 || cp -p $$d/$$file $(distdir)/$$file || :; \
21566 fi; \
21567 done
21568 -pdu.o: pdu.c ../../config.h ../../src/include/stdint.h pdu.h \
21569 - ../../src/include/atmd.h ../../src/include/atm.h
21570 -queue.o: queue.c ../../config.h ../../src/include/atmd.h \
21571 - ../../src/include/stdint.h ../../src/include/atm.h queue.h
21572 -saal.o: saal.c ../../config.h sscop.h ../../src/include/stdint.h \
21573 - ../../src/include/atmd.h ../../src/include/atm.h queue.h saal.h \
21574 - sscf.h
21575 -sscf.o: sscf.c ../../config.h ../../src/include/atmd.h \
21576 - ../../src/include/stdint.h ../../src/include/atm.h sscop.h \
21577 - queue.h sscf.h
21578 -sscop.o: sscop.c ../../config.h ../../src/include/stdint.h \
21579 - ../../src/include/atmd.h ../../src/include/atm.h sscop.h \
21580 - queue.h pdu.h
21581
21582 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
21583 +
21584 +-include $(DEP_FILES)
21585 +
21586 +mostlyclean-depend:
21587 +
21588 +clean-depend:
21589 +
21590 +distclean-depend:
21591 + -rm -rf .deps
21592 +
21593 +maintainer-clean-depend:
21594 +
21595 +%.o: %.c
21596 + @echo '$(COMPILE) -c $<'; \
21597 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
21598 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
21599 + tr ' ' '\012' < .deps/$(*F).pp \
21600 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
21601 + >> .deps/$(*F).P; \
21602 + rm .deps/$(*F).pp
21603 +
21604 +%.lo: %.c
21605 + @echo '$(LTCOMPILE) -c $<'; \
21606 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
21607 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
21608 + < .deps/$(*F).pp > .deps/$(*F).P; \
21609 + tr ' ' '\012' < .deps/$(*F).pp \
21610 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
21611 + >> .deps/$(*F).P; \
21612 + rm -f .deps/$(*F).pp
21613 info-am:
21614 info: info-am
21615 dvi-am:
21616 @@ -282,27 +300,27 @@
21617
21618 maintainer-clean-generic:
21619 mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
21620 - mostlyclean-libtool mostlyclean-tags \
21621 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
21622 mostlyclean-generic
21623
21624 mostlyclean: mostlyclean-am
21625
21626 clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
21627 - clean-generic mostlyclean-am
21628 + clean-depend clean-generic mostlyclean-am
21629
21630 clean: clean-am
21631
21632 distclean-am: distclean-noinstLIBRARIES distclean-compile \
21633 - distclean-libtool distclean-tags distclean-generic \
21634 - clean-am
21635 + distclean-libtool distclean-tags distclean-depend \
21636 + distclean-generic clean-am
21637 -rm -f libtool
21638
21639 distclean: distclean-am
21640
21641 maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
21642 maintainer-clean-compile maintainer-clean-libtool \
21643 - maintainer-clean-tags maintainer-clean-generic \
21644 - distclean-am
21645 + maintainer-clean-tags maintainer-clean-depend \
21646 + maintainer-clean-generic distclean-am
21647 @echo "This command is intended for maintainers to use;"
21648 @echo "it deletes files that may require special tools to rebuild."
21649
21650 @@ -313,12 +331,14 @@
21651 mostlyclean-compile distclean-compile clean-compile \
21652 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
21653 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
21654 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
21655 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
21656 -install-exec install-data-am install-data install-am install \
21657 -uninstall-am uninstall all-redirect all-am all installdirs \
21658 -mostlyclean-generic distclean-generic clean-generic \
21659 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
21660 +distclean-tags clean-tags maintainer-clean-tags distdir \
21661 +mostlyclean-depend distclean-depend clean-depend \
21662 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
21663 +installcheck-am installcheck install-exec-am install-exec \
21664 +install-data-am install-data install-am install uninstall-am uninstall \
21665 +all-redirect all-am all installdirs mostlyclean-generic \
21666 +distclean-generic clean-generic maintainer-clean-generic clean \
21667 +mostlyclean distclean maintainer-clean
21668
21669
21670 # Tell versions [3.59,3.63) of GNU make to not export all variables.
21671 Index: linux-atm-2.4.1/src/sigd/Makefile.in
21672 ===================================================================
21673 --- linux-atm-2.4.1.orig/src/sigd/Makefile.in 2007-06-04 13:23:54.051516816 +0200
21674 +++ linux-atm-2.4.1/src/sigd/Makefile.in 2007-06-04 13:23:54.492449784 +0200
21675 @@ -1,4 +1,4 @@
21676 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
21677 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
21678
21679 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
21680 # This Makefile.in is free software; the Free Software Foundation
21681 @@ -88,14 +88,9 @@
21682 INCLUDES = -I$(top_builddir)/src/qgen -I$(top_builddir)/src/saal -I.
21683
21684 sbin_PROGRAMS = atmsigd
21685 -atmsigd_SOURCES = atmsigd.c io.c io.h kernel.c proto.c proto.h uni.c \
21686 - sap.c sap.h timeout.c timeout.h trace.c trace.h \
21687 - policy.c policy.h cfg_y.y cfg_l.l
21688 -
21689 -atmsigd_XTRAS = mess.o $(top_builddir)/src/qgen/q.out.o \
21690 - $(top_builddir)/src/qgen/qd.dump.o \
21691 - $(top_builddir)/src/lib/libatm.la \
21692 - $(top_builddir)/src/saal/libsaal.a
21693 +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
21694 +
21695 +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
21696
21697 atmsigd_LDADD = $(atmsigd_XTRAS) -lfl
21698 atmsigd_DEPENDENCIES = mess.c $(atmsigd_XTRAS)
21699 @@ -140,8 +135,11 @@
21700
21701 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
21702
21703 -TAR = gtar
21704 +TAR = tar
21705 GZIP_ENV = --best
21706 +DEP_FILES = .deps/atmsigd.P .deps/cfg_l.P .deps/cfg_y.P .deps/io.P \
21707 +.deps/kernel.P .deps/policy.P .deps/proto.P .deps/sap.P .deps/timeout.P \
21708 +.deps/trace.P .deps/uni.P
21709 SOURCES = $(atmsigd_SOURCES)
21710 OBJECTS = $(atmsigd_OBJECTS)
21711
21712 @@ -149,9 +147,9 @@
21713 .SUFFIXES:
21714 .SUFFIXES: .S .c .l .lo .o .obj .s .y
21715 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
21716 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/sigd/Makefile
21717 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/sigd/Makefile
21718
21719 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
21720 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
21721 cd $(top_builddir) \
21722 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
21723
21724 @@ -181,9 +179,6 @@
21725 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
21726 done
21727
21728 -.c.o:
21729 - $(COMPILE) -c $<
21730 -
21731 # FIXME: We should only use cygpath when building on Windows,
21732 # and only if it is available.
21733 .c.obj:
21734 @@ -206,9 +201,6 @@
21735
21736 maintainer-clean-compile:
21737
21738 -.c.lo:
21739 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
21740 -
21741 .s.lo:
21742 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
21743
21744 @@ -347,7 +339,7 @@
21745 awk ' { files[$$0] = 1; } \
21746 END { for (i in files) print i; }'`; \
21747 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
21748 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
21749 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
21750
21751 mostlyclean-tags:
21752
21753 @@ -363,6 +355,11 @@
21754 subdir = src/sigd
21755
21756 distdir: $(DISTFILES)
21757 + here=`cd $(top_builddir) && pwd`; \
21758 + top_distdir=`cd $(top_distdir) && pwd`; \
21759 + distdir=`cd $(distdir) && pwd`; \
21760 + cd $(top_srcdir) \
21761 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/sigd/Makefile
21762 @for file in $(DISTFILES); do \
21763 d=$(srcdir); \
21764 if test -d $$d/$$file; then \
21765 @@ -373,69 +370,38 @@
21766 || cp -p $$d/$$file $(distdir)/$$file || :; \
21767 fi; \
21768 done
21769 -atmsigd.o: atmsigd.c ../../config.h ../../src/include/atm.h \
21770 - ../../src/include/stdint.h ../../src/include/atmd.h \
21771 - ../../src/qgen/qlib.h io.h proto.h ../../src/include/atmsap.h \
21772 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21773 - ../../src/saal/sscop.h ../../src/saal/queue.h trace.h
21774 -cfg_l.o: cfg_l.c ../../config.h ../../src/include/atm.h \
21775 - ../../src/include/stdint.h cfg_y.h
21776 -cfg_y.o: cfg_y.c ../../config.h ../../src/include/atm.h \
21777 - ../../src/include/stdint.h ../../src/include/atmd.h proto.h \
21778 - ../../src/include/atmsap.h ../../src/saal/saal.h \
21779 - ../../src/saal/sscf.h ../../src/saal/sscop.h \
21780 - ../../src/saal/queue.h io.h trace.h policy.h
21781 -io.o: io.c ../../config.h ../../src/include/atm.h \
21782 - ../../src/include/stdint.h ../../src/include/atmd.h \
21783 - ../../src/qgen/uni.h ../../src/saal/pdu.h proto.h \
21784 - ../../src/include/atmsap.h ../../src/saal/saal.h \
21785 - ../../src/saal/sscf.h ../../src/saal/sscop.h \
21786 - ../../src/saal/queue.h io.h trace.h
21787 -kernel.o: kernel.c ../../config.h ../../src/include/atm.h \
21788 - ../../src/include/stdint.h ../../src/include/atmd.h \
21789 - ../../src/qgen/uni.h ../../src/qgen/qlib.h \
21790 - ../../src/qgen/q.out.h proto.h ../../src/include/atmsap.h \
21791 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21792 - ../../src/saal/sscop.h ../../src/saal/queue.h sap.h io.h \
21793 - policy.h timeout.h
21794 -mess.o: mess.c ../../config.h
21795 -policy.o: policy.c ../../config.h ../../src/include/atm.h \
21796 - ../../src/include/stdint.h ../../src/include/atmd.h proto.h \
21797 - ../../src/include/atmsap.h ../../src/saal/saal.h \
21798 - ../../src/saal/sscf.h ../../src/saal/sscop.h \
21799 - ../../src/saal/queue.h policy.h
21800 -proto.o: proto.c ../../config.h ../../src/include/atmd.h \
21801 - ../../src/include/stdint.h ../../src/include/atm.h \
21802 - ../../src/qgen/uni.h ../../src/qgen/qlib.h \
21803 - ../../src/qgen/q.out.h io.h proto.h ../../src/include/atmsap.h \
21804 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21805 - ../../src/saal/sscop.h ../../src/saal/queue.h sap.h
21806 -sap.o: sap.c ../../config.h ../../src/include/atm.h \
21807 - ../../src/include/stdint.h ../../src/include/atmd.h \
21808 - ../../src/qgen/uni.h ../../src/qgen/qlib.h \
21809 - ../../src/qgen/q.out.h ../../src/qgen/common.h proto.h \
21810 - ../../src/include/atmsap.h ../../src/saal/saal.h \
21811 - ../../src/saal/sscf.h ../../src/saal/sscop.h \
21812 - ../../src/saal/queue.h sap.h
21813 -timeout.o: timeout.c ../../config.h ../../src/include/atm.h \
21814 - ../../src/include/stdint.h ../../src/include/atmd.h \
21815 - ../../src/qgen/uni.h proto.h ../../src/include/atmsap.h \
21816 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21817 - ../../src/saal/sscop.h ../../src/saal/queue.h timeout.h
21818 -trace.o: trace.c ../../config.h ../../src/include/atm.h \
21819 - ../../src/include/stdint.h ../../src/include/atmd.h \
21820 - ../../src/include/atmsap.h trace.h proto.h \
21821 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21822 - ../../src/saal/sscop.h ../../src/saal/queue.h \
21823 - ../../src/qgen/qlib.h
21824 -uni.o: uni.c ../../config.h ../../src/include/atm.h \
21825 - ../../src/include/stdint.h ../../src/include/atmd.h \
21826 - ../../src/qgen/uni.h ../../src/qgen/qlib.h \
21827 - ../../src/qgen/q.out.h proto.h ../../src/include/atmsap.h \
21828 - ../../src/saal/saal.h ../../src/saal/sscf.h \
21829 - ../../src/saal/sscop.h ../../src/saal/queue.h sap.h io.h \
21830 - policy.h timeout.h trace.h
21831
21832 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
21833 +
21834 +-include $(DEP_FILES)
21835 +
21836 +mostlyclean-depend:
21837 +
21838 +clean-depend:
21839 +
21840 +distclean-depend:
21841 + -rm -rf .deps
21842 +
21843 +maintainer-clean-depend:
21844 +
21845 +%.o: %.c
21846 + @echo '$(COMPILE) -c $<'; \
21847 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
21848 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
21849 + tr ' ' '\012' < .deps/$(*F).pp \
21850 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
21851 + >> .deps/$(*F).P; \
21852 + rm .deps/$(*F).pp
21853 +
21854 +%.lo: %.c
21855 + @echo '$(LTCOMPILE) -c $<'; \
21856 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
21857 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
21858 + < .deps/$(*F).pp > .deps/$(*F).P; \
21859 + tr ' ' '\012' < .deps/$(*F).pp \
21860 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
21861 + >> .deps/$(*F).P; \
21862 + rm -f .deps/$(*F).pp
21863 info-am:
21864 info: info-am
21865 dvi-am:
21866 @@ -474,29 +440,29 @@
21867 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
21868
21869 maintainer-clean-generic:
21870 - -test -z "cfg_llcfg_yhcfg_yc" || rm -f cfg_ll cfg_yh cfg_yc
21871 + -test -z "cfg_lccfg_yhcfg_yc" || rm -f cfg_lc cfg_yh cfg_yc
21872 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
21873 - mostlyclean-libtool mostlyclean-tags \
21874 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
21875 mostlyclean-generic
21876
21877 mostlyclean: mostlyclean-am
21878
21879 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
21880 - clean-generic mostlyclean-am
21881 + clean-depend clean-generic mostlyclean-am
21882
21883 clean: clean-am
21884
21885 distclean-am: distclean-sbinPROGRAMS distclean-compile \
21886 - distclean-libtool distclean-tags distclean-generic \
21887 - clean-am
21888 + distclean-libtool distclean-tags distclean-depend \
21889 + distclean-generic clean-am
21890 -rm -f libtool
21891
21892 distclean: distclean-am
21893
21894 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
21895 maintainer-clean-compile maintainer-clean-libtool \
21896 - maintainer-clean-tags maintainer-clean-generic \
21897 - distclean-am
21898 + maintainer-clean-tags maintainer-clean-depend \
21899 + maintainer-clean-generic distclean-am
21900 @echo "This command is intended for maintainers to use;"
21901 @echo "it deletes files that may require special tools to rebuild."
21902
21903 @@ -509,12 +475,14 @@
21904 distclean-libtool clean-libtool maintainer-clean-libtool install-man4 \
21905 uninstall-man4 install-man8 uninstall-man8 install-man uninstall-man \
21906 uninstall-sysconfDATA install-sysconfDATA tags mostlyclean-tags \
21907 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
21908 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
21909 -install-exec install-data-am install-data install-am install \
21910 -uninstall-am uninstall all-redirect all-am all installdirs \
21911 -mostlyclean-generic distclean-generic clean-generic \
21912 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
21913 +distclean-tags clean-tags maintainer-clean-tags distdir \
21914 +mostlyclean-depend distclean-depend clean-depend \
21915 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
21916 +installcheck-am installcheck install-exec-am install-exec \
21917 +install-data-am install-data install-am install uninstall-am uninstall \
21918 +all-redirect all-am all installdirs mostlyclean-generic \
21919 +distclean-generic clean-generic maintainer-clean-generic clean \
21920 +mostlyclean distclean maintainer-clean
21921
21922
21923 mess.c: $(top_builddir)/src/qgen/uni.h mkmess.pl
21924 Index: linux-atm-2.4.1/src/sigd/cfg_y.c
21925 ===================================================================
21926 --- linux-atm-2.4.1.orig/src/sigd/cfg_y.c 2007-06-04 13:23:54.057515904 +0200
21927 +++ linux-atm-2.4.1/src/sigd/cfg_y.c 2007-06-04 13:23:54.494449480 +0200
21928 @@ -1,46 +1,137 @@
21929 +/* A Bison parser, made by GNU Bison 1.875d. */
21930
21931 -/* A Bison parser, made from cfg_y.y
21932 - by GNU Bison version 1.28 */
21933 +/* Skeleton parser for Yacc-like parsing with Bison,
21934 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
21935
21936 -#define YYBISON 1 /* Identify Bison output. */
21937 + This program is free software; you can redistribute it and/or modify
21938 + it under the terms of the GNU General Public License as published by
21939 + the Free Software Foundation; either version 2, or (at your option)
21940 + any later version.
21941
21942 -#define TOK_LEVEL 257
21943 -#define TOK_DEBUG 258
21944 -#define TOK_INFO 259
21945 -#define TOK_WARN 260
21946 -#define TOK_ERROR 261
21947 -#define TOK_FATAL 262
21948 -#define TOK_SIG 263
21949 -#define TOK_UNI30 264
21950 -#define TOK_UNI31 265
21951 -#define TOK_UNI40 266
21952 -#define TOK_Q2963_1 267
21953 -#define TOK_SAAL 268
21954 -#define TOK_VC 269
21955 -#define TOK_IO 270
21956 -#define TOK_MODE 271
21957 -#define TOK_USER 272
21958 -#define TOK_NET 273
21959 -#define TOK_SWITCH 274
21960 -#define TOK_VPCI 275
21961 -#define TOK_ITF 276
21962 -#define TOK_PCR 277
21963 -#define TOK_TRACE 278
21964 -#define TOK_POLICY 279
21965 -#define TOK_ALLOW 280
21966 -#define TOK_REJECT 281
21967 -#define TOK_ENTITY 282
21968 -#define TOK_DEFAULT 283
21969 -#define TOK_NUMBER 284
21970 -#define TOK_MAX_RATE 285
21971 -#define TOK_DUMP_DIR 286
21972 -#define TOK_LOGFILE 287
21973 -#define TOK_QOS 288
21974 -#define TOK_FROM 289
21975 -#define TOK_TO 290
21976 -#define TOK_ROUTE 291
21977 -#define TOK_PVC 292
21978 + This program is distributed in the hope that it will be useful,
21979 + but WITHOUT ANY WARRANTY; without even the implied warranty of
21980 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21981 + GNU General Public License for more details.
21982
21983 + You should have received a copy of the GNU General Public License
21984 + along with this program; if not, write to the Free Software
21985 + Foundation, Inc., 59 Temple Place - Suite 330,
21986 + Boston, MA 02111-1307, USA. */
21987 +
21988 +/* As a special exception, when this file is copied by Bison into a
21989 + Bison output file, you may use that output file without restriction.
21990 + This special exception was added by the Free Software Foundation
21991 + in version 1.24 of Bison. */
21992 +
21993 +/* Written by Richard Stallman by simplifying the original so called
21994 + ``semantic'' parser. */
21995 +
21996 +/* All symbols defined below should begin with yy or YY, to avoid
21997 + infringing on user name space. This should be done even for local
21998 + variables, as they might otherwise be expanded by user macros.
21999 + There are some unavoidable exceptions within include files to
22000 + define necessary library symbols; they are noted "INFRINGES ON
22001 + USER NAME SPACE" below. */
22002 +
22003 +/* Identify Bison output. */
22004 +#define YYBISON 1
22005 +
22006 +/* Skeleton name. */
22007 +#define YYSKELETON_NAME "yacc.c"
22008 +
22009 +/* Pure parsers. */
22010 +#define YYPURE 0
22011 +
22012 +/* Using locations. */
22013 +#define YYLSP_NEEDED 0
22014 +
22015 +
22016 +
22017 +/* Tokens. */
22018 +#ifndef YYTOKENTYPE
22019 +# define YYTOKENTYPE
22020 + /* Put the tokens into the symbol table, so that GDB and other debuggers
22021 + know about them. */
22022 + enum yytokentype {
22023 + TOK_LEVEL = 258,
22024 + TOK_DEBUG = 259,
22025 + TOK_INFO = 260,
22026 + TOK_WARN = 261,
22027 + TOK_ERROR = 262,
22028 + TOK_FATAL = 263,
22029 + TOK_SIG = 264,
22030 + TOK_UNI30 = 265,
22031 + TOK_UNI31 = 266,
22032 + TOK_UNI40 = 267,
22033 + TOK_Q2963_1 = 268,
22034 + TOK_SAAL = 269,
22035 + TOK_VC = 270,
22036 + TOK_IO = 271,
22037 + TOK_MODE = 272,
22038 + TOK_USER = 273,
22039 + TOK_NET = 274,
22040 + TOK_SWITCH = 275,
22041 + TOK_VPCI = 276,
22042 + TOK_ITF = 277,
22043 + TOK_PCR = 278,
22044 + TOK_TRACE = 279,
22045 + TOK_POLICY = 280,
22046 + TOK_ALLOW = 281,
22047 + TOK_REJECT = 282,
22048 + TOK_ENTITY = 283,
22049 + TOK_DEFAULT = 284,
22050 + TOK_NUMBER = 285,
22051 + TOK_MAX_RATE = 286,
22052 + TOK_DUMP_DIR = 287,
22053 + TOK_LOGFILE = 288,
22054 + TOK_QOS = 289,
22055 + TOK_FROM = 290,
22056 + TOK_TO = 291,
22057 + TOK_ROUTE = 292,
22058 + TOK_PVC = 293
22059 + };
22060 +#endif
22061 +#define TOK_LEVEL 258
22062 +#define TOK_DEBUG 259
22063 +#define TOK_INFO 260
22064 +#define TOK_WARN 261
22065 +#define TOK_ERROR 262
22066 +#define TOK_FATAL 263
22067 +#define TOK_SIG 264
22068 +#define TOK_UNI30 265
22069 +#define TOK_UNI31 266
22070 +#define TOK_UNI40 267
22071 +#define TOK_Q2963_1 268
22072 +#define TOK_SAAL 269
22073 +#define TOK_VC 270
22074 +#define TOK_IO 271
22075 +#define TOK_MODE 272
22076 +#define TOK_USER 273
22077 +#define TOK_NET 274
22078 +#define TOK_SWITCH 275
22079 +#define TOK_VPCI 276
22080 +#define TOK_ITF 277
22081 +#define TOK_PCR 278
22082 +#define TOK_TRACE 279
22083 +#define TOK_POLICY 280
22084 +#define TOK_ALLOW 281
22085 +#define TOK_REJECT 282
22086 +#define TOK_ENTITY 283
22087 +#define TOK_DEFAULT 284
22088 +#define TOK_NUMBER 285
22089 +#define TOK_MAX_RATE 286
22090 +#define TOK_DUMP_DIR 287
22091 +#define TOK_LOGFILE 288
22092 +#define TOK_QOS 289
22093 +#define TOK_FROM 290
22094 +#define TOK_TO 291
22095 +#define TOK_ROUTE 292
22096 +#define TOK_PVC 293
22097 +
22098 +
22099 +
22100 +
22101 +/* Copy the first part of user declarations. */
22102 #line 1 "cfg_y.y"
22103
22104 /* cfg.y - configuration language */
22105 @@ -51,6 +142,7 @@
22106 #include <config.h>
22107 #endif
22108
22109 +#include <stdlib.h>
22110 #include <string.h>
22111 #include <ctype.h>
22112 #include <limits.h>
22113 @@ -63,6 +155,8 @@
22114 #include "trace.h"
22115 #include "policy.h"
22116
22117 +extern void yywarn(const char *s);
22118 +extern void yyerror(const char *s);
22119
22120 static RULE *rule;
22121 static SIG_ENTITY *curr_sig = &_entity;
22122 @@ -93,516 +187,830 @@
22123 }
22124
22125
22126 -#line 53 "cfg_y.y"
22127 -typedef union {
22128 +
22129 +/* Enabling traces. */
22130 +#ifndef YYDEBUG
22131 +# define YYDEBUG 0
22132 +#endif
22133 +
22134 +/* Enabling verbose error messages. */
22135 +#ifdef YYERROR_VERBOSE
22136 +# undef YYERROR_VERBOSE
22137 +# define YYERROR_VERBOSE 1
22138 +#else
22139 +# define YYERROR_VERBOSE 0
22140 +#endif
22141 +
22142 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
22143 +#line 56 "cfg_y.y"
22144 +typedef union YYSTYPE {
22145 int num;
22146 char *str;
22147 struct sockaddr_atmpvc pvc;
22148 } YYSTYPE;
22149 -#include <stdio.h>
22150 +/* Line 191 of yacc.c. */
22151 +#line 213 "y.tab.c"
22152 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
22153 +# define YYSTYPE_IS_DECLARED 1
22154 +# define YYSTYPE_IS_TRIVIAL 1
22155 +#endif
22156 +
22157 +
22158 +
22159 +/* Copy the second part of user declarations. */
22160 +
22161 +
22162 +/* Line 214 of yacc.c. */
22163 +#line 225 "y.tab.c"
22164 +
22165 +#if ! defined (yyoverflow) || YYERROR_VERBOSE
22166 +
22167 +# ifndef YYFREE
22168 +# define YYFREE free
22169 +# endif
22170 +# ifndef YYMALLOC
22171 +# define YYMALLOC malloc
22172 +# endif
22173 +
22174 +/* The parser invokes alloca or malloc; define the necessary symbols. */
22175 +
22176 +# ifdef YYSTACK_USE_ALLOCA
22177 +# if YYSTACK_USE_ALLOCA
22178 +# define YYSTACK_ALLOC alloca
22179 +# endif
22180 +# else
22181 +# if defined (alloca) || defined (_ALLOCA_H)
22182 +# define YYSTACK_ALLOC alloca
22183 +# else
22184 +# ifdef __GNUC__
22185 +# define YYSTACK_ALLOC __builtin_alloca
22186 +# endif
22187 +# endif
22188 +# endif
22189 +
22190 +# ifdef YYSTACK_ALLOC
22191 + /* Pacify GCC's `empty if-body' warning. */
22192 +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
22193 +# else
22194 +# if defined (__STDC__) || defined (__cplusplus)
22195 +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
22196 +# define YYSIZE_T size_t
22197 +# endif
22198 +# define YYSTACK_ALLOC YYMALLOC
22199 +# define YYSTACK_FREE YYFREE
22200 +# endif
22201 +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
22202 +
22203 +
22204 +#if (! defined (yyoverflow) \
22205 + && (! defined (__cplusplus) \
22206 + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
22207 +
22208 +/* A type that is properly aligned for any stack member. */
22209 +union yyalloc
22210 +{
22211 + short int yyss;
22212 + YYSTYPE yyvs;
22213 + };
22214 +
22215 +/* The size of the maximum gap between one aligned stack and the next. */
22216 +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
22217 +
22218 +/* The size of an array large to enough to hold all stacks, each with
22219 + N elements. */
22220 +# define YYSTACK_BYTES(N) \
22221 + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
22222 + + YYSTACK_GAP_MAXIMUM)
22223 +
22224 +/* Copy COUNT objects from FROM to TO. The source and destination do
22225 + not overlap. */
22226 +# ifndef YYCOPY
22227 +# if defined (__GNUC__) && 1 < __GNUC__
22228 +# define YYCOPY(To, From, Count) \
22229 + __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
22230 +# else
22231 +# define YYCOPY(To, From, Count) \
22232 + do \
22233 + { \
22234 + register YYSIZE_T yyi; \
22235 + for (yyi = 0; yyi < (Count); yyi++) \
22236 + (To)[yyi] = (From)[yyi]; \
22237 + } \
22238 + while (0)
22239 +# endif
22240 +# endif
22241 +
22242 +/* Relocate STACK from its old location to the new one. The
22243 + local variables YYSIZE and YYSTACKSIZE give the old and new number of
22244 + elements in the stack, and YYPTR gives the new location of the
22245 + stack. Advance YYPTR to a properly aligned location for the next
22246 + stack. */
22247 +# define YYSTACK_RELOCATE(Stack) \
22248 + do \
22249 + { \
22250 + YYSIZE_T yynewbytes; \
22251 + YYCOPY (&yyptr->Stack, Stack, yysize); \
22252 + Stack = &yyptr->Stack; \
22253 + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
22254 + yyptr += yynewbytes / sizeof (*yyptr); \
22255 + } \
22256 + while (0)
22257
22258 -#ifndef __cplusplus
22259 -#ifndef __STDC__
22260 -#define const
22261 -#endif
22262 #endif
22263
22264 +#if defined (__STDC__) || defined (__cplusplus)
22265 + typedef signed char yysigned_char;
22266 +#else
22267 + typedef short int yysigned_char;
22268 +#endif
22269
22270 -
22271 -#define YYFINAL 117
22272 -#define YYFLAG -32768
22273 -#define YYNTBASE 41
22274 -
22275 -#define YYTRANSLATE(x) ((unsigned)(x) <= 292 ? yytranslate[x] : 71)
22276 -
22277 -static const char yytranslate[] = { 0,
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, 2, 2, 2, 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, 39, 2, 40, 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, 2, 2, 2, 2,
22296 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22297 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22298 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22299 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22300 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22301 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22302 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22303 - 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
22304 - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
22305 - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
22306 - 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
22307 - 37, 38
22308 +/* YYFINAL -- State number of the termination state. */
22309 +#define YYFINAL 53
22310 +/* YYLAST -- Last index in YYTABLE. */
22311 +#define YYLAST 108
22312 +
22313 +/* YYNTOKENS -- Number of terminals. */
22314 +#define YYNTOKENS 41
22315 +/* YYNNTS -- Number of nonterminals. */
22316 +#define YYNNTS 31
22317 +/* YYNRULES -- Number of rules. */
22318 +#define YYNRULES 79
22319 +/* YYNRULES -- Number of states. */
22320 +#define YYNSTATES 117
22321 +
22322 +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
22323 +#define YYUNDEFTOK 2
22324 +#define YYMAXUTOK 293
22325 +
22326 +#define YYTRANSLATE(YYX) \
22327 + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
22328 +
22329 +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
22330 +static const unsigned char yytranslate[] =
22331 +{
22332 + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22333 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22334 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22335 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22336 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22337 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22338 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22339 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22340 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22341 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22342 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22343 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22344 + 2, 2, 2, 39, 2, 40, 2, 2, 2, 2,
22345 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22346 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22347 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22348 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22349 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22350 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22351 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22352 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22353 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22354 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22355 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22356 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
22357 + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
22358 + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
22359 + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
22360 + 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
22361 + 35, 36, 37, 38
22362 };
22363
22364 -#if YYDEBUG != 0
22365 -static const short yyprhs[] = { 0,
22366 - 0, 3, 4, 7, 8, 11, 14, 17, 20, 23,
22367 - 26, 29, 30, 35, 36, 40, 41, 44, 49, 52,
22368 - 54, 56, 58, 60, 62, 66, 67, 70, 72, 76,
22369 - 77, 80, 82, 86, 87, 90, 92, 96, 97, 100,
22370 - 102, 106, 107, 110, 113, 118, 120, 122, 124, 126,
22371 - 128, 131, 134, 137, 140, 143, 145, 147, 150, 152,
22372 - 154, 157, 158, 160, 162, 164, 166, 168, 170, 172,
22373 - 174, 176, 179, 180, 184, 186, 188, 190
22374 +#if YYDEBUG
22375 +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
22376 + YYRHS. */
22377 +static const unsigned char yyprhs[] =
22378 +{
22379 + 0, 0, 3, 6, 7, 10, 11, 14, 17, 20,
22380 + 23, 26, 29, 32, 33, 38, 39, 43, 44, 47,
22381 + 52, 55, 57, 59, 61, 63, 65, 69, 70, 73,
22382 + 75, 79, 80, 83, 85, 89, 90, 93, 95, 99,
22383 + 100, 103, 105, 109, 110, 113, 116, 121, 123, 125,
22384 + 127, 129, 131, 134, 137, 140, 143, 146, 148, 150,
22385 + 153, 155, 157, 160, 161, 163, 165, 167, 169, 171,
22386 + 173, 175, 177, 179, 182, 183, 187, 189, 191, 193
22387 };
22388
22389 -static const short yyrhs[] = { 42,
22390 - 43, 0, 0, 44, 42, 0, 0, 45, 43, 0,
22391 - 3, 65, 0, 9, 50, 0, 14, 52, 0, 16,
22392 - 54, 0, 4, 56, 0, 25, 58, 0, 0, 28,
22393 - 38, 46, 47, 0, 0, 39, 48, 40, 0, 0,
22394 - 49, 48, 0, 21, 30, 22, 30, 0, 17, 66,
22395 - 0, 34, 0, 31, 0, 37, 0, 29, 0, 60,
22396 - 0, 39, 51, 40, 0, 0, 60, 51, 0, 61,
22397 - 0, 39, 53, 40, 0, 0, 61, 53, 0, 62,
22398 - 0, 39, 55, 40, 0, 0, 62, 55, 0, 63,
22399 - 0, 39, 57, 40, 0, 0, 63, 57, 0, 67,
22400 - 0, 39, 59, 40, 0, 0, 67, 59, 0, 3,
22401 - 65, 0, 21, 30, 22, 30, 0, 10, 0, 11,
22402 - 0, 12, 0, 13, 0, 19, 0, 17, 66, 0,
22403 - 3, 65, 0, 3, 65, 0, 15, 38, 0, 23,
22404 - 30, 0, 34, 0, 31, 0, 3, 65, 0, 32,
22405 - 0, 33, 0, 24, 64, 0, 0, 30, 0, 4,
22406 - 0, 5, 0, 6, 0, 7, 0, 8, 0, 18,
22407 - 0, 19, 0, 20, 0, 3, 65, 0, 0, 69,
22408 - 68, 70, 0, 26, 0, 27, 0, 35, 0, 36,
22409 - 0
22410 +/* YYRHS -- A `-1'-separated list of the rules' RHS. */
22411 +static const yysigned_char yyrhs[] =
22412 +{
22413 + 42, 0, -1, 43, 44, -1, -1, 45, 43, -1,
22414 + -1, 46, 44, -1, 3, 66, -1, 9, 51, -1,
22415 + 14, 53, -1, 16, 55, -1, 4, 57, -1, 25,
22416 + 59, -1, -1, 28, 38, 47, 48, -1, -1, 39,
22417 + 49, 40, -1, -1, 50, 49, -1, 21, 30, 22,
22418 + 30, -1, 17, 67, -1, 34, -1, 31, -1, 37,
22419 + -1, 29, -1, 61, -1, 39, 52, 40, -1, -1,
22420 + 61, 52, -1, 62, -1, 39, 54, 40, -1, -1,
22421 + 62, 54, -1, 63, -1, 39, 56, 40, -1, -1,
22422 + 63, 56, -1, 64, -1, 39, 58, 40, -1, -1,
22423 + 64, 58, -1, 68, -1, 39, 60, 40, -1, -1,
22424 + 68, 60, -1, 3, 66, -1, 21, 30, 22, 30,
22425 + -1, 10, -1, 11, -1, 12, -1, 13, -1, 19,
22426 + -1, 17, 67, -1, 3, 66, -1, 3, 66, -1,
22427 + 15, 38, -1, 23, 30, -1, 34, -1, 31, -1,
22428 + 3, 66, -1, 32, -1, 33, -1, 24, 65, -1,
22429 + -1, 30, -1, 4, -1, 5, -1, 6, -1, 7,
22430 + -1, 8, -1, 18, -1, 19, -1, 20, -1, 3,
22431 + 66, -1, -1, 70, 69, 71, -1, 26, -1, 27,
22432 + -1, 35, -1, 36, -1
22433 };
22434
22435 -#endif
22436 -
22437 -#if YYDEBUG != 0
22438 -static const short yyrline[] = { 0,
22439 - 73, 77, 78, 81, 82, 105, 110, 111, 112, 113,
22440 - 114, 117, 138, 140, 141, 144, 145, 148, 153, 154,
22441 - 158, 162, 176, 182, 184, 187, 188, 191, 193, 196,
22442 - 197, 200, 202, 205, 206, 209, 211, 214, 215, 218,
22443 - 220, 223, 224, 227, 234, 238, 247, 256, 265, 274,
22444 - 279, 282, 290, 295, 299, 304, 308, 314, 319, 324,
22445 - 328, 334, 338, 344, 349, 353, 357, 361, 367, 372,
22446 - 376, 382, 387, 393, 395, 400, 406, 412
22447 +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
22448 +static const unsigned short int yyrline[] =
22449 +{
22450 + 0, 77, 77, 80, 81, 84, 85, 109, 113, 114,
22451 + 115, 116, 117, 122, 121, 151, 152, 155, 156, 160,
22452 + 164, 165, 169, 173, 187, 194, 195, 198, 199, 203,
22453 + 204, 207, 208, 212, 213, 216, 217, 221, 222, 225,
22454 + 226, 230, 231, 234, 235, 239, 245, 249, 258, 267,
22455 + 276, 285, 290, 294, 302, 306, 310, 315, 319, 326,
22456 + 330, 335, 339, 346, 349, 356, 360, 364, 368, 372,
22457 + 379, 383, 387, 394, 399, 398, 407, 411, 418, 423
22458 };
22459 #endif
22460
22461 -
22462 -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
22463 -
22464 -static const char * const yytname[] = { "$","error","$undefined.","TOK_LEVEL",
22465 -"TOK_DEBUG","TOK_INFO","TOK_WARN","TOK_ERROR","TOK_FATAL","TOK_SIG","TOK_UNI30",
22466 -"TOK_UNI31","TOK_UNI40","TOK_Q2963_1","TOK_SAAL","TOK_VC","TOK_IO","TOK_MODE",
22467 -"TOK_USER","TOK_NET","TOK_SWITCH","TOK_VPCI","TOK_ITF","TOK_PCR","TOK_TRACE",
22468 -"TOK_POLICY","TOK_ALLOW","TOK_REJECT","TOK_ENTITY","TOK_DEFAULT","TOK_NUMBER",
22469 -"TOK_MAX_RATE","TOK_DUMP_DIR","TOK_LOGFILE","TOK_QOS","TOK_FROM","TOK_TO","TOK_ROUTE",
22470 -"TOK_PVC","'{'","'}'","all","global","local","item","entity","@1","opt_options",
22471 -"options","option","sig","sig_items","saal","saal_items","io","io_items","debug",
22472 -"debug_items","policy","policy_items","sig_item","saal_item","io_item","debug_item",
22473 -"opt_trace_size","level","mode","policy_item","@2","action","direction", NULL
22474 +#if YYDEBUG || YYERROR_VERBOSE
22475 +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
22476 + First, the terminals, then, starting at YYNTOKENS, nonterminals. */
22477 +static const char *const yytname[] =
22478 +{
22479 + "$end", "error", "$undefined", "TOK_LEVEL", "TOK_DEBUG", "TOK_INFO",
22480 + "TOK_WARN", "TOK_ERROR", "TOK_FATAL", "TOK_SIG", "TOK_UNI30",
22481 + "TOK_UNI31", "TOK_UNI40", "TOK_Q2963_1", "TOK_SAAL", "TOK_VC", "TOK_IO",
22482 + "TOK_MODE", "TOK_USER", "TOK_NET", "TOK_SWITCH", "TOK_VPCI", "TOK_ITF",
22483 + "TOK_PCR", "TOK_TRACE", "TOK_POLICY", "TOK_ALLOW", "TOK_REJECT",
22484 + "TOK_ENTITY", "TOK_DEFAULT", "TOK_NUMBER", "TOK_MAX_RATE",
22485 + "TOK_DUMP_DIR", "TOK_LOGFILE", "TOK_QOS", "TOK_FROM", "TOK_TO",
22486 + "TOK_ROUTE", "TOK_PVC", "'{'", "'}'", "$accept", "all", "global",
22487 + "local", "item", "entity", "@1", "opt_options", "options", "option",
22488 + "sig", "sig_items", "saal", "saal_items", "io", "io_items", "debug",
22489 + "debug_items", "policy", "policy_items", "sig_item", "saal_item",
22490 + "io_item", "debug_item", "opt_trace_size", "level", "mode",
22491 + "policy_item", "@2", "action", "direction", 0
22492 };
22493 #endif
22494
22495 -static const short yyr1[] = { 0,
22496 - 41, 42, 42, 43, 43, 44, 44, 44, 44, 44,
22497 - 44, 46, 45, 47, 47, 48, 48, 49, 49, 49,
22498 - 49, 49, 49, 50, 50, 51, 51, 52, 52, 53,
22499 - 53, 54, 54, 55, 55, 56, 56, 57, 57, 58,
22500 - 58, 59, 59, 60, 60, 60, 60, 60, 60, 60,
22501 - 60, 61, 62, 62, 62, 62, 62, 63, 63, 63,
22502 - 63, 64, 64, 65, 65, 65, 65, 65, 66, 66,
22503 - 66, 67, 68, 67, 69, 69, 70, 70
22504 +# ifdef YYPRINT
22505 +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
22506 + token YYLEX-NUM. */
22507 +static const unsigned short int yytoknum[] =
22508 +{
22509 + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
22510 + 265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
22511 + 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
22512 + 285, 286, 287, 288, 289, 290, 291, 292, 293, 123,
22513 + 125
22514 };
22515 +# endif
22516
22517 -static const short yyr2[] = { 0,
22518 - 2, 0, 2, 0, 2, 2, 2, 2, 2, 2,
22519 - 2, 0, 4, 0, 3, 0, 2, 4, 2, 1,
22520 - 1, 1, 1, 1, 3, 0, 2, 1, 3, 0,
22521 - 2, 1, 3, 0, 2, 1, 3, 0, 2, 1,
22522 - 3, 0, 2, 2, 4, 1, 1, 1, 1, 1,
22523 - 2, 2, 2, 2, 2, 1, 1, 2, 1, 1,
22524 - 2, 0, 1, 1, 1, 1, 1, 1, 1, 1,
22525 - 1, 2, 0, 3, 1, 1, 1, 1
22526 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
22527 +static const unsigned char yyr1[] =
22528 +{
22529 + 0, 41, 42, 43, 43, 44, 44, 45, 45, 45,
22530 + 45, 45, 45, 47, 46, 48, 48, 49, 49, 50,
22531 + 50, 50, 50, 50, 50, 51, 51, 52, 52, 53,
22532 + 53, 54, 54, 55, 55, 56, 56, 57, 57, 58,
22533 + 58, 59, 59, 60, 60, 61, 61, 61, 61, 61,
22534 + 61, 61, 61, 62, 63, 63, 63, 63, 63, 64,
22535 + 64, 64, 64, 65, 65, 66, 66, 66, 66, 66,
22536 + 67, 67, 67, 68, 69, 68, 70, 70, 71, 71
22537 };
22538
22539 -static const short yydefact[] = { 2,
22540 - 0, 0, 0, 0, 0, 0, 4, 2, 64, 65,
22541 - 66, 67, 68, 6, 0, 62, 59, 60, 38, 10,
22542 - 36, 0, 46, 47, 48, 49, 0, 50, 0, 26,
22543 - 7, 24, 0, 30, 8, 28, 0, 0, 0, 57,
22544 - 56, 34, 9, 32, 0, 75, 76, 42, 11, 40,
22545 - 73, 0, 1, 4, 3, 58, 63, 61, 0, 38,
22546 - 44, 69, 70, 71, 51, 0, 0, 26, 52, 0,
22547 - 30, 53, 54, 55, 0, 34, 72, 0, 42, 0,
22548 - 12, 5, 37, 39, 0, 25, 27, 29, 31, 33,
22549 - 35, 41, 43, 77, 78, 74, 14, 45, 16, 13,
22550 - 0, 0, 23, 21, 20, 22, 0, 16, 19, 0,
22551 - 15, 17, 0, 18, 0, 0, 0
22552 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
22553 +static const unsigned char yyr2[] =
22554 +{
22555 + 0, 2, 2, 0, 2, 0, 2, 2, 2, 2,
22556 + 2, 2, 2, 0, 4, 0, 3, 0, 2, 4,
22557 + 2, 1, 1, 1, 1, 1, 3, 0, 2, 1,
22558 + 3, 0, 2, 1, 3, 0, 2, 1, 3, 0,
22559 + 2, 1, 3, 0, 2, 2, 4, 1, 1, 1,
22560 + 1, 1, 2, 2, 2, 2, 2, 1, 1, 2,
22561 + 1, 1, 2, 0, 1, 1, 1, 1, 1, 1,
22562 + 1, 1, 1, 2, 0, 3, 1, 1, 1, 1
22563 };
22564
22565 -static const short yydefgoto[] = { 115,
22566 - 7, 53, 8, 54, 97, 100, 107, 108, 31, 67,
22567 - 35, 70, 43, 75, 20, 59, 49, 78, 68, 71,
22568 - 76, 60, 58, 14, 65, 79, 80, 51, 96
22569 +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
22570 + STATE-NUM when YYTABLE doesn't specify something else to do. Zero
22571 + means the default is an error. */
22572 +static const unsigned char yydefact[] =
22573 +{
22574 + 3, 0, 0, 0, 0, 0, 0, 0, 5, 3,
22575 + 65, 66, 67, 68, 69, 7, 0, 63, 60, 61,
22576 + 39, 11, 37, 0, 47, 48, 49, 50, 0, 51,
22577 + 0, 27, 8, 25, 0, 31, 9, 29, 0, 0,
22578 + 0, 58, 57, 35, 10, 33, 0, 76, 77, 43,
22579 + 12, 41, 74, 1, 0, 2, 5, 4, 59, 64,
22580 + 62, 0, 39, 45, 70, 71, 72, 52, 0, 0,
22581 + 27, 53, 0, 31, 54, 55, 56, 0, 35, 73,
22582 + 0, 43, 0, 13, 6, 38, 40, 0, 26, 28,
22583 + 30, 32, 34, 36, 42, 44, 78, 79, 75, 15,
22584 + 46, 17, 14, 0, 0, 24, 22, 21, 23, 0,
22585 + 17, 20, 0, 16, 18, 0, 19
22586 };
22587
22588 -static const short yypact[] = { 52,
22589 - 100, 1, -3, -1, -2, 0, -17, 52,-32768,-32768,
22590 --32768,-32768,-32768,-32768, 100, -18,-32768,-32768, 25,-32768,
22591 --32768, 100,-32768,-32768,-32768,-32768, 60,-32768, -15, 82,
22592 --32768,-32768, 100, 14,-32768,-32768, 100, -19, -10,-32768,
22593 --32768, 20,-32768,-32768, 100,-32768,-32768, 19,-32768,-32768,
22594 --32768, -14,-32768, -17,-32768,-32768,-32768,-32768, -9, 25,
22595 --32768,-32768,-32768,-32768,-32768, 8, 2, 82,-32768, 4,
22596 - 14,-32768,-32768,-32768, 7, 20,-32768, 10, 19, -30,
22597 --32768,-32768,-32768,-32768, 22,-32768,-32768,-32768,-32768,-32768,
22598 --32768,-32768,-32768,-32768,-32768,-32768, 21,-32768, 53,-32768,
22599 - 60, 23,-32768,-32768,-32768,-32768, 24, 53,-32768, 40,
22600 --32768,-32768, 35,-32768, 67, 69,-32768
22601 +/* YYDEFGOTO[NTERM-NUM]. */
22602 +static const yysigned_char yydefgoto[] =
22603 +{
22604 + -1, 7, 8, 55, 9, 56, 99, 102, 109, 110,
22605 + 32, 69, 36, 72, 44, 77, 21, 61, 50, 80,
22606 + 70, 73, 78, 62, 60, 15, 67, 81, 82, 52,
22607 + 98
22608 };
22609
22610 -static const short yypgoto[] = {-32768,
22611 - 64, 27,-32768,-32768,-32768,-32768, -35,-32768,-32768, 15,
22612 --32768, 5,-32768, 12,-32768, 29,-32768, -4, 83, 87,
22613 - 91, 95,-32768, 26, 9, 92,-32768,-32768,-32768
22614 +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
22615 + STATE-NUM. */
22616 +#define YYPACT_NINF -31
22617 +static const yysigned_char yypact[] =
22618 +{
22619 + 53, 69, 1, -3, -1, -2, 0, 11, -16, 53,
22620 + -31, -31, -31, -31, -31, -31, 69, -15, -31, -31,
22621 + 28, -31, -31, 69, -31, -31, -31, -31, 46, -31,
22622 + -13, 80, -31, -31, 69, 16, -31, -31, 69, -18,
22623 + -6, -31, -31, 20, -31, -31, 69, -31, -31, 19,
22624 + -31, -31, -31, -31, -10, -31, -16, -31, -31, -31,
22625 + -31, 2, 28, -31, -31, -31, -31, -31, 8, 4,
22626 + 80, -31, 7, 16, -31, -31, -31, 9, 20, -31,
22627 + 10, 19, -30, -31, -31, -31, -31, 23, -31, -31,
22628 + -31, -31, -31, -31, -31, -31, -31, -31, -31, 31,
22629 + -31, 51, -31, 46, 49, -31, -31, -31, -31, 15,
22630 + 51, -31, 36, -31, -31, 54, -31
22631 };
22632
22633 -
22634 -#define YYLAST 110
22635 -
22636 -
22637 -static const short yytable[] = { 22,
22638 - 37, 33, 45, 15, 94, 95, 23, 24, 25, 26,
22639 - 52, 57, 38, 27, 66, 28, 33, 29, 73, 74,
22640 - 39, 45, 37, 81, 16, 46, 47, 15, 40, 85,
22641 - 83, 41, 17, 18, 38, 30, 42, 34, 48, 19,
22642 - 56, 86, 39, 88, 46, 47, 90, 61, 16, 92,
22643 - 40, 98, 110, 41, 1, 2, 17, 18, 69, 99,
22644 - 3, 113, 72, 111, 114, 4, 116, 5, 117, 101,
22645 - 77, 55, 112, 102, 93, 89, 6, 62, 63, 64,
22646 - 82, 103, 87, 104, 22, 32, 105, 91, 84, 106,
22647 - 36, 23, 24, 25, 26, 44, 21, 50, 27, 0,
22648 - 28, 0, 29, 9, 10, 11, 12, 13, 0, 109
22649 +/* YYPGOTO[NTERM-NUM]. */
22650 +static const yysigned_char yypgoto[] =
22651 +{
22652 + -31, -31, 72, 30, -31, -31, -31, -31, -23, -31,
22653 + -31, 24, -31, 22, -31, 18, -31, 27, -31, 17,
22654 + 97, 98, 99, 101, -31, 25, 3, 102, -31, -31,
22655 + -31
22656 };
22657
22658 -static const short yycheck[] = { 3,
22659 - 3, 3, 3, 3, 35, 36, 10, 11, 12, 13,
22660 - 28, 30, 15, 17, 30, 19, 3, 21, 38, 30,
22661 - 23, 3, 3, 38, 24, 26, 27, 3, 31, 22,
22662 - 40, 34, 32, 33, 15, 39, 39, 39, 39, 39,
22663 - 15, 40, 23, 40, 26, 27, 40, 22, 24, 40,
22664 - 31, 30, 30, 34, 3, 4, 32, 33, 33, 39,
22665 - 9, 22, 37, 40, 30, 14, 0, 16, 0, 17,
22666 - 45, 8, 108, 21, 79, 71, 25, 18, 19, 20,
22667 - 54, 29, 68, 31, 3, 3, 34, 76, 60, 37,
22668 - 4, 10, 11, 12, 13, 5, 2, 6, 17, -1,
22669 - 19, -1, 21, 4, 5, 6, 7, 8, -1, 101
22670 +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
22671 + positive, shift that token. If negative, reduce the rule which
22672 + number is the opposite. If zero, do what YYDEFACT says.
22673 + If YYTABLE_NINF, syntax error. */
22674 +#define YYTABLE_NINF -1
22675 +static const unsigned char yytable[] =
22676 +{
22677 + 23, 38, 34, 46, 16, 96, 97, 24, 25, 26,
22678 + 27, 53, 54, 39, 28, 59, 29, 68, 30, 34,
22679 + 75, 40, 46, 38, 76, 17, 47, 48, 83, 41,
22680 + 87, 16, 42, 18, 19, 39, 31, 43, 35, 49,
22681 + 20, 58, 85, 40, 88, 47, 48, 90, 63, 92,
22682 + 94, 41, 17, 100, 42, 113, 1, 2, 115, 71,
22683 + 18, 19, 3, 74, 64, 65, 66, 4, 103, 5,
22684 + 101, 79, 104, 10, 11, 12, 13, 14, 6, 112,
22685 + 105, 57, 106, 23, 116, 107, 84, 114, 108, 86,
22686 + 24, 25, 26, 27, 89, 91, 93, 28, 95, 29,
22687 + 33, 30, 37, 22, 45, 0, 111, 0, 51
22688 };
22689 -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
22690 -#line 3 "/usr/lib/bison.simple"
22691 -/* This file comes from bison-1.28. */
22692 -
22693 -/* Skeleton output parser for bison,
22694 - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
22695 -
22696 - This program is free software; you can redistribute it and/or modify
22697 - it under the terms of the GNU General Public License as published by
22698 - the Free Software Foundation; either version 2, or (at your option)
22699 - any later version.
22700
22701 - This program is distributed in the hope that it will be useful,
22702 - but WITHOUT ANY WARRANTY; without even the implied warranty of
22703 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22704 - GNU General Public License for more details.
22705 -
22706 - You should have received a copy of the GNU General Public License
22707 - along with this program; if not, write to the Free Software
22708 - Foundation, Inc., 59 Temple Place - Suite 330,
22709 - Boston, MA 02111-1307, USA. */
22710 -
22711 -/* As a special exception, when this file is copied by Bison into a
22712 - Bison output file, you may use that output file without restriction.
22713 - This special exception was added by the Free Software Foundation
22714 - in version 1.24 of Bison. */
22715 +static const yysigned_char yycheck[] =
22716 +{
22717 + 3, 3, 3, 3, 3, 35, 36, 10, 11, 12,
22718 + 13, 0, 28, 15, 17, 30, 19, 30, 21, 3,
22719 + 38, 23, 3, 3, 30, 24, 26, 27, 38, 31,
22720 + 22, 3, 34, 32, 33, 15, 39, 39, 39, 39,
22721 + 39, 16, 40, 23, 40, 26, 27, 40, 23, 40,
22722 + 40, 31, 24, 30, 34, 40, 3, 4, 22, 34,
22723 + 32, 33, 9, 38, 18, 19, 20, 14, 17, 16,
22724 + 39, 46, 21, 4, 5, 6, 7, 8, 25, 30,
22725 + 29, 9, 31, 3, 30, 34, 56, 110, 37, 62,
22726 + 10, 11, 12, 13, 70, 73, 78, 17, 81, 19,
22727 + 3, 21, 4, 2, 5, -1, 103, -1, 6
22728 +};
22729
22730 -/* This is the parser code that is written into each bison parser
22731 - when the %semantic_parser declaration is not specified in the grammar.
22732 - It was written by Richard Stallman by simplifying the hairy parser
22733 - used when %semantic_parser is specified. */
22734 -
22735 -#ifndef YYSTACK_USE_ALLOCA
22736 -#ifdef alloca
22737 -#define YYSTACK_USE_ALLOCA
22738 -#else /* alloca not defined */
22739 -#ifdef __GNUC__
22740 -#define YYSTACK_USE_ALLOCA
22741 -#define alloca __builtin_alloca
22742 -#else /* not GNU C. */
22743 -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
22744 -#define YYSTACK_USE_ALLOCA
22745 -#include <alloca.h>
22746 -#else /* not sparc */
22747 -/* We think this test detects Watcom and Microsoft C. */
22748 -/* This used to test MSDOS, but that is a bad idea
22749 - since that symbol is in the user namespace. */
22750 -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
22751 -#if 0 /* No need for malloc.h, which pollutes the namespace;
22752 - instead, just don't use alloca. */
22753 -#include <malloc.h>
22754 -#endif
22755 -#else /* not MSDOS, or __TURBOC__ */
22756 -#if defined(_AIX)
22757 -/* I don't know what this was needed for, but it pollutes the namespace.
22758 - So I turned it off. rms, 2 May 1997. */
22759 -/* #include <malloc.h> */
22760 - #pragma alloca
22761 -#define YYSTACK_USE_ALLOCA
22762 -#else /* not MSDOS, or __TURBOC__, or _AIX */
22763 -#if 0
22764 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
22765 - and on HPUX 10. Eventually we can turn this on. */
22766 -#define YYSTACK_USE_ALLOCA
22767 -#define alloca __builtin_alloca
22768 -#endif /* __hpux */
22769 -#endif
22770 -#endif /* not _AIX */
22771 -#endif /* not MSDOS, or __TURBOC__ */
22772 -#endif /* not sparc */
22773 -#endif /* not GNU C */
22774 -#endif /* alloca not defined */
22775 -#endif /* YYSTACK_USE_ALLOCA not defined */
22776 +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
22777 + symbol of state STATE-NUM. */
22778 +static const unsigned char yystos[] =
22779 +{
22780 + 0, 3, 4, 9, 14, 16, 25, 42, 43, 45,
22781 + 4, 5, 6, 7, 8, 66, 3, 24, 32, 33,
22782 + 39, 57, 64, 3, 10, 11, 12, 13, 17, 19,
22783 + 21, 39, 51, 61, 3, 39, 53, 62, 3, 15,
22784 + 23, 31, 34, 39, 55, 63, 3, 26, 27, 39,
22785 + 59, 68, 70, 0, 28, 44, 46, 43, 66, 30,
22786 + 65, 58, 64, 66, 18, 19, 20, 67, 30, 52,
22787 + 61, 66, 54, 62, 66, 38, 30, 56, 63, 66,
22788 + 60, 68, 69, 38, 44, 40, 58, 22, 40, 52,
22789 + 40, 54, 40, 56, 40, 60, 35, 36, 71, 47,
22790 + 30, 39, 48, 17, 21, 29, 31, 34, 37, 49,
22791 + 50, 67, 30, 40, 49, 22, 30
22792 +};
22793
22794 -#ifdef YYSTACK_USE_ALLOCA
22795 -#define YYSTACK_ALLOC alloca
22796 -#else
22797 -#define YYSTACK_ALLOC malloc
22798 +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
22799 +# define YYSIZE_T __SIZE_TYPE__
22800 +#endif
22801 +#if ! defined (YYSIZE_T) && defined (size_t)
22802 +# define YYSIZE_T size_t
22803 +#endif
22804 +#if ! defined (YYSIZE_T)
22805 +# if defined (__STDC__) || defined (__cplusplus)
22806 +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
22807 +# define YYSIZE_T size_t
22808 +# endif
22809 +#endif
22810 +#if ! defined (YYSIZE_T)
22811 +# define YYSIZE_T unsigned int
22812 #endif
22813 -
22814 -/* Note: there must be only one dollar sign in this file.
22815 - It is replaced by the list of actions, each action
22816 - as one case of the switch. */
22817
22818 #define yyerrok (yyerrstatus = 0)
22819 #define yyclearin (yychar = YYEMPTY)
22820 -#define YYEMPTY -2
22821 +#define YYEMPTY (-2)
22822 #define YYEOF 0
22823 +
22824 #define YYACCEPT goto yyacceptlab
22825 -#define YYABORT goto yyabortlab
22826 -#define YYERROR goto yyerrlab1
22827 -/* Like YYERROR except do call yyerror.
22828 - This remains here temporarily to ease the
22829 - transition to the new meaning of YYERROR, for GCC.
22830 +#define YYABORT goto yyabortlab
22831 +#define YYERROR goto yyerrorlab
22832 +
22833 +
22834 +/* Like YYERROR except do call yyerror. This remains here temporarily
22835 + to ease the transition to the new meaning of YYERROR, for GCC.
22836 Once GCC version 2 has supplanted version 1, this can go. */
22837 +
22838 #define YYFAIL goto yyerrlab
22839 +
22840 #define YYRECOVERING() (!!yyerrstatus)
22841 -#define YYBACKUP(token, value) \
22842 +
22843 +#define YYBACKUP(Token, Value) \
22844 do \
22845 if (yychar == YYEMPTY && yylen == 1) \
22846 - { yychar = (token), yylval = (value); \
22847 - yychar1 = YYTRANSLATE (yychar); \
22848 + { \
22849 + yychar = (Token); \
22850 + yylval = (Value); \
22851 + yytoken = YYTRANSLATE (yychar); \
22852 YYPOPSTACK; \
22853 goto yybackup; \
22854 } \
22855 else \
22856 - { yyerror ("syntax error: cannot back up"); YYERROR; } \
22857 + { \
22858 + yyerror ("syntax error: cannot back up");\
22859 + YYERROR; \
22860 + } \
22861 while (0)
22862
22863 #define YYTERROR 1
22864 #define YYERRCODE 256
22865
22866 -#ifndef YYPURE
22867 -#define YYLEX yylex()
22868 -#endif
22869 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions
22870 + are run). */
22871
22872 -#ifdef YYPURE
22873 -#ifdef YYLSP_NEEDED
22874 -#ifdef YYLEX_PARAM
22875 -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
22876 -#else
22877 -#define YYLEX yylex(&yylval, &yylloc)
22878 +#ifndef YYLLOC_DEFAULT
22879 +# define YYLLOC_DEFAULT(Current, Rhs, N) \
22880 + ((Current).first_line = (Rhs)[1].first_line, \
22881 + (Current).first_column = (Rhs)[1].first_column, \
22882 + (Current).last_line = (Rhs)[N].last_line, \
22883 + (Current).last_column = (Rhs)[N].last_column)
22884 #endif
22885 -#else /* not YYLSP_NEEDED */
22886 +
22887 +/* YYLEX -- calling `yylex' with the right arguments. */
22888 +
22889 #ifdef YYLEX_PARAM
22890 -#define YYLEX yylex(&yylval, YYLEX_PARAM)
22891 +# define YYLEX yylex (YYLEX_PARAM)
22892 #else
22893 -#define YYLEX yylex(&yylval)
22894 -#endif
22895 -#endif /* not YYLSP_NEEDED */
22896 +# define YYLEX yylex ()
22897 #endif
22898
22899 -/* If nonreentrant, generate the variables here */
22900 +/* Enable debugging if requested. */
22901 +#if YYDEBUG
22902
22903 -#ifndef YYPURE
22904 +# ifndef YYFPRINTF
22905 +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
22906 +# define YYFPRINTF fprintf
22907 +# endif
22908 +
22909 +# define YYDPRINTF(Args) \
22910 +do { \
22911 + if (yydebug) \
22912 + YYFPRINTF Args; \
22913 +} while (0)
22914 +
22915 +# define YYDSYMPRINT(Args) \
22916 +do { \
22917 + if (yydebug) \
22918 + yysymprint Args; \
22919 +} while (0)
22920 +
22921 +# define YYDSYMPRINTF(Title, Token, Value, Location) \
22922 +do { \
22923 + if (yydebug) \
22924 + { \
22925 + YYFPRINTF (stderr, "%s ", Title); \
22926 + yysymprint (stderr, \
22927 + Token, Value); \
22928 + YYFPRINTF (stderr, "\n"); \
22929 + } \
22930 +} while (0)
22931
22932 -int yychar; /* the lookahead symbol */
22933 -YYSTYPE yylval; /* the semantic value of the */
22934 - /* lookahead symbol */
22935 +/*------------------------------------------------------------------.
22936 +| yy_stack_print -- Print the state stack from its BOTTOM up to its |
22937 +| TOP (included). |
22938 +`------------------------------------------------------------------*/
22939
22940 -#ifdef YYLSP_NEEDED
22941 -YYLTYPE yylloc; /* location data for the lookahead */
22942 - /* symbol */
22943 +#if defined (__STDC__) || defined (__cplusplus)
22944 +static void
22945 +yy_stack_print (short int *bottom, short int *top)
22946 +#else
22947 +static void
22948 +yy_stack_print (bottom, top)
22949 + short int *bottom;
22950 + short int *top;
22951 #endif
22952 +{
22953 + YYFPRINTF (stderr, "Stack now");
22954 + for (/* Nothing. */; bottom <= top; ++bottom)
22955 + YYFPRINTF (stderr, " %d", *bottom);
22956 + YYFPRINTF (stderr, "\n");
22957 +}
22958 +
22959 +# define YY_STACK_PRINT(Bottom, Top) \
22960 +do { \
22961 + if (yydebug) \
22962 + yy_stack_print ((Bottom), (Top)); \
22963 +} while (0)
22964
22965 -int yynerrs; /* number of parse errors so far */
22966 -#endif /* not YYPURE */
22967
22968 -#if YYDEBUG != 0
22969 -int yydebug; /* nonzero means print parse trace */
22970 -/* Since this is uninitialized, it does not stop multiple parsers
22971 - from coexisting. */
22972 +/*------------------------------------------------.
22973 +| Report that the YYRULE is going to be reduced. |
22974 +`------------------------------------------------*/
22975 +
22976 +#if defined (__STDC__) || defined (__cplusplus)
22977 +static void
22978 +yy_reduce_print (int yyrule)
22979 +#else
22980 +static void
22981 +yy_reduce_print (yyrule)
22982 + int yyrule;
22983 #endif
22984 +{
22985 + int yyi;
22986 + unsigned int yylno = yyrline[yyrule];
22987 + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
22988 + yyrule - 1, yylno);
22989 + /* Print the symbols being reduced, and their result. */
22990 + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
22991 + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
22992 + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
22993 +}
22994 +
22995 +# define YY_REDUCE_PRINT(Rule) \
22996 +do { \
22997 + if (yydebug) \
22998 + yy_reduce_print (Rule); \
22999 +} while (0)
23000 +
23001 +/* Nonzero means print parse trace. It is left uninitialized so that
23002 + multiple parsers can coexist. */
23003 +int yydebug;
23004 +#else /* !YYDEBUG */
23005 +# define YYDPRINTF(Args)
23006 +# define YYDSYMPRINT(Args)
23007 +# define YYDSYMPRINTF(Title, Token, Value, Location)
23008 +# define YY_STACK_PRINT(Bottom, Top)
23009 +# define YY_REDUCE_PRINT(Rule)
23010 +#endif /* !YYDEBUG */
23011
23012 -/* YYINITDEPTH indicates the initial size of the parser's stacks */
23013
23014 +/* YYINITDEPTH -- initial size of the parser's stacks. */
23015 #ifndef YYINITDEPTH
23016 -#define YYINITDEPTH 200
23017 +# define YYINITDEPTH 200
23018 #endif
23019
23020 -/* YYMAXDEPTH is the maximum size the stacks can grow to
23021 - (effective only if the built-in stack extension method is used). */
23022 +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
23023 + if the built-in stack extension method is used).
23024
23025 -#if YYMAXDEPTH == 0
23026 -#undef YYMAXDEPTH
23027 + Do not make this value too large; the results are undefined if
23028 + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
23029 + evaluated with infinite-precision integer arithmetic. */
23030 +
23031 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
23032 +# undef YYMAXDEPTH
23033 #endif
23034
23035 #ifndef YYMAXDEPTH
23036 -#define YYMAXDEPTH 10000
23037 +# define YYMAXDEPTH 10000
23038 #endif
23039 +
23040 \f
23041 -/* Define __yy_memcpy. Note that the size argument
23042 - should be passed with type unsigned int, because that is what the non-GCC
23043 - definitions require. With GCC, __builtin_memcpy takes an arg
23044 - of type size_t, but it can handle unsigned int. */
23045 -
23046 -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
23047 -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
23048 -#else /* not GNU C or C++ */
23049 -#ifndef __cplusplus
23050
23051 -/* This is the most reliable way to avoid incompatibilities
23052 - in available built-in functions on various systems. */
23053 -static void
23054 -__yy_memcpy (to, from, count)
23055 - char *to;
23056 - char *from;
23057 - unsigned int count;
23058 -{
23059 - register char *f = from;
23060 - register char *t = to;
23061 - register int i = count;
23062 +#if YYERROR_VERBOSE
23063
23064 - while (i-- > 0)
23065 - *t++ = *f++;
23066 +# ifndef yystrlen
23067 +# if defined (__GLIBC__) && defined (_STRING_H)
23068 +# define yystrlen strlen
23069 +# else
23070 +/* Return the length of YYSTR. */
23071 +static YYSIZE_T
23072 +# if defined (__STDC__) || defined (__cplusplus)
23073 +yystrlen (const char *yystr)
23074 +# else
23075 +yystrlen (yystr)
23076 + const char *yystr;
23077 +# endif
23078 +{
23079 + register const char *yys = yystr;
23080 +
23081 + while (*yys++ != '\0')
23082 + continue;
23083 +
23084 + return yys - yystr - 1;
23085 }
23086 +# endif
23087 +# endif
23088
23089 -#else /* __cplusplus */
23090 +# ifndef yystpcpy
23091 +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
23092 +# define yystpcpy stpcpy
23093 +# else
23094 +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
23095 + YYDEST. */
23096 +static char *
23097 +# if defined (__STDC__) || defined (__cplusplus)
23098 +yystpcpy (char *yydest, const char *yysrc)
23099 +# else
23100 +yystpcpy (yydest, yysrc)
23101 + char *yydest;
23102 + const char *yysrc;
23103 +# endif
23104 +{
23105 + register char *yyd = yydest;
23106 + register const char *yys = yysrc;
23107 +
23108 + while ((*yyd++ = *yys++) != '\0')
23109 + continue;
23110 +
23111 + return yyd - 1;
23112 +}
23113 +# endif
23114 +# endif
23115
23116 -/* This is the most reliable way to avoid incompatibilities
23117 - in available built-in functions on various systems. */
23118 +#endif /* !YYERROR_VERBOSE */
23119 +
23120 +\f
23121 +
23122 +#if YYDEBUG
23123 +/*--------------------------------.
23124 +| Print this symbol on YYOUTPUT. |
23125 +`--------------------------------*/
23126 +
23127 +#if defined (__STDC__) || defined (__cplusplus)
23128 static void
23129 -__yy_memcpy (char *to, char *from, unsigned int count)
23130 +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
23131 +#else
23132 +static void
23133 +yysymprint (yyoutput, yytype, yyvaluep)
23134 + FILE *yyoutput;
23135 + int yytype;
23136 + YYSTYPE *yyvaluep;
23137 +#endif
23138 {
23139 - register char *t = to;
23140 - register char *f = from;
23141 - register int i = count;
23142 + /* Pacify ``unused variable'' warnings. */
23143 + (void) yyvaluep;
23144
23145 - while (i-- > 0)
23146 - *t++ = *f++;
23147 + if (yytype < YYNTOKENS)
23148 + {
23149 + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
23150 +# ifdef YYPRINT
23151 + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
23152 +# endif
23153 + }
23154 + else
23155 + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
23156 +
23157 + switch (yytype)
23158 + {
23159 + default:
23160 + break;
23161 + }
23162 + YYFPRINTF (yyoutput, ")");
23163 }
23164
23165 +#endif /* ! YYDEBUG */
23166 +/*-----------------------------------------------.
23167 +| Release the memory associated to this symbol. |
23168 +`-----------------------------------------------*/
23169 +
23170 +#if defined (__STDC__) || defined (__cplusplus)
23171 +static void
23172 +yydestruct (int yytype, YYSTYPE *yyvaluep)
23173 +#else
23174 +static void
23175 +yydestruct (yytype, yyvaluep)
23176 + int yytype;
23177 + YYSTYPE *yyvaluep;
23178 #endif
23179 -#endif
23180 +{
23181 + /* Pacify ``unused variable'' warnings. */
23182 + (void) yyvaluep;
23183 +
23184 + switch (yytype)
23185 + {
23186 +
23187 + default:
23188 + break;
23189 + }
23190 +}
23191 \f
23192 -#line 217 "/usr/lib/bison.simple"
23193
23194 -/* The user can define YYPARSE_PARAM as the name of an argument to be passed
23195 - into yyparse. The argument should have type void *.
23196 - It should actually point to an object.
23197 - Grammar actions can access the variable by casting it
23198 - to the proper pointer type. */
23199 +/* Prevent warnings from -Wmissing-prototypes. */
23200
23201 #ifdef YYPARSE_PARAM
23202 -#ifdef __cplusplus
23203 -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
23204 -#define YYPARSE_PARAM_DECL
23205 -#else /* not __cplusplus */
23206 -#define YYPARSE_PARAM_ARG YYPARSE_PARAM
23207 -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
23208 -#endif /* not __cplusplus */
23209 -#else /* not YYPARSE_PARAM */
23210 -#define YYPARSE_PARAM_ARG
23211 -#define YYPARSE_PARAM_DECL
23212 -#endif /* not YYPARSE_PARAM */
23213 +# if defined (__STDC__) || defined (__cplusplus)
23214 +int yyparse (void *YYPARSE_PARAM);
23215 +# else
23216 +int yyparse ();
23217 +# endif
23218 +#else /* ! YYPARSE_PARAM */
23219 +#if defined (__STDC__) || defined (__cplusplus)
23220 +int yyparse (void);
23221 +#else
23222 +int yyparse ();
23223 +#endif
23224 +#endif /* ! YYPARSE_PARAM */
23225 +
23226 +
23227 +
23228 +/* The lookahead symbol. */
23229 +int yychar;
23230 +
23231 +/* The semantic value of the lookahead symbol. */
23232 +YYSTYPE yylval;
23233 +
23234 +/* Number of syntax errors so far. */
23235 +int yynerrs;
23236 +
23237 +
23238 +
23239 +/*----------.
23240 +| yyparse. |
23241 +`----------*/
23242
23243 -/* Prevent warning if -Wstrict-prototypes. */
23244 -#ifdef __GNUC__
23245 #ifdef YYPARSE_PARAM
23246 -int yyparse (void *);
23247 +# if defined (__STDC__) || defined (__cplusplus)
23248 +int yyparse (void *YYPARSE_PARAM)
23249 +# else
23250 +int yyparse (YYPARSE_PARAM)
23251 + void *YYPARSE_PARAM;
23252 +# endif
23253 +#else /* ! YYPARSE_PARAM */
23254 +#if defined (__STDC__) || defined (__cplusplus)
23255 +int
23256 +yyparse (void)
23257 #else
23258 -int yyparse (void);
23259 +int
23260 +yyparse ()
23261 +
23262 #endif
23263 #endif
23264 -
23265 -int
23266 -yyparse(YYPARSE_PARAM_ARG)
23267 - YYPARSE_PARAM_DECL
23268 {
23269 +
23270 register int yystate;
23271 register int yyn;
23272 - register short *yyssp;
23273 + int yyresult;
23274 + /* Number of tokens to shift before error messages enabled. */
23275 + int yyerrstatus;
23276 + /* Lookahead token as an internal (translated) token number. */
23277 + int yytoken = 0;
23278 +
23279 + /* Three stacks and their tools:
23280 + `yyss': related to states,
23281 + `yyvs': related to semantic values,
23282 + `yyls': related to locations.
23283 +
23284 + Refer to the stacks thru separate pointers, to allow yyoverflow
23285 + to reallocate them elsewhere. */
23286 +
23287 + /* The state stack. */
23288 + short int yyssa[YYINITDEPTH];
23289 + short int *yyss = yyssa;
23290 + register short int *yyssp;
23291 +
23292 + /* The semantic value stack. */
23293 + YYSTYPE yyvsa[YYINITDEPTH];
23294 + YYSTYPE *yyvs = yyvsa;
23295 register YYSTYPE *yyvsp;
23296 - int yyerrstatus; /* number of tokens to shift before error messages enabled */
23297 - int yychar1 = 0; /* lookahead token as an internal (translated) token number */
23298
23299 - short yyssa[YYINITDEPTH]; /* the state stack */
23300 - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */
23301
23302 - short *yyss = yyssa; /* refer to the stacks thru separate pointers */
23303 - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */
23304
23305 -#ifdef YYLSP_NEEDED
23306 - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */
23307 - YYLTYPE *yyls = yylsa;
23308 - YYLTYPE *yylsp;
23309 -
23310 -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
23311 -#else
23312 #define YYPOPSTACK (yyvsp--, yyssp--)
23313 -#endif
23314
23315 - int yystacksize = YYINITDEPTH;
23316 - int yyfree_stacks = 0;
23317 + YYSIZE_T yystacksize = YYINITDEPTH;
23318
23319 -#ifdef YYPURE
23320 - int yychar;
23321 - YYSTYPE yylval;
23322 - int yynerrs;
23323 -#ifdef YYLSP_NEEDED
23324 - YYLTYPE yylloc;
23325 -#endif
23326 -#endif
23327 + /* The variables used to return semantic value and location from the
23328 + action routines. */
23329 + YYSTYPE yyval;
23330
23331 - YYSTYPE yyval; /* the variable used to return */
23332 - /* semantic values from the action */
23333 - /* routines */
23334
23335 + /* When reducing, the number of symbols on the RHS of the reduced
23336 + rule. */
23337 int yylen;
23338
23339 -#if YYDEBUG != 0
23340 - if (yydebug)
23341 - fprintf(stderr, "Starting parse\n");
23342 -#endif
23343 + YYDPRINTF ((stderr, "Starting parse\n"));
23344
23345 yystate = 0;
23346 yyerrstatus = 0;
23347 @@ -614,110 +1022,97 @@
23348 so that they stay on the same level as the state stack.
23349 The wasted elements are never initialized. */
23350
23351 - yyssp = yyss - 1;
23352 + yyssp = yyss;
23353 yyvsp = yyvs;
23354 -#ifdef YYLSP_NEEDED
23355 - yylsp = yyls;
23356 -#endif
23357
23358 -/* Push a new state, which is found in yystate . */
23359 -/* In all cases, when you get here, the value and location stacks
23360 - have just been pushed. so pushing a state here evens the stacks. */
23361 -yynewstate:
23362
23363 - *++yyssp = yystate;
23364 + goto yysetstate;
23365
23366 - if (yyssp >= yyss + yystacksize - 1)
23367 - {
23368 - /* Give user a chance to reallocate the stack */
23369 - /* Use copies of these so that the &'s don't force the real ones into memory. */
23370 - YYSTYPE *yyvs1 = yyvs;
23371 - short *yyss1 = yyss;
23372 -#ifdef YYLSP_NEEDED
23373 - YYLTYPE *yyls1 = yyls;
23374 -#endif
23375 +/*------------------------------------------------------------.
23376 +| yynewstate -- Push a new state, which is found in yystate. |
23377 +`------------------------------------------------------------*/
23378 + yynewstate:
23379 + /* In all cases, when you get here, the value and location stacks
23380 + have just been pushed. so pushing a state here evens the stacks.
23381 + */
23382 + yyssp++;
23383
23384 + yysetstate:
23385 + *yyssp = yystate;
23386 +
23387 + if (yyss + yystacksize - 1 <= yyssp)
23388 + {
23389 /* Get the current used size of the three stacks, in elements. */
23390 - int size = yyssp - yyss + 1;
23391 + YYSIZE_T yysize = yyssp - yyss + 1;
23392
23393 #ifdef yyoverflow
23394 - /* Each stack pointer address is followed by the size of
23395 - the data in use in that stack, in bytes. */
23396 -#ifdef YYLSP_NEEDED
23397 - /* This used to be a conditional around just the two extra args,
23398 - but that might be undefined if yyoverflow is a macro. */
23399 - yyoverflow("parser stack overflow",
23400 - &yyss1, size * sizeof (*yyssp),
23401 - &yyvs1, size * sizeof (*yyvsp),
23402 - &yyls1, size * sizeof (*yylsp),
23403 - &yystacksize);
23404 -#else
23405 - yyoverflow("parser stack overflow",
23406 - &yyss1, size * sizeof (*yyssp),
23407 - &yyvs1, size * sizeof (*yyvsp),
23408 - &yystacksize);
23409 -#endif
23410 -
23411 - yyss = yyss1; yyvs = yyvs1;
23412 -#ifdef YYLSP_NEEDED
23413 - yyls = yyls1;
23414 -#endif
23415 + {
23416 + /* Give user a chance to reallocate the stack. Use copies of
23417 + these so that the &'s don't force the real ones into
23418 + memory. */
23419 + YYSTYPE *yyvs1 = yyvs;
23420 + short int *yyss1 = yyss;
23421 +
23422 +
23423 + /* Each stack pointer address is followed by the size of the
23424 + data in use in that stack, in bytes. This used to be a
23425 + conditional around just the two extra args, but that might
23426 + be undefined if yyoverflow is a macro. */
23427 + yyoverflow ("parser stack overflow",
23428 + &yyss1, yysize * sizeof (*yyssp),
23429 + &yyvs1, yysize * sizeof (*yyvsp),
23430 +
23431 + &yystacksize);
23432 +
23433 + yyss = yyss1;
23434 + yyvs = yyvs1;
23435 + }
23436 #else /* no yyoverflow */
23437 +# ifndef YYSTACK_RELOCATE
23438 + goto yyoverflowlab;
23439 +# else
23440 /* Extend the stack our own way. */
23441 - if (yystacksize >= YYMAXDEPTH)
23442 - {
23443 - yyerror("parser stack overflow");
23444 - if (yyfree_stacks)
23445 - {
23446 - free (yyss);
23447 - free (yyvs);
23448 -#ifdef YYLSP_NEEDED
23449 - free (yyls);
23450 -#endif
23451 - }
23452 - return 2;
23453 - }
23454 + if (YYMAXDEPTH <= yystacksize)
23455 + goto yyoverflowlab;
23456 yystacksize *= 2;
23457 - if (yystacksize > YYMAXDEPTH)
23458 + if (YYMAXDEPTH < yystacksize)
23459 yystacksize = YYMAXDEPTH;
23460 -#ifndef YYSTACK_USE_ALLOCA
23461 - yyfree_stacks = 1;
23462 -#endif
23463 - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
23464 - __yy_memcpy ((char *)yyss, (char *)yyss1,
23465 - size * (unsigned int) sizeof (*yyssp));
23466 - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
23467 - __yy_memcpy ((char *)yyvs, (char *)yyvs1,
23468 - size * (unsigned int) sizeof (*yyvsp));
23469 -#ifdef YYLSP_NEEDED
23470 - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
23471 - __yy_memcpy ((char *)yyls, (char *)yyls1,
23472 - size * (unsigned int) sizeof (*yylsp));
23473 -#endif
23474 +
23475 + {
23476 + short int *yyss1 = yyss;
23477 + union yyalloc *yyptr =
23478 + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
23479 + if (! yyptr)
23480 + goto yyoverflowlab;
23481 + YYSTACK_RELOCATE (yyss);
23482 + YYSTACK_RELOCATE (yyvs);
23483 +
23484 +# undef YYSTACK_RELOCATE
23485 + if (yyss1 != yyssa)
23486 + YYSTACK_FREE (yyss1);
23487 + }
23488 +# endif
23489 #endif /* no yyoverflow */
23490
23491 - yyssp = yyss + size - 1;
23492 - yyvsp = yyvs + size - 1;
23493 -#ifdef YYLSP_NEEDED
23494 - yylsp = yyls + size - 1;
23495 -#endif
23496 + yyssp = yyss + yysize - 1;
23497 + yyvsp = yyvs + yysize - 1;
23498
23499 -#if YYDEBUG != 0
23500 - if (yydebug)
23501 - fprintf(stderr, "Stack size increased to %d\n", yystacksize);
23502 -#endif
23503
23504 - if (yyssp >= yyss + yystacksize - 1)
23505 + YYDPRINTF ((stderr, "Stack size increased to %lu\n",
23506 + (unsigned long int) yystacksize));
23507 +
23508 + if (yyss + yystacksize - 1 <= yyssp)
23509 YYABORT;
23510 }
23511
23512 -#if YYDEBUG != 0
23513 - if (yydebug)
23514 - fprintf(stderr, "Entering state %d\n", yystate);
23515 -#endif
23516 + YYDPRINTF ((stderr, "Entering state %d\n", yystate));
23517
23518 goto yybackup;
23519 - yybackup:
23520 +
23521 +/*-----------.
23522 +| yybackup. |
23523 +`-----------*/
23524 +yybackup:
23525
23526 /* Do appropriate processing given the current state. */
23527 /* Read a lookahead token if we need one and don't already have one. */
23528 @@ -726,135 +1121,99 @@
23529 /* First try to decide what to do without reference to lookahead token. */
23530
23531 yyn = yypact[yystate];
23532 - if (yyn == YYFLAG)
23533 + if (yyn == YYPACT_NINF)
23534 goto yydefault;
23535
23536 /* Not known => get a lookahead token if don't already have one. */
23537
23538 - /* yychar is either YYEMPTY or YYEOF
23539 - or a valid token in external form. */
23540 -
23541 + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
23542 if (yychar == YYEMPTY)
23543 {
23544 -#if YYDEBUG != 0
23545 - if (yydebug)
23546 - fprintf(stderr, "Reading a token: ");
23547 -#endif
23548 + YYDPRINTF ((stderr, "Reading a token: "));
23549 yychar = YYLEX;
23550 }
23551
23552 - /* Convert token to internal form (in yychar1) for indexing tables with */
23553 -
23554 - if (yychar <= 0) /* This means end of input. */
23555 + if (yychar <= YYEOF)
23556 {
23557 - yychar1 = 0;
23558 - yychar = YYEOF; /* Don't call YYLEX any more */
23559 -
23560 -#if YYDEBUG != 0
23561 - if (yydebug)
23562 - fprintf(stderr, "Now at end of input.\n");
23563 -#endif
23564 + yychar = yytoken = YYEOF;
23565 + YYDPRINTF ((stderr, "Now at end of input.\n"));
23566 }
23567 else
23568 {
23569 - yychar1 = YYTRANSLATE(yychar);
23570 -
23571 -#if YYDEBUG != 0
23572 - if (yydebug)
23573 - {
23574 - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
23575 - /* Give the individual parser a way to print the precise meaning
23576 - of a token, for further debugging info. */
23577 -#ifdef YYPRINT
23578 - YYPRINT (stderr, yychar, yylval);
23579 -#endif
23580 - fprintf (stderr, ")\n");
23581 - }
23582 -#endif
23583 + yytoken = YYTRANSLATE (yychar);
23584 + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
23585 }
23586
23587 - yyn += yychar1;
23588 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
23589 + /* If the proper action on seeing token YYTOKEN is to reduce or to
23590 + detect an error, take that action. */
23591 + yyn += yytoken;
23592 + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
23593 goto yydefault;
23594 -
23595 yyn = yytable[yyn];
23596 -
23597 - /* yyn is what to do for this token type in this state.
23598 - Negative => reduce, -yyn is rule number.
23599 - Positive => shift, yyn is new state.
23600 - New state is final state => don't bother to shift,
23601 - just return success.
23602 - 0, or most negative number => error. */
23603 -
23604 - if (yyn < 0)
23605 + if (yyn <= 0)
23606 {
23607 - if (yyn == YYFLAG)
23608 + if (yyn == 0 || yyn == YYTABLE_NINF)
23609 goto yyerrlab;
23610 yyn = -yyn;
23611 goto yyreduce;
23612 }
23613 - else if (yyn == 0)
23614 - goto yyerrlab;
23615
23616 if (yyn == YYFINAL)
23617 YYACCEPT;
23618
23619 /* Shift the lookahead token. */
23620 -
23621 -#if YYDEBUG != 0
23622 - if (yydebug)
23623 - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
23624 -#endif
23625 + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
23626
23627 /* Discard the token being shifted unless it is eof. */
23628 if (yychar != YYEOF)
23629 yychar = YYEMPTY;
23630
23631 *++yyvsp = yylval;
23632 -#ifdef YYLSP_NEEDED
23633 - *++yylsp = yylloc;
23634 -#endif
23635
23636 - /* count tokens shifted since error; after three, turn off error status. */
23637 - if (yyerrstatus) yyerrstatus--;
23638 +
23639 + /* Count tokens shifted since error; after three, turn off error
23640 + status. */
23641 + if (yyerrstatus)
23642 + yyerrstatus--;
23643
23644 yystate = yyn;
23645 goto yynewstate;
23646
23647 -/* Do the default action for the current state. */
23648 -yydefault:
23649
23650 +/*-----------------------------------------------------------.
23651 +| yydefault -- do the default action for the current state. |
23652 +`-----------------------------------------------------------*/
23653 +yydefault:
23654 yyn = yydefact[yystate];
23655 if (yyn == 0)
23656 goto yyerrlab;
23657 + goto yyreduce;
23658 +
23659
23660 -/* Do a reduction. yyn is the number of a rule to reduce with. */
23661 +/*-----------------------------.
23662 +| yyreduce -- Do a reduction. |
23663 +`-----------------------------*/
23664 yyreduce:
23665 + /* yyn is the number of a rule to reduce with. */
23666 yylen = yyr2[yyn];
23667 - if (yylen > 0)
23668 - yyval = yyvsp[1-yylen]; /* implement default value of the action */
23669
23670 -#if YYDEBUG != 0
23671 - if (yydebug)
23672 - {
23673 - int i;
23674 -
23675 - fprintf (stderr, "Reducing via rule %d (line %d), ",
23676 - yyn, yyrline[yyn]);
23677 + /* If YYLEN is nonzero, implement the default value of the action:
23678 + `$$ = $1'.
23679
23680 - /* Print the symbols being reduced, and their result. */
23681 - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
23682 - fprintf (stderr, "%s ", yytname[yyrhs[i]]);
23683 - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
23684 - }
23685 -#endif
23686 + Otherwise, the following line sets YYVAL to garbage.
23687 + This behavior is undocumented and Bison
23688 + users should not rely upon it. Assigning to YYVAL
23689 + unconditionally makes the parser a bit smaller, and it avoids a
23690 + GCC warning that YYVAL may be used uninitialized. */
23691 + yyval = yyvsp[1-yylen];
23692
23693
23694 - switch (yyn) {
23695 -
23696 -case 5:
23697 -#line 83 "cfg_y.y"
23698 -{
23699 + YY_REDUCE_PRINT (yyn);
23700 + switch (yyn)
23701 + {
23702 + case 6:
23703 +#line 86 "cfg_y.y"
23704 + {
23705 if (!curr_sig->uni)
23706 curr_sig->uni =
23707 #if defined(UNI30) || defined(DYNAMIC_UNI)
23708 @@ -873,17 +1232,19 @@
23709 #endif
23710 #endif
23711 ;
23712 - ;
23713 - break;}
23714 -case 6:
23715 -#line 107 "cfg_y.y"
23716 -{
23717 + }
23718 + break;
23719 +
23720 + case 7:
23721 +#line 110 "cfg_y.y"
23722 + {
23723 set_verbosity(NULL,yyvsp[0].num);
23724 - ;
23725 - break;}
23726 -case 12:
23727 -#line 119 "cfg_y.y"
23728 -{
23729 + }
23730 + break;
23731 +
23732 + case 13:
23733 +#line 122 "cfg_y.y"
23734 + {
23735 SIG_ENTITY *sig,**walk;
23736
23737 if (atmpvc_addr_in_use(_entity.signaling_pvc))
23738 @@ -892,37 +1253,49 @@
23739 if (entities == &_entity) entities = NULL;
23740 for (sig = entities; sig; sig = sig->next)
23741 if (atm_equal((struct sockaddr *) &sig->signaling_pvc,
23742 - (struct sockaddr *) &yyvsp[0].pvc,0,0))
23743 - yyerror("duplicate PVC address %d.%d.%d",S_PVC(sig));
23744 + (struct sockaddr *) &yyvsp[0].pvc,0,0)) {
23745 + const char *err;
23746 + asprintf(&err,"duplicate PVC address %d.%d.%d",S_PVC(sig));
23747 + if(err) {
23748 + yyerror(err);
23749 + free(err);
23750 + }
23751 + else
23752 + yyerror("duplicate PVC address");
23753 + }
23754 curr_sig = alloc_t(SIG_ENTITY);
23755 *curr_sig = _entity;
23756 curr_sig->signaling_pvc = yyvsp[0].pvc;
23757 curr_sig->next = NULL;
23758 for (walk = &entities; *walk; walk = &(*walk)->next);
23759 *walk = curr_sig;
23760 - ;
23761 - break;}
23762 -case 18:
23763 -#line 150 "cfg_y.y"
23764 -{
23765 + }
23766 + break;
23767 +
23768 + case 19:
23769 +#line 161 "cfg_y.y"
23770 + {
23771 enter_vpci(curr_sig,yyvsp[-2].num,yyvsp[0].num);
23772 - ;
23773 - break;}
23774 -case 20:
23775 -#line 155 "cfg_y.y"
23776 -{
23777 + }
23778 + break;
23779 +
23780 + case 21:
23781 +#line 166 "cfg_y.y"
23782 + {
23783 curr_sig->sig_qos = yyvsp[0].str;
23784 - ;
23785 - break;}
23786 -case 21:
23787 -#line 159 "cfg_y.y"
23788 -{
23789 + }
23790 + break;
23791 +
23792 + case 22:
23793 +#line 170 "cfg_y.y"
23794 + {
23795 curr_sig->max_rate = yyvsp[0].num;
23796 - ;
23797 - break;}
23798 -case 22:
23799 -#line 163 "cfg_y.y"
23800 -{
23801 + }
23802 + break;
23803 +
23804 + case 23:
23805 +#line 174 "cfg_y.y"
23806 + {
23807 struct sockaddr_atmsvc addr;
23808 char *mask;
23809
23810 @@ -931,464 +1304,506 @@
23811 if (text2atm(yyvsp[0].str,(struct sockaddr *) &addr,sizeof(addr),
23812 T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) {
23813 yyerror("invalid address");
23814 - return;
23815 + return 0;
23816 }
23817 add_route(curr_sig,&addr,mask ? strtol(mask,NULL,10) : INT_MAX);
23818 - ;
23819 - break;}
23820 -case 23:
23821 -#line 177 "cfg_y.y"
23822 -{
23823 + }
23824 + break;
23825 +
23826 + case 24:
23827 +#line 188 "cfg_y.y"
23828 + {
23829 add_route(curr_sig,NULL,0);
23830 - ;
23831 - break;}
23832 -case 44:
23833 -#line 229 "cfg_y.y"
23834 -{
23835 + }
23836 + break;
23837 +
23838 + case 45:
23839 +#line 240 "cfg_y.y"
23840 + {
23841 set_verbosity("UNI",yyvsp[0].num);
23842 set_verbosity("KERNEL",yyvsp[0].num);
23843 set_verbosity("SAP",yyvsp[0].num);
23844 - ;
23845 - break;}
23846 -case 45:
23847 -#line 235 "cfg_y.y"
23848 -{
23849 + }
23850 + break;
23851 +
23852 + case 46:
23853 +#line 246 "cfg_y.y"
23854 + {
23855 enter_vpci(curr_sig,yyvsp[-2].num,yyvsp[0].num);
23856 - ;
23857 - break;}
23858 -case 46:
23859 -#line 239 "cfg_y.y"
23860 -{
23861 + }
23862 + break;
23863 +
23864 + case 47:
23865 +#line 250 "cfg_y.y"
23866 + {
23867 #if defined(UNI30) || defined(ALLOW_UNI30) || defined(DYNAMIC_UNI)
23868 if (curr_sig->uni & ~S_UNI31) yyerror("UNI mode is already set");
23869 curr_sig->uni |= S_UNI30;
23870 #else
23871 yyerror("Sorry, not supported yet");
23872 #endif
23873 - ;
23874 - break;}
23875 -case 47:
23876 -#line 248 "cfg_y.y"
23877 -{
23878 + }
23879 + break;
23880 +
23881 + case 48:
23882 +#line 259 "cfg_y.y"
23883 + {
23884 #if defined(UNI31) || defined(ALLOW_UNI30) || defined(DYNAMIC_UNI)
23885 if (curr_sig->uni & ~S_UNI30) yyerror("UNI mode is already set");
23886 curr_sig->uni |= S_UNI31;
23887 #else
23888 yyerror("Sorry, not supported yet");
23889 #endif
23890 - ;
23891 - break;}
23892 -case 48:
23893 -#line 257 "cfg_y.y"
23894 -{
23895 + }
23896 + break;
23897 +
23898 + case 49:
23899 +#line 268 "cfg_y.y"
23900 + {
23901 #if defined(UNI40) || defined(DYNAMIC_UNI)
23902 if (curr_sig->uni) yyerror("UNI mode is already set");
23903 curr_sig->uni = S_UNI40;
23904 #else
23905 yyerror("Sorry, not supported yet");
23906 #endif
23907 - ;
23908 - break;}
23909 -case 49:
23910 -#line 266 "cfg_y.y"
23911 -{
23912 + }
23913 + break;
23914 +
23915 + case 50:
23916 +#line 277 "cfg_y.y"
23917 + {
23918 #if defined(Q2963_1) || defined(DYNAMIC_UNI)
23919 if (!(curr_sig->uni & S_UNI40)) yyerror("Incompatible UNI mode");
23920 curr_sig->uni |= S_Q2963_1;
23921 #else
23922 yyerror("Sorry, not supported yet");
23923 #endif
23924 - ;
23925 - break;}
23926 -case 50:
23927 -#line 275 "cfg_y.y"
23928 -{
23929 + }
23930 + break;
23931 +
23932 + case 51:
23933 +#line 286 "cfg_y.y"
23934 + {
23935 yywarn("sig net is obsolete, please use sig mode net instead");
23936 curr_sig->mode = sm_net;
23937 - ;
23938 - break;}
23939 -case 52:
23940 -#line 284 "cfg_y.y"
23941 -{
23942 + }
23943 + break;
23944 +
23945 + case 53:
23946 +#line 295 "cfg_y.y"
23947 + {
23948 set_verbosity("SSCF",yyvsp[0].num);
23949 set_verbosity("SSCOP",yyvsp[0].num);
23950 - ;
23951 - break;}
23952 -case 53:
23953 -#line 292 "cfg_y.y"
23954 -{
23955 + }
23956 + break;
23957 +
23958 + case 54:
23959 +#line 303 "cfg_y.y"
23960 + {
23961 set_verbosity("IO",yyvsp[0].num);
23962 - ;
23963 - break;}
23964 -case 54:
23965 -#line 296 "cfg_y.y"
23966 -{
23967 + }
23968 + break;
23969 +
23970 + case 55:
23971 +#line 307 "cfg_y.y"
23972 + {
23973 curr_sig->signaling_pvc = yyvsp[0].pvc;
23974 - ;
23975 - break;}
23976 -case 55:
23977 -#line 300 "cfg_y.y"
23978 -{
23979 + }
23980 + break;
23981 +
23982 + case 56:
23983 +#line 311 "cfg_y.y"
23984 + {
23985 yywarn("io pcr is obsolete, please use io qos instead");
23986 curr_sig->sig_pcr = yyvsp[0].num;
23987 - ;
23988 - break;}
23989 -case 56:
23990 -#line 305 "cfg_y.y"
23991 -{
23992 + }
23993 + break;
23994 +
23995 + case 57:
23996 +#line 316 "cfg_y.y"
23997 + {
23998 curr_sig->sig_qos = yyvsp[0].str;
23999 - ;
24000 - break;}
24001 -case 57:
24002 -#line 309 "cfg_y.y"
24003 -{
24004 + }
24005 + break;
24006 +
24007 + case 58:
24008 +#line 320 "cfg_y.y"
24009 + {
24010 curr_sig->max_rate = yyvsp[0].num;
24011 - ;
24012 - break;}
24013 -case 58:
24014 -#line 316 "cfg_y.y"
24015 -{
24016 + }
24017 + break;
24018 +
24019 + case 59:
24020 +#line 327 "cfg_y.y"
24021 + {
24022 set_verbosity(NULL,yyvsp[0].num);
24023 - ;
24024 - break;}
24025 -case 59:
24026 -#line 320 "cfg_y.y"
24027 -{
24028 + }
24029 + break;
24030 +
24031 + case 60:
24032 +#line 331 "cfg_y.y"
24033 + {
24034 dump_dir = yyvsp[0].str;
24035 if (!trace_size) trace_size = DEFAULT_TRACE_SIZE;
24036 - ;
24037 - break;}
24038 -case 60:
24039 -#line 325 "cfg_y.y"
24040 -{
24041 + }
24042 + break;
24043 +
24044 + case 61:
24045 +#line 336 "cfg_y.y"
24046 + {
24047 set_logfile(yyvsp[0].str);
24048 - ;
24049 - break;}
24050 -case 61:
24051 -#line 329 "cfg_y.y"
24052 -{
24053 + }
24054 + break;
24055 +
24056 + case 62:
24057 +#line 340 "cfg_y.y"
24058 + {
24059 trace_size = yyvsp[0].num;
24060 - ;
24061 - break;}
24062 -case 62:
24063 -#line 335 "cfg_y.y"
24064 -{
24065 + }
24066 + break;
24067 +
24068 + case 63:
24069 +#line 346 "cfg_y.y"
24070 + {
24071 yyval.num = DEFAULT_TRACE_SIZE;
24072 - ;
24073 - break;}
24074 -case 63:
24075 -#line 339 "cfg_y.y"
24076 -{
24077 + }
24078 + break;
24079 +
24080 + case 64:
24081 +#line 350 "cfg_y.y"
24082 + {
24083 yyval.num = yyvsp[0].num;
24084 - ;
24085 - break;}
24086 -case 64:
24087 -#line 346 "cfg_y.y"
24088 -{
24089 + }
24090 + break;
24091 +
24092 + case 65:
24093 +#line 357 "cfg_y.y"
24094 + {
24095 yyval.num = DIAG_DEBUG;
24096 - ;
24097 - break;}
24098 -case 65:
24099 -#line 350 "cfg_y.y"
24100 -{
24101 + }
24102 + break;
24103 +
24104 + case 66:
24105 +#line 361 "cfg_y.y"
24106 + {
24107 yyval.num = DIAG_INFO;
24108 - ;
24109 - break;}
24110 -case 66:
24111 -#line 354 "cfg_y.y"
24112 -{
24113 + }
24114 + break;
24115 +
24116 + case 67:
24117 +#line 365 "cfg_y.y"
24118 + {
24119 yyval.num = DIAG_WARN;
24120 - ;
24121 - break;}
24122 -case 67:
24123 -#line 358 "cfg_y.y"
24124 -{
24125 + }
24126 + break;
24127 +
24128 + case 68:
24129 +#line 369 "cfg_y.y"
24130 + {
24131 yyval.num = DIAG_ERROR;
24132 - ;
24133 - break;}
24134 -case 68:
24135 -#line 362 "cfg_y.y"
24136 -{
24137 + }
24138 + break;
24139 +
24140 + case 69:
24141 +#line 373 "cfg_y.y"
24142 + {
24143 yyval.num = DIAG_FATAL;
24144 - ;
24145 - break;}
24146 -case 69:
24147 -#line 369 "cfg_y.y"
24148 -{
24149 + }
24150 + break;
24151 +
24152 + case 70:
24153 +#line 380 "cfg_y.y"
24154 + {
24155 curr_sig->mode = sm_user;
24156 - ;
24157 - break;}
24158 -case 70:
24159 -#line 373 "cfg_y.y"
24160 -{
24161 + }
24162 + break;
24163 +
24164 + case 71:
24165 +#line 384 "cfg_y.y"
24166 + {
24167 curr_sig->mode = sm_net;
24168 - ;
24169 - break;}
24170 -case 71:
24171 -#line 377 "cfg_y.y"
24172 -{
24173 + }
24174 + break;
24175 +
24176 + case 72:
24177 +#line 388 "cfg_y.y"
24178 + {
24179 curr_sig->mode = sm_switch;
24180 - ;
24181 - break;}
24182 -case 72:
24183 -#line 384 "cfg_y.y"
24184 -{
24185 + }
24186 + break;
24187 +
24188 + case 73:
24189 +#line 395 "cfg_y.y"
24190 + {
24191 set_verbosity("POLICY",yyvsp[0].num);
24192 - ;
24193 - break;}
24194 -case 73:
24195 -#line 388 "cfg_y.y"
24196 -{
24197 + }
24198 + break;
24199 +
24200 + case 74:
24201 +#line 399 "cfg_y.y"
24202 + {
24203 rule = alloc_t(RULE);
24204 rule->type = yyvsp[0].num;
24205 - ;
24206 - break;}
24207 -case 75:
24208 -#line 397 "cfg_y.y"
24209 -{
24210 + }
24211 + break;
24212 +
24213 + case 76:
24214 +#line 408 "cfg_y.y"
24215 + {
24216 yyval.num = ACL_ALLOW;
24217 - ;
24218 - break;}
24219 -case 76:
24220 -#line 401 "cfg_y.y"
24221 -{
24222 + }
24223 + break;
24224 +
24225 + case 77:
24226 +#line 412 "cfg_y.y"
24227 + {
24228 yyval.num = ACL_REJECT;
24229 - ;
24230 - break;}
24231 -case 77:
24232 -#line 408 "cfg_y.y"
24233 -{
24234 + }
24235 + break;
24236 +
24237 + case 78:
24238 +#line 419 "cfg_y.y"
24239 + {
24240 rule->type |= ACL_IN;
24241 put_address(yyvsp[0].str);
24242 - ;
24243 - break;}
24244 -case 78:
24245 -#line 413 "cfg_y.y"
24246 -{
24247 + }
24248 + break;
24249 +
24250 + case 79:
24251 +#line 424 "cfg_y.y"
24252 + {
24253 rule->type |= ACL_OUT;
24254 put_address(yyvsp[0].str);
24255 - ;
24256 - break;}
24257 -}
24258 - /* the action file gets copied in in place of this dollarsign */
24259 -#line 543 "/usr/lib/bison.simple"
24260 + }
24261 + break;
24262 +
24263 +
24264 + }
24265 +
24266 +/* Line 1010 of yacc.c. */
24267 +#line 1585 "y.tab.c"
24268 \f
24269 yyvsp -= yylen;
24270 yyssp -= yylen;
24271 -#ifdef YYLSP_NEEDED
24272 - yylsp -= yylen;
24273 -#endif
24274
24275 -#if YYDEBUG != 0
24276 - if (yydebug)
24277 - {
24278 - short *ssp1 = yyss - 1;
24279 - fprintf (stderr, "state stack now");
24280 - while (ssp1 != yyssp)
24281 - fprintf (stderr, " %d", *++ssp1);
24282 - fprintf (stderr, "\n");
24283 - }
24284 -#endif
24285 +
24286 + YY_STACK_PRINT (yyss, yyssp);
24287
24288 *++yyvsp = yyval;
24289
24290 -#ifdef YYLSP_NEEDED
24291 - yylsp++;
24292 - if (yylen == 0)
24293 - {
24294 - yylsp->first_line = yylloc.first_line;
24295 - yylsp->first_column = yylloc.first_column;
24296 - yylsp->last_line = (yylsp-1)->last_line;
24297 - yylsp->last_column = (yylsp-1)->last_column;
24298 - yylsp->text = 0;
24299 - }
24300 - else
24301 - {
24302 - yylsp->last_line = (yylsp+yylen-1)->last_line;
24303 - yylsp->last_column = (yylsp+yylen-1)->last_column;
24304 - }
24305 -#endif
24306
24307 - /* Now "shift" the result of the reduction.
24308 - Determine what state that goes to,
24309 - based on the state we popped back to
24310 - and the rule number reduced by. */
24311 + /* Now `shift' the result of the reduction. Determine what state
24312 + that goes to, based on the state we popped back to and the rule
24313 + number reduced by. */
24314
24315 yyn = yyr1[yyn];
24316
24317 - yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
24318 - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
24319 + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
24320 + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
24321 yystate = yytable[yystate];
24322 else
24323 - yystate = yydefgoto[yyn - YYNTBASE];
24324 + yystate = yydefgoto[yyn - YYNTOKENS];
24325
24326 goto yynewstate;
24327
24328 -yyerrlab: /* here on detecting error */
24329
24330 - if (! yyerrstatus)
24331 - /* If not already recovering from an error, report this error. */
24332 +/*------------------------------------.
24333 +| yyerrlab -- here on detecting error |
24334 +`------------------------------------*/
24335 +yyerrlab:
24336 + /* If not already recovering from an error, report this error. */
24337 + if (!yyerrstatus)
24338 {
24339 ++yynerrs;
24340 -
24341 -#ifdef YYERROR_VERBOSE
24342 +#if YYERROR_VERBOSE
24343 yyn = yypact[yystate];
24344
24345 - if (yyn > YYFLAG && yyn < YYLAST)
24346 + if (YYPACT_NINF < yyn && yyn < YYLAST)
24347 {
24348 - int size = 0;
24349 - char *msg;
24350 - int x, count;
24351 -
24352 - count = 0;
24353 - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
24354 - for (x = (yyn < 0 ? -yyn : 0);
24355 - x < (sizeof(yytname) / sizeof(char *)); x++)
24356 - if (yycheck[x + yyn] == x)
24357 - size += strlen(yytname[x]) + 15, count++;
24358 - msg = (char *) malloc(size + 15);
24359 - if (msg != 0)
24360 + YYSIZE_T yysize = 0;
24361 + int yytype = YYTRANSLATE (yychar);
24362 + const char* yyprefix;
24363 + char *yymsg;
24364 + int yyx;
24365 +
24366 + /* Start YYX at -YYN if negative to avoid negative indexes in
24367 + YYCHECK. */
24368 + int yyxbegin = yyn < 0 ? -yyn : 0;
24369 +
24370 + /* Stay within bounds of both yycheck and yytname. */
24371 + int yychecklim = YYLAST - yyn;
24372 + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
24373 + int yycount = 0;
24374 +
24375 + yyprefix = ", expecting ";
24376 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
24377 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
24378 + {
24379 + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
24380 + yycount += 1;
24381 + if (yycount == 5)
24382 + {
24383 + yysize = 0;
24384 + break;
24385 + }
24386 + }
24387 + yysize += (sizeof ("syntax error, unexpected ")
24388 + + yystrlen (yytname[yytype]));
24389 + yymsg = (char *) YYSTACK_ALLOC (yysize);
24390 + if (yymsg != 0)
24391 {
24392 - strcpy(msg, "parse error");
24393 + char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
24394 + yyp = yystpcpy (yyp, yytname[yytype]);
24395
24396 - if (count < 5)
24397 + if (yycount < 5)
24398 {
24399 - count = 0;
24400 - for (x = (yyn < 0 ? -yyn : 0);
24401 - x < (sizeof(yytname) / sizeof(char *)); x++)
24402 - if (yycheck[x + yyn] == x)
24403 + yyprefix = ", expecting ";
24404 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
24405 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
24406 {
24407 - strcat(msg, count == 0 ? ", expecting `" : " or `");
24408 - strcat(msg, yytname[x]);
24409 - strcat(msg, "'");
24410 - count++;
24411 + yyp = yystpcpy (yyp, yyprefix);
24412 + yyp = yystpcpy (yyp, yytname[yyx]);
24413 + yyprefix = " or ";
24414 }
24415 }
24416 - yyerror(msg);
24417 - free(msg);
24418 + yyerror (yymsg);
24419 + YYSTACK_FREE (yymsg);
24420 }
24421 else
24422 - yyerror ("parse error; also virtual memory exceeded");
24423 + yyerror ("syntax error; also virtual memory exhausted");
24424 }
24425 else
24426 #endif /* YYERROR_VERBOSE */
24427 - yyerror("parse error");
24428 + yyerror ("syntax error");
24429 }
24430
24431 - goto yyerrlab1;
24432 -yyerrlab1: /* here on error raised explicitly by an action */
24433 +
24434
24435 if (yyerrstatus == 3)
24436 {
24437 - /* if just tried and failed to reuse lookahead token after an error, discard it. */
24438 + /* If just tried and failed to reuse lookahead token after an
24439 + error, discard it. */
24440
24441 - /* return failure if at end of input */
24442 - if (yychar == YYEOF)
24443 - YYABORT;
24444 -
24445 -#if YYDEBUG != 0
24446 - if (yydebug)
24447 - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
24448 -#endif
24449 + if (yychar <= YYEOF)
24450 + {
24451 + /* If at end of input, pop the error token,
24452 + then the rest of the stack, then return failure. */
24453 + if (yychar == YYEOF)
24454 + for (;;)
24455 + {
24456 + YYPOPSTACK;
24457 + if (yyssp == yyss)
24458 + YYABORT;
24459 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
24460 + yydestruct (yystos[*yyssp], yyvsp);
24461 + }
24462 + }
24463 + else
24464 + {
24465 + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
24466 + yydestruct (yytoken, &yylval);
24467 + yychar = YYEMPTY;
24468
24469 - yychar = YYEMPTY;
24470 + }
24471 }
24472
24473 - /* Else will try to reuse lookahead token
24474 - after shifting the error token. */
24475 -
24476 - yyerrstatus = 3; /* Each real token shifted decrements this */
24477 + /* Else will try to reuse lookahead token after shifting the error
24478 + token. */
24479 + goto yyerrlab1;
24480
24481 - goto yyerrhandle;
24482
24483 -yyerrdefault: /* current state does not do anything special for the error token. */
24484 +/*---------------------------------------------------.
24485 +| yyerrorlab -- error raised explicitly by YYERROR. |
24486 +`---------------------------------------------------*/
24487 +yyerrorlab:
24488
24489 -#if 0
24490 - /* This is wrong; only states that explicitly want error tokens
24491 - should shift them. */
24492 - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/
24493 - if (yyn) goto yydefault;
24494 +#ifdef __GNUC__
24495 + /* Pacify GCC when the user code never invokes YYERROR and the label
24496 + yyerrorlab therefore never appears in user code. */
24497 + if (0)
24498 + goto yyerrorlab;
24499 #endif
24500
24501 -yyerrpop: /* pop the current state because it cannot handle the error token */
24502 -
24503 - if (yyssp == yyss) YYABORT;
24504 - yyvsp--;
24505 - yystate = *--yyssp;
24506 -#ifdef YYLSP_NEEDED
24507 - yylsp--;
24508 -#endif
24509 + yyvsp -= yylen;
24510 + yyssp -= yylen;
24511 + yystate = *yyssp;
24512 + goto yyerrlab1;
24513
24514 -#if YYDEBUG != 0
24515 - if (yydebug)
24516 - {
24517 - short *ssp1 = yyss - 1;
24518 - fprintf (stderr, "Error: state stack now");
24519 - while (ssp1 != yyssp)
24520 - fprintf (stderr, " %d", *++ssp1);
24521 - fprintf (stderr, "\n");
24522 - }
24523 -#endif
24524
24525 -yyerrhandle:
24526 +/*-------------------------------------------------------------.
24527 +| yyerrlab1 -- common code for both syntax error and YYERROR. |
24528 +`-------------------------------------------------------------*/
24529 +yyerrlab1:
24530 + yyerrstatus = 3; /* Each real token shifted decrements this. */
24531
24532 - yyn = yypact[yystate];
24533 - if (yyn == YYFLAG)
24534 - goto yyerrdefault;
24535 + for (;;)
24536 + {
24537 + yyn = yypact[yystate];
24538 + if (yyn != YYPACT_NINF)
24539 + {
24540 + yyn += YYTERROR;
24541 + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
24542 + {
24543 + yyn = yytable[yyn];
24544 + if (0 < yyn)
24545 + break;
24546 + }
24547 + }
24548
24549 - yyn += YYTERROR;
24550 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
24551 - goto yyerrdefault;
24552 + /* Pop the current state because it cannot handle the error token. */
24553 + if (yyssp == yyss)
24554 + YYABORT;
24555
24556 - yyn = yytable[yyn];
24557 - if (yyn < 0)
24558 - {
24559 - if (yyn == YYFLAG)
24560 - goto yyerrpop;
24561 - yyn = -yyn;
24562 - goto yyreduce;
24563 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
24564 + yydestruct (yystos[yystate], yyvsp);
24565 + YYPOPSTACK;
24566 + yystate = *yyssp;
24567 + YY_STACK_PRINT (yyss, yyssp);
24568 }
24569 - else if (yyn == 0)
24570 - goto yyerrpop;
24571
24572 if (yyn == YYFINAL)
24573 YYACCEPT;
24574
24575 -#if YYDEBUG != 0
24576 - if (yydebug)
24577 - fprintf(stderr, "Shifting error token, ");
24578 -#endif
24579 + YYDPRINTF ((stderr, "Shifting error token, "));
24580
24581 *++yyvsp = yylval;
24582 -#ifdef YYLSP_NEEDED
24583 - *++yylsp = yylloc;
24584 -#endif
24585 +
24586
24587 yystate = yyn;
24588 goto yynewstate;
24589
24590 - yyacceptlab:
24591 - /* YYACCEPT comes here. */
24592 - if (yyfree_stacks)
24593 - {
24594 - free (yyss);
24595 - free (yyvs);
24596 -#ifdef YYLSP_NEEDED
24597 - free (yyls);
24598 -#endif
24599 - }
24600 - return 0;
24601
24602 - yyabortlab:
24603 - /* YYABORT comes here. */
24604 - if (yyfree_stacks)
24605 - {
24606 - free (yyss);
24607 - free (yyvs);
24608 -#ifdef YYLSP_NEEDED
24609 - free (yyls);
24610 +/*-------------------------------------.
24611 +| yyacceptlab -- YYACCEPT comes here. |
24612 +`-------------------------------------*/
24613 +yyacceptlab:
24614 + yyresult = 0;
24615 + goto yyreturn;
24616 +
24617 +/*-----------------------------------.
24618 +| yyabortlab -- YYABORT comes here. |
24619 +`-----------------------------------*/
24620 +yyabortlab:
24621 + yyresult = 1;
24622 + goto yyreturn;
24623 +
24624 +#ifndef yyoverflow
24625 +/*----------------------------------------------.
24626 +| yyoverflowlab -- parser overflow comes here. |
24627 +`----------------------------------------------*/
24628 +yyoverflowlab:
24629 + yyerror ("parser stack overflow");
24630 + yyresult = 2;
24631 + /* Fall through. */
24632 +#endif
24633 +
24634 +yyreturn:
24635 +#ifndef yyoverflow
24636 + if (yyss != yyssa)
24637 + YYSTACK_FREE (yyss);
24638 #endif
24639 - }
24640 - return 1;
24641 + return yyresult;
24642 }
24643 -#line 418 "cfg_y.y"
24644 +
24645 +
24646 +
24647 Index: linux-atm-2.4.1/src/sigd/proto.c
24648 ===================================================================
24649 --- linux-atm-2.4.1.orig/src/sigd/proto.c 2007-06-04 13:23:54.062515144 +0200
24650 +++ linux-atm-2.4.1/src/sigd/proto.c 2007-06-04 13:23:54.495449328 +0200
24651 @@ -259,6 +259,7 @@
24652 break;
24653 }
24654 default:
24655 + break;
24656 }
24657 va_end(ap);
24658 if ((size = q_close(&dsc)) >= 0) to_signaling(sock->sig,q_buffer,size);
24659 @@ -288,6 +289,7 @@
24660 }
24661 break;
24662 default:
24663 + break;
24664 }
24665 va_end(ap);
24666 }
24667 Index: linux-atm-2.4.1/src/sigd/cfg_y.y
24668 ===================================================================
24669 --- linux-atm-2.4.1.orig/src/sigd/cfg_y.y 2007-06-04 13:23:54.068514232 +0200
24670 +++ linux-atm-2.4.1/src/sigd/cfg_y.y 2007-06-04 13:23:54.495449328 +0200
24671 @@ -7,6 +7,7 @@
24672 #include <config.h>
24673 #endif
24674
24675 +#include <stdlib.h>
24676 #include <string.h>
24677 #include <ctype.h>
24678 #include <limits.h>
24679 @@ -19,6 +20,8 @@
24680 #include "trace.h"
24681 #include "policy.h"
24682
24683 +extern void yywarn(const char *s);
24684 +extern void yyerror(const char *s);
24685
24686 static RULE *rule;
24687 static SIG_ENTITY *curr_sig = &_entity;
24688 @@ -125,8 +128,16 @@
24689 if (entities == &_entity) entities = NULL;
24690 for (sig = entities; sig; sig = sig->next)
24691 if (atm_equal((struct sockaddr *) &sig->signaling_pvc,
24692 - (struct sockaddr *) &$2,0,0))
24693 - yyerror("duplicate PVC address %d.%d.%d",S_PVC(sig));
24694 + (struct sockaddr *) &$2,0,0)) {
24695 + const char *err;
24696 + asprintf(&err,"duplicate PVC address %d.%d.%d",S_PVC(sig));
24697 + if(err) {
24698 + yyerror(err);
24699 + free(err);
24700 + }
24701 + else
24702 + yyerror("duplicate PVC address");
24703 + }
24704 curr_sig = alloc_t(SIG_ENTITY);
24705 *curr_sig = _entity;
24706 curr_sig->signaling_pvc = $2;
24707 @@ -169,7 +180,7 @@
24708 if (text2atm($1,(struct sockaddr *) &addr,sizeof(addr),
24709 T2A_SVC | T2A_WILDCARD | T2A_NAME | T2A_LOCAL) < 0) {
24710 yyerror("invalid address");
24711 - return;
24712 + return 0;
24713 }
24714 add_route(curr_sig,&addr,mask ? strtol(mask,NULL,10) : INT_MAX);
24715 }
24716 Index: linux-atm-2.4.1/src/sigd/cfg_y.h
24717 ===================================================================
24718 --- linux-atm-2.4.1.orig/src/sigd/cfg_y.h 2007-06-04 13:23:54.074513320 +0200
24719 +++ linux-atm-2.4.1/src/sigd/cfg_y.h 2007-06-04 13:23:54.496449176 +0200
24720 @@ -1,44 +1,127 @@
24721 -typedef union {
24722 +/* A Bison parser, made by GNU Bison 1.875d. */
24723 +
24724 +/* Skeleton parser for Yacc-like parsing with Bison,
24725 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
24726 +
24727 + This program is free software; you can redistribute it and/or modify
24728 + it under the terms of the GNU General Public License as published by
24729 + the Free Software Foundation; either version 2, or (at your option)
24730 + any later version.
24731 +
24732 + This program is distributed in the hope that it will be useful,
24733 + but WITHOUT ANY WARRANTY; without even the implied warranty of
24734 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
24735 + GNU General Public License for more details.
24736 +
24737 + You should have received a copy of the GNU General Public License
24738 + along with this program; if not, write to the Free Software
24739 + Foundation, Inc., 59 Temple Place - Suite 330,
24740 + Boston, MA 02111-1307, USA. */
24741 +
24742 +/* As a special exception, when this file is copied by Bison into a
24743 + Bison output file, you may use that output file without restriction.
24744 + This special exception was added by the Free Software Foundation
24745 + in version 1.24 of Bison. */
24746 +
24747 +/* Tokens. */
24748 +#ifndef YYTOKENTYPE
24749 +# define YYTOKENTYPE
24750 + /* Put the tokens into the symbol table, so that GDB and other debuggers
24751 + know about them. */
24752 + enum yytokentype {
24753 + TOK_LEVEL = 258,
24754 + TOK_DEBUG = 259,
24755 + TOK_INFO = 260,
24756 + TOK_WARN = 261,
24757 + TOK_ERROR = 262,
24758 + TOK_FATAL = 263,
24759 + TOK_SIG = 264,
24760 + TOK_UNI30 = 265,
24761 + TOK_UNI31 = 266,
24762 + TOK_UNI40 = 267,
24763 + TOK_Q2963_1 = 268,
24764 + TOK_SAAL = 269,
24765 + TOK_VC = 270,
24766 + TOK_IO = 271,
24767 + TOK_MODE = 272,
24768 + TOK_USER = 273,
24769 + TOK_NET = 274,
24770 + TOK_SWITCH = 275,
24771 + TOK_VPCI = 276,
24772 + TOK_ITF = 277,
24773 + TOK_PCR = 278,
24774 + TOK_TRACE = 279,
24775 + TOK_POLICY = 280,
24776 + TOK_ALLOW = 281,
24777 + TOK_REJECT = 282,
24778 + TOK_ENTITY = 283,
24779 + TOK_DEFAULT = 284,
24780 + TOK_NUMBER = 285,
24781 + TOK_MAX_RATE = 286,
24782 + TOK_DUMP_DIR = 287,
24783 + TOK_LOGFILE = 288,
24784 + TOK_QOS = 289,
24785 + TOK_FROM = 290,
24786 + TOK_TO = 291,
24787 + TOK_ROUTE = 292,
24788 + TOK_PVC = 293
24789 + };
24790 +#endif
24791 +#define TOK_LEVEL 258
24792 +#define TOK_DEBUG 259
24793 +#define TOK_INFO 260
24794 +#define TOK_WARN 261
24795 +#define TOK_ERROR 262
24796 +#define TOK_FATAL 263
24797 +#define TOK_SIG 264
24798 +#define TOK_UNI30 265
24799 +#define TOK_UNI31 266
24800 +#define TOK_UNI40 267
24801 +#define TOK_Q2963_1 268
24802 +#define TOK_SAAL 269
24803 +#define TOK_VC 270
24804 +#define TOK_IO 271
24805 +#define TOK_MODE 272
24806 +#define TOK_USER 273
24807 +#define TOK_NET 274
24808 +#define TOK_SWITCH 275
24809 +#define TOK_VPCI 276
24810 +#define TOK_ITF 277
24811 +#define TOK_PCR 278
24812 +#define TOK_TRACE 279
24813 +#define TOK_POLICY 280
24814 +#define TOK_ALLOW 281
24815 +#define TOK_REJECT 282
24816 +#define TOK_ENTITY 283
24817 +#define TOK_DEFAULT 284
24818 +#define TOK_NUMBER 285
24819 +#define TOK_MAX_RATE 286
24820 +#define TOK_DUMP_DIR 287
24821 +#define TOK_LOGFILE 288
24822 +#define TOK_QOS 289
24823 +#define TOK_FROM 290
24824 +#define TOK_TO 291
24825 +#define TOK_ROUTE 292
24826 +#define TOK_PVC 293
24827 +
24828 +
24829 +
24830 +
24831 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
24832 +#line 56 "cfg_y.y"
24833 +typedef union YYSTYPE {
24834 int num;
24835 char *str;
24836 struct sockaddr_atmpvc pvc;
24837 } YYSTYPE;
24838 -#define TOK_LEVEL 257
24839 -#define TOK_DEBUG 258
24840 -#define TOK_INFO 259
24841 -#define TOK_WARN 260
24842 -#define TOK_ERROR 261
24843 -#define TOK_FATAL 262
24844 -#define TOK_SIG 263
24845 -#define TOK_UNI30 264
24846 -#define TOK_UNI31 265
24847 -#define TOK_UNI40 266
24848 -#define TOK_Q2963_1 267
24849 -#define TOK_SAAL 268
24850 -#define TOK_VC 269
24851 -#define TOK_IO 270
24852 -#define TOK_MODE 271
24853 -#define TOK_USER 272
24854 -#define TOK_NET 273
24855 -#define TOK_SWITCH 274
24856 -#define TOK_VPCI 275
24857 -#define TOK_ITF 276
24858 -#define TOK_PCR 277
24859 -#define TOK_TRACE 278
24860 -#define TOK_POLICY 279
24861 -#define TOK_ALLOW 280
24862 -#define TOK_REJECT 281
24863 -#define TOK_ENTITY 282
24864 -#define TOK_DEFAULT 283
24865 -#define TOK_NUMBER 284
24866 -#define TOK_MAX_RATE 285
24867 -#define TOK_DUMP_DIR 286
24868 -#define TOK_LOGFILE 287
24869 -#define TOK_QOS 288
24870 -#define TOK_FROM 289
24871 -#define TOK_TO 290
24872 -#define TOK_ROUTE 291
24873 -#define TOK_PVC 292
24874 -
24875 +/* Line 1285 of yacc.c. */
24876 +#line 119 "y.tab.h"
24877 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
24878 +# define YYSTYPE_IS_DECLARED 1
24879 +# define YYSTYPE_IS_TRIVIAL 1
24880 +#endif
24881
24882 extern YYSTYPE yylval;
24883 +
24884 +
24885 +
24886 Index: linux-atm-2.4.1/src/maint/Makefile.in
24887 ===================================================================
24888 --- linux-atm-2.4.1.orig/src/maint/Makefile.in 2007-06-04 13:23:54.079512560 +0200
24889 +++ linux-atm-2.4.1/src/maint/Makefile.in 2007-06-04 13:23:54.496449176 +0200
24890 @@ -1,4 +1,4 @@
24891 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
24892 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
24893
24894 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
24895 # This Makefile.in is free software; the Free Software Foundation
24896 @@ -181,8 +181,11 @@
24897
24898 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
24899
24900 -TAR = gtar
24901 +TAR = tar
24902 GZIP_ENV = --best
24903 +DEP_FILES = .deps/atmaddr.P .deps/atmdiag.P .deps/atmdump.P \
24904 +.deps/atmloop.P .deps/atmtcp.P .deps/enitune.P .deps/esi.P \
24905 +.deps/saaldump.P .deps/sonetdiag.P .deps/zntune.P
24906 SOURCES = $(atmdiag_SOURCES) $(atmdump_SOURCES) $(sonetdiag_SOURCES) $(saaldump_SOURCES) $(atmaddr_SOURCES) $(esi_SOURCES) $(atmloop_SOURCES) $(atmtcp_SOURCES) $(enitune_SOURCES) $(zntune_SOURCES)
24907 OBJECTS = $(atmdiag_OBJECTS) $(atmdump_OBJECTS) $(sonetdiag_OBJECTS) $(saaldump_OBJECTS) $(atmaddr_OBJECTS) $(esi_OBJECTS) $(atmloop_OBJECTS) $(atmtcp_OBJECTS) $(enitune_OBJECTS) $(zntune_OBJECTS)
24908
24909 @@ -190,9 +193,9 @@
24910 .SUFFIXES:
24911 .SUFFIXES: .S .c .lo .o .obj .s
24912 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
24913 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/maint/Makefile
24914 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/maint/Makefile
24915
24916 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
24917 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
24918 cd $(top_builddir) \
24919 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
24920
24921 @@ -247,9 +250,6 @@
24922 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
24923 done
24924
24925 -.c.o:
24926 - $(COMPILE) -c $<
24927 -
24928 # FIXME: We should only use cygpath when building on Windows,
24929 # and only if it is available.
24930 .c.obj:
24931 @@ -272,9 +272,6 @@
24932
24933 maintainer-clean-compile:
24934
24935 -.c.lo:
24936 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
24937 -
24938 .s.lo:
24939 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
24940
24941 @@ -388,7 +385,7 @@
24942 awk ' { files[$$0] = 1; } \
24943 END { for (i in files) print i; }'`; \
24944 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
24945 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
24946 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
24947
24948 mostlyclean-tags:
24949
24950 @@ -404,6 +401,11 @@
24951 subdir = src/maint
24952
24953 distdir: $(DISTFILES)
24954 + here=`cd $(top_builddir) && pwd`; \
24955 + top_distdir=`cd $(top_distdir) && pwd`; \
24956 + distdir=`cd $(distdir) && pwd`; \
24957 + cd $(top_srcdir) \
24958 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/maint/Makefile
24959 @for file in $(DISTFILES); do \
24960 d=$(srcdir); \
24961 if test -d $$d/$$file; then \
24962 @@ -414,28 +416,38 @@
24963 || cp -p $$d/$$file $(distdir)/$$file || :; \
24964 fi; \
24965 done
24966 -atmaddr.o: atmaddr.c ../../config.h ../../src/include/atm.h \
24967 - ../../src/include/stdint.h
24968 -atmdiag.o: atmdiag.c ../../config.h ../../src/include/atm.h \
24969 - ../../src/include/stdint.h
24970 -atmdump.o: atmdump.c ../../config.h ../../src/include/stdint.h \
24971 - ../../src/include/atm.h
24972 -atmloop.o: atmloop.c ../../config.h ../../src/include/atm.h \
24973 - ../../src/include/stdint.h
24974 -atmtcp.o: atmtcp.c ../../config.h ../../src/include/stdint.h \
24975 - ../../src/include/atm.h ../../src/include/atmd.h
24976 -enitune.o: enitune.c ../../config.h ../../src/include/atm.h \
24977 - ../../src/include/stdint.h
24978 -esi.o: esi.c ../../config.h ../../src/include/atm.h \
24979 - ../../src/include/stdint.h
24980 -saaldump.o: saaldump.c ../../config.h ../../src/include/atm.h \
24981 - ../../src/include/stdint.h ../../src/saal/pdu.h \
24982 - ../../src/include/atmd.h ../../src/qgen/qlib.h
24983 -sonetdiag.o: sonetdiag.c ../../config.h ../../src/include/atm.h \
24984 - ../../src/include/stdint.h
24985 -zntune.o: zntune.c ../../config.h ../../src/include/atm.h \
24986 - ../../src/include/stdint.h
24987
24988 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
24989 +
24990 +-include $(DEP_FILES)
24991 +
24992 +mostlyclean-depend:
24993 +
24994 +clean-depend:
24995 +
24996 +distclean-depend:
24997 + -rm -rf .deps
24998 +
24999 +maintainer-clean-depend:
25000 +
25001 +%.o: %.c
25002 + @echo '$(COMPILE) -c $<'; \
25003 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25004 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
25005 + tr ' ' '\012' < .deps/$(*F).pp \
25006 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25007 + >> .deps/$(*F).P; \
25008 + rm .deps/$(*F).pp
25009 +
25010 +%.lo: %.c
25011 + @echo '$(LTCOMPILE) -c $<'; \
25012 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25013 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
25014 + < .deps/$(*F).pp > .deps/$(*F).P; \
25015 + tr ' ' '\012' < .deps/$(*F).pp \
25016 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25017 + >> .deps/$(*F).P; \
25018 + rm -f .deps/$(*F).pp
25019 info-am:
25020 info: info-am
25021 dvi-am:
25022 @@ -475,18 +487,19 @@
25023 maintainer-clean-generic:
25024 mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-sbinPROGRAMS \
25025 mostlyclean-compile mostlyclean-libtool \
25026 - mostlyclean-tags mostlyclean-generic
25027 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
25028
25029 mostlyclean: mostlyclean-am
25030
25031 clean-am: clean-binPROGRAMS clean-sbinPROGRAMS clean-compile \
25032 - clean-libtool clean-tags clean-generic mostlyclean-am
25033 + clean-libtool clean-tags clean-depend clean-generic \
25034 + mostlyclean-am
25035
25036 clean: clean-am
25037
25038 distclean-am: distclean-binPROGRAMS distclean-sbinPROGRAMS \
25039 distclean-compile distclean-libtool distclean-tags \
25040 - distclean-generic clean-am
25041 + distclean-depend distclean-generic clean-am
25042 -rm -f libtool
25043
25044 distclean: distclean-am
25045 @@ -494,7 +507,8 @@
25046 maintainer-clean-am: maintainer-clean-binPROGRAMS \
25047 maintainer-clean-sbinPROGRAMS maintainer-clean-compile \
25048 maintainer-clean-libtool maintainer-clean-tags \
25049 - maintainer-clean-generic distclean-am
25050 + maintainer-clean-depend maintainer-clean-generic \
25051 + distclean-am
25052 @echo "This command is intended for maintainers to use;"
25053 @echo "it deletes files that may require special tools to rebuild."
25054
25055 @@ -508,12 +522,14 @@
25056 clean-compile maintainer-clean-compile mostlyclean-libtool \
25057 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
25058 uninstall-man8 install-man uninstall-man tags mostlyclean-tags \
25059 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
25060 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
25061 -install-exec install-data-am install-data install-am install \
25062 -uninstall-am uninstall all-redirect all-am all installdirs \
25063 -mostlyclean-generic distclean-generic clean-generic \
25064 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
25065 +distclean-tags clean-tags maintainer-clean-tags distdir \
25066 +mostlyclean-depend distclean-depend clean-depend \
25067 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
25068 +installcheck-am installcheck install-exec-am install-exec \
25069 +install-data-am install-data install-am install uninstall-am uninstall \
25070 +all-redirect all-am all installdirs mostlyclean-generic \
25071 +distclean-generic clean-generic maintainer-clean-generic clean \
25072 +mostlyclean distclean maintainer-clean
25073
25074
25075 # Tell versions [3.59,3.63) of GNU make to not export all variables.
25076 Index: linux-atm-2.4.1/src/maint/atmtcp.c
25077 ===================================================================
25078 --- linux-atm-2.4.1.orig/src/maint/atmtcp.c 2007-06-04 13:23:54.085511648 +0200
25079 +++ linux-atm-2.4.1/src/maint/atmtcp.c 2007-06-04 13:23:54.497449024 +0200
25080 @@ -60,7 +60,7 @@
25081 static IN *inputs = NULL;
25082 static fd_set in_set;
25083 static int fds = 0;
25084 -static int debug = 0;
25085 +static int atmtcp_debug = 0;
25086 static int links = 0;
25087
25088
25089 @@ -86,7 +86,7 @@
25090 {
25091 OUT *out;
25092
25093 - if (debug)
25094 + if (atmtcp_debug)
25095 fprintf(stderr,"Emit: %d.%d, %d bytes\n",ntohs(hdr->vpi),
25096 ntohs(hdr->vci),(int) ntohl(hdr->length));
25097 for (out = outputs; out; out = out->next)
25098 @@ -99,7 +99,7 @@
25099 OUT *out;
25100 int changed = 0;
25101
25102 - if (debug)
25103 + if (atmtcp_debug)
25104 fprintf(stderr,"Control: (%d.%d) %s %d.%d, vcc %s\n",
25105 ntohs(msg->hdr.vpi),ntohs(msg->hdr.vci),
25106 msg->type == ATMTCP_CTRL_OPEN ? "OPEN" :
25107 @@ -295,19 +295,19 @@
25108 }
25109 if ((s = socket(PF_ATMPVC,SOCK_DGRAM,0)) < 0) {
25110 msg->result = -errno;
25111 - if (debug) perror("socket");
25112 + if (atmtcp_debug) perror("socket");
25113 return 1;
25114 }
25115 if (setsockopt(s,SOL_ATM,SO_ATMQOS,&msg->qos,sizeof(msg->qos)) < 0) {
25116 msg->result = -errno;
25117 - if (debug) perror("setsockopt SO_ATMQOS");
25118 + if (atmtcp_debug) perror("setsockopt SO_ATMQOS");
25119 return 1;
25120 }
25121 msg->addr.sap_addr.itf = data->itf;
25122 if (connect(s,(struct sockaddr *) &msg->addr,
25123 sizeof(struct sockaddr_atmpvc)) < 0) {
25124 msg->result = -errno;
25125 - if (debug) perror("connect");
25126 + if (atmtcp_debug) perror("connect");
25127 return 1;
25128 }
25129 (*vcc) = alloc_t(VCC);
25130 @@ -333,7 +333,7 @@
25131 addr.sap_addr.vci = ntohs(hdr->vci);
25132 vcc = real_lookup(data,&addr);
25133 if (!*vcc) {
25134 - if (debug)
25135 + if (atmtcp_debug)
25136 fprintf(stderr,"VCC %d.%d not found\n",addr.sap_addr.vpi,
25137 addr.sap_addr.vci);
25138 return;
25139 @@ -430,7 +430,7 @@
25140 exit(1);
25141 }
25142 if (in->bytes < sizeof(*hdr)+ntohl(hdr->length)) return;
25143 - if (debug)
25144 + if (atmtcp_debug)
25145 fprintf(stderr,"TCP %d.%d, %d bytes\n",ntohs(hdr->vpi),
25146 ntohs(hdr->vci),(unsigned int) ntohl(hdr->length));
25147 in->bytes = 0;
25148 @@ -447,7 +447,7 @@
25149 fprintf(stderr,"unrecognized control message \"%s\"\n",msg);
25150 return;
25151 }
25152 - if (debug) fprintf(stderr,"received control \"%s\"\n",msg);
25153 + if (atmtcp_debug) fprintf(stderr,"received control \"%s\"\n",msg);
25154 ctl.hdr.vpi = htons(vpi);
25155 ctl.hdr.vci = htons(vci);
25156 ctl.hdr.length = htonl(ATMTCP_HDR_MAGIC);
25157 @@ -508,7 +508,7 @@
25158 }
25159 hdr->vpi = hdr->vci = htons(0);
25160 hdr->length = htonl(pos-start);
25161 - if (debug) fprintf(stderr,"sending control \"%s\"\n",start);
25162 + if (atmtcp_debug) fprintf(stderr,"sending control \"%s\"\n",start);
25163 tcp_do_send(*(int *) out->user,buf,pos-buf);
25164 return 0;
25165 }
25166 @@ -555,7 +555,7 @@
25167 exit(1);
25168 }
25169 if (in->bytes < sizeof(int)+sizeof(*hdr)+ntohl(hdr->length)) return;
25170 - if (debug)
25171 + if (atmtcp_debug)
25172 fprintf(stderr,"File %d.%d, %d bytes\n",ntohs(hdr->vpi),
25173 ntohs(hdr->vci),(unsigned int) ntohl(hdr->length));
25174 }
25175 @@ -708,7 +708,7 @@
25176 while ((c = getopt(argc,argv,"dvV")) != EOF)
25177 switch (c) {
25178 case 'd':
25179 - debug = 1;
25180 + atmtcp_debug = 1;
25181 break;
25182 case 'v':
25183 verbose = 1;
25184 @@ -817,7 +817,8 @@
25185 }
25186 else if (!strcmp(ARG,"listen") ||
25187 (do_background = !strcmp(ARG,"listen-bg"))) {
25188 - int fd,port,addr_len;
25189 + int fd,port;
25190 + size_t addr_len;
25191 int *fd2 = alloc_t(int);
25192
25193 if ((fd = socket(PF_INET,SOCK_STREAM,0)) < 0) {
25194 Index: linux-atm-2.4.1/src/maint/enitune.c
25195 ===================================================================
25196 --- linux-atm-2.4.1.orig/src/maint/enitune.c 2007-06-04 13:23:54.091510736 +0200
25197 +++ linux-atm-2.4.1/src/maint/enitune.c 2007-06-04 13:23:54.497449024 +0200
25198 @@ -44,6 +44,7 @@
25199 if (*end || mult.rx <= 100) usage(name);
25200 break;
25201 default:
25202 + break;
25203 }
25204 if (argc != optind+1) usage(name);
25205 sioc.number = strtol(argv[optind],&end,0);
25206 Index: linux-atm-2.4.1/src/arpd/Makefile.in
25207 ===================================================================
25208 --- linux-atm-2.4.1.orig/src/arpd/Makefile.in 2007-06-04 13:23:54.097509824 +0200
25209 +++ linux-atm-2.4.1/src/arpd/Makefile.in 2007-06-04 13:23:54.497449024 +0200
25210 @@ -1,4 +1,4 @@
25211 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
25212 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
25213
25214 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
25215 # This Makefile.in is free software; the Free Software Foundation
25216 @@ -90,8 +90,7 @@
25217 sbin_PROGRAMS = atmarp atmarpd
25218
25219 atmarp_SOURCES = atmarp.c atmarp.h atmarpd.h
25220 -atmarpd_SOURCES = atmarpd.c atmarpd.h arp.c arp.h io.c io.h itf.c itf.h \
25221 - table.c table.h atmarp.h
25222 +atmarpd_SOURCES = atmarpd.c atmarpd.h arp.c arp.h io.c io.h itf.c itf.h table.c table.h atmarp.h
25223
25224
25225 include_HEADERS = atmarp.h atmarpd.h
25226 @@ -135,8 +134,10 @@
25227
25228 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
25229
25230 -TAR = gtar
25231 +TAR = tar
25232 GZIP_ENV = --best
25233 +DEP_FILES = .deps/arp.P .deps/atmarp.P .deps/atmarpd.P .deps/io.P \
25234 +.deps/itf.P .deps/table.P
25235 SOURCES = $(atmarp_SOURCES) $(atmarpd_SOURCES)
25236 OBJECTS = $(atmarp_OBJECTS) $(atmarpd_OBJECTS)
25237
25238 @@ -144,9 +145,9 @@
25239 .SUFFIXES:
25240 .SUFFIXES: .S .c .lo .o .obj .s
25241 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
25242 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/arpd/Makefile
25243 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/arpd/Makefile
25244
25245 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
25246 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
25247 cd $(top_builddir) \
25248 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
25249
25250 @@ -176,9 +177,6 @@
25251 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
25252 done
25253
25254 -.c.o:
25255 - $(COMPILE) -c $<
25256 -
25257 # FIXME: We should only use cygpath when building on Windows,
25258 # and only if it is available.
25259 .c.obj:
25260 @@ -201,9 +199,6 @@
25261
25262 maintainer-clean-compile:
25263
25264 -.c.lo:
25265 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25266 -
25267 .s.lo:
25268 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25269
25270 @@ -300,7 +295,7 @@
25271 awk ' { files[$$0] = 1; } \
25272 END { for (i in files) print i; }'`; \
25273 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
25274 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
25275 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
25276
25277 mostlyclean-tags:
25278
25279 @@ -316,6 +311,11 @@
25280 subdir = src/arpd
25281
25282 distdir: $(DISTFILES)
25283 + here=`cd $(top_builddir) && pwd`; \
25284 + top_distdir=`cd $(top_distdir) && pwd`; \
25285 + distdir=`cd $(distdir) && pwd`; \
25286 + cd $(top_srcdir) \
25287 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/arpd/Makefile
25288 @for file in $(DISTFILES); do \
25289 d=$(srcdir); \
25290 if test -d $$d/$$file; then \
25291 @@ -326,24 +326,38 @@
25292 || cp -p $$d/$$file $(distdir)/$$file || :; \
25293 fi; \
25294 done
25295 -arp.o: arp.c ../../config.h ../../src/include/stdint.h \
25296 - ../../src/include/atm.h ../../src/include/atmd.h atmarp.h \
25297 - atmarpd.h table.h itf.h io.h arp.h
25298 -atmarp.o: atmarp.c ../../config.h ../../src/include/stdint.h \
25299 - ../../src/include/atm.h ../../src/include/atmd.h atmarpd.h
25300 -atmarpd.o: atmarpd.c ../../config.h ../../src/include/atm.h \
25301 - ../../src/include/stdint.h ../../src/include/atmd.h atmarpd.h \
25302 - io.h table.h
25303 -io.o: io.c ../../config.h ../../src/include/stdint.h \
25304 - ../../src/include/atm.h ../../src/include/atmd.h atmarpd.h \
25305 - table.h arp.h atmarp.h itf.h io.h
25306 -itf.o: itf.c ../../config.h ../../src/include/stdint.h \
25307 - ../../src/include/atmd.h ../../src/include/atm.h table.h io.h \
25308 - itf.h arp.h atmarp.h atmarpd.h
25309 -table.o: table.c ../../config.h ../../src/include/stdint.h \
25310 - ../../src/include/atm.h ../../src/include/atmd.h atmarpd.h \
25311 - table.h
25312
25313 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
25314 +
25315 +-include $(DEP_FILES)
25316 +
25317 +mostlyclean-depend:
25318 +
25319 +clean-depend:
25320 +
25321 +distclean-depend:
25322 + -rm -rf .deps
25323 +
25324 +maintainer-clean-depend:
25325 +
25326 +%.o: %.c
25327 + @echo '$(COMPILE) -c $<'; \
25328 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25329 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
25330 + tr ' ' '\012' < .deps/$(*F).pp \
25331 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25332 + >> .deps/$(*F).P; \
25333 + rm .deps/$(*F).pp
25334 +
25335 +%.lo: %.c
25336 + @echo '$(LTCOMPILE) -c $<'; \
25337 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25338 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
25339 + < .deps/$(*F).pp > .deps/$(*F).P; \
25340 + tr ' ' '\012' < .deps/$(*F).pp \
25341 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25342 + >> .deps/$(*F).P; \
25343 + rm -f .deps/$(*F).pp
25344 info-am:
25345 info: info-am
25346 dvi-am:
25347 @@ -383,27 +397,27 @@
25348
25349 maintainer-clean-generic:
25350 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
25351 - mostlyclean-libtool mostlyclean-tags \
25352 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
25353 mostlyclean-generic
25354
25355 mostlyclean: mostlyclean-am
25356
25357 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
25358 - clean-generic mostlyclean-am
25359 + clean-depend clean-generic mostlyclean-am
25360
25361 clean: clean-am
25362
25363 distclean-am: distclean-sbinPROGRAMS distclean-compile \
25364 - distclean-libtool distclean-tags distclean-generic \
25365 - clean-am
25366 + distclean-libtool distclean-tags distclean-depend \
25367 + distclean-generic clean-am
25368 -rm -f libtool
25369
25370 distclean: distclean-am
25371
25372 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
25373 maintainer-clean-compile maintainer-clean-libtool \
25374 - maintainer-clean-tags maintainer-clean-generic \
25375 - distclean-am
25376 + maintainer-clean-tags maintainer-clean-depend \
25377 + maintainer-clean-generic distclean-am
25378 @echo "This command is intended for maintainers to use;"
25379 @echo "it deletes files that may require special tools to rebuild."
25380
25381 @@ -416,8 +430,9 @@
25382 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
25383 uninstall-man8 install-man uninstall-man uninstall-includeHEADERS \
25384 install-includeHEADERS tags mostlyclean-tags distclean-tags clean-tags \
25385 -maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
25386 -installcheck-am installcheck install-exec-am install-exec \
25387 +maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
25388 +clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
25389 +check-am installcheck-am installcheck install-exec-am install-exec \
25390 install-data-am install-data install-am install uninstall-am uninstall \
25391 all-redirect all-am all installdirs mostlyclean-generic \
25392 distclean-generic clean-generic maintainer-clean-generic clean \
25393 Index: linux-atm-2.4.1/src/arpd/atmarp.c
25394 ===================================================================
25395 --- linux-atm-2.4.1.orig/src/arpd/atmarp.c 2007-06-04 13:23:54.103508912 +0200
25396 +++ linux-atm-2.4.1/src/arpd/atmarp.c 2007-06-04 13:23:54.497449024 +0200
25397 @@ -92,7 +92,7 @@
25398 perror("read " ATMARP_DUMP_DIR "/" ATMARP_DUMP_FILE);
25399 return 1;
25400 }
25401 - if (write(0,buffer,size) < 0) {
25402 + if (write(1,buffer,size) < 0) {
25403 perror("write stdout");
25404 return 1;
25405 }
25406 Index: linux-atm-2.4.1/src/ilmid/Makefile.in
25407 ===================================================================
25408 --- linux-atm-2.4.1.orig/src/ilmid/Makefile.in 2007-06-04 13:23:54.108508152 +0200
25409 +++ linux-atm-2.4.1/src/ilmid/Makefile.in 2007-06-04 13:23:54.498448872 +0200
25410 @@ -1,4 +1,4 @@
25411 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
25412 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
25413
25414 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
25415 # This Makefile.in is free software; the Free Software Foundation
25416 @@ -91,13 +91,9 @@
25417
25418 sbin_PROGRAMS = ilmid
25419
25420 -ilmid_SOURCES = rfc1157_snmp.c rfc1157_snmp.h rfc1155_smi.c rfc1155_smi.h \
25421 - util.c util.h io.c io.h message.c message.h \
25422 - atmf_uni.c atmf_uni.h mib.c mib.h \
25423 - sysgroup.c sysgroup.h ilmid.c
25424 +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
25425
25426 -ilmid_LDADD = $(top_builddir)/src/lib/libatm.la \
25427 - $(top_builddir)/src/ilmid/asn1/libasn1.a
25428 +ilmid_LDADD = $(top_builddir)/src/lib/libatm.la $(top_builddir)/src/ilmid/asn1/libasn1.a
25429
25430 ilmid_DEPENDENCIES = $(ilmid_LDADD)
25431
25432 @@ -127,8 +123,11 @@
25433
25434 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
25435
25436 -TAR = gtar
25437 +TAR = tar
25438 GZIP_ENV = --best
25439 +DEP_FILES = .deps/atmf_uni.P .deps/ilmid.P .deps/io.P .deps/message.P \
25440 +.deps/mib.P .deps/rfc1155_smi.P .deps/rfc1157_snmp.P .deps/sysgroup.P \
25441 +.deps/util.P
25442 SOURCES = $(ilmid_SOURCES)
25443 OBJECTS = $(ilmid_OBJECTS)
25444
25445 @@ -136,9 +135,9 @@
25446 .SUFFIXES:
25447 .SUFFIXES: .S .c .lo .o .obj .s
25448 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
25449 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/ilmid/Makefile
25450 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/ilmid/Makefile
25451
25452 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
25453 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
25454 cd $(top_builddir) \
25455 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
25456
25457 @@ -168,9 +167,6 @@
25458 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
25459 done
25460
25461 -.c.o:
25462 - $(COMPILE) -c $<
25463 -
25464 # FIXME: We should only use cygpath when building on Windows,
25465 # and only if it is available.
25466 .c.obj:
25467 @@ -193,9 +189,6 @@
25468
25469 maintainer-clean-compile:
25470
25471 -.c.lo:
25472 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25473 -
25474 .s.lo:
25475 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25476
25477 @@ -294,7 +287,7 @@
25478 awk ' { files[$$0] = 1; } \
25479 END { for (i in files) print i; }'`; \
25480 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
25481 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
25482 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
25483
25484 mostlyclean-tags:
25485
25486 @@ -310,6 +303,11 @@
25487 subdir = src/ilmid
25488
25489 distdir: $(DISTFILES)
25490 + here=`cd $(top_builddir) && pwd`; \
25491 + top_distdir=`cd $(top_distdir) && pwd`; \
25492 + distdir=`cd $(distdir) && pwd`; \
25493 + cd $(top_srcdir) \
25494 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/ilmid/Makefile
25495 @for file in $(DISTFILES); do \
25496 d=$(srcdir); \
25497 if test -d $$d/$$file; then \
25498 @@ -330,62 +328,38 @@
25499 || exit 1; \
25500 fi; \
25501 done
25502 -atmf_uni.o: atmf_uni.c ../../config.h atmf_uni.h asn1/asn_incl.h \
25503 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25504 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25505 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25506 - rfc1155_smi.h rfc1157_snmp.h mib.h ../../src/include/atmd.h \
25507 - ../../src/include/stdint.h ../../src/include/atm.h util.h
25508 -ilmid.o: ilmid.c ../../config.h asn1/asn_incl.h asn1/asn_config.h \
25509 - asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h asn1/asn_len.h \
25510 - asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h asn1/asn_bits.h \
25511 - asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h rfc1155_smi.h \
25512 - rfc1157_snmp.h message.h util.h ../../src/include/atmd.h \
25513 - ../../src/include/stdint.h ../../src/include/atm.h io.h mib.h \
25514 - atmf_uni.h sysgroup.h
25515 -io.o: io.c ../../config.h ../../src/include/stdint.h \
25516 - ../../src/include/atm.h io.h asn1/asn_incl.h asn1/asn_config.h \
25517 - asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h asn1/asn_len.h \
25518 - asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h asn1/asn_bits.h \
25519 - asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h rfc1155_smi.h \
25520 - rfc1157_snmp.h ../../src/include/atmd.h atmf_uni.h mib.h
25521 -message.o: message.c ../../config.h message.h asn1/asn_incl.h \
25522 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25523 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25524 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25525 - rfc1155_smi.h rfc1157_snmp.h atmf_uni.h mib.h \
25526 - ../../src/include/atmd.h ../../src/include/stdint.h \
25527 - ../../src/include/atm.h util.h
25528 -mib.o: mib.c ../../config.h mib.h ../../src/include/atmd.h \
25529 - ../../src/include/stdint.h ../../src/include/atm.h \
25530 - asn1/asn_incl.h asn1/asn_config.h asn1/nibble_alloc.h \
25531 - asn1/sbuf.h asn1/print.h asn1/asn_len.h asn1/asn_tag.h \
25532 - asn1/asn_int.h asn1/asn_octs.h asn1/asn_bits.h asn1/asn_oid.h \
25533 - asn1/asn_null.h asn1/asn_list.h rfc1155_smi.h rfc1157_snmp.h \
25534 - sysgroup.h atmf_uni.h util.h
25535 -rfc1155_smi.o: rfc1155_smi.c ../../config.h asn1/asn_incl.h \
25536 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25537 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25538 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25539 - rfc1155_smi.h rfc1157_snmp.h
25540 -rfc1157_snmp.o: rfc1157_snmp.c ../../config.h asn1/asn_incl.h \
25541 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25542 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25543 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25544 - rfc1155_smi.h rfc1157_snmp.h
25545 -sysgroup.o: sysgroup.c ../../config.h sysgroup.h asn1/asn_incl.h \
25546 - asn1/asn_config.h asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h \
25547 - asn1/asn_len.h asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h \
25548 - asn1/asn_bits.h asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h \
25549 - rfc1155_smi.h rfc1157_snmp.h mib.h ../../src/include/atmd.h \
25550 - ../../src/include/stdint.h ../../src/include/atm.h
25551 -util.o: util.c ../../config.h util.h asn1/asn_incl.h asn1/asn_config.h \
25552 - asn1/nibble_alloc.h asn1/sbuf.h asn1/print.h asn1/asn_len.h \
25553 - asn1/asn_tag.h asn1/asn_int.h asn1/asn_octs.h asn1/asn_bits.h \
25554 - asn1/asn_oid.h asn1/asn_null.h asn1/asn_list.h rfc1155_smi.h \
25555 - rfc1157_snmp.h ../../src/include/atmd.h \
25556 - ../../src/include/stdint.h ../../src/include/atm.h
25557
25558 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
25559 +
25560 +-include $(DEP_FILES)
25561 +
25562 +mostlyclean-depend:
25563 +
25564 +clean-depend:
25565 +
25566 +distclean-depend:
25567 + -rm -rf .deps
25568 +
25569 +maintainer-clean-depend:
25570 +
25571 +%.o: %.c
25572 + @echo '$(COMPILE) -c $<'; \
25573 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25574 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
25575 + tr ' ' '\012' < .deps/$(*F).pp \
25576 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25577 + >> .deps/$(*F).P; \
25578 + rm .deps/$(*F).pp
25579 +
25580 +%.lo: %.c
25581 + @echo '$(LTCOMPILE) -c $<'; \
25582 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25583 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
25584 + < .deps/$(*F).pp > .deps/$(*F).P; \
25585 + tr ' ' '\012' < .deps/$(*F).pp \
25586 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25587 + >> .deps/$(*F).P; \
25588 + rm -f .deps/$(*F).pp
25589 info-am:
25590 info: info-recursive
25591 dvi-am:
25592 @@ -424,27 +398,27 @@
25593
25594 maintainer-clean-generic:
25595 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
25596 - mostlyclean-libtool mostlyclean-tags \
25597 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
25598 mostlyclean-generic
25599
25600 mostlyclean: mostlyclean-recursive
25601
25602 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
25603 - clean-generic mostlyclean-am
25604 + clean-depend clean-generic mostlyclean-am
25605
25606 clean: clean-recursive
25607
25608 distclean-am: distclean-sbinPROGRAMS distclean-compile \
25609 - distclean-libtool distclean-tags distclean-generic \
25610 - clean-am
25611 + distclean-libtool distclean-tags distclean-depend \
25612 + distclean-generic clean-am
25613 -rm -f libtool
25614
25615 distclean: distclean-recursive
25616
25617 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
25618 maintainer-clean-compile maintainer-clean-libtool \
25619 - maintainer-clean-tags maintainer-clean-generic \
25620 - distclean-am
25621 + maintainer-clean-tags maintainer-clean-depend \
25622 + maintainer-clean-generic distclean-am
25623 @echo "This command is intended for maintainers to use;"
25624 @echo "it deletes files that may require special tools to rebuild."
25625
25626 @@ -460,12 +434,14 @@
25627 all-recursive check-recursive installcheck-recursive info-recursive \
25628 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
25629 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
25630 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
25631 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
25632 -install-exec install-data-am install-data install-am install \
25633 -uninstall-am uninstall all-redirect all-am all installdirs-am \
25634 -installdirs mostlyclean-generic distclean-generic clean-generic \
25635 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
25636 +distclean-tags clean-tags maintainer-clean-tags distdir \
25637 +mostlyclean-depend distclean-depend clean-depend \
25638 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
25639 +installcheck-am installcheck install-exec-am install-exec \
25640 +install-data-am install-data install-am install uninstall-am uninstall \
25641 +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
25642 +distclean-generic clean-generic maintainer-clean-generic clean \
25643 +mostlyclean distclean maintainer-clean
25644
25645
25646 # Tell versions [3.59,3.63) of GNU make to not export all variables.
25647 Index: linux-atm-2.4.1/src/ilmid/io.c
25648 ===================================================================
25649 --- linux-atm-2.4.1.orig/src/ilmid/io.c 2007-06-04 13:23:54.114507240 +0200
25650 +++ linux-atm-2.4.1/src/ilmid/io.c 2007-06-04 13:23:54.498448872 +0200
25651 @@ -32,6 +32,7 @@
25652 #include <net/if.h>
25653 #include <atm.h>
25654 #include <linux/atmdev.h>
25655 +#include <unistd.h>
25656 #include "io.h"
25657 #include "atmd.h"
25658 #include "atmf_uni.h"
25659 @@ -299,4 +300,5 @@
25660 diag(COMPONENT,DIAG_ERROR,"ioctl ATM_GETCIRANGE: %s",strerror(errno));
25661 return error;
25662 }
25663 + return 0;
25664 }
25665 Index: linux-atm-2.4.1/src/ilmid/atmf_uni.c
25666 ===================================================================
25667 --- linux-atm-2.4.1.orig/src/ilmid/atmf_uni.c 2007-06-04 13:23:54.119506480 +0200
25668 +++ linux-atm-2.4.1/src/ilmid/atmf_uni.c 2007-06-04 13:23:54.498448872 +0200
25669 @@ -187,7 +187,7 @@
25670 newPrefix->name = alloc_t(AsnOid);
25671 newPrefix->name->octs = alloc(varBindName->octetLen);
25672 AsnOidCopy(newPrefix->name, varBindName);
25673 - Q_INSERT_BEFORE((NetPrefixNode *) var->value, newPrefix, prefix);
25674 + Q_INSERT_BEFORE_TYPED(var->value,(NetPrefixNode *), newPrefix, prefix);
25675 if(atmNetPrefix.octs == NULL)
25676 {
25677 atmNetPrefix.octetLen = varBindName->octetLen - NETPREFIX_LEN - 2;
25678 @@ -197,7 +197,7 @@
25679 }
25680 else if (varbind->value->a.simple->a.number == INVALID && cmp == AsnOidEqual)
25681 {
25682 - Q_REMOVE((NetPrefixNode *) var->value, prefix);
25683 + Q_REMOVE(var->value, prefix);
25684 }
25685
25686 return NOERROR;
25687 Index: linux-atm-2.4.1/src/ilmid/mib.c
25688 ===================================================================
25689 --- linux-atm-2.4.1.orig/src/ilmid/mib.c 2007-06-04 13:23:54.124505720 +0200
25690 +++ linux-atm-2.4.1/src/ilmid/mib.c 2007-06-04 13:23:54.499448720 +0200
25691 @@ -58,13 +58,13 @@
25692 { NULL }
25693 };
25694
25695 -void MIBget(VarBindList *list, PDUInt *status, AsnInt *index)
25696 +void MIBget(VarBindList *list, PDUInt *status, AsnInt *Mindex)
25697 {
25698 VarBind *varbind;
25699 Variable *var;
25700 AsnOidResult result;
25701
25702 - *index = 1;
25703 + *Mindex = 1;
25704 FOR_EACH_LIST_ELMT(varbind, list)
25705 {
25706 /* Find the first MIB object not lexigraphically less than the *
25707 @@ -91,20 +91,20 @@
25708 if(*status != NOERROR)
25709 return;
25710
25711 - (*index)++;
25712 + (*Mindex)++;
25713 }
25714 - *index = 0;
25715 + *Mindex = 0;
25716 return;
25717 }
25718
25719
25720 -void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *index)
25721 +void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *Mindex)
25722 {
25723 VarBind *varbind;
25724 Variable *var;
25725 AsnOidResult result;
25726
25727 - *index = 1;
25728 + *Mindex = 1;
25729 FOR_EACH_LIST_ELMT(varbind, list)
25730 {
25731 /* Find the first complex MIB object not lexigraphically less than *
25732 @@ -139,19 +139,19 @@
25733 if(*status != NOERROR)
25734 return;
25735
25736 - (*index)++;
25737 + (*Mindex)++;
25738 }
25739 - *index = 0;
25740 + *Mindex = 0;
25741 return;
25742 }
25743
25744 -void MIBset(VarBindList *list, PDUInt *status, AsnInt *index)
25745 +void MIBset(VarBindList *list, PDUInt *status, AsnInt *Mindex)
25746 {
25747 VarBind *varbind;
25748 Variable *var;
25749 AsnOidResult result;
25750
25751 - *index = 1;
25752 + *Mindex = 1;
25753 FOR_EACH_LIST_ELMT(varbind, list)
25754 {
25755 /* Find the first MIB object not lexigraphically less than the *
25756 @@ -182,9 +182,9 @@
25757 if(*status != NOERROR)
25758 return;
25759
25760 - (*index)++;
25761 + (*Mindex)++;
25762 }
25763 - *index = 0;
25764 + *Mindex = 0;
25765 return;
25766 }
25767
25768 Index: linux-atm-2.4.1/src/ilmid/mib.h
25769 ===================================================================
25770 --- linux-atm-2.4.1.orig/src/ilmid/mib.h 2007-06-04 13:23:54.130504808 +0200
25771 +++ linux-atm-2.4.1/src/ilmid/mib.h 2007-06-04 13:23:54.499448720 +0200
25772 @@ -39,9 +39,9 @@
25773 void *value;
25774 } Variable;
25775
25776 -void MIBget(VarBindList *list, PDUInt *status, AsnInt *index);
25777 -void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *index);
25778 -void MIBset(VarBindList *list, PDUInt *status, AsnInt *index);
25779 +void MIBget(VarBindList *list, PDUInt *status, AsnInt *Mindex);
25780 +void MIBgetnext(VarBindList *list, PDUInt *status, AsnInt *Mindex);
25781 +void MIBset(VarBindList *list, PDUInt *status, AsnInt *Mindex);
25782 void *MIBdelete(AsnOid *oid);
25783
25784 AsnInt getString(VarBind *varbind, Variable *var);
25785 Index: linux-atm-2.4.1/src/ilmid/ilmid.c
25786 ===================================================================
25787 --- linux-atm-2.4.1.orig/src/ilmid/ilmid.c 2007-06-04 13:23:54.135504048 +0200
25788 +++ linux-atm-2.4.1/src/ilmid/ilmid.c 2007-06-04 13:23:54.499448720 +0200
25789 @@ -33,6 +33,7 @@
25790 #include <config.h>
25791 #endif
25792
25793 +#include <stdlib.h>
25794 #include <unistd.h>
25795 #include <sys/time.h>
25796 #include <errno.h>
25797 Index: linux-atm-2.4.1/src/ilmid/asn1/Makefile.in
25798 ===================================================================
25799 --- linux-atm-2.4.1.orig/src/ilmid/asn1/Makefile.in 2007-06-04 13:23:54.141503136 +0200
25800 +++ linux-atm-2.4.1/src/ilmid/asn1/Makefile.in 2007-06-04 13:23:54.499448720 +0200
25801 @@ -1,4 +1,4 @@
25802 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
25803 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
25804
25805 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
25806 # This Makefile.in is free software; the Free Software Foundation
25807 @@ -87,13 +87,7 @@
25808
25809 noinst_LIBRARIES = libasn1.a
25810
25811 -libasn1_a_SOURCES = asn_len.c asn_len.h asn_tag.c asn_tag.h \
25812 - asn_int.c asn_int.h asn_octs.c asn_octs.h \
25813 - asn_bits.c asn_bits.h str_stk.c str_stk.h \
25814 - asn_oid.c asn_oid.h asn_null.c asn_null.h \
25815 - asn_list.c asn_list.h nibble_alloc.c nibble_alloc.h \
25816 - print.c print.h \
25817 - asn_config.h min_buf.h sbuf.h exp_buf.h
25818 +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
25819
25820
25821 EXTRA_libasn1_a_SOURCES = asn_incl.h exp_buf.c
25822 @@ -125,8 +119,12 @@
25823
25824 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
25825
25826 -TAR = gtar
25827 +TAR = tar
25828 GZIP_ENV = --best
25829 +DEP_FILES = .deps/asn_bits.P .deps/asn_int.P .deps/asn_len.P \
25830 +.deps/asn_list.P .deps/asn_null.P .deps/asn_octs.P .deps/asn_oid.P \
25831 +.deps/asn_tag.P .deps/exp_buf.P .deps/nibble_alloc.P .deps/print.P \
25832 +.deps/str_stk.P
25833 SOURCES = $(libasn1_a_SOURCES) $(EXTRA_libasn1_a_SOURCES)
25834 OBJECTS = $(libasn1_a_OBJECTS)
25835
25836 @@ -134,9 +132,9 @@
25837 .SUFFIXES:
25838 .SUFFIXES: .S .c .lo .o .obj .s
25839 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
25840 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/ilmid/asn1/Makefile
25841 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/ilmid/asn1/Makefile
25842
25843 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
25844 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
25845 cd $(top_builddir) \
25846 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
25847
25848 @@ -150,9 +148,6 @@
25849
25850 maintainer-clean-noinstLIBRARIES:
25851
25852 -.c.o:
25853 - $(COMPILE) -c $<
25854 -
25855 # FIXME: We should only use cygpath when building on Windows,
25856 # and only if it is available.
25857 .c.obj:
25858 @@ -175,9 +170,6 @@
25859
25860 maintainer-clean-compile:
25861
25862 -.c.lo:
25863 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25864 -
25865 .s.lo:
25866 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
25867
25868 @@ -217,7 +209,7 @@
25869 awk ' { files[$$0] = 1; } \
25870 END { for (i in files) print i; }'`; \
25871 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
25872 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
25873 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
25874
25875 mostlyclean-tags:
25876
25877 @@ -233,6 +225,11 @@
25878 subdir = src/ilmid/asn1
25879
25880 distdir: $(DISTFILES)
25881 + here=`cd $(top_builddir) && pwd`; \
25882 + top_distdir=`cd $(top_distdir) && pwd`; \
25883 + distdir=`cd $(distdir) && pwd`; \
25884 + cd $(top_srcdir) \
25885 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/ilmid/asn1/Makefile
25886 @for file in $(DISTFILES); do \
25887 d=$(srcdir); \
25888 if test -d $$d/$$file; then \
25889 @@ -243,30 +240,38 @@
25890 || cp -p $$d/$$file $(distdir)/$$file || :; \
25891 fi; \
25892 done
25893 -asn_bits.o: asn_bits.c ../../../config.h asn_config.h nibble_alloc.h \
25894 - sbuf.h print.h asn_len.h asn_tag.h str_stk.h asn_bits.h
25895 -asn_int.o: asn_int.c ../../../config.h asn_config.h nibble_alloc.h \
25896 - sbuf.h print.h asn_len.h asn_tag.h asn_int.h
25897 -asn_len.o: asn_len.c ../../../config.h asn_config.h nibble_alloc.h \
25898 - sbuf.h print.h asn_len.h
25899 -asn_list.o: asn_list.c ../../../config.h asn_config.h nibble_alloc.h \
25900 - sbuf.h print.h asn_list.h
25901 -asn_null.o: asn_null.c ../../../config.h asn_config.h nibble_alloc.h \
25902 - sbuf.h print.h asn_len.h asn_tag.h asn_null.h
25903 -asn_octs.o: asn_octs.c ../../../config.h asn_config.h nibble_alloc.h \
25904 - sbuf.h print.h asn_len.h asn_tag.h str_stk.h asn_bits.h \
25905 - asn_octs.h
25906 -asn_oid.o: asn_oid.c ../../../config.h asn_config.h nibble_alloc.h \
25907 - sbuf.h print.h asn_len.h asn_tag.h asn_octs.h asn_oid.h
25908 -asn_tag.o: asn_tag.c ../../../config.h asn_config.h nibble_alloc.h \
25909 - sbuf.h print.h asn_len.h asn_tag.h
25910 -nibble_alloc.o: nibble_alloc.c ../../../config.h asn_config.h \
25911 - nibble_alloc.h sbuf.h print.h
25912 -print.o: print.c ../../../config.h asn_config.h nibble_alloc.h sbuf.h \
25913 - print.h
25914 -str_stk.o: str_stk.c ../../../config.h asn_config.h nibble_alloc.h \
25915 - sbuf.h print.h str_stk.h
25916
25917 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
25918 +
25919 +-include $(DEP_FILES)
25920 +
25921 +mostlyclean-depend:
25922 +
25923 +clean-depend:
25924 +
25925 +distclean-depend:
25926 + -rm -rf .deps
25927 +
25928 +maintainer-clean-depend:
25929 +
25930 +%.o: %.c
25931 + @echo '$(COMPILE) -c $<'; \
25932 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25933 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
25934 + tr ' ' '\012' < .deps/$(*F).pp \
25935 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25936 + >> .deps/$(*F).P; \
25937 + rm .deps/$(*F).pp
25938 +
25939 +%.lo: %.c
25940 + @echo '$(LTCOMPILE) -c $<'; \
25941 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
25942 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
25943 + < .deps/$(*F).pp > .deps/$(*F).P; \
25944 + tr ' ' '\012' < .deps/$(*F).pp \
25945 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
25946 + >> .deps/$(*F).P; \
25947 + rm -f .deps/$(*F).pp
25948 info-am:
25949 info: info-am
25950 dvi-am:
25951 @@ -303,27 +308,27 @@
25952
25953 maintainer-clean-generic:
25954 mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
25955 - mostlyclean-libtool mostlyclean-tags \
25956 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
25957 mostlyclean-generic
25958
25959 mostlyclean: mostlyclean-am
25960
25961 clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
25962 - clean-generic mostlyclean-am
25963 + clean-depend clean-generic mostlyclean-am
25964
25965 clean: clean-am
25966
25967 distclean-am: distclean-noinstLIBRARIES distclean-compile \
25968 - distclean-libtool distclean-tags distclean-generic \
25969 - clean-am
25970 + distclean-libtool distclean-tags distclean-depend \
25971 + distclean-generic clean-am
25972 -rm -f libtool
25973
25974 distclean: distclean-am
25975
25976 maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
25977 maintainer-clean-compile maintainer-clean-libtool \
25978 - maintainer-clean-tags maintainer-clean-generic \
25979 - distclean-am
25980 + maintainer-clean-tags maintainer-clean-depend \
25981 + maintainer-clean-generic distclean-am
25982 @echo "This command is intended for maintainers to use;"
25983 @echo "it deletes files that may require special tools to rebuild."
25984
25985 @@ -334,12 +339,14 @@
25986 mostlyclean-compile distclean-compile clean-compile \
25987 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
25988 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
25989 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
25990 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
25991 -install-exec install-data-am install-data install-am install \
25992 -uninstall-am uninstall all-redirect all-am all installdirs \
25993 -mostlyclean-generic distclean-generic clean-generic \
25994 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
25995 +distclean-tags clean-tags maintainer-clean-tags distdir \
25996 +mostlyclean-depend distclean-depend clean-depend \
25997 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
25998 +installcheck-am installcheck install-exec-am install-exec \
25999 +install-data-am install-data install-am install uninstall-am uninstall \
26000 +all-redirect all-am all installdirs mostlyclean-generic \
26001 +distclean-generic clean-generic maintainer-clean-generic clean \
26002 +mostlyclean distclean maintainer-clean
26003
26004
26005 # Tell versions [3.59,3.63) of GNU make to not export all variables.
26006 Index: linux-atm-2.4.1/src/ilmid/asn1/asn_int.c
26007 ===================================================================
26008 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_int.c 2007-06-04 13:23:54.147502224 +0200
26009 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_int.c 2007-06-04 13:23:54.500448568 +0200
26010 @@ -185,7 +185,7 @@
26011 AsnInt* v _AND_
26012 unsigned short int indent)
26013 {
26014 - fprintf(f,"%d", *v);
26015 + fprintf(f,"%ld", *v);
26016 }
26017
26018
26019 @@ -252,7 +252,6 @@
26020 UAsnInt* data)
26021 {
26022 int len;
26023 - int retLen;
26024 int i;
26025 unsigned long int mask;
26026 unsigned long int dataCpy;
26027 @@ -370,5 +369,5 @@
26028 UAsnInt* v _AND_
26029 unsigned short int indent)
26030 {
26031 - fprintf(f,"%u", *v);
26032 + fprintf(f,"%lu", *v);
26033 }
26034 Index: linux-atm-2.4.1/src/ilmid/asn1/asn_octs.c
26035 ===================================================================
26036 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_octs.c 2007-06-04 13:23:54.152501464 +0200
26037 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_octs.c 2007-06-04 13:23:54.500448568 +0200
26038 @@ -21,6 +21,9 @@
26039 #include <config.h>
26040 #endif
26041
26042 +#include <stdlib.h>
26043 +#include <string.h>
26044 +
26045 #include "asn_config.h"
26046 #include "asn_len.h"
26047 #include "asn_tag.h"
26048 Index: linux-atm-2.4.1/src/ilmid/asn1/asn_bits.c
26049 ===================================================================
26050 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_bits.c 2007-06-04 13:23:54.157500704 +0200
26051 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_bits.c 2007-06-04 13:23:54.500448568 +0200
26052 @@ -21,6 +21,9 @@
26053 #include <config.h>
26054 #endif
26055
26056 +#include <stdlib.h>
26057 +#include <string.h>
26058 +
26059 #include "asn_config.h"
26060 #include "asn_len.h"
26061 #include "asn_tag.h"
26062 Index: linux-atm-2.4.1/src/ilmid/asn1/asn_oid.c
26063 ===================================================================
26064 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_oid.c 2007-06-04 13:23:54.163499792 +0200
26065 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_oid.c 2007-06-04 13:23:54.500448568 +0200
26066 @@ -21,6 +21,9 @@
26067 #include <config.h>
26068 #endif
26069
26070 +#include <stdlib.h>
26071 +#include <string.h>
26072 +
26073 #include "asn_config.h"
26074 #include "asn_len.h"
26075 #include "asn_tag.h"
26076 @@ -125,7 +128,7 @@
26077 if (firstArcNum > 2)
26078 firstArcNum = 2;
26079
26080 - fprintf(f,"%u %u", firstArcNum, arcNum - (firstArcNum * 40));
26081 + fprintf(f,"%d %lu", firstArcNum, arcNum - (firstArcNum * 40));
26082
26083 for (; i < v->octetLen ; )
26084 {
26085 @@ -134,7 +137,7 @@
26086
26087 arcNum = (arcNum << 7) + (v->octs[i] & 0x7f);
26088 i++;
26089 - fprintf(f," %u", arcNum);
26090 + fprintf(f," %lu", arcNum);
26091 }
26092 fprintf(f,"}");
26093
26094 Index: linux-atm-2.4.1/src/ilmid/asn1/asn_list.c
26095 ===================================================================
26096 --- linux-atm-2.4.1.orig/src/ilmid/asn1/asn_list.c 2007-06-04 13:23:54.168499032 +0200
26097 +++ linux-atm-2.4.1/src/ilmid/asn1/asn_list.c 2007-06-04 13:23:54.501448416 +0200
26098 @@ -20,6 +20,8 @@
26099 #include <config.h>
26100 #endif
26101
26102 +#include <stdlib.h>
26103 +
26104 #include "asn_config.h"
26105 #include "asn_list.h"
26106
26107 Index: linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.c
26108 ===================================================================
26109 --- linux-atm-2.4.1.orig/src/ilmid/asn1/nibble_alloc.c 2007-06-04 13:23:54.174498120 +0200
26110 +++ linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.c 2007-06-04 13:23:54.501448416 +0200
26111 @@ -20,7 +20,9 @@
26112 #include <config.h>
26113 #endif
26114
26115 +#include <string.h>
26116 #include <memory.h>
26117 +#include <stdlib.h>
26118 #include "asn_config.h"
26119 #include "nibble_alloc.h"
26120
26121 Index: linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.h
26122 ===================================================================
26123 --- linux-atm-2.4.1.orig/src/ilmid/asn1/nibble_alloc.h 2007-06-04 13:23:54.181497056 +0200
26124 +++ linux-atm-2.4.1/src/ilmid/asn1/nibble_alloc.h 2007-06-04 13:23:54.501448416 +0200
26125 @@ -39,13 +39,13 @@
26126 void InitNibbleMem PROTO((unsigned long int initialSize,
26127 unsigned long int incrementSize));
26128
26129 -void ShutdownNibbleMem();
26130 +void ShutdownNibbleMem(void);
26131
26132 void ServiceNibbleFault PROTO((unsigned long int size));
26133
26134 void* NibbleAlloc PROTO((unsigned long int size));
26135
26136 -void ResetNibbleMem();
26137 +void ResetNibbleMem(void);
26138
26139
26140 #endif /* conditional include */
26141 Index: linux-atm-2.4.1/src/man/Makefile.in
26142 ===================================================================
26143 --- linux-atm-2.4.1.orig/src/man/Makefile.in 2007-06-04 13:23:54.187496144 +0200
26144 +++ linux-atm-2.4.1/src/man/Makefile.in 2007-06-04 13:23:54.501448416 +0200
26145 @@ -1,4 +1,4 @@
26146 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26147 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26148
26149 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26150 # This Makefile.in is free software; the Free Software Foundation
26151 @@ -100,14 +100,14 @@
26152
26153 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26154
26155 -TAR = gtar
26156 +TAR = tar
26157 GZIP_ENV = --best
26158 all: all-redirect
26159 .SUFFIXES:
26160 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26161 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/man/Makefile
26162 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/man/Makefile
26163
26164 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26165 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26166 cd $(top_builddir) \
26167 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26168
26169 @@ -159,6 +159,11 @@
26170 subdir = src/man
26171
26172 distdir: $(DISTFILES)
26173 + here=`cd $(top_builddir) && pwd`; \
26174 + top_distdir=`cd $(top_distdir) && pwd`; \
26175 + distdir=`cd $(distdir) && pwd`; \
26176 + cd $(top_srcdir) \
26177 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/man/Makefile
26178 @for file in $(DISTFILES); do \
26179 d=$(srcdir); \
26180 if test -d $$d/$$file; then \
26181 Index: linux-atm-2.4.1/src/led/Makefile.in
26182 ===================================================================
26183 --- linux-atm-2.4.1.orig/src/led/Makefile.in 2007-06-04 13:23:54.193495232 +0200
26184 +++ linux-atm-2.4.1/src/led/Makefile.in 2007-06-04 13:23:54.502448264 +0200
26185 @@ -1,4 +1,4 @@
26186 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26187 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26188
26189 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26190 # This Makefile.in is free software; the Free Software Foundation
26191 @@ -87,9 +87,7 @@
26192
26193 sbin_PROGRAMS = zeppelin
26194
26195 -zeppelin_SOURCES = join.c join.h conn.c conn.h main.c address.c address.h \
26196 - frames.c frames.h display.c display.h \
26197 - kernel.c kernel.h frame_defs.h lec.h
26198 +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
26199
26200 zeppelin_LDADD = $(top_builddir)/src/lib/libatm.la
26201 zeppelin_DEPENDENCIES = $(zeppelin_LDADD)
26202 @@ -125,8 +123,10 @@
26203
26204 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26205
26206 -TAR = gtar
26207 +TAR = tar
26208 GZIP_ENV = --best
26209 +DEP_FILES = .deps/address.P .deps/conn.P .deps/display.P .deps/frames.P \
26210 +.deps/join.P .deps/kernel.P .deps/main.P
26211 SOURCES = $(zeppelin_SOURCES)
26212 OBJECTS = $(zeppelin_OBJECTS)
26213
26214 @@ -134,9 +134,9 @@
26215 .SUFFIXES:
26216 .SUFFIXES: .S .c .lo .o .obj .s
26217 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26218 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/led/Makefile
26219 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/led/Makefile
26220
26221 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26222 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26223 cd $(top_builddir) \
26224 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26225
26226 @@ -166,9 +166,6 @@
26227 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
26228 done
26229
26230 -.c.o:
26231 - $(COMPILE) -c $<
26232 -
26233 # FIXME: We should only use cygpath when building on Windows,
26234 # and only if it is available.
26235 .c.obj:
26236 @@ -191,9 +188,6 @@
26237
26238 maintainer-clean-compile:
26239
26240 -.c.lo:
26241 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26242 -
26243 .s.lo:
26244 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26245
26246 @@ -271,7 +265,7 @@
26247 awk ' { files[$$0] = 1; } \
26248 END { for (i in files) print i; }'`; \
26249 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
26250 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
26251 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
26252
26253 mostlyclean-tags:
26254
26255 @@ -287,6 +281,11 @@
26256 subdir = src/led
26257
26258 distdir: $(DISTFILES)
26259 + here=`cd $(top_builddir) && pwd`; \
26260 + top_distdir=`cd $(top_distdir) && pwd`; \
26261 + distdir=`cd $(distdir) && pwd`; \
26262 + cd $(top_srcdir) \
26263 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/led/Makefile
26264 @for file in $(DISTFILES); do \
26265 d=$(srcdir); \
26266 if test -d $$d/$$file; then \
26267 @@ -297,28 +296,38 @@
26268 || cp -p $$d/$$file $(distdir)/$$file || :; \
26269 fi; \
26270 done
26271 -address.o: address.c ../../config.h ../../src/include/atm.h \
26272 - ../../src/include/stdint.h ../../src/include/atmd.h address.h
26273 -conn.o: conn.c ../../config.h ../../src/include/atm.h \
26274 - ../../src/include/stdint.h ../../src/include/atmsap.h \
26275 - ../../src/include/atmd.h conn.h display.h lec.h frames.h \
26276 - frame_defs.h kernel.h
26277 -display.o: display.c ../../config.h ../../src/include/atm.h \
26278 - ../../src/include/stdint.h ../../src/include/atmd.h display.h \
26279 - frame_defs.h
26280 -frames.o: frames.c ../../config.h ../../src/include/atm.h \
26281 - ../../src/include/stdint.h ../../src/include/atmd.h conn.h \
26282 - lec.h frames.h frame_defs.h display.h kernel.h
26283 -join.o: join.c ../../config.h ../../src/include/atm.h \
26284 - ../../src/include/stdint.h ../../src/include/atmd.h conn.h \
26285 - lec.h join.h frames.h frame_defs.h display.h
26286 -kernel.o: kernel.c ../../config.h ../../src/include/atm.h \
26287 - ../../src/include/stdint.h ../../src/include/atmd.h kernel.h \
26288 - lec.h conn.h frames.h frame_defs.h
26289 -main.o: main.c ../../config.h ../../src/include/atm.h \
26290 - ../../src/include/stdint.h ../../src/include/atmd.h join.h \
26291 - lec.h conn.h address.h display.h kernel.h
26292
26293 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
26294 +
26295 +-include $(DEP_FILES)
26296 +
26297 +mostlyclean-depend:
26298 +
26299 +clean-depend:
26300 +
26301 +distclean-depend:
26302 + -rm -rf .deps
26303 +
26304 +maintainer-clean-depend:
26305 +
26306 +%.o: %.c
26307 + @echo '$(COMPILE) -c $<'; \
26308 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26309 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
26310 + tr ' ' '\012' < .deps/$(*F).pp \
26311 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26312 + >> .deps/$(*F).P; \
26313 + rm .deps/$(*F).pp
26314 +
26315 +%.lo: %.c
26316 + @echo '$(LTCOMPILE) -c $<'; \
26317 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26318 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
26319 + < .deps/$(*F).pp > .deps/$(*F).P; \
26320 + tr ' ' '\012' < .deps/$(*F).pp \
26321 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26322 + >> .deps/$(*F).P; \
26323 + rm -f .deps/$(*F).pp
26324 info-am:
26325 info: info-am
26326 dvi-am:
26327 @@ -356,27 +365,27 @@
26328
26329 maintainer-clean-generic:
26330 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
26331 - mostlyclean-libtool mostlyclean-tags \
26332 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
26333 mostlyclean-generic
26334
26335 mostlyclean: mostlyclean-am
26336
26337 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
26338 - clean-generic mostlyclean-am
26339 + clean-depend clean-generic mostlyclean-am
26340
26341 clean: clean-am
26342
26343 distclean-am: distclean-sbinPROGRAMS distclean-compile \
26344 - distclean-libtool distclean-tags distclean-generic \
26345 - clean-am
26346 + distclean-libtool distclean-tags distclean-depend \
26347 + distclean-generic clean-am
26348 -rm -f libtool
26349
26350 distclean: distclean-am
26351
26352 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
26353 maintainer-clean-compile maintainer-clean-libtool \
26354 - maintainer-clean-tags maintainer-clean-generic \
26355 - distclean-am
26356 + maintainer-clean-tags maintainer-clean-depend \
26357 + maintainer-clean-generic distclean-am
26358 @echo "This command is intended for maintainers to use;"
26359 @echo "it deletes files that may require special tools to rebuild."
26360
26361 @@ -388,12 +397,14 @@
26362 clean-compile maintainer-clean-compile mostlyclean-libtool \
26363 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
26364 uninstall-man8 install-man uninstall-man tags mostlyclean-tags \
26365 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
26366 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
26367 -install-exec install-data-am install-data install-am install \
26368 -uninstall-am uninstall all-redirect all-am all installdirs \
26369 -mostlyclean-generic distclean-generic clean-generic \
26370 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
26371 +distclean-tags clean-tags maintainer-clean-tags distdir \
26372 +mostlyclean-depend distclean-depend clean-depend \
26373 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
26374 +installcheck-am installcheck install-exec-am install-exec \
26375 +install-data-am install-data install-am install uninstall-am uninstall \
26376 +all-redirect all-am all installdirs mostlyclean-generic \
26377 +distclean-generic clean-generic maintainer-clean-generic clean \
26378 +mostlyclean distclean maintainer-clean
26379
26380
26381 # Tell versions [3.59,3.63) of GNU make to not export all variables.
26382 Index: linux-atm-2.4.1/src/lane/Makefile.in
26383 ===================================================================
26384 --- linux-atm-2.4.1.orig/src/lane/Makefile.in 2007-06-04 13:23:54.200494168 +0200
26385 +++ linux-atm-2.4.1/src/lane/Makefile.in 2007-06-04 13:23:54.502448264 +0200
26386 @@ -1,4 +1,4 @@
26387 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26388 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26389
26390 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26391 # This Makefile.in is free software; the Free Software Foundation
26392 @@ -89,14 +89,11 @@
26393
26394 LDADD = $(top_builddir)/src/lib/libatm.la
26395
26396 -LES_BUS_SRCS = mem.c mem.h load.c load.h units.c units.h load_lex.l load_lex.h \
26397 - timers.c timers.h dump.c dump.h lane_atm.c lane_atm.h \
26398 - events.c events.h lane.c lane.h
26399 +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
26400
26401 les_SOURCES = $(LES_BUS_SRCS) packet.c packet.h connect.c connect.h db.c db.h
26402 bus_SOURCES = $(LES_BUS_SRCS) connect_bus.c
26403 -lecs_SOURCES = lecs_db.l lecs_db.h lecs_load.c lecs_load.h lecs.c lecs.h \
26404 - ldb.c ldb.h mem_lecs.c mem_lecs.h atm_lecs.c atm_lecs.h
26405 +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
26406
26407
26408 man_MANS = les.8 lecs.8 bus.8
26409 @@ -148,8 +145,13 @@
26410
26411 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26412
26413 -TAR = gtar
26414 +TAR = tar
26415 GZIP_ENV = --best
26416 +DEP_FILES = .deps/atm_lecs.P .deps/connect.P .deps/connect_bus.P \
26417 +.deps/db.P .deps/dump.P .deps/events.P .deps/lane.P .deps/lane_atm.P \
26418 +.deps/ldb.P .deps/lecs.P .deps/lecs_db.P .deps/lecs_load.P .deps/load.P \
26419 +.deps/load_lex.P .deps/mem.P .deps/mem_lecs.P .deps/packet.P \
26420 +.deps/timers.P .deps/units.P
26421 SOURCES = $(les_SOURCES) $(bus_SOURCES) $(lecs_SOURCES)
26422 OBJECTS = $(les_OBJECTS) $(bus_OBJECTS) $(lecs_OBJECTS)
26423
26424 @@ -157,9 +159,9 @@
26425 .SUFFIXES:
26426 .SUFFIXES: .S .c .l .lo .o .obj .s
26427 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26428 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/lane/Makefile
26429 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/lane/Makefile
26430
26431 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26432 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26433 cd $(top_builddir) \
26434 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26435
26436 @@ -189,9 +191,6 @@
26437 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
26438 done
26439
26440 -.c.o:
26441 - $(COMPILE) -c $<
26442 -
26443 # FIXME: We should only use cygpath when building on Windows,
26444 # and only if it is available.
26445 .c.obj:
26446 @@ -214,9 +213,6 @@
26447
26448 maintainer-clean-compile:
26449
26450 -.c.lo:
26451 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26452 -
26453 .s.lo:
26454 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26455
26456 @@ -304,7 +300,7 @@
26457 awk ' { files[$$0] = 1; } \
26458 END { for (i in files) print i; }'`; \
26459 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
26460 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
26461 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
26462
26463 mostlyclean-tags:
26464
26465 @@ -320,6 +316,11 @@
26466 subdir = src/lane
26467
26468 distdir: $(DISTFILES)
26469 + here=`cd $(top_builddir) && pwd`; \
26470 + top_distdir=`cd $(top_distdir) && pwd`; \
26471 + distdir=`cd $(distdir) && pwd`; \
26472 + cd $(top_srcdir) \
26473 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/lane/Makefile
26474 @for file in $(DISTFILES); do \
26475 d=$(srcdir); \
26476 if test -d $$d/$$file; then \
26477 @@ -330,62 +331,38 @@
26478 || cp -p $$d/$$file $(distdir)/$$file || :; \
26479 fi; \
26480 done
26481 -atm_lecs.o: atm_lecs.c ../../config.h ../../src/include/atm.h \
26482 - ../../src/include/stdint.h ../../src/include/atmsap.h \
26483 - atm_lecs.h
26484 -connect.o: connect.c ../../config.h ../../src/include/stdint.h mem.h \
26485 - units.h lane.h dump.h ../../src/include/atm.h \
26486 - ../../src/include/atmsap.h load.h connect.h timers.h events.h \
26487 - db.h packet.h lane_atm.h
26488 -connect_bus.o: connect_bus.c ../../config.h ../../src/include/stdint.h \
26489 - mem.h units.h lane.h dump.h ../../src/include/atm.h \
26490 - ../../src/include/atmsap.h load.h connect.h timers.h events.h \
26491 - lane_atm.h
26492 -db.o: db.c ../../config.h ../../src/include/stdint.h mem.h units.h \
26493 - lane.h dump.h ../../src/include/atm.h \
26494 - ../../src/include/atmsap.h load.h connect.h timers.h events.h \
26495 - db.h
26496 -dump.o: dump.c ../../config.h ../../src/include/stdint.h \
26497 - ../../src/include/atm.h ../../src/include/atmsap.h dump.h \
26498 - units.h lane.h load.h
26499 -events.o: events.c ../../config.h events.h units.h load.h lane.h dump.h \
26500 - ../../src/include/atm.h ../../src/include/stdint.h \
26501 - ../../src/include/atmsap.h mem.h timers.h connect.h
26502 -lane.o: lane.c ../../config.h units.h load.h lane.h dump.h \
26503 - ../../src/include/atm.h ../../src/include/stdint.h \
26504 - ../../src/include/atmsap.h mem.h connect.h timers.h events.h
26505 -lane_atm.o: lane_atm.c ../../config.h lane_atm.h units.h lane.h \
26506 - connect.h timers.h load.h events.h ../../src/include/atmsap.h \
26507 - ../../src/include/stdint.h dump.h ../../src/include/atm.h mem.h
26508 -ldb.o: ldb.c ../../config.h ../../src/include/atm.h \
26509 - ../../src/include/stdint.h lecs.h ldb.h mem_lecs.h
26510 -lecs.o: lecs.c ../../config.h ../../src/include/stdint.h \
26511 - ../../src/include/atm.h lecs_load.h ldb.h mem_lecs.h lecs.h \
26512 - atm_lecs.h
26513 -lecs_db.o: lecs_db.c ../../config.h lecs_load.h lecs_db.h
26514 -lecs_load.o: lecs_load.c ../../config.h lecs_load.h lecs_db.h ldb.h \
26515 - lecs.h
26516 -load.o: load.c ../../config.h load.h units.h lane.h dump.h \
26517 - ../../src/include/atm.h ../../src/include/stdint.h \
26518 - ../../src/include/atmsap.h mem.h load_lex.h
26519 -load_lex.o: load_lex.c ../../config.h ../../src/include/stdint.h \
26520 - load_lex.h lane.h units.h load.h mem.h
26521 -mem.o: mem.c ../../config.h mem.h units.h dump.h ../../src/include/atm.h \
26522 - ../../src/include/stdint.h ../../src/include/atmsap.h lane.h \
26523 - load.h
26524 -mem_lecs.o: mem_lecs.c ../../config.h mem_lecs.h
26525 -packet.o: packet.c ../../config.h ../../src/include/stdint.h mem.h \
26526 - units.h lane.h dump.h ../../src/include/atm.h \
26527 - ../../src/include/atmsap.h load.h connect.h timers.h events.h \
26528 - db.h packet.h
26529 -timers.o: timers.c ../../config.h timers.h units.h load.h lane.h dump.h \
26530 - ../../src/include/atm.h ../../src/include/stdint.h \
26531 - ../../src/include/atmsap.h mem.h
26532 -units.o: units.c ../../config.h units.h mem.h lane.h load.h dump.h \
26533 - ../../src/include/atm.h ../../src/include/stdint.h \
26534 - ../../src/include/atmsap.h connect.h timers.h events.h \
26535 - lane_atm.h
26536
26537 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
26538 +
26539 +-include $(DEP_FILES)
26540 +
26541 +mostlyclean-depend:
26542 +
26543 +clean-depend:
26544 +
26545 +distclean-depend:
26546 + -rm -rf .deps
26547 +
26548 +maintainer-clean-depend:
26549 +
26550 +%.o: %.c
26551 + @echo '$(COMPILE) -c $<'; \
26552 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26553 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
26554 + tr ' ' '\012' < .deps/$(*F).pp \
26555 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26556 + >> .deps/$(*F).P; \
26557 + rm .deps/$(*F).pp
26558 +
26559 +%.lo: %.c
26560 + @echo '$(LTCOMPILE) -c $<'; \
26561 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26562 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
26563 + < .deps/$(*F).pp > .deps/$(*F).P; \
26564 + tr ' ' '\012' < .deps/$(*F).pp \
26565 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26566 + >> .deps/$(*F).P; \
26567 + rm -f .deps/$(*F).pp
26568 info-am:
26569 info: info-am
26570 dvi-am:
26571 @@ -422,29 +399,29 @@
26572 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
26573
26574 maintainer-clean-generic:
26575 - -test -z "lecs_dblload_lexl" || rm -f lecs_dbl load_lexl
26576 + -test -z "lecs_dbcload_lexc" || rm -f lecs_dbc load_lexc
26577 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
26578 - mostlyclean-libtool mostlyclean-tags \
26579 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
26580 mostlyclean-generic
26581
26582 mostlyclean: mostlyclean-am
26583
26584 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
26585 - clean-generic mostlyclean-am
26586 + clean-depend clean-generic mostlyclean-am
26587
26588 clean: clean-am
26589
26590 distclean-am: distclean-sbinPROGRAMS distclean-compile \
26591 - distclean-libtool distclean-tags distclean-generic \
26592 - clean-am
26593 + distclean-libtool distclean-tags distclean-depend \
26594 + distclean-generic clean-am
26595 -rm -f libtool
26596
26597 distclean: distclean-am
26598
26599 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
26600 maintainer-clean-compile maintainer-clean-libtool \
26601 - maintainer-clean-tags maintainer-clean-generic \
26602 - distclean-am
26603 + maintainer-clean-tags maintainer-clean-depend \
26604 + maintainer-clean-generic distclean-am
26605 @echo "This command is intended for maintainers to use;"
26606 @echo "it deletes files that may require special tools to rebuild."
26607
26608 @@ -456,12 +433,14 @@
26609 clean-compile maintainer-clean-compile mostlyclean-libtool \
26610 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
26611 uninstall-man8 install-man uninstall-man tags mostlyclean-tags \
26612 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
26613 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
26614 -install-exec install-data-am install-data install-am install \
26615 -uninstall-am uninstall all-redirect all-am all installdirs \
26616 -mostlyclean-generic distclean-generic clean-generic \
26617 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
26618 +distclean-tags clean-tags maintainer-clean-tags distdir \
26619 +mostlyclean-depend distclean-depend clean-depend \
26620 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
26621 +installcheck-am installcheck install-exec-am install-exec \
26622 +install-data-am install-data install-am install uninstall-am uninstall \
26623 +all-redirect all-am all installdirs mostlyclean-generic \
26624 +distclean-generic clean-generic maintainer-clean-generic clean \
26625 +mostlyclean distclean maintainer-clean
26626
26627
26628 # Tell versions [3.59,3.63) of GNU make to not export all variables.
26629 Index: linux-atm-2.4.1/src/mpoad/Makefile.in
26630 ===================================================================
26631 --- linux-atm-2.4.1.orig/src/mpoad/Makefile.in 2007-06-04 13:23:54.206493256 +0200
26632 +++ linux-atm-2.4.1/src/mpoad/Makefile.in 2007-06-04 13:23:54.503448112 +0200
26633 @@ -1,4 +1,4 @@
26634 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26635 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26636
26637 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26638 # This Makefile.in is free software; the Free Software Foundation
26639 @@ -89,9 +89,7 @@
26640
26641 LDADD = $(top_builddir)/src/lib/libatm.la
26642
26643 -mpcd_SOURCES = get_vars.c get_vars.h io.c io.h k_interf.c k_interf.h main.c \
26644 - p_factory.c p_recogn.c id_list.c tag_list.c \
26645 - poll2select.c poll2select.h lecs.c lecs.h packets.h
26646 +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
26647
26648
26649 man_MANS = mpcd.8
26650 @@ -128,8 +126,11 @@
26651
26652 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26653
26654 -TAR = gtar
26655 +TAR = tar
26656 GZIP_ENV = --best
26657 +DEP_FILES = .deps/get_vars.P .deps/id_list.P .deps/io.P \
26658 +.deps/k_interf.P .deps/lecs.P .deps/main.P .deps/p_factory.P \
26659 +.deps/p_recogn.P .deps/poll2select.P .deps/tag_list.P
26660 SOURCES = $(mpcd_SOURCES)
26661 OBJECTS = $(mpcd_OBJECTS)
26662
26663 @@ -137,9 +138,9 @@
26664 .SUFFIXES:
26665 .SUFFIXES: .S .c .lo .o .obj .s
26666 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26667 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/mpoad/Makefile
26668 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/mpoad/Makefile
26669
26670 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26671 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26672 cd $(top_builddir) \
26673 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26674
26675 @@ -169,9 +170,6 @@
26676 rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
26677 done
26678
26679 -.c.o:
26680 - $(COMPILE) -c $<
26681 -
26682 # FIXME: We should only use cygpath when building on Windows,
26683 # and only if it is available.
26684 .c.obj:
26685 @@ -194,9 +192,6 @@
26686
26687 maintainer-clean-compile:
26688
26689 -.c.lo:
26690 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26691 -
26692 .s.lo:
26693 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26694
26695 @@ -274,7 +269,7 @@
26696 awk ' { files[$$0] = 1; } \
26697 END { for (i in files) print i; }'`; \
26698 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
26699 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
26700 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
26701
26702 mostlyclean-tags:
26703
26704 @@ -290,6 +285,11 @@
26705 subdir = src/mpoad
26706
26707 distdir: $(DISTFILES)
26708 + here=`cd $(top_builddir) && pwd`; \
26709 + top_distdir=`cd $(top_distdir) && pwd`; \
26710 + distdir=`cd $(distdir) && pwd`; \
26711 + cd $(top_srcdir) \
26712 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/mpoad/Makefile
26713 @for file in $(DISTFILES); do \
26714 d=$(srcdir); \
26715 if test -d $$d/$$file; then \
26716 @@ -300,29 +300,38 @@
26717 || cp -p $$d/$$file $(distdir)/$$file || :; \
26718 fi; \
26719 done
26720 -get_vars.o: get_vars.c ../../config.h ../../src/include/stdint.h \
26721 - ../../src/include/atm.h packets.h get_vars.h io.h
26722 -id_list.o: id_list.c ../../config.h ../../src/include/atm.h \
26723 - ../../src/include/stdint.h packets.h
26724 -io.o: io.c ../../config.h ../../src/include/atm.h \
26725 - ../../src/include/stdint.h packets.h k_interf.h io.h get_vars.h \
26726 - poll2select.h
26727 -k_interf.o: k_interf.c ../../config.h ../../src/include/stdint.h \
26728 - ../../src/include/atm.h k_interf.h packets.h io.h get_vars.h
26729 -lecs.o: lecs.c ../../config.h ../../src/include/stdint.h \
26730 - ../../src/include/atm.h ../../src/include/atmsap.h lecs.h \
26731 - k_interf.h
26732 -main.o: main.c ../../config.h ../../src/include/atm.h \
26733 - ../../src/include/stdint.h packets.h io.h k_interf.h get_vars.h \
26734 - lecs.h
26735 -p_factory.o: p_factory.c ../../config.h ../../src/include/stdint.h \
26736 - ../../src/include/atm.h packets.h get_vars.h io.h
26737 -p_recogn.o: p_recogn.c ../../config.h ../../src/include/atm.h \
26738 - ../../src/include/stdint.h io.h k_interf.h packets.h
26739 -poll2select.o: poll2select.c ../../config.h
26740 -tag_list.o: tag_list.c ../../config.h packets.h ../../src/include/atm.h \
26741 - ../../src/include/stdint.h
26742
26743 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
26744 +
26745 +-include $(DEP_FILES)
26746 +
26747 +mostlyclean-depend:
26748 +
26749 +clean-depend:
26750 +
26751 +distclean-depend:
26752 + -rm -rf .deps
26753 +
26754 +maintainer-clean-depend:
26755 +
26756 +%.o: %.c
26757 + @echo '$(COMPILE) -c $<'; \
26758 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26759 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
26760 + tr ' ' '\012' < .deps/$(*F).pp \
26761 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26762 + >> .deps/$(*F).P; \
26763 + rm .deps/$(*F).pp
26764 +
26765 +%.lo: %.c
26766 + @echo '$(LTCOMPILE) -c $<'; \
26767 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26768 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
26769 + < .deps/$(*F).pp > .deps/$(*F).P; \
26770 + tr ' ' '\012' < .deps/$(*F).pp \
26771 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26772 + >> .deps/$(*F).P; \
26773 + rm -f .deps/$(*F).pp
26774 info-am:
26775 info: info-am
26776 dvi-am:
26777 @@ -360,27 +369,27 @@
26778
26779 maintainer-clean-generic:
26780 mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \
26781 - mostlyclean-libtool mostlyclean-tags \
26782 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
26783 mostlyclean-generic
26784
26785 mostlyclean: mostlyclean-am
26786
26787 clean-am: clean-sbinPROGRAMS clean-compile clean-libtool clean-tags \
26788 - clean-generic mostlyclean-am
26789 + clean-depend clean-generic mostlyclean-am
26790
26791 clean: clean-am
26792
26793 distclean-am: distclean-sbinPROGRAMS distclean-compile \
26794 - distclean-libtool distclean-tags distclean-generic \
26795 - clean-am
26796 + distclean-libtool distclean-tags distclean-depend \
26797 + distclean-generic clean-am
26798 -rm -f libtool
26799
26800 distclean: distclean-am
26801
26802 maintainer-clean-am: maintainer-clean-sbinPROGRAMS \
26803 maintainer-clean-compile maintainer-clean-libtool \
26804 - maintainer-clean-tags maintainer-clean-generic \
26805 - distclean-am
26806 + maintainer-clean-tags maintainer-clean-depend \
26807 + maintainer-clean-generic distclean-am
26808 @echo "This command is intended for maintainers to use;"
26809 @echo "it deletes files that may require special tools to rebuild."
26810
26811 @@ -392,12 +401,14 @@
26812 clean-compile maintainer-clean-compile mostlyclean-libtool \
26813 distclean-libtool clean-libtool maintainer-clean-libtool install-man8 \
26814 uninstall-man8 install-man uninstall-man tags mostlyclean-tags \
26815 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
26816 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
26817 -install-exec install-data-am install-data install-am install \
26818 -uninstall-am uninstall all-redirect all-am all installdirs \
26819 -mostlyclean-generic distclean-generic clean-generic \
26820 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
26821 +distclean-tags clean-tags maintainer-clean-tags distdir \
26822 +mostlyclean-depend distclean-depend clean-depend \
26823 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
26824 +installcheck-am installcheck install-exec-am install-exec \
26825 +install-data-am install-data install-am install uninstall-am uninstall \
26826 +all-redirect all-am all installdirs mostlyclean-generic \
26827 +distclean-generic clean-generic maintainer-clean-generic clean \
26828 +mostlyclean distclean maintainer-clean
26829
26830
26831 # Tell versions [3.59,3.63) of GNU make to not export all variables.
26832 Index: linux-atm-2.4.1/src/mpoad/p_factory.c
26833 ===================================================================
26834 --- linux-atm-2.4.1.orig/src/mpoad/p_factory.c 2007-06-04 13:23:54.212492344 +0200
26835 +++ linux-atm-2.4.1/src/mpoad/p_factory.c 2007-06-04 13:23:54.503448112 +0200
26836 @@ -34,7 +34,7 @@
26837
26838 while( count > 1 ) {
26839 /* This is the inner loop */
26840 - sum += * ((uint16_t *) addr)++;
26841 + sum += * ((uint16_t *) addr); addr += sizeof(uint16_t);
26842 count -= 2;
26843 }
26844
26845 Index: linux-atm-2.4.1/src/switch/Makefile.in
26846 ===================================================================
26847 --- linux-atm-2.4.1.orig/src/switch/Makefile.in 2007-06-04 13:23:54.218491432 +0200
26848 +++ linux-atm-2.4.1/src/switch/Makefile.in 2007-06-04 13:23:54.503448112 +0200
26849 @@ -1,4 +1,4 @@
26850 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
26851 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
26852
26853 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
26854 # This Makefile.in is free software; the Free Software Foundation
26855 @@ -92,11 +92,9 @@
26856
26857 swc_SOURCES = swc.c swc.h
26858 swc_LDADD = $(top_builddir)/src/lib/libatm.la
26859 -swc_DEPENDENCIES = $(swc_LDADD) $(top_builddir)/src/include/atm.h \
26860 - $(top_builddir)/src/include/atmd.h
26861 +swc_DEPENDENCIES = $(swc_LDADD) $(top_builddir)/src/include/atm.h $(top_builddir)/src/include/atmd.h
26862
26863 -libsw_a_SOURCES = control.c dispatch.c dispatch.h proto.c proto.h relay.c \
26864 - route.c route.h sig.c sig.h cfg_y.y cfg_l.l fab.h
26865 +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
26866
26867
26868 EXTRA_DIST = cfg_y.h README
26869 @@ -132,8 +130,11 @@
26870
26871 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
26872
26873 -TAR = gtar
26874 +TAR = tar
26875 GZIP_ENV = --best
26876 +DEP_FILES = .deps/cfg_l.P .deps/cfg_y.P .deps/control.P \
26877 +.deps/dispatch.P .deps/proto.P .deps/relay.P .deps/route.P .deps/sig.P \
26878 +.deps/swc.P
26879 SOURCES = $(libsw_a_SOURCES) $(swc_SOURCES)
26880 OBJECTS = $(libsw_a_OBJECTS) $(swc_OBJECTS)
26881
26882 @@ -141,9 +142,9 @@
26883 .SUFFIXES:
26884 .SUFFIXES: .S .c .l .lo .o .obj .s .y
26885 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
26886 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/switch/Makefile
26887 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/switch/Makefile
26888
26889 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
26890 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
26891 cd $(top_builddir) \
26892 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
26893
26894 @@ -157,9 +158,6 @@
26895
26896 maintainer-clean-noinstLIBRARIES:
26897
26898 -.c.o:
26899 - $(COMPILE) -c $<
26900 -
26901 # FIXME: We should only use cygpath when building on Windows,
26902 # and only if it is available.
26903 .c.obj:
26904 @@ -182,9 +180,6 @@
26905
26906 maintainer-clean-compile:
26907
26908 -.c.lo:
26909 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26910 -
26911 .s.lo:
26912 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
26913
26914 @@ -306,7 +301,7 @@
26915 awk ' { files[$$0] = 1; } \
26916 END { for (i in files) print i; }'`; \
26917 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
26918 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
26919 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
26920
26921 mostlyclean-tags:
26922
26923 @@ -322,6 +317,11 @@
26924 subdir = src/switch
26925
26926 distdir: $(DISTFILES)
26927 + here=`cd $(top_builddir) && pwd`; \
26928 + top_distdir=`cd $(top_distdir) && pwd`; \
26929 + distdir=`cd $(distdir) && pwd`; \
26930 + cd $(top_srcdir) \
26931 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/switch/Makefile
26932 @for file in $(DISTFILES); do \
26933 d=$(srcdir); \
26934 if test -d $$d/$$file; then \
26935 @@ -342,32 +342,38 @@
26936 || exit 1; \
26937 fi; \
26938 done
26939 -cfg_l.o: cfg_l.c ../../config.h ../../src/include/atm.h \
26940 - ../../src/include/stdint.h cfg_y.h
26941 -cfg_y.o: cfg_y.c ../../config.h ../../src/include/atm.h \
26942 - ../../src/include/stdint.h fab.h proto.h \
26943 - ../../src/include/atmsap.h ../../src/include/atmd.h sig.h \
26944 - route.h swc.h
26945 -control.o: control.c ../../config.h ../../src/include/atm.h \
26946 - ../../src/include/stdint.h ../../src/include/atmd.h fab.h \
26947 - proto.h ../../src/include/atmsap.h sig.h dispatch.h swc.h
26948 -dispatch.o: dispatch.c ../../config.h ../../src/include/atmd.h \
26949 - ../../src/include/stdint.h ../../src/include/atm.h dispatch.h
26950 -proto.o: proto.c ../../config.h ../../src/include/atm.h \
26951 - ../../src/include/stdint.h ../../src/include/atmd.h sig.h fab.h \
26952 - proto.h ../../src/include/atmsap.h
26953 -relay.o: relay.c ../../config.h ../../src/include/atm.h \
26954 - ../../src/include/stdint.h ../../src/include/atmd.h fab.h \
26955 - proto.h ../../src/include/atmsap.h sig.h dispatch.h route.h
26956 -route.o: route.c ../../config.h ../../src/include/atm.h \
26957 - ../../src/include/stdint.h ../../src/include/atmd.h route.h \
26958 - sig.h
26959 -sig.o: sig.c ../../config.h ../../src/include/stdint.h \
26960 - ../../src/include/atmd.h ../../src/include/atm.h dispatch.h \
26961 - proto.h ../../src/include/atmsap.h sig.h route.h fab.h
26962 -swc.o: swc.c ../../config.h ../../src/include/atm.h \
26963 - ../../src/include/stdint.h ../../src/include/atmd.h swc.h
26964
26965 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
26966 +
26967 +-include $(DEP_FILES)
26968 +
26969 +mostlyclean-depend:
26970 +
26971 +clean-depend:
26972 +
26973 +distclean-depend:
26974 + -rm -rf .deps
26975 +
26976 +maintainer-clean-depend:
26977 +
26978 +%.o: %.c
26979 + @echo '$(COMPILE) -c $<'; \
26980 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26981 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
26982 + tr ' ' '\012' < .deps/$(*F).pp \
26983 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26984 + >> .deps/$(*F).P; \
26985 + rm .deps/$(*F).pp
26986 +
26987 +%.lo: %.c
26988 + @echo '$(LTCOMPILE) -c $<'; \
26989 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
26990 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
26991 + < .deps/$(*F).pp > .deps/$(*F).P; \
26992 + tr ' ' '\012' < .deps/$(*F).pp \
26993 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
26994 + >> .deps/$(*F).P; \
26995 + rm -f .deps/$(*F).pp
26996 info-am:
26997 info: info-recursive
26998 dvi-am:
26999 @@ -404,22 +410,23 @@
27000 -rm -f config.cache config.log stamp-h stamp-h[0-9]*
27001
27002 maintainer-clean-generic:
27003 - -test -z "cfg_llcfg_yhcfg_yc" || rm -f cfg_ll cfg_yh cfg_yc
27004 + -test -z "cfg_lccfg_yhcfg_yc" || rm -f cfg_lc cfg_yh cfg_yc
27005 mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
27006 mostlyclean-libtool mostlyclean-noinstPROGRAMS \
27007 - mostlyclean-tags mostlyclean-generic
27008 + mostlyclean-tags mostlyclean-depend mostlyclean-generic
27009
27010 mostlyclean: mostlyclean-recursive
27011
27012 clean-am: clean-noinstLIBRARIES clean-compile clean-libtool \
27013 - clean-noinstPROGRAMS clean-tags clean-generic \
27014 - mostlyclean-am
27015 + clean-noinstPROGRAMS clean-tags clean-depend \
27016 + clean-generic mostlyclean-am
27017
27018 clean: clean-recursive
27019
27020 distclean-am: distclean-noinstLIBRARIES distclean-compile \
27021 distclean-libtool distclean-noinstPROGRAMS \
27022 - distclean-tags distclean-generic clean-am
27023 + distclean-tags distclean-depend distclean-generic \
27024 + clean-am
27025 -rm -f libtool
27026
27027 distclean: distclean-recursive
27028 @@ -427,7 +434,8 @@
27029 maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
27030 maintainer-clean-compile maintainer-clean-libtool \
27031 maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
27032 - maintainer-clean-generic distclean-am
27033 + maintainer-clean-depend maintainer-clean-generic \
27034 + distclean-am
27035 @echo "This command is intended for maintainers to use;"
27036 @echo "it deletes files that may require special tools to rebuild."
27037
27038 @@ -445,12 +453,14 @@
27039 all-recursive check-recursive installcheck-recursive info-recursive \
27040 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
27041 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
27042 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
27043 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
27044 -install-exec install-data-am install-data install-am install \
27045 -uninstall-am uninstall all-redirect all-am all installdirs-am \
27046 -installdirs mostlyclean-generic distclean-generic clean-generic \
27047 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
27048 +distclean-tags clean-tags maintainer-clean-tags distdir \
27049 +mostlyclean-depend distclean-depend clean-depend \
27050 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
27051 +installcheck-am installcheck install-exec-am install-exec \
27052 +install-data-am install-data install-am install uninstall-am uninstall \
27053 +all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
27054 +distclean-generic clean-generic maintainer-clean-generic clean \
27055 +mostlyclean distclean maintainer-clean
27056
27057
27058 # Tell versions [3.59,3.63) of GNU make to not export all variables.
27059 Index: linux-atm-2.4.1/src/switch/cfg_y.c
27060 ===================================================================
27061 --- linux-atm-2.4.1.orig/src/switch/cfg_y.c 2007-06-04 13:23:54.223490672 +0200
27062 +++ linux-atm-2.4.1/src/switch/cfg_y.c 2007-06-04 13:23:54.505447808 +0200
27063 @@ -1,21 +1,87 @@
27064 +/* A Bison parser, made by GNU Bison 1.875d. */
27065
27066 -/* A Bison parser, made from cfg_y.y
27067 - by GNU Bison version 1.28 */
27068 +/* Skeleton parser for Yacc-like parsing with Bison,
27069 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
27070
27071 -#define YYBISON 1 /* Identify Bison output. */
27072 + This program is free software; you can redistribute it and/or modify
27073 + it under the terms of the GNU General Public License as published by
27074 + the Free Software Foundation; either version 2, or (at your option)
27075 + any later version.
27076 +
27077 + This program is distributed in the hope that it will be useful,
27078 + but WITHOUT ANY WARRANTY; without even the implied warranty of
27079 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27080 + GNU General Public License for more details.
27081 +
27082 + You should have received a copy of the GNU General Public License
27083 + along with this program; if not, write to the Free Software
27084 + Foundation, Inc., 59 Temple Place - Suite 330,
27085 + Boston, MA 02111-1307, USA. */
27086 +
27087 +/* As a special exception, when this file is copied by Bison into a
27088 + Bison output file, you may use that output file without restriction.
27089 + This special exception was added by the Free Software Foundation
27090 + in version 1.24 of Bison. */
27091 +
27092 +/* Written by Richard Stallman by simplifying the original so called
27093 + ``semantic'' parser. */
27094 +
27095 +/* All symbols defined below should begin with yy or YY, to avoid
27096 + infringing on user name space. This should be done even for local
27097 + variables, as they might otherwise be expanded by user macros.
27098 + There are some unavoidable exceptions within include files to
27099 + define necessary library symbols; they are noted "INFRINGES ON
27100 + USER NAME SPACE" below. */
27101 +
27102 +/* Identify Bison output. */
27103 +#define YYBISON 1
27104 +
27105 +/* Skeleton name. */
27106 +#define YYSKELETON_NAME "yacc.c"
27107 +
27108 +/* Pure parsers. */
27109 +#define YYPURE 0
27110 +
27111 +/* Using locations. */
27112 +#define YYLSP_NEEDED 0
27113
27114 -#define TOK_COMMAND 257
27115 -#define TOK_VPCI 258
27116 -#define TOK_ITF 259
27117 -#define TOK_DEFAULT 260
27118 -#define TOK_ROUTE 261
27119 -#define TOK_STR 262
27120 -#define TOK_SOCKET 263
27121 -#define TOK_OPTION 264
27122 -#define TOK_CONTROL 265
27123 -#define TOK_NUM 266
27124 -#define TOK_PVC 267
27125
27126 +
27127 +/* Tokens. */
27128 +#ifndef YYTOKENTYPE
27129 +# define YYTOKENTYPE
27130 + /* Put the tokens into the symbol table, so that GDB and other debuggers
27131 + know about them. */
27132 + enum yytokentype {
27133 + TOK_COMMAND = 258,
27134 + TOK_VPCI = 259,
27135 + TOK_ITF = 260,
27136 + TOK_DEFAULT = 261,
27137 + TOK_ROUTE = 262,
27138 + TOK_STR = 263,
27139 + TOK_SOCKET = 264,
27140 + TOK_OPTION = 265,
27141 + TOK_CONTROL = 266,
27142 + TOK_NUM = 267,
27143 + TOK_PVC = 268
27144 + };
27145 +#endif
27146 +#define TOK_COMMAND 258
27147 +#define TOK_VPCI 259
27148 +#define TOK_ITF 260
27149 +#define TOK_DEFAULT 261
27150 +#define TOK_ROUTE 262
27151 +#define TOK_STR 263
27152 +#define TOK_SOCKET 264
27153 +#define TOK_OPTION 265
27154 +#define TOK_CONTROL 266
27155 +#define TOK_NUM 267
27156 +#define TOK_PVC 268
27157 +
27158 +
27159 +
27160 +
27161 +/* Copy the first part of user declarations. */
27162 #line 1 "cfg_y.y"
27163
27164 /* cfg.y - switch configuration language */
27165 @@ -29,6 +95,7 @@
27166 #include <string.h>
27167 #include <errno.h>
27168 #include <limits.h>
27169 +#include <stdlib.h>
27170
27171 #include "atm.h"
27172
27173 @@ -38,436 +105,743 @@
27174 #include "swc.h"
27175
27176
27177 +extern void yyerror(const char *s);
27178 +
27179 static int itf;
27180 static SIGNALING_ENTITY *sig;
27181
27182
27183 -#line 27 "cfg_y.y"
27184 -typedef union {
27185 +
27186 +/* Enabling traces. */
27187 +#ifndef YYDEBUG
27188 +# define YYDEBUG 0
27189 +#endif
27190 +
27191 +/* Enabling verbose error messages. */
27192 +#ifdef YYERROR_VERBOSE
27193 +# undef YYERROR_VERBOSE
27194 +# define YYERROR_VERBOSE 1
27195 +#else
27196 +# define YYERROR_VERBOSE 0
27197 +#endif
27198 +
27199 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
27200 +#line 30 "cfg_y.y"
27201 +typedef union YYSTYPE {
27202 int num;
27203 char *str;
27204 struct sockaddr_atmpvc pvc;
27205 } YYSTYPE;
27206 -#include <stdio.h>
27207 -
27208 -#ifndef __cplusplus
27209 -#ifndef __STDC__
27210 -#define const
27211 -#endif
27212 +/* Line 191 of yacc.c. */
27213 +#line 137 "y.tab.c"
27214 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
27215 +# define YYSTYPE_IS_DECLARED 1
27216 +# define YYSTYPE_IS_TRIVIAL 1
27217 #endif
27218
27219
27220
27221 -#define YYFINAL 31
27222 -#define YYFLAG -32768
27223 -#define YYNTBASE 16
27224 -
27225 -#define YYTRANSLATE(x) ((unsigned)(x) <= 267 ? yytranslate[x] : 27)
27226 -
27227 -static const char yytranslate[] = { 0,
27228 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27229 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27230 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27231 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27232 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27233 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27234 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27235 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27236 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27237 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27238 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27239 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27240 - 2, 2, 14, 2, 15, 2, 2, 2, 2, 2,
27241 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27242 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27243 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27244 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27245 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27246 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27247 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27248 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27249 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27250 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27251 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27252 - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27253 - 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
27254 - 7, 8, 9, 10, 11, 12, 13
27255 -};
27256 -
27257 -#if YYDEBUG != 0
27258 -static const short yyprhs[] = { 0,
27259 - 0, 1, 4, 7, 10, 13, 14, 15, 25, 26,
27260 - 29, 30, 33, 34, 36, 37, 40, 41, 45
27261 -};
27262 +/* Copy the second part of user declarations. */
27263 +
27264 +
27265 +/* Line 214 of yacc.c. */
27266 +#line 149 "y.tab.c"
27267 +
27268 +#if ! defined (yyoverflow) || YYERROR_VERBOSE
27269 +
27270 +# ifndef YYFREE
27271 +# define YYFREE free
27272 +# endif
27273 +# ifndef YYMALLOC
27274 +# define YYMALLOC malloc
27275 +# endif
27276 +
27277 +/* The parser invokes alloca or malloc; define the necessary symbols. */
27278 +
27279 +# ifdef YYSTACK_USE_ALLOCA
27280 +# if YYSTACK_USE_ALLOCA
27281 +# define YYSTACK_ALLOC alloca
27282 +# endif
27283 +# else
27284 +# if defined (alloca) || defined (_ALLOCA_H)
27285 +# define YYSTACK_ALLOC alloca
27286 +# else
27287 +# ifdef __GNUC__
27288 +# define YYSTACK_ALLOC __builtin_alloca
27289 +# endif
27290 +# endif
27291 +# endif
27292 +
27293 +# ifdef YYSTACK_ALLOC
27294 + /* Pacify GCC's `empty if-body' warning. */
27295 +# define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
27296 +# else
27297 +# if defined (__STDC__) || defined (__cplusplus)
27298 +# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
27299 +# define YYSIZE_T size_t
27300 +# endif
27301 +# define YYSTACK_ALLOC YYMALLOC
27302 +# define YYSTACK_FREE YYFREE
27303 +# endif
27304 +#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
27305 +
27306 +
27307 +#if (! defined (yyoverflow) \
27308 + && (! defined (__cplusplus) \
27309 + || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
27310
27311 -static const short yyrhs[] = { -1,
27312 - 17, 16, 0, 18, 16, 0, 11, 16, 0, 10,
27313 - 8, 0, 0, 0, 21, 9, 14, 19, 22, 20,
27314 - 23, 24, 15, 0, 0, 3, 8, 0, 0, 5,
27315 - 12, 0, 0, 13, 0, 0, 26, 24, 0, 0,
27316 - 6, 25, 24, 0, 7, 0
27317 -};
27318 +/* A type that is properly aligned for any stack member. */
27319 +union yyalloc
27320 +{
27321 + short int yyss;
27322 + YYSTYPE yyvs;
27323 + };
27324 +
27325 +/* The size of the maximum gap between one aligned stack and the next. */
27326 +# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
27327 +
27328 +/* The size of an array large to enough to hold all stacks, each with
27329 + N elements. */
27330 +# define YYSTACK_BYTES(N) \
27331 + ((N) * (sizeof (short int) + sizeof (YYSTYPE)) \
27332 + + YYSTACK_GAP_MAXIMUM)
27333 +
27334 +/* Copy COUNT objects from FROM to TO. The source and destination do
27335 + not overlap. */
27336 +# ifndef YYCOPY
27337 +# if defined (__GNUC__) && 1 < __GNUC__
27338 +# define YYCOPY(To, From, Count) \
27339 + __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
27340 +# else
27341 +# define YYCOPY(To, From, Count) \
27342 + do \
27343 + { \
27344 + register YYSIZE_T yyi; \
27345 + for (yyi = 0; yyi < (Count); yyi++) \
27346 + (To)[yyi] = (From)[yyi]; \
27347 + } \
27348 + while (0)
27349 +# endif
27350 +# endif
27351 +
27352 +/* Relocate STACK from its old location to the new one. The
27353 + local variables YYSIZE and YYSTACKSIZE give the old and new number of
27354 + elements in the stack, and YYPTR gives the new location of the
27355 + stack. Advance YYPTR to a properly aligned location for the next
27356 + stack. */
27357 +# define YYSTACK_RELOCATE(Stack) \
27358 + do \
27359 + { \
27360 + YYSIZE_T yynewbytes; \
27361 + YYCOPY (&yyptr->Stack, Stack, yysize); \
27362 + Stack = &yyptr->Stack; \
27363 + yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
27364 + yyptr += yynewbytes / sizeof (*yyptr); \
27365 + } \
27366 + while (0)
27367
27368 #endif
27369
27370 -#if YYDEBUG != 0
27371 -static const short yyrline[] = { 0,
27372 - 43, 44, 45, 46, 52, 59, 65, 73, 76, 80,
27373 - 87, 88, 94, 95, 101, 102, 103, 108, 110
27374 -};
27375 +#if defined (__STDC__) || defined (__cplusplus)
27376 + typedef signed char yysigned_char;
27377 +#else
27378 + typedef short int yysigned_char;
27379 #endif
27380
27381 +/* YYFINAL -- State number of the termination state. */
27382 +#define YYFINAL 11
27383 +/* YYLAST -- Last index in YYTABLE. */
27384 +#define YYLAST 22
27385 +
27386 +/* YYNTOKENS -- Number of terminals. */
27387 +#define YYNTOKENS 16
27388 +/* YYNNTS -- Number of nonterminals. */
27389 +#define YYNNTS 12
27390 +/* YYNRULES -- Number of rules. */
27391 +#define YYNRULES 20
27392 +/* YYNRULES -- Number of states. */
27393 +#define YYNSTATES 31
27394 +
27395 +/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
27396 +#define YYUNDEFTOK 2
27397 +#define YYMAXUTOK 268
27398
27399 -#if YYDEBUG != 0 || defined (YYERROR_VERBOSE)
27400 +#define YYTRANSLATE(YYX) \
27401 + ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
27402
27403 -static const char * const yytname[] = { "$","error","$undefined.","TOK_COMMAND",
27404 -"TOK_VPCI","TOK_ITF","TOK_DEFAULT","TOK_ROUTE","TOK_STR","TOK_SOCKET","TOK_OPTION",
27405 -"TOK_CONTROL","TOK_NUM","TOK_PVC","'{'","'}'","all","option","sig","@1","@2",
27406 -"opt_command","opt_itf","opt_via","routes","@3","route", NULL
27407 +/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
27408 +static const unsigned char yytranslate[] =
27409 +{
27410 + 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27411 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27412 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27413 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27414 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27415 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27416 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27417 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27418 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27419 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27420 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27421 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27422 + 2, 2, 2, 14, 2, 15, 2, 2, 2, 2,
27423 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27424 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27425 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27426 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27427 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27428 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27429 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27430 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27431 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27432 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27433 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27434 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
27435 + 2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
27436 + 5, 6, 7, 8, 9, 10, 11, 12, 13
27437 };
27438 -#endif
27439
27440 -static const short yyr1[] = { 0,
27441 - 16, 16, 16, 16, 17, 19, 20, 18, 21, 21,
27442 - 22, 22, 23, 23, 24, 24, 25, 24, 26
27443 +#if YYDEBUG
27444 +/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
27445 + YYRHS. */
27446 +static const unsigned char yyprhs[] =
27447 +{
27448 + 0, 0, 3, 4, 7, 10, 13, 16, 17, 18,
27449 + 28, 29, 32, 33, 36, 37, 39, 40, 43, 44,
27450 + 48
27451 };
27452
27453 -static const short yyr2[] = { 0,
27454 - 0, 2, 2, 2, 2, 0, 0, 9, 0, 2,
27455 - 0, 2, 0, 1, 0, 2, 0, 3, 1
27456 +/* YYRHS -- A `-1'-separated list of the rules' RHS. */
27457 +static const yysigned_char yyrhs[] =
27458 +{
27459 + 17, 0, -1, -1, 18, 17, -1, 19, 17, -1,
27460 + 11, 17, -1, 10, 8, -1, -1, -1, 22, 9,
27461 + 14, 20, 23, 21, 24, 25, 15, -1, -1, 3,
27462 + 8, -1, -1, 5, 12, -1, -1, 13, -1, -1,
27463 + 27, 25, -1, -1, 6, 26, 25, -1, 7, -1
27464 };
27465
27466 -static const short yydefact[] = { 1,
27467 - 0, 0, 1, 1, 1, 0, 10, 5, 4, 2,
27468 - 3, 0, 6, 11, 0, 7, 12, 13, 14, 15,
27469 - 17, 19, 0, 15, 15, 8, 16, 18, 0, 0,
27470 - 0
27471 +/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
27472 +static const unsigned char yyrline[] =
27473 +{
27474 + 0, 46, 46, 47, 48, 49, 56, 64, 68, 63,
27475 + 80, 83, 90, 91, 97, 98, 104, 105, 107, 106,
27476 + 114
27477 };
27478 +#endif
27479
27480 -static const short yydefgoto[] = { 9,
27481 - 4, 5, 14, 18, 6, 16, 20, 23, 25, 24
27482 +#if YYDEBUG || YYERROR_VERBOSE
27483 +/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
27484 + First, the terminals, then, starting at YYNTOKENS, nonterminals. */
27485 +static const char *const yytname[] =
27486 +{
27487 + "$end", "error", "$undefined", "TOK_COMMAND", "TOK_VPCI", "TOK_ITF",
27488 + "TOK_DEFAULT", "TOK_ROUTE", "TOK_STR", "TOK_SOCKET", "TOK_OPTION",
27489 + "TOK_CONTROL", "TOK_NUM", "TOK_PVC", "'{'", "'}'", "$accept", "all",
27490 + "option", "sig", "@1", "@2", "opt_command", "opt_itf", "opt_via",
27491 + "routes", "@3", "route", 0
27492 };
27493 +#endif
27494
27495 -static const short yypact[] = { -3,
27496 - 3, 4, -3, -3, -3, 6,-32768,-32768,-32768,-32768,
27497 --32768, -1,-32768, 9, 7,-32768,-32768, 8,-32768, -5,
27498 --32768,-32768, 1, -5, -5,-32768,-32768,-32768, 17, 18,
27499 --32768
27500 +# ifdef YYPRINT
27501 +/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
27502 + token YYLEX-NUM. */
27503 +static const unsigned short int yytoknum[] =
27504 +{
27505 + 0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
27506 + 265, 266, 267, 268, 123, 125
27507 };
27508 +# endif
27509
27510 -static const short yypgoto[] = { 5,
27511 --32768,-32768,-32768,-32768,-32768,-32768,-32768, -21,-32768,-32768
27512 +/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
27513 +static const unsigned char yyr1[] =
27514 +{
27515 + 0, 16, 17, 17, 17, 17, 18, 20, 21, 19,
27516 + 22, 22, 23, 23, 24, 24, 25, 25, 26, 25,
27517 + 27
27518 };
27519
27520 -
27521 -#define YYLAST 21
27522 -
27523 -
27524 -static const short yytable[] = { 1,
27525 - 21, 22, 27, 28, 29, -9, 2, 3, 10, 11,
27526 - 7, 8, 13, 15, 12, 26, 30, 31, 17, 0,
27527 - 19
27528 +/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
27529 +static const unsigned char yyr2[] =
27530 +{
27531 + 0, 2, 0, 2, 2, 2, 2, 0, 0, 9,
27532 + 0, 2, 0, 2, 0, 1, 0, 2, 0, 3,
27533 + 1
27534 };
27535
27536 -static const short yycheck[] = { 3,
27537 - 6, 7, 24, 25, 0, 9, 10, 11, 4, 5,
27538 - 8, 8, 14, 5, 9, 15, 0, 0, 12, -1,
27539 - 13
27540 +/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
27541 + STATE-NUM when YYTABLE doesn't specify something else to do. Zero
27542 + means the default is an error. */
27543 +static const unsigned char yydefact[] =
27544 +{
27545 + 2, 0, 0, 2, 0, 2, 2, 0, 11, 6,
27546 + 5, 1, 3, 4, 0, 7, 12, 0, 8, 13,
27547 + 14, 15, 16, 18, 20, 0, 16, 16, 9, 17,
27548 + 19
27549 };
27550 -/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
27551 -#line 3 "/usr/lib/bison.simple"
27552 -/* This file comes from bison-1.28. */
27553
27554 -/* Skeleton output parser for bison,
27555 - Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
27556 +/* YYDEFGOTO[NTERM-NUM]. */
27557 +static const yysigned_char yydefgoto[] =
27558 +{
27559 + -1, 4, 5, 6, 16, 20, 7, 18, 22, 25,
27560 + 27, 26
27561 +};
27562
27563 - This program is free software; you can redistribute it and/or modify
27564 - it under the terms of the GNU General Public License as published by
27565 - the Free Software Foundation; either version 2, or (at your option)
27566 - any later version.
27567 +/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
27568 + STATE-NUM. */
27569 +#define YYPACT_NINF -16
27570 +static const yysigned_char yypact[] =
27571 +{
27572 + -3, -6, 5, -3, 14, -3, -3, -4, -16, -16,
27573 + -16, -16, -16, -16, 1, -16, 11, 6, -16, -16,
27574 + 4, -16, 3, -16, -16, 7, 3, 3, -16, -16,
27575 + -16
27576 +};
27577
27578 - This program is distributed in the hope that it will be useful,
27579 - but WITHOUT ANY WARRANTY; without even the implied warranty of
27580 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27581 - GNU General Public License for more details.
27582 +/* YYPGOTO[NTERM-NUM]. */
27583 +static const yysigned_char yypgoto[] =
27584 +{
27585 + -16, -2, -16, -16, -16, -16, -16, -16, -16, -15,
27586 + -16, -16
27587 +};
27588
27589 - You should have received a copy of the GNU General Public License
27590 - along with this program; if not, write to the Free Software
27591 - Foundation, Inc., 59 Temple Place - Suite 330,
27592 - Boston, MA 02111-1307, USA. */
27593 +/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
27594 + positive, shift that token. If negative, reduce the rule which
27595 + number is the opposite. If zero, do what YYDEFACT says.
27596 + If YYTABLE_NINF, syntax error. */
27597 +#define YYTABLE_NINF -11
27598 +static const yysigned_char yytable[] =
27599 +{
27600 + 1, 10, 8, 12, 13, 14, -10, 2, 3, 23,
27601 + 24, 29, 30, 9, 11, 15, 17, 21, 19, 0,
27602 + 0, 0, 28
27603 +};
27604
27605 -/* As a special exception, when this file is copied by Bison into a
27606 - Bison output file, you may use that output file without restriction.
27607 - This special exception was added by the Free Software Foundation
27608 - in version 1.24 of Bison. */
27609 +static const yysigned_char yycheck[] =
27610 +{
27611 + 3, 3, 8, 5, 6, 9, 9, 10, 11, 6,
27612 + 7, 26, 27, 8, 0, 14, 5, 13, 12, -1,
27613 + -1, -1, 15
27614 +};
27615
27616 -/* This is the parser code that is written into each bison parser
27617 - when the %semantic_parser declaration is not specified in the grammar.
27618 - It was written by Richard Stallman by simplifying the hairy parser
27619 - used when %semantic_parser is specified. */
27620 -
27621 -#ifndef YYSTACK_USE_ALLOCA
27622 -#ifdef alloca
27623 -#define YYSTACK_USE_ALLOCA
27624 -#else /* alloca not defined */
27625 -#ifdef __GNUC__
27626 -#define YYSTACK_USE_ALLOCA
27627 -#define alloca __builtin_alloca
27628 -#else /* not GNU C. */
27629 -#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
27630 -#define YYSTACK_USE_ALLOCA
27631 -#include <alloca.h>
27632 -#else /* not sparc */
27633 -/* We think this test detects Watcom and Microsoft C. */
27634 -/* This used to test MSDOS, but that is a bad idea
27635 - since that symbol is in the user namespace. */
27636 -#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
27637 -#if 0 /* No need for malloc.h, which pollutes the namespace;
27638 - instead, just don't use alloca. */
27639 -#include <malloc.h>
27640 -#endif
27641 -#else /* not MSDOS, or __TURBOC__ */
27642 -#if defined(_AIX)
27643 -/* I don't know what this was needed for, but it pollutes the namespace.
27644 - So I turned it off. rms, 2 May 1997. */
27645 -/* #include <malloc.h> */
27646 - #pragma alloca
27647 -#define YYSTACK_USE_ALLOCA
27648 -#else /* not MSDOS, or __TURBOC__, or _AIX */
27649 -#if 0
27650 -#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
27651 - and on HPUX 10. Eventually we can turn this on. */
27652 -#define YYSTACK_USE_ALLOCA
27653 -#define alloca __builtin_alloca
27654 -#endif /* __hpux */
27655 -#endif
27656 -#endif /* not _AIX */
27657 -#endif /* not MSDOS, or __TURBOC__ */
27658 -#endif /* not sparc */
27659 -#endif /* not GNU C */
27660 -#endif /* alloca not defined */
27661 -#endif /* YYSTACK_USE_ALLOCA not defined */
27662 +/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
27663 + symbol of state STATE-NUM. */
27664 +static const unsigned char yystos[] =
27665 +{
27666 + 0, 3, 10, 11, 17, 18, 19, 22, 8, 8,
27667 + 17, 0, 17, 17, 9, 14, 20, 5, 23, 12,
27668 + 21, 13, 24, 6, 7, 25, 27, 26, 15, 25,
27669 + 25
27670 +};
27671
27672 -#ifdef YYSTACK_USE_ALLOCA
27673 -#define YYSTACK_ALLOC alloca
27674 -#else
27675 -#define YYSTACK_ALLOC malloc
27676 +#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
27677 +# define YYSIZE_T __SIZE_TYPE__
27678 +#endif
27679 +#if ! defined (YYSIZE_T) && defined (size_t)
27680 +# define YYSIZE_T size_t
27681 +#endif
27682 +#if ! defined (YYSIZE_T)
27683 +# if defined (__STDC__) || defined (__cplusplus)
27684 +# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
27685 +# define YYSIZE_T size_t
27686 +# endif
27687 +#endif
27688 +#if ! defined (YYSIZE_T)
27689 +# define YYSIZE_T unsigned int
27690 #endif
27691 -
27692 -/* Note: there must be only one dollar sign in this file.
27693 - It is replaced by the list of actions, each action
27694 - as one case of the switch. */
27695
27696 #define yyerrok (yyerrstatus = 0)
27697 #define yyclearin (yychar = YYEMPTY)
27698 -#define YYEMPTY -2
27699 +#define YYEMPTY (-2)
27700 #define YYEOF 0
27701 +
27702 #define YYACCEPT goto yyacceptlab
27703 -#define YYABORT goto yyabortlab
27704 -#define YYERROR goto yyerrlab1
27705 -/* Like YYERROR except do call yyerror.
27706 - This remains here temporarily to ease the
27707 - transition to the new meaning of YYERROR, for GCC.
27708 +#define YYABORT goto yyabortlab
27709 +#define YYERROR goto yyerrorlab
27710 +
27711 +
27712 +/* Like YYERROR except do call yyerror. This remains here temporarily
27713 + to ease the transition to the new meaning of YYERROR, for GCC.
27714 Once GCC version 2 has supplanted version 1, this can go. */
27715 +
27716 #define YYFAIL goto yyerrlab
27717 +
27718 #define YYRECOVERING() (!!yyerrstatus)
27719 -#define YYBACKUP(token, value) \
27720 +
27721 +#define YYBACKUP(Token, Value) \
27722 do \
27723 if (yychar == YYEMPTY && yylen == 1) \
27724 - { yychar = (token), yylval = (value); \
27725 - yychar1 = YYTRANSLATE (yychar); \
27726 + { \
27727 + yychar = (Token); \
27728 + yylval = (Value); \
27729 + yytoken = YYTRANSLATE (yychar); \
27730 YYPOPSTACK; \
27731 goto yybackup; \
27732 } \
27733 else \
27734 - { yyerror ("syntax error: cannot back up"); YYERROR; } \
27735 + { \
27736 + yyerror ("syntax error: cannot back up");\
27737 + YYERROR; \
27738 + } \
27739 while (0)
27740
27741 #define YYTERROR 1
27742 #define YYERRCODE 256
27743
27744 -#ifndef YYPURE
27745 -#define YYLEX yylex()
27746 -#endif
27747 +/* YYLLOC_DEFAULT -- Compute the default location (before the actions
27748 + are run). */
27749
27750 -#ifdef YYPURE
27751 -#ifdef YYLSP_NEEDED
27752 -#ifdef YYLEX_PARAM
27753 -#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM)
27754 -#else
27755 -#define YYLEX yylex(&yylval, &yylloc)
27756 +#ifndef YYLLOC_DEFAULT
27757 +# define YYLLOC_DEFAULT(Current, Rhs, N) \
27758 + ((Current).first_line = (Rhs)[1].first_line, \
27759 + (Current).first_column = (Rhs)[1].first_column, \
27760 + (Current).last_line = (Rhs)[N].last_line, \
27761 + (Current).last_column = (Rhs)[N].last_column)
27762 #endif
27763 -#else /* not YYLSP_NEEDED */
27764 +
27765 +/* YYLEX -- calling `yylex' with the right arguments. */
27766 +
27767 #ifdef YYLEX_PARAM
27768 -#define YYLEX yylex(&yylval, YYLEX_PARAM)
27769 +# define YYLEX yylex (YYLEX_PARAM)
27770 #else
27771 -#define YYLEX yylex(&yylval)
27772 -#endif
27773 -#endif /* not YYLSP_NEEDED */
27774 +# define YYLEX yylex ()
27775 #endif
27776
27777 -/* If nonreentrant, generate the variables here */
27778 +/* Enable debugging if requested. */
27779 +#if YYDEBUG
27780
27781 -#ifndef YYPURE
27782 +# ifndef YYFPRINTF
27783 +# include <stdio.h> /* INFRINGES ON USER NAME SPACE */
27784 +# define YYFPRINTF fprintf
27785 +# endif
27786 +
27787 +# define YYDPRINTF(Args) \
27788 +do { \
27789 + if (yydebug) \
27790 + YYFPRINTF Args; \
27791 +} while (0)
27792 +
27793 +# define YYDSYMPRINT(Args) \
27794 +do { \
27795 + if (yydebug) \
27796 + yysymprint Args; \
27797 +} while (0)
27798 +
27799 +# define YYDSYMPRINTF(Title, Token, Value, Location) \
27800 +do { \
27801 + if (yydebug) \
27802 + { \
27803 + YYFPRINTF (stderr, "%s ", Title); \
27804 + yysymprint (stderr, \
27805 + Token, Value); \
27806 + YYFPRINTF (stderr, "\n"); \
27807 + } \
27808 +} while (0)
27809
27810 -int yychar; /* the lookahead symbol */
27811 -YYSTYPE yylval; /* the semantic value of the */
27812 - /* lookahead symbol */
27813 +/*------------------------------------------------------------------.
27814 +| yy_stack_print -- Print the state stack from its BOTTOM up to its |
27815 +| TOP (included). |
27816 +`------------------------------------------------------------------*/
27817
27818 -#ifdef YYLSP_NEEDED
27819 -YYLTYPE yylloc; /* location data for the lookahead */
27820 - /* symbol */
27821 +#if defined (__STDC__) || defined (__cplusplus)
27822 +static void
27823 +yy_stack_print (short int *bottom, short int *top)
27824 +#else
27825 +static void
27826 +yy_stack_print (bottom, top)
27827 + short int *bottom;
27828 + short int *top;
27829 #endif
27830 +{
27831 + YYFPRINTF (stderr, "Stack now");
27832 + for (/* Nothing. */; bottom <= top; ++bottom)
27833 + YYFPRINTF (stderr, " %d", *bottom);
27834 + YYFPRINTF (stderr, "\n");
27835 +}
27836
27837 -int yynerrs; /* number of parse errors so far */
27838 -#endif /* not YYPURE */
27839 +# define YY_STACK_PRINT(Bottom, Top) \
27840 +do { \
27841 + if (yydebug) \
27842 + yy_stack_print ((Bottom), (Top)); \
27843 +} while (0)
27844
27845 -#if YYDEBUG != 0
27846 -int yydebug; /* nonzero means print parse trace */
27847 -/* Since this is uninitialized, it does not stop multiple parsers
27848 - from coexisting. */
27849 +
27850 +/*------------------------------------------------.
27851 +| Report that the YYRULE is going to be reduced. |
27852 +`------------------------------------------------*/
27853 +
27854 +#if defined (__STDC__) || defined (__cplusplus)
27855 +static void
27856 +yy_reduce_print (int yyrule)
27857 +#else
27858 +static void
27859 +yy_reduce_print (yyrule)
27860 + int yyrule;
27861 #endif
27862 +{
27863 + int yyi;
27864 + unsigned int yylno = yyrline[yyrule];
27865 + YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
27866 + yyrule - 1, yylno);
27867 + /* Print the symbols being reduced, and their result. */
27868 + for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
27869 + YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
27870 + YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
27871 +}
27872 +
27873 +# define YY_REDUCE_PRINT(Rule) \
27874 +do { \
27875 + if (yydebug) \
27876 + yy_reduce_print (Rule); \
27877 +} while (0)
27878 +
27879 +/* Nonzero means print parse trace. It is left uninitialized so that
27880 + multiple parsers can coexist. */
27881 +int yydebug;
27882 +#else /* !YYDEBUG */
27883 +# define YYDPRINTF(Args)
27884 +# define YYDSYMPRINT(Args)
27885 +# define YYDSYMPRINTF(Title, Token, Value, Location)
27886 +# define YY_STACK_PRINT(Bottom, Top)
27887 +# define YY_REDUCE_PRINT(Rule)
27888 +#endif /* !YYDEBUG */
27889
27890 -/* YYINITDEPTH indicates the initial size of the parser's stacks */
27891
27892 +/* YYINITDEPTH -- initial size of the parser's stacks. */
27893 #ifndef YYINITDEPTH
27894 -#define YYINITDEPTH 200
27895 +# define YYINITDEPTH 200
27896 #endif
27897
27898 -/* YYMAXDEPTH is the maximum size the stacks can grow to
27899 - (effective only if the built-in stack extension method is used). */
27900 +/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
27901 + if the built-in stack extension method is used).
27902
27903 -#if YYMAXDEPTH == 0
27904 -#undef YYMAXDEPTH
27905 + Do not make this value too large; the results are undefined if
27906 + SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
27907 + evaluated with infinite-precision integer arithmetic. */
27908 +
27909 +#if defined (YYMAXDEPTH) && YYMAXDEPTH == 0
27910 +# undef YYMAXDEPTH
27911 #endif
27912
27913 #ifndef YYMAXDEPTH
27914 -#define YYMAXDEPTH 10000
27915 +# define YYMAXDEPTH 10000
27916 #endif
27917 +
27918 \f
27919 -/* Define __yy_memcpy. Note that the size argument
27920 - should be passed with type unsigned int, because that is what the non-GCC
27921 - definitions require. With GCC, __builtin_memcpy takes an arg
27922 - of type size_t, but it can handle unsigned int. */
27923 -
27924 -#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
27925 -#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
27926 -#else /* not GNU C or C++ */
27927 -#ifndef __cplusplus
27928
27929 -/* This is the most reliable way to avoid incompatibilities
27930 - in available built-in functions on various systems. */
27931 -static void
27932 -__yy_memcpy (to, from, count)
27933 - char *to;
27934 - char *from;
27935 - unsigned int count;
27936 -{
27937 - register char *f = from;
27938 - register char *t = to;
27939 - register int i = count;
27940 +#if YYERROR_VERBOSE
27941 +
27942 +# ifndef yystrlen
27943 +# if defined (__GLIBC__) && defined (_STRING_H)
27944 +# define yystrlen strlen
27945 +# else
27946 +/* Return the length of YYSTR. */
27947 +static YYSIZE_T
27948 +# if defined (__STDC__) || defined (__cplusplus)
27949 +yystrlen (const char *yystr)
27950 +# else
27951 +yystrlen (yystr)
27952 + const char *yystr;
27953 +# endif
27954 +{
27955 + register const char *yys = yystr;
27956 +
27957 + while (*yys++ != '\0')
27958 + continue;
27959 +
27960 + return yys - yystr - 1;
27961 +}
27962 +# endif
27963 +# endif
27964 +
27965 +# ifndef yystpcpy
27966 +# if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
27967 +# define yystpcpy stpcpy
27968 +# else
27969 +/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
27970 + YYDEST. */
27971 +static char *
27972 +# if defined (__STDC__) || defined (__cplusplus)
27973 +yystpcpy (char *yydest, const char *yysrc)
27974 +# else
27975 +yystpcpy (yydest, yysrc)
27976 + char *yydest;
27977 + const char *yysrc;
27978 +# endif
27979 +{
27980 + register char *yyd = yydest;
27981 + register const char *yys = yysrc;
27982
27983 - while (i-- > 0)
27984 - *t++ = *f++;
27985 + while ((*yyd++ = *yys++) != '\0')
27986 + continue;
27987 +
27988 + return yyd - 1;
27989 }
27990 +# endif
27991 +# endif
27992 +
27993 +#endif /* !YYERROR_VERBOSE */
27994
27995 -#else /* __cplusplus */
27996 +\f
27997 +
27998 +#if YYDEBUG
27999 +/*--------------------------------.
28000 +| Print this symbol on YYOUTPUT. |
28001 +`--------------------------------*/
28002
28003 -/* This is the most reliable way to avoid incompatibilities
28004 - in available built-in functions on various systems. */
28005 +#if defined (__STDC__) || defined (__cplusplus)
28006 static void
28007 -__yy_memcpy (char *to, char *from, unsigned int count)
28008 +yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
28009 +#else
28010 +static void
28011 +yysymprint (yyoutput, yytype, yyvaluep)
28012 + FILE *yyoutput;
28013 + int yytype;
28014 + YYSTYPE *yyvaluep;
28015 +#endif
28016 {
28017 - register char *t = to;
28018 - register char *f = from;
28019 - register int i = count;
28020 + /* Pacify ``unused variable'' warnings. */
28021 + (void) yyvaluep;
28022
28023 - while (i-- > 0)
28024 - *t++ = *f++;
28025 + if (yytype < YYNTOKENS)
28026 + {
28027 + YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
28028 +# ifdef YYPRINT
28029 + YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
28030 +# endif
28031 + }
28032 + else
28033 + YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
28034 +
28035 + switch (yytype)
28036 + {
28037 + default:
28038 + break;
28039 + }
28040 + YYFPRINTF (yyoutput, ")");
28041 }
28042
28043 +#endif /* ! YYDEBUG */
28044 +/*-----------------------------------------------.
28045 +| Release the memory associated to this symbol. |
28046 +`-----------------------------------------------*/
28047 +
28048 +#if defined (__STDC__) || defined (__cplusplus)
28049 +static void
28050 +yydestruct (int yytype, YYSTYPE *yyvaluep)
28051 +#else
28052 +static void
28053 +yydestruct (yytype, yyvaluep)
28054 + int yytype;
28055 + YYSTYPE *yyvaluep;
28056 #endif
28057 -#endif
28058 +{
28059 + /* Pacify ``unused variable'' warnings. */
28060 + (void) yyvaluep;
28061 +
28062 + switch (yytype)
28063 + {
28064 +
28065 + default:
28066 + break;
28067 + }
28068 +}
28069 \f
28070 -#line 217 "/usr/lib/bison.simple"
28071
28072 -/* The user can define YYPARSE_PARAM as the name of an argument to be passed
28073 - into yyparse. The argument should have type void *.
28074 - It should actually point to an object.
28075 - Grammar actions can access the variable by casting it
28076 - to the proper pointer type. */
28077 +/* Prevent warnings from -Wmissing-prototypes. */
28078
28079 #ifdef YYPARSE_PARAM
28080 -#ifdef __cplusplus
28081 -#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM
28082 -#define YYPARSE_PARAM_DECL
28083 -#else /* not __cplusplus */
28084 -#define YYPARSE_PARAM_ARG YYPARSE_PARAM
28085 -#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM;
28086 -#endif /* not __cplusplus */
28087 -#else /* not YYPARSE_PARAM */
28088 -#define YYPARSE_PARAM_ARG
28089 -#define YYPARSE_PARAM_DECL
28090 -#endif /* not YYPARSE_PARAM */
28091 +# if defined (__STDC__) || defined (__cplusplus)
28092 +int yyparse (void *YYPARSE_PARAM);
28093 +# else
28094 +int yyparse ();
28095 +# endif
28096 +#else /* ! YYPARSE_PARAM */
28097 +#if defined (__STDC__) || defined (__cplusplus)
28098 +int yyparse (void);
28099 +#else
28100 +int yyparse ();
28101 +#endif
28102 +#endif /* ! YYPARSE_PARAM */
28103 +
28104 +
28105 +
28106 +/* The lookahead symbol. */
28107 +int yychar;
28108 +
28109 +/* The semantic value of the lookahead symbol. */
28110 +YYSTYPE yylval;
28111 +
28112 +/* Number of syntax errors so far. */
28113 +int yynerrs;
28114 +
28115 +
28116 +
28117 +/*----------.
28118 +| yyparse. |
28119 +`----------*/
28120
28121 -/* Prevent warning if -Wstrict-prototypes. */
28122 -#ifdef __GNUC__
28123 #ifdef YYPARSE_PARAM
28124 -int yyparse (void *);
28125 +# if defined (__STDC__) || defined (__cplusplus)
28126 +int yyparse (void *YYPARSE_PARAM)
28127 +# else
28128 +int yyparse (YYPARSE_PARAM)
28129 + void *YYPARSE_PARAM;
28130 +# endif
28131 +#else /* ! YYPARSE_PARAM */
28132 +#if defined (__STDC__) || defined (__cplusplus)
28133 +int
28134 +yyparse (void)
28135 #else
28136 -int yyparse (void);
28137 +int
28138 +yyparse ()
28139 +
28140 #endif
28141 #endif
28142 -
28143 -int
28144 -yyparse(YYPARSE_PARAM_ARG)
28145 - YYPARSE_PARAM_DECL
28146 {
28147 +
28148 register int yystate;
28149 register int yyn;
28150 - register short *yyssp;
28151 + int yyresult;
28152 + /* Number of tokens to shift before error messages enabled. */
28153 + int yyerrstatus;
28154 + /* Lookahead token as an internal (translated) token number. */
28155 + int yytoken = 0;
28156 +
28157 + /* Three stacks and their tools:
28158 + `yyss': related to states,
28159 + `yyvs': related to semantic values,
28160 + `yyls': related to locations.
28161 +
28162 + Refer to the stacks thru separate pointers, to allow yyoverflow
28163 + to reallocate them elsewhere. */
28164 +
28165 + /* The state stack. */
28166 + short int yyssa[YYINITDEPTH];
28167 + short int *yyss = yyssa;
28168 + register short int *yyssp;
28169 +
28170 + /* The semantic value stack. */
28171 + YYSTYPE yyvsa[YYINITDEPTH];
28172 + YYSTYPE *yyvs = yyvsa;
28173 register YYSTYPE *yyvsp;
28174 - int yyerrstatus; /* number of tokens to shift before error messages enabled */
28175 - int yychar1 = 0; /* lookahead token as an internal (translated) token number */
28176 -
28177 - short yyssa[YYINITDEPTH]; /* the state stack */
28178 - YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */
28179
28180 - short *yyss = yyssa; /* refer to the stacks thru separate pointers */
28181 - YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */
28182
28183 -#ifdef YYLSP_NEEDED
28184 - YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */
28185 - YYLTYPE *yyls = yylsa;
28186 - YYLTYPE *yylsp;
28187
28188 -#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--)
28189 -#else
28190 #define YYPOPSTACK (yyvsp--, yyssp--)
28191 -#endif
28192
28193 - int yystacksize = YYINITDEPTH;
28194 - int yyfree_stacks = 0;
28195 + YYSIZE_T yystacksize = YYINITDEPTH;
28196
28197 -#ifdef YYPURE
28198 - int yychar;
28199 - YYSTYPE yylval;
28200 - int yynerrs;
28201 -#ifdef YYLSP_NEEDED
28202 - YYLTYPE yylloc;
28203 -#endif
28204 -#endif
28205 + /* The variables used to return semantic value and location from the
28206 + action routines. */
28207 + YYSTYPE yyval;
28208
28209 - YYSTYPE yyval; /* the variable used to return */
28210 - /* semantic values from the action */
28211 - /* routines */
28212
28213 + /* When reducing, the number of symbols on the RHS of the reduced
28214 + rule. */
28215 int yylen;
28216
28217 -#if YYDEBUG != 0
28218 - if (yydebug)
28219 - fprintf(stderr, "Starting parse\n");
28220 -#endif
28221 + YYDPRINTF ((stderr, "Starting parse\n"));
28222
28223 yystate = 0;
28224 yyerrstatus = 0;
28225 @@ -479,110 +853,97 @@
28226 so that they stay on the same level as the state stack.
28227 The wasted elements are never initialized. */
28228
28229 - yyssp = yyss - 1;
28230 + yyssp = yyss;
28231 yyvsp = yyvs;
28232 -#ifdef YYLSP_NEEDED
28233 - yylsp = yyls;
28234 -#endif
28235
28236 -/* Push a new state, which is found in yystate . */
28237 -/* In all cases, when you get here, the value and location stacks
28238 - have just been pushed. so pushing a state here evens the stacks. */
28239 -yynewstate:
28240
28241 - *++yyssp = yystate;
28242 + goto yysetstate;
28243
28244 - if (yyssp >= yyss + yystacksize - 1)
28245 - {
28246 - /* Give user a chance to reallocate the stack */
28247 - /* Use copies of these so that the &'s don't force the real ones into memory. */
28248 - YYSTYPE *yyvs1 = yyvs;
28249 - short *yyss1 = yyss;
28250 -#ifdef YYLSP_NEEDED
28251 - YYLTYPE *yyls1 = yyls;
28252 -#endif
28253 +/*------------------------------------------------------------.
28254 +| yynewstate -- Push a new state, which is found in yystate. |
28255 +`------------------------------------------------------------*/
28256 + yynewstate:
28257 + /* In all cases, when you get here, the value and location stacks
28258 + have just been pushed. so pushing a state here evens the stacks.
28259 + */
28260 + yyssp++;
28261
28262 + yysetstate:
28263 + *yyssp = yystate;
28264 +
28265 + if (yyss + yystacksize - 1 <= yyssp)
28266 + {
28267 /* Get the current used size of the three stacks, in elements. */
28268 - int size = yyssp - yyss + 1;
28269 + YYSIZE_T yysize = yyssp - yyss + 1;
28270
28271 #ifdef yyoverflow
28272 - /* Each stack pointer address is followed by the size of
28273 - the data in use in that stack, in bytes. */
28274 -#ifdef YYLSP_NEEDED
28275 - /* This used to be a conditional around just the two extra args,
28276 - but that might be undefined if yyoverflow is a macro. */
28277 - yyoverflow("parser stack overflow",
28278 - &yyss1, size * sizeof (*yyssp),
28279 - &yyvs1, size * sizeof (*yyvsp),
28280 - &yyls1, size * sizeof (*yylsp),
28281 - &yystacksize);
28282 -#else
28283 - yyoverflow("parser stack overflow",
28284 - &yyss1, size * sizeof (*yyssp),
28285 - &yyvs1, size * sizeof (*yyvsp),
28286 - &yystacksize);
28287 -#endif
28288 -
28289 - yyss = yyss1; yyvs = yyvs1;
28290 -#ifdef YYLSP_NEEDED
28291 - yyls = yyls1;
28292 -#endif
28293 + {
28294 + /* Give user a chance to reallocate the stack. Use copies of
28295 + these so that the &'s don't force the real ones into
28296 + memory. */
28297 + YYSTYPE *yyvs1 = yyvs;
28298 + short int *yyss1 = yyss;
28299 +
28300 +
28301 + /* Each stack pointer address is followed by the size of the
28302 + data in use in that stack, in bytes. This used to be a
28303 + conditional around just the two extra args, but that might
28304 + be undefined if yyoverflow is a macro. */
28305 + yyoverflow ("parser stack overflow",
28306 + &yyss1, yysize * sizeof (*yyssp),
28307 + &yyvs1, yysize * sizeof (*yyvsp),
28308 +
28309 + &yystacksize);
28310 +
28311 + yyss = yyss1;
28312 + yyvs = yyvs1;
28313 + }
28314 #else /* no yyoverflow */
28315 +# ifndef YYSTACK_RELOCATE
28316 + goto yyoverflowlab;
28317 +# else
28318 /* Extend the stack our own way. */
28319 - if (yystacksize >= YYMAXDEPTH)
28320 - {
28321 - yyerror("parser stack overflow");
28322 - if (yyfree_stacks)
28323 - {
28324 - free (yyss);
28325 - free (yyvs);
28326 -#ifdef YYLSP_NEEDED
28327 - free (yyls);
28328 -#endif
28329 - }
28330 - return 2;
28331 - }
28332 + if (YYMAXDEPTH <= yystacksize)
28333 + goto yyoverflowlab;
28334 yystacksize *= 2;
28335 - if (yystacksize > YYMAXDEPTH)
28336 + if (YYMAXDEPTH < yystacksize)
28337 yystacksize = YYMAXDEPTH;
28338 -#ifndef YYSTACK_USE_ALLOCA
28339 - yyfree_stacks = 1;
28340 -#endif
28341 - yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
28342 - __yy_memcpy ((char *)yyss, (char *)yyss1,
28343 - size * (unsigned int) sizeof (*yyssp));
28344 - yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
28345 - __yy_memcpy ((char *)yyvs, (char *)yyvs1,
28346 - size * (unsigned int) sizeof (*yyvsp));
28347 -#ifdef YYLSP_NEEDED
28348 - yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
28349 - __yy_memcpy ((char *)yyls, (char *)yyls1,
28350 - size * (unsigned int) sizeof (*yylsp));
28351 -#endif
28352 +
28353 + {
28354 + short int *yyss1 = yyss;
28355 + union yyalloc *yyptr =
28356 + (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
28357 + if (! yyptr)
28358 + goto yyoverflowlab;
28359 + YYSTACK_RELOCATE (yyss);
28360 + YYSTACK_RELOCATE (yyvs);
28361 +
28362 +# undef YYSTACK_RELOCATE
28363 + if (yyss1 != yyssa)
28364 + YYSTACK_FREE (yyss1);
28365 + }
28366 +# endif
28367 #endif /* no yyoverflow */
28368
28369 - yyssp = yyss + size - 1;
28370 - yyvsp = yyvs + size - 1;
28371 -#ifdef YYLSP_NEEDED
28372 - yylsp = yyls + size - 1;
28373 -#endif
28374 + yyssp = yyss + yysize - 1;
28375 + yyvsp = yyvs + yysize - 1;
28376
28377 -#if YYDEBUG != 0
28378 - if (yydebug)
28379 - fprintf(stderr, "Stack size increased to %d\n", yystacksize);
28380 -#endif
28381
28382 - if (yyssp >= yyss + yystacksize - 1)
28383 + YYDPRINTF ((stderr, "Stack size increased to %lu\n",
28384 + (unsigned long int) yystacksize));
28385 +
28386 + if (yyss + yystacksize - 1 <= yyssp)
28387 YYABORT;
28388 }
28389
28390 -#if YYDEBUG != 0
28391 - if (yydebug)
28392 - fprintf(stderr, "Entering state %d\n", yystate);
28393 -#endif
28394 + YYDPRINTF ((stderr, "Entering state %d\n", yystate));
28395
28396 goto yybackup;
28397 - yybackup:
28398 +
28399 +/*-----------.
28400 +| yybackup. |
28401 +`-----------*/
28402 +yybackup:
28403
28404 /* Do appropriate processing given the current state. */
28405 /* Read a lookahead token if we need one and don't already have one. */
28406 @@ -591,194 +952,167 @@
28407 /* First try to decide what to do without reference to lookahead token. */
28408
28409 yyn = yypact[yystate];
28410 - if (yyn == YYFLAG)
28411 + if (yyn == YYPACT_NINF)
28412 goto yydefault;
28413
28414 /* Not known => get a lookahead token if don't already have one. */
28415
28416 - /* yychar is either YYEMPTY or YYEOF
28417 - or a valid token in external form. */
28418 -
28419 + /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol. */
28420 if (yychar == YYEMPTY)
28421 {
28422 -#if YYDEBUG != 0
28423 - if (yydebug)
28424 - fprintf(stderr, "Reading a token: ");
28425 -#endif
28426 + YYDPRINTF ((stderr, "Reading a token: "));
28427 yychar = YYLEX;
28428 }
28429
28430 - /* Convert token to internal form (in yychar1) for indexing tables with */
28431 -
28432 - if (yychar <= 0) /* This means end of input. */
28433 + if (yychar <= YYEOF)
28434 {
28435 - yychar1 = 0;
28436 - yychar = YYEOF; /* Don't call YYLEX any more */
28437 -
28438 -#if YYDEBUG != 0
28439 - if (yydebug)
28440 - fprintf(stderr, "Now at end of input.\n");
28441 -#endif
28442 + yychar = yytoken = YYEOF;
28443 + YYDPRINTF ((stderr, "Now at end of input.\n"));
28444 }
28445 else
28446 {
28447 - yychar1 = YYTRANSLATE(yychar);
28448 -
28449 -#if YYDEBUG != 0
28450 - if (yydebug)
28451 - {
28452 - fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
28453 - /* Give the individual parser a way to print the precise meaning
28454 - of a token, for further debugging info. */
28455 -#ifdef YYPRINT
28456 - YYPRINT (stderr, yychar, yylval);
28457 -#endif
28458 - fprintf (stderr, ")\n");
28459 - }
28460 -#endif
28461 + yytoken = YYTRANSLATE (yychar);
28462 + YYDSYMPRINTF ("Next token is", yytoken, &yylval, &yylloc);
28463 }
28464
28465 - yyn += yychar1;
28466 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
28467 + /* If the proper action on seeing token YYTOKEN is to reduce or to
28468 + detect an error, take that action. */
28469 + yyn += yytoken;
28470 + if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
28471 goto yydefault;
28472 -
28473 yyn = yytable[yyn];
28474 -
28475 - /* yyn is what to do for this token type in this state.
28476 - Negative => reduce, -yyn is rule number.
28477 - Positive => shift, yyn is new state.
28478 - New state is final state => don't bother to shift,
28479 - just return success.
28480 - 0, or most negative number => error. */
28481 -
28482 - if (yyn < 0)
28483 + if (yyn <= 0)
28484 {
28485 - if (yyn == YYFLAG)
28486 + if (yyn == 0 || yyn == YYTABLE_NINF)
28487 goto yyerrlab;
28488 yyn = -yyn;
28489 goto yyreduce;
28490 }
28491 - else if (yyn == 0)
28492 - goto yyerrlab;
28493
28494 if (yyn == YYFINAL)
28495 YYACCEPT;
28496
28497 /* Shift the lookahead token. */
28498 -
28499 -#if YYDEBUG != 0
28500 - if (yydebug)
28501 - fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
28502 -#endif
28503 + YYDPRINTF ((stderr, "Shifting token %s, ", yytname[yytoken]));
28504
28505 /* Discard the token being shifted unless it is eof. */
28506 if (yychar != YYEOF)
28507 yychar = YYEMPTY;
28508
28509 *++yyvsp = yylval;
28510 -#ifdef YYLSP_NEEDED
28511 - *++yylsp = yylloc;
28512 -#endif
28513
28514 - /* count tokens shifted since error; after three, turn off error status. */
28515 - if (yyerrstatus) yyerrstatus--;
28516 +
28517 + /* Count tokens shifted since error; after three, turn off error
28518 + status. */
28519 + if (yyerrstatus)
28520 + yyerrstatus--;
28521
28522 yystate = yyn;
28523 goto yynewstate;
28524
28525 -/* Do the default action for the current state. */
28526 -yydefault:
28527
28528 +/*-----------------------------------------------------------.
28529 +| yydefault -- do the default action for the current state. |
28530 +`-----------------------------------------------------------*/
28531 +yydefault:
28532 yyn = yydefact[yystate];
28533 if (yyn == 0)
28534 goto yyerrlab;
28535 + goto yyreduce;
28536 +
28537
28538 -/* Do a reduction. yyn is the number of a rule to reduce with. */
28539 +/*-----------------------------.
28540 +| yyreduce -- Do a reduction. |
28541 +`-----------------------------*/
28542 yyreduce:
28543 + /* yyn is the number of a rule to reduce with. */
28544 yylen = yyr2[yyn];
28545 - if (yylen > 0)
28546 - yyval = yyvsp[1-yylen]; /* implement default value of the action */
28547
28548 -#if YYDEBUG != 0
28549 - if (yydebug)
28550 - {
28551 - int i;
28552 + /* If YYLEN is nonzero, implement the default value of the action:
28553 + `$$ = $1'.
28554
28555 - fprintf (stderr, "Reducing via rule %d (line %d), ",
28556 - yyn, yyrline[yyn]);
28557 + Otherwise, the following line sets YYVAL to garbage.
28558 + This behavior is undocumented and Bison
28559 + users should not rely upon it. Assigning to YYVAL
28560 + unconditionally makes the parser a bit smaller, and it avoids a
28561 + GCC warning that YYVAL may be used uninitialized. */
28562 + yyval = yyvsp[1-yylen];
28563
28564 - /* Print the symbols being reduced, and their result. */
28565 - for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
28566 - fprintf (stderr, "%s ", yytname[yyrhs[i]]);
28567 - fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
28568 - }
28569 -#endif
28570
28571 -
28572 - switch (yyn) {
28573 -
28574 -case 4:
28575 -#line 47 "cfg_y.y"
28576 -{
28577 + YY_REDUCE_PRINT (yyn);
28578 + switch (yyn)
28579 + {
28580 + case 5:
28581 +#line 50 "cfg_y.y"
28582 + {
28583 control_init(yyvsp[-1].str);
28584 - ;
28585 - break;}
28586 -case 5:
28587 -#line 54 "cfg_y.y"
28588 -{
28589 + }
28590 + break;
28591 +
28592 + case 6:
28593 +#line 57 "cfg_y.y"
28594 + {
28595 fab_option(yyvsp[-1].str,yyvsp[0].str);
28596 - ;
28597 - break;}
28598 -case 6:
28599 -#line 61 "cfg_y.y"
28600 -{
28601 + }
28602 + break;
28603 +
28604 + case 7:
28605 +#line 64 "cfg_y.y"
28606 + {
28607 itf = 0;
28608 - ;
28609 - break;}
28610 -case 7:
28611 -#line 65 "cfg_y.y"
28612 -{
28613 + }
28614 + break;
28615 +
28616 + case 8:
28617 +#line 68 "cfg_y.y"
28618 + {
28619 char *tmp;
28620
28621 tmp = strdup(yyvsp[-3].str);
28622 if (!tmp) yyerror(strerror(errno));
28623 sig = sig_vc(yyvsp[-4].str,tmp,itf);
28624 - ;
28625 - break;}
28626 -case 9:
28627 -#line 77 "cfg_y.y"
28628 -{
28629 + }
28630 + break;
28631 +
28632 + case 10:
28633 +#line 80 "cfg_y.y"
28634 + {
28635 yyval.str = NULL;
28636 - ;
28637 - break;}
28638 -case 10:
28639 -#line 81 "cfg_y.y"
28640 -{
28641 + }
28642 + break;
28643 +
28644 + case 11:
28645 +#line 84 "cfg_y.y"
28646 + {
28647 yyval.str = strdup(yyvsp[0].str);
28648 if (!yyval.str) yyerror(strerror(errno));
28649 - ;
28650 - break;}
28651 -case 12:
28652 -#line 89 "cfg_y.y"
28653 -{
28654 + }
28655 + break;
28656 +
28657 + case 13:
28658 +#line 92 "cfg_y.y"
28659 + {
28660 itf = yyvsp[0].num;
28661 - ;
28662 - break;}
28663 -case 14:
28664 -#line 96 "cfg_y.y"
28665 -{
28666 + }
28667 + break;
28668 +
28669 + case 15:
28670 +#line 99 "cfg_y.y"
28671 + {
28672 sig->pvc = yyvsp[0].pvc;
28673 - ;
28674 - break;}
28675 -case 17:
28676 -#line 104 "cfg_y.y"
28677 -{
28678 + }
28679 + break;
28680 +
28681 + case 18:
28682 +#line 107 "cfg_y.y"
28683 + {
28684 put_route(NULL,0,sig);
28685 - ;
28686 - break;}
28687 -case 19:
28688 -#line 112 "cfg_y.y"
28689 -{
28690 + }
28691 + break;
28692 +
28693 + case 20:
28694 +#line 115 "cfg_y.y"
28695 + {
28696 struct sockaddr_atmsvc addr;
28697 char *mask;
28698
28699 @@ -790,228 +1124,236 @@
28700 return;
28701 }
28702 put_route(&addr,mask ? strtol(mask,NULL,10) : INT_MAX,sig);
28703 - ;
28704 - break;}
28705 -}
28706 - /* the action file gets copied in in place of this dollarsign */
28707 -#line 543 "/usr/lib/bison.simple"
28708 + }
28709 + break;
28710 +
28711 +
28712 + }
28713 +
28714 +/* Line 1010 of yacc.c. */
28715 +#line 1135 "y.tab.c"
28716 \f
28717 yyvsp -= yylen;
28718 yyssp -= yylen;
28719 -#ifdef YYLSP_NEEDED
28720 - yylsp -= yylen;
28721 -#endif
28722
28723 -#if YYDEBUG != 0
28724 - if (yydebug)
28725 - {
28726 - short *ssp1 = yyss - 1;
28727 - fprintf (stderr, "state stack now");
28728 - while (ssp1 != yyssp)
28729 - fprintf (stderr, " %d", *++ssp1);
28730 - fprintf (stderr, "\n");
28731 - }
28732 -#endif
28733 +
28734 + YY_STACK_PRINT (yyss, yyssp);
28735
28736 *++yyvsp = yyval;
28737
28738 -#ifdef YYLSP_NEEDED
28739 - yylsp++;
28740 - if (yylen == 0)
28741 - {
28742 - yylsp->first_line = yylloc.first_line;
28743 - yylsp->first_column = yylloc.first_column;
28744 - yylsp->last_line = (yylsp-1)->last_line;
28745 - yylsp->last_column = (yylsp-1)->last_column;
28746 - yylsp->text = 0;
28747 - }
28748 - else
28749 - {
28750 - yylsp->last_line = (yylsp+yylen-1)->last_line;
28751 - yylsp->last_column = (yylsp+yylen-1)->last_column;
28752 - }
28753 -#endif
28754
28755 - /* Now "shift" the result of the reduction.
28756 - Determine what state that goes to,
28757 - based on the state we popped back to
28758 - and the rule number reduced by. */
28759 + /* Now `shift' the result of the reduction. Determine what state
28760 + that goes to, based on the state we popped back to and the rule
28761 + number reduced by. */
28762
28763 yyn = yyr1[yyn];
28764
28765 - yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
28766 - if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
28767 + yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
28768 + if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
28769 yystate = yytable[yystate];
28770 else
28771 - yystate = yydefgoto[yyn - YYNTBASE];
28772 + yystate = yydefgoto[yyn - YYNTOKENS];
28773
28774 goto yynewstate;
28775
28776 -yyerrlab: /* here on detecting error */
28777
28778 - if (! yyerrstatus)
28779 - /* If not already recovering from an error, report this error. */
28780 +/*------------------------------------.
28781 +| yyerrlab -- here on detecting error |
28782 +`------------------------------------*/
28783 +yyerrlab:
28784 + /* If not already recovering from an error, report this error. */
28785 + if (!yyerrstatus)
28786 {
28787 ++yynerrs;
28788 -
28789 -#ifdef YYERROR_VERBOSE
28790 +#if YYERROR_VERBOSE
28791 yyn = yypact[yystate];
28792
28793 - if (yyn > YYFLAG && yyn < YYLAST)
28794 + if (YYPACT_NINF < yyn && yyn < YYLAST)
28795 {
28796 - int size = 0;
28797 - char *msg;
28798 - int x, count;
28799 -
28800 - count = 0;
28801 - /* Start X at -yyn if nec to avoid negative indexes in yycheck. */
28802 - for (x = (yyn < 0 ? -yyn : 0);
28803 - x < (sizeof(yytname) / sizeof(char *)); x++)
28804 - if (yycheck[x + yyn] == x)
28805 - size += strlen(yytname[x]) + 15, count++;
28806 - msg = (char *) malloc(size + 15);
28807 - if (msg != 0)
28808 + YYSIZE_T yysize = 0;
28809 + int yytype = YYTRANSLATE (yychar);
28810 + const char* yyprefix;
28811 + char *yymsg;
28812 + int yyx;
28813 +
28814 + /* Start YYX at -YYN if negative to avoid negative indexes in
28815 + YYCHECK. */
28816 + int yyxbegin = yyn < 0 ? -yyn : 0;
28817 +
28818 + /* Stay within bounds of both yycheck and yytname. */
28819 + int yychecklim = YYLAST - yyn;
28820 + int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
28821 + int yycount = 0;
28822 +
28823 + yyprefix = ", expecting ";
28824 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
28825 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
28826 + {
28827 + yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
28828 + yycount += 1;
28829 + if (yycount == 5)
28830 + {
28831 + yysize = 0;
28832 + break;
28833 + }
28834 + }
28835 + yysize += (sizeof ("syntax error, unexpected ")
28836 + + yystrlen (yytname[yytype]));
28837 + yymsg = (char *) YYSTACK_ALLOC (yysize);
28838 + if (yymsg != 0)
28839 {
28840 - strcpy(msg, "parse error");
28841 + char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
28842 + yyp = yystpcpy (yyp, yytname[yytype]);
28843
28844 - if (count < 5)
28845 + if (yycount < 5)
28846 {
28847 - count = 0;
28848 - for (x = (yyn < 0 ? -yyn : 0);
28849 - x < (sizeof(yytname) / sizeof(char *)); x++)
28850 - if (yycheck[x + yyn] == x)
28851 + yyprefix = ", expecting ";
28852 + for (yyx = yyxbegin; yyx < yyxend; ++yyx)
28853 + if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
28854 {
28855 - strcat(msg, count == 0 ? ", expecting `" : " or `");
28856 - strcat(msg, yytname[x]);
28857 - strcat(msg, "'");
28858 - count++;
28859 + yyp = yystpcpy (yyp, yyprefix);
28860 + yyp = yystpcpy (yyp, yytname[yyx]);
28861 + yyprefix = " or ";
28862 }
28863 }
28864 - yyerror(msg);
28865 - free(msg);
28866 + yyerror (yymsg);
28867 + YYSTACK_FREE (yymsg);
28868 }
28869 else
28870 - yyerror ("parse error; also virtual memory exceeded");
28871 + yyerror ("syntax error; also virtual memory exhausted");
28872 }
28873 else
28874 #endif /* YYERROR_VERBOSE */
28875 - yyerror("parse error");
28876 + yyerror ("syntax error");
28877 }
28878
28879 - goto yyerrlab1;
28880 -yyerrlab1: /* here on error raised explicitly by an action */
28881 +
28882
28883 if (yyerrstatus == 3)
28884 {
28885 - /* if just tried and failed to reuse lookahead token after an error, discard it. */
28886 + /* If just tried and failed to reuse lookahead token after an
28887 + error, discard it. */
28888
28889 - /* return failure if at end of input */
28890 - if (yychar == YYEOF)
28891 - YYABORT;
28892 -
28893 -#if YYDEBUG != 0
28894 - if (yydebug)
28895 - fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
28896 -#endif
28897 + if (yychar <= YYEOF)
28898 + {
28899 + /* If at end of input, pop the error token,
28900 + then the rest of the stack, then return failure. */
28901 + if (yychar == YYEOF)
28902 + for (;;)
28903 + {
28904 + YYPOPSTACK;
28905 + if (yyssp == yyss)
28906 + YYABORT;
28907 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
28908 + yydestruct (yystos[*yyssp], yyvsp);
28909 + }
28910 + }
28911 + else
28912 + {
28913 + YYDSYMPRINTF ("Error: discarding", yytoken, &yylval, &yylloc);
28914 + yydestruct (yytoken, &yylval);
28915 + yychar = YYEMPTY;
28916
28917 - yychar = YYEMPTY;
28918 + }
28919 }
28920
28921 - /* Else will try to reuse lookahead token
28922 - after shifting the error token. */
28923 -
28924 - yyerrstatus = 3; /* Each real token shifted decrements this */
28925 + /* Else will try to reuse lookahead token after shifting the error
28926 + token. */
28927 + goto yyerrlab1;
28928
28929 - goto yyerrhandle;
28930
28931 -yyerrdefault: /* current state does not do anything special for the error token. */
28932 +/*---------------------------------------------------.
28933 +| yyerrorlab -- error raised explicitly by YYERROR. |
28934 +`---------------------------------------------------*/
28935 +yyerrorlab:
28936
28937 -#if 0
28938 - /* This is wrong; only states that explicitly want error tokens
28939 - should shift them. */
28940 - yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/
28941 - if (yyn) goto yydefault;
28942 +#ifdef __GNUC__
28943 + /* Pacify GCC when the user code never invokes YYERROR and the label
28944 + yyerrorlab therefore never appears in user code. */
28945 + if (0)
28946 + goto yyerrorlab;
28947 #endif
28948
28949 -yyerrpop: /* pop the current state because it cannot handle the error token */
28950 -
28951 - if (yyssp == yyss) YYABORT;
28952 - yyvsp--;
28953 - yystate = *--yyssp;
28954 -#ifdef YYLSP_NEEDED
28955 - yylsp--;
28956 -#endif
28957 + yyvsp -= yylen;
28958 + yyssp -= yylen;
28959 + yystate = *yyssp;
28960 + goto yyerrlab1;
28961
28962 -#if YYDEBUG != 0
28963 - if (yydebug)
28964 - {
28965 - short *ssp1 = yyss - 1;
28966 - fprintf (stderr, "Error: state stack now");
28967 - while (ssp1 != yyssp)
28968 - fprintf (stderr, " %d", *++ssp1);
28969 - fprintf (stderr, "\n");
28970 - }
28971 -#endif
28972
28973 -yyerrhandle:
28974 +/*-------------------------------------------------------------.
28975 +| yyerrlab1 -- common code for both syntax error and YYERROR. |
28976 +`-------------------------------------------------------------*/
28977 +yyerrlab1:
28978 + yyerrstatus = 3; /* Each real token shifted decrements this. */
28979
28980 - yyn = yypact[yystate];
28981 - if (yyn == YYFLAG)
28982 - goto yyerrdefault;
28983 + for (;;)
28984 + {
28985 + yyn = yypact[yystate];
28986 + if (yyn != YYPACT_NINF)
28987 + {
28988 + yyn += YYTERROR;
28989 + if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
28990 + {
28991 + yyn = yytable[yyn];
28992 + if (0 < yyn)
28993 + break;
28994 + }
28995 + }
28996
28997 - yyn += YYTERROR;
28998 - if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
28999 - goto yyerrdefault;
29000 + /* Pop the current state because it cannot handle the error token. */
29001 + if (yyssp == yyss)
29002 + YYABORT;
29003
29004 - yyn = yytable[yyn];
29005 - if (yyn < 0)
29006 - {
29007 - if (yyn == YYFLAG)
29008 - goto yyerrpop;
29009 - yyn = -yyn;
29010 - goto yyreduce;
29011 + YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
29012 + yydestruct (yystos[yystate], yyvsp);
29013 + YYPOPSTACK;
29014 + yystate = *yyssp;
29015 + YY_STACK_PRINT (yyss, yyssp);
29016 }
29017 - else if (yyn == 0)
29018 - goto yyerrpop;
29019
29020 if (yyn == YYFINAL)
29021 YYACCEPT;
29022
29023 -#if YYDEBUG != 0
29024 - if (yydebug)
29025 - fprintf(stderr, "Shifting error token, ");
29026 -#endif
29027 + YYDPRINTF ((stderr, "Shifting error token, "));
29028
29029 *++yyvsp = yylval;
29030 -#ifdef YYLSP_NEEDED
29031 - *++yylsp = yylloc;
29032 -#endif
29033 +
29034
29035 yystate = yyn;
29036 goto yynewstate;
29037
29038 - yyacceptlab:
29039 - /* YYACCEPT comes here. */
29040 - if (yyfree_stacks)
29041 - {
29042 - free (yyss);
29043 - free (yyvs);
29044 -#ifdef YYLSP_NEEDED
29045 - free (yyls);
29046 -#endif
29047 - }
29048 - return 0;
29049
29050 - yyabortlab:
29051 - /* YYABORT comes here. */
29052 - if (yyfree_stacks)
29053 - {
29054 - free (yyss);
29055 - free (yyvs);
29056 -#ifdef YYLSP_NEEDED
29057 - free (yyls);
29058 +/*-------------------------------------.
29059 +| yyacceptlab -- YYACCEPT comes here. |
29060 +`-------------------------------------*/
29061 +yyacceptlab:
29062 + yyresult = 0;
29063 + goto yyreturn;
29064 +
29065 +/*-----------------------------------.
29066 +| yyabortlab -- YYABORT comes here. |
29067 +`-----------------------------------*/
29068 +yyabortlab:
29069 + yyresult = 1;
29070 + goto yyreturn;
29071 +
29072 +#ifndef yyoverflow
29073 +/*----------------------------------------------.
29074 +| yyoverflowlab -- parser overflow comes here. |
29075 +`----------------------------------------------*/
29076 +yyoverflowlab:
29077 + yyerror ("parser stack overflow");
29078 + yyresult = 2;
29079 + /* Fall through. */
29080 +#endif
29081 +
29082 +yyreturn:
29083 +#ifndef yyoverflow
29084 + if (yyss != yyssa)
29085 + YYSTACK_FREE (yyss);
29086 #endif
29087 - }
29088 - return 1;
29089 + return yyresult;
29090 }
29091 -#line 126 "cfg_y.y"
29092 +
29093 +
29094 +
29095 Index: linux-atm-2.4.1/src/switch/cfg_y.y
29096 ===================================================================
29097 --- linux-atm-2.4.1.orig/src/switch/cfg_y.y 2007-06-04 13:23:54.229489760 +0200
29098 +++ linux-atm-2.4.1/src/switch/cfg_y.y 2007-06-04 13:23:54.505447808 +0200
29099 @@ -10,6 +10,7 @@
29100 #include <string.h>
29101 #include <errno.h>
29102 #include <limits.h>
29103 +#include <stdlib.h>
29104
29105 #include "atm.h"
29106
29107 @@ -19,6 +20,8 @@
29108 #include "swc.h"
29109
29110
29111 +extern void yyerror(const char *s);
29112 +
29113 static int itf;
29114 static SIGNALING_ENTITY *sig;
29115
29116 Index: linux-atm-2.4.1/src/switch/cfg_y.h
29117 ===================================================================
29118 --- linux-atm-2.4.1.orig/src/switch/cfg_y.h 2007-06-04 13:23:54.234489000 +0200
29119 +++ linux-atm-2.4.1/src/switch/cfg_y.h 2007-06-04 13:23:54.505447808 +0200
29120 @@ -1,19 +1,77 @@
29121 -typedef union {
29122 +/* A Bison parser, made by GNU Bison 1.875d. */
29123 +
29124 +/* Skeleton parser for Yacc-like parsing with Bison,
29125 + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
29126 +
29127 + This program is free software; you can redistribute it and/or modify
29128 + it under the terms of the GNU General Public License as published by
29129 + the Free Software Foundation; either version 2, or (at your option)
29130 + any later version.
29131 +
29132 + This program is distributed in the hope that it will be useful,
29133 + but WITHOUT ANY WARRANTY; without even the implied warranty of
29134 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
29135 + GNU General Public License for more details.
29136 +
29137 + You should have received a copy of the GNU General Public License
29138 + along with this program; if not, write to the Free Software
29139 + Foundation, Inc., 59 Temple Place - Suite 330,
29140 + Boston, MA 02111-1307, USA. */
29141 +
29142 +/* As a special exception, when this file is copied by Bison into a
29143 + Bison output file, you may use that output file without restriction.
29144 + This special exception was added by the Free Software Foundation
29145 + in version 1.24 of Bison. */
29146 +
29147 +/* Tokens. */
29148 +#ifndef YYTOKENTYPE
29149 +# define YYTOKENTYPE
29150 + /* Put the tokens into the symbol table, so that GDB and other debuggers
29151 + know about them. */
29152 + enum yytokentype {
29153 + TOK_COMMAND = 258,
29154 + TOK_VPCI = 259,
29155 + TOK_ITF = 260,
29156 + TOK_DEFAULT = 261,
29157 + TOK_ROUTE = 262,
29158 + TOK_STR = 263,
29159 + TOK_SOCKET = 264,
29160 + TOK_OPTION = 265,
29161 + TOK_CONTROL = 266,
29162 + TOK_NUM = 267,
29163 + TOK_PVC = 268
29164 + };
29165 +#endif
29166 +#define TOK_COMMAND 258
29167 +#define TOK_VPCI 259
29168 +#define TOK_ITF 260
29169 +#define TOK_DEFAULT 261
29170 +#define TOK_ROUTE 262
29171 +#define TOK_STR 263
29172 +#define TOK_SOCKET 264
29173 +#define TOK_OPTION 265
29174 +#define TOK_CONTROL 266
29175 +#define TOK_NUM 267
29176 +#define TOK_PVC 268
29177 +
29178 +
29179 +
29180 +
29181 +#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
29182 +#line 30 "cfg_y.y"
29183 +typedef union YYSTYPE {
29184 int num;
29185 char *str;
29186 struct sockaddr_atmpvc pvc;
29187 } YYSTYPE;
29188 -#define TOK_COMMAND 257
29189 -#define TOK_VPCI 258
29190 -#define TOK_ITF 259
29191 -#define TOK_DEFAULT 260
29192 -#define TOK_ROUTE 261
29193 -#define TOK_STR 262
29194 -#define TOK_SOCKET 263
29195 -#define TOK_OPTION 264
29196 -#define TOK_CONTROL 265
29197 -#define TOK_NUM 266
29198 -#define TOK_PVC 267
29199 -
29200 +/* Line 1285 of yacc.c. */
29201 +#line 69 "y.tab.h"
29202 +# define yystype YYSTYPE /* obsolescent; will be withdrawn */
29203 +# define YYSTYPE_IS_DECLARED 1
29204 +# define YYSTYPE_IS_TRIVIAL 1
29205 +#endif
29206
29207 extern YYSTYPE yylval;
29208 +
29209 +
29210 +
29211 Index: linux-atm-2.4.1/src/switch/debug/Makefile.in
29212 ===================================================================
29213 --- linux-atm-2.4.1.orig/src/switch/debug/Makefile.in 2007-06-04 13:23:54.239488240 +0200
29214 +++ linux-atm-2.4.1/src/switch/debug/Makefile.in 2007-06-04 13:23:54.506447656 +0200
29215 @@ -1,4 +1,4 @@
29216 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29217 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29218
29219 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29220 # This Makefile.in is free software; the Free Software Foundation
29221 @@ -90,8 +90,7 @@
29222 INCLUDES = -I$(top_builddir)/src/qgen
29223
29224 sw_debug_SOURCES = debug.c
29225 -sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a \
29226 - $(top_builddir)/src/lib/libatm.la
29227 +sw_debug_XTRAS = $(top_builddir)/src/switch/libsw.a $(top_builddir)/src/lib/libatm.la
29228
29229 sw_debug_LDADD = $(sw_debug_XTRAS) -lfl
29230
29231 @@ -121,8 +120,9 @@
29232
29233 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29234
29235 -TAR = gtar
29236 +TAR = tar
29237 GZIP_ENV = --best
29238 +DEP_FILES = .deps/debug.P
29239 SOURCES = $(sw_debug_SOURCES)
29240 OBJECTS = $(sw_debug_OBJECTS)
29241
29242 @@ -130,9 +130,9 @@
29243 .SUFFIXES:
29244 .SUFFIXES: .S .c .lo .o .obj .s
29245 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29246 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/switch/debug/Makefile
29247 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/switch/debug/Makefile
29248
29249 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29250 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29251 cd $(top_builddir) \
29252 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29253
29254 @@ -146,9 +146,6 @@
29255
29256 maintainer-clean-noinstPROGRAMS:
29257
29258 -.c.o:
29259 - $(COMPILE) -c $<
29260 -
29261 # FIXME: We should only use cygpath when building on Windows,
29262 # and only if it is available.
29263 .c.obj:
29264 @@ -171,9 +168,6 @@
29265
29266 maintainer-clean-compile:
29267
29268 -.c.lo:
29269 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29270 -
29271 .s.lo:
29272 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29273
29274 @@ -212,7 +206,7 @@
29275 awk ' { files[$$0] = 1; } \
29276 END { for (i in files) print i; }'`; \
29277 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
29278 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
29279 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
29280
29281 mostlyclean-tags:
29282
29283 @@ -228,6 +222,11 @@
29284 subdir = src/switch/debug
29285
29286 distdir: $(DISTFILES)
29287 + here=`cd $(top_builddir) && pwd`; \
29288 + top_distdir=`cd $(top_distdir) && pwd`; \
29289 + distdir=`cd $(distdir) && pwd`; \
29290 + cd $(top_srcdir) \
29291 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/switch/debug/Makefile
29292 @for file in $(DISTFILES); do \
29293 d=$(srcdir); \
29294 if test -d $$d/$$file; then \
29295 @@ -238,11 +237,38 @@
29296 || cp -p $$d/$$file $(distdir)/$$file || :; \
29297 fi; \
29298 done
29299 -debug.o: debug.c ../../../config.h ../../../src/include/atm.h \
29300 - ../../../src/include/stdint.h ../../../src/include/atmd.h \
29301 - ../../../src/qgen/uni.h ../fab.h ../proto.h \
29302 - ../../../src/include/atmsap.h ../sig.h
29303
29304 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
29305 +
29306 +-include $(DEP_FILES)
29307 +
29308 +mostlyclean-depend:
29309 +
29310 +clean-depend:
29311 +
29312 +distclean-depend:
29313 + -rm -rf .deps
29314 +
29315 +maintainer-clean-depend:
29316 +
29317 +%.o: %.c
29318 + @echo '$(COMPILE) -c $<'; \
29319 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
29320 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
29321 + tr ' ' '\012' < .deps/$(*F).pp \
29322 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
29323 + >> .deps/$(*F).P; \
29324 + rm .deps/$(*F).pp
29325 +
29326 +%.lo: %.c
29327 + @echo '$(LTCOMPILE) -c $<'; \
29328 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
29329 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
29330 + < .deps/$(*F).pp > .deps/$(*F).P; \
29331 + tr ' ' '\012' < .deps/$(*F).pp \
29332 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
29333 + >> .deps/$(*F).P; \
29334 + rm -f .deps/$(*F).pp
29335 info-am:
29336 info: info-am
29337 dvi-am:
29338 @@ -279,27 +305,27 @@
29339
29340 maintainer-clean-generic:
29341 mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \
29342 - mostlyclean-libtool mostlyclean-tags \
29343 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
29344 mostlyclean-generic
29345
29346 mostlyclean: mostlyclean-am
29347
29348 clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
29349 - clean-generic mostlyclean-am
29350 + clean-depend clean-generic mostlyclean-am
29351
29352 clean: clean-am
29353
29354 distclean-am: distclean-noinstPROGRAMS distclean-compile \
29355 - distclean-libtool distclean-tags distclean-generic \
29356 - clean-am
29357 + distclean-libtool distclean-tags distclean-depend \
29358 + distclean-generic clean-am
29359 -rm -f libtool
29360
29361 distclean: distclean-am
29362
29363 maintainer-clean-am: maintainer-clean-noinstPROGRAMS \
29364 maintainer-clean-compile maintainer-clean-libtool \
29365 - maintainer-clean-tags maintainer-clean-generic \
29366 - distclean-am
29367 + maintainer-clean-tags maintainer-clean-depend \
29368 + maintainer-clean-generic distclean-am
29369 @echo "This command is intended for maintainers to use;"
29370 @echo "it deletes files that may require special tools to rebuild."
29371
29372 @@ -310,12 +336,14 @@
29373 mostlyclean-compile distclean-compile clean-compile \
29374 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
29375 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
29376 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
29377 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
29378 -install-exec install-data-am install-data install-am install \
29379 -uninstall-am uninstall all-redirect all-am all installdirs \
29380 -mostlyclean-generic distclean-generic clean-generic \
29381 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
29382 +distclean-tags clean-tags maintainer-clean-tags distdir \
29383 +mostlyclean-depend distclean-depend clean-depend \
29384 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
29385 +installcheck-am installcheck install-exec-am install-exec \
29386 +install-data-am install-data install-am install uninstall-am uninstall \
29387 +all-redirect all-am all installdirs mostlyclean-generic \
29388 +distclean-generic clean-generic maintainer-clean-generic clean \
29389 +mostlyclean distclean maintainer-clean
29390
29391
29392 # Tell versions [3.59,3.63) of GNU make to not export all variables.
29393 Index: linux-atm-2.4.1/src/switch/debug/debug.c
29394 ===================================================================
29395 --- linux-atm-2.4.1.orig/src/switch/debug/debug.c 2007-06-04 13:23:54.246487176 +0200
29396 +++ linux-atm-2.4.1/src/switch/debug/debug.c 2007-06-04 13:23:54.506447656 +0200
29397 @@ -43,7 +43,7 @@
29398
29399 void fab_init(CALL *call)
29400 {
29401 - PRV(call) = alloc_t(FAB);
29402 + call->fab = alloc_t(FAB);
29403 PRV(call)->next = calls;
29404 calls = call;
29405 }
29406 @@ -59,7 +59,7 @@
29407 diag(COMPONENT,DIAG_FATAL,"fab_destroy: call %p not found",call);
29408 *walk = PRV(call)->next;
29409 free(PRV(call));
29410 - PRV(call) = NULL;
29411 + call->fab = NULL;
29412 }
29413
29414
29415 Index: linux-atm-2.4.1/src/switch/tcp/Makefile.in
29416 ===================================================================
29417 --- linux-atm-2.4.1.orig/src/switch/tcp/Makefile.in 2007-06-04 13:23:54.252486264 +0200
29418 +++ linux-atm-2.4.1/src/switch/tcp/Makefile.in 2007-06-04 13:23:54.506447656 +0200
29419 @@ -1,4 +1,4 @@
29420 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29421 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29422
29423 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29424 # This Makefile.in is free software; the Free Software Foundation
29425 @@ -90,8 +90,7 @@
29426 INCLUDES = -I$(top_builddir)/src/qgen
29427
29428 sw_tcp_SOURCES = tcpsw.c
29429 -sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a \
29430 - $(top_builddir)/src/lib/libatm.la
29431 +sw_tcp_XTRAS = $(top_builddir)/src/switch/libsw.a $(top_builddir)/src/lib/libatm.la
29432
29433 sw_tcp_LDADD = $(sw_tcp_XTRAS) -lfl
29434 sw_tcp_DEPENDENCIES = $(sw_tcp_XTRAS)
29435 @@ -120,8 +119,9 @@
29436
29437 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29438
29439 -TAR = gtar
29440 +TAR = tar
29441 GZIP_ENV = --best
29442 +DEP_FILES = .deps/tcpsw.P
29443 SOURCES = $(sw_tcp_SOURCES)
29444 OBJECTS = $(sw_tcp_OBJECTS)
29445
29446 @@ -129,9 +129,9 @@
29447 .SUFFIXES:
29448 .SUFFIXES: .S .c .lo .o .obj .s
29449 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29450 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/switch/tcp/Makefile
29451 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/switch/tcp/Makefile
29452
29453 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29454 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29455 cd $(top_builddir) \
29456 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29457
29458 @@ -145,9 +145,6 @@
29459
29460 maintainer-clean-noinstPROGRAMS:
29461
29462 -.c.o:
29463 - $(COMPILE) -c $<
29464 -
29465 # FIXME: We should only use cygpath when building on Windows,
29466 # and only if it is available.
29467 .c.obj:
29468 @@ -170,9 +167,6 @@
29469
29470 maintainer-clean-compile:
29471
29472 -.c.lo:
29473 - $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29474 -
29475 .s.lo:
29476 $(LIBTOOL) --mode=compile $(COMPILE) -c $<
29477
29478 @@ -211,7 +205,7 @@
29479 awk ' { files[$$0] = 1; } \
29480 END { for (i in files) print i; }'`; \
29481 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
29482 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
29483 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
29484
29485 mostlyclean-tags:
29486
29487 @@ -227,6 +221,11 @@
29488 subdir = src/switch/tcp
29489
29490 distdir: $(DISTFILES)
29491 + here=`cd $(top_builddir) && pwd`; \
29492 + top_distdir=`cd $(top_distdir) && pwd`; \
29493 + distdir=`cd $(distdir) && pwd`; \
29494 + cd $(top_srcdir) \
29495 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/switch/tcp/Makefile
29496 @for file in $(DISTFILES); do \
29497 d=$(srcdir); \
29498 if test -d $$d/$$file; then \
29499 @@ -237,11 +236,38 @@
29500 || cp -p $$d/$$file $(distdir)/$$file || :; \
29501 fi; \
29502 done
29503 -tcpsw.o: tcpsw.c ../../../config.h ../../../src/include/stdint.h \
29504 - ../../../src/include/atm.h ../../../src/include/atmd.h \
29505 - ../../../src/qgen/uni.h ../fab.h ../proto.h \
29506 - ../../../src/include/atmsap.h ../sig.h ../dispatch.h ../swc.h
29507
29508 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
29509 +
29510 +-include $(DEP_FILES)
29511 +
29512 +mostlyclean-depend:
29513 +
29514 +clean-depend:
29515 +
29516 +distclean-depend:
29517 + -rm -rf .deps
29518 +
29519 +maintainer-clean-depend:
29520 +
29521 +%.o: %.c
29522 + @echo '$(COMPILE) -c $<'; \
29523 + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
29524 + @-cp .deps/$(*F).pp .deps/$(*F).P; \
29525 + tr ' ' '\012' < .deps/$(*F).pp \
29526 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
29527 + >> .deps/$(*F).P; \
29528 + rm .deps/$(*F).pp
29529 +
29530 +%.lo: %.c
29531 + @echo '$(LTCOMPILE) -c $<'; \
29532 + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
29533 + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
29534 + < .deps/$(*F).pp > .deps/$(*F).P; \
29535 + tr ' ' '\012' < .deps/$(*F).pp \
29536 + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
29537 + >> .deps/$(*F).P; \
29538 + rm -f .deps/$(*F).pp
29539 info-am:
29540 info: info-am
29541 dvi-am:
29542 @@ -278,27 +304,27 @@
29543
29544 maintainer-clean-generic:
29545 mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \
29546 - mostlyclean-libtool mostlyclean-tags \
29547 + mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
29548 mostlyclean-generic
29549
29550 mostlyclean: mostlyclean-am
29551
29552 clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
29553 - clean-generic mostlyclean-am
29554 + clean-depend clean-generic mostlyclean-am
29555
29556 clean: clean-am
29557
29558 distclean-am: distclean-noinstPROGRAMS distclean-compile \
29559 - distclean-libtool distclean-tags distclean-generic \
29560 - clean-am
29561 + distclean-libtool distclean-tags distclean-depend \
29562 + distclean-generic clean-am
29563 -rm -f libtool
29564
29565 distclean: distclean-am
29566
29567 maintainer-clean-am: maintainer-clean-noinstPROGRAMS \
29568 maintainer-clean-compile maintainer-clean-libtool \
29569 - maintainer-clean-tags maintainer-clean-generic \
29570 - distclean-am
29571 + maintainer-clean-tags maintainer-clean-depend \
29572 + maintainer-clean-generic distclean-am
29573 @echo "This command is intended for maintainers to use;"
29574 @echo "it deletes files that may require special tools to rebuild."
29575
29576 @@ -309,12 +335,14 @@
29577 mostlyclean-compile distclean-compile clean-compile \
29578 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
29579 clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
29580 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
29581 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
29582 -install-exec install-data-am install-data install-am install \
29583 -uninstall-am uninstall all-redirect all-am all installdirs \
29584 -mostlyclean-generic distclean-generic clean-generic \
29585 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
29586 +distclean-tags clean-tags maintainer-clean-tags distdir \
29587 +mostlyclean-depend distclean-depend clean-depend \
29588 +maintainer-clean-depend info-am info dvi-am dvi check check-am \
29589 +installcheck-am installcheck install-exec-am install-exec \
29590 +install-data-am install-data install-am install uninstall-am uninstall \
29591 +all-redirect all-am all installdirs mostlyclean-generic \
29592 +distclean-generic clean-generic maintainer-clean-generic clean \
29593 +mostlyclean distclean maintainer-clean
29594
29595
29596 # Tell versions [3.59,3.63) of GNU make to not export all variables.
29597 Index: linux-atm-2.4.1/src/switch/tcp/tcpsw.c
29598 ===================================================================
29599 --- linux-atm-2.4.1.orig/src/switch/tcp/tcpsw.c 2007-06-04 13:23:54.259485200 +0200
29600 +++ linux-atm-2.4.1/src/switch/tcp/tcpsw.c 2007-06-04 13:23:54.507447504 +0200
29601 @@ -345,7 +345,7 @@
29602
29603 void fab_init(CALL *call)
29604 {
29605 - PRV(call) = alloc_t(FAB);
29606 + call->fab = alloc_t(FAB);
29607 PRV(call)->active = 0;
29608 PRV(call)->next = calls;
29609 calls = call;
29610 @@ -362,7 +362,7 @@
29611 diag(COMPONENT,DIAG_FATAL,"fab_destroy: call %p not found",call);
29612 *walk = PRV(call)->next;
29613 free(PRV(call));
29614 - PRV(call) = NULL;
29615 + call->fab = NULL;
29616 }
29617
29618
29619 Index: linux-atm-2.4.1/src/config/Makefile.in
29620 ===================================================================
29621 --- linux-atm-2.4.1.orig/src/config/Makefile.in 2007-06-04 13:23:54.264484440 +0200
29622 +++ linux-atm-2.4.1/src/config/Makefile.in 2007-06-04 13:23:54.507447504 +0200
29623 @@ -1,4 +1,4 @@
29624 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29625 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29626
29627 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29628 # This Makefile.in is free software; the Free Software Foundation
29629 @@ -96,14 +96,14 @@
29630
29631 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29632
29633 -TAR = gtar
29634 +TAR = tar
29635 GZIP_ENV = --best
29636 all: all-redirect
29637 .SUFFIXES:
29638 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29639 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/config/Makefile
29640 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/config/Makefile
29641
29642 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29643 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29644 cd $(top_builddir) \
29645 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29646
29647 @@ -186,7 +186,7 @@
29648 awk ' { files[$$0] = 1; } \
29649 END { for (i in files) print i; }'`; \
29650 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
29651 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
29652 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
29653
29654 mostlyclean-tags:
29655
29656 @@ -202,6 +202,11 @@
29657 subdir = src/config
29658
29659 distdir: $(DISTFILES)
29660 + here=`cd $(top_builddir) && pwd`; \
29661 + top_distdir=`cd $(top_distdir) && pwd`; \
29662 + distdir=`cd $(distdir) && pwd`; \
29663 + cd $(top_srcdir) \
29664 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/config/Makefile
29665 @for file in $(DISTFILES); do \
29666 d=$(srcdir); \
29667 if test -d $$d/$$file; then \
29668 Index: linux-atm-2.4.1/src/config/init-redhat/Makefile.in
29669 ===================================================================
29670 --- linux-atm-2.4.1.orig/src/config/init-redhat/Makefile.in 2007-06-04 13:23:54.271483376 +0200
29671 +++ linux-atm-2.4.1/src/config/init-redhat/Makefile.in 2007-06-04 13:23:54.507447504 +0200
29672 @@ -1,4 +1,4 @@
29673 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29674 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29675
29676 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29677 # This Makefile.in is free software; the Free Software Foundation
29678 @@ -94,14 +94,14 @@
29679
29680 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29681
29682 -TAR = gtar
29683 +TAR = tar
29684 GZIP_ENV = --best
29685 all: all-redirect
29686 .SUFFIXES:
29687 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29688 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/config/init-redhat/Makefile
29689 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/config/init-redhat/Makefile
29690
29691 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29692 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29693 cd $(top_builddir) \
29694 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29695
29696 @@ -114,6 +114,11 @@
29697 subdir = src/config/init-redhat
29698
29699 distdir: $(DISTFILES)
29700 + here=`cd $(top_builddir) && pwd`; \
29701 + top_distdir=`cd $(top_distdir) && pwd`; \
29702 + distdir=`cd $(distdir) && pwd`; \
29703 + cd $(top_srcdir) \
29704 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/config/init-redhat/Makefile
29705 @for file in $(DISTFILES); do \
29706 d=$(srcdir); \
29707 if test -d $$d/$$file; then \
29708 Index: linux-atm-2.4.1/src/extra/Makefile.in
29709 ===================================================================
29710 --- linux-atm-2.4.1.orig/src/extra/Makefile.in 2007-06-04 13:23:54.277482464 +0200
29711 +++ linux-atm-2.4.1/src/extra/Makefile.in 2007-06-04 13:23:54.508447352 +0200
29712 @@ -1,4 +1,4 @@
29713 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29714 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29715
29716 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29717 # This Makefile.in is free software; the Free Software Foundation
29718 @@ -96,14 +96,14 @@
29719
29720 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29721
29722 -TAR = gtar
29723 +TAR = tar
29724 GZIP_ENV = --best
29725 all: all-redirect
29726 .SUFFIXES:
29727 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29728 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/extra/Makefile
29729 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/extra/Makefile
29730
29731 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29732 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29733 cd $(top_builddir) \
29734 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29735
29736 @@ -188,7 +188,7 @@
29737 awk ' { files[$$0] = 1; } \
29738 END { for (i in files) print i; }'`; \
29739 test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
29740 - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
29741 + || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
29742
29743 mostlyclean-tags:
29744
29745 @@ -204,6 +204,11 @@
29746 subdir = src/extra
29747
29748 distdir: $(DISTFILES)
29749 + here=`cd $(top_builddir) && pwd`; \
29750 + top_distdir=`cd $(top_distdir) && pwd`; \
29751 + distdir=`cd $(distdir) && pwd`; \
29752 + cd $(top_srcdir) \
29753 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/extra/Makefile
29754 @for file in $(DISTFILES); do \
29755 d=$(srcdir); \
29756 if test -d $$d/$$file; then \
29757 Index: linux-atm-2.4.1/src/extra/ANS/Makefile.in
29758 ===================================================================
29759 --- linux-atm-2.4.1.orig/src/extra/ANS/Makefile.in 2007-06-04 13:23:54.285481248 +0200
29760 +++ linux-atm-2.4.1/src/extra/ANS/Makefile.in 2007-06-04 13:23:54.508447352 +0200
29761 @@ -1,4 +1,4 @@
29762 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29763 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29764
29765 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29766 # This Makefile.in is free software; the Free Software Foundation
29767 @@ -94,14 +94,14 @@
29768
29769 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29770
29771 -TAR = gtar
29772 +TAR = tar
29773 GZIP_ENV = --best
29774 all: all-redirect
29775 .SUFFIXES:
29776 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29777 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/extra/ANS/Makefile
29778 + cd $(top_srcdir) && $(AUTOMAKE) --gnu src/extra/ANS/Makefile
29779
29780 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29781 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29782 cd $(top_builddir) \
29783 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29784
29785 @@ -114,6 +114,11 @@
29786 subdir = src/extra/ANS
29787
29788 distdir: $(DISTFILES)
29789 + here=`cd $(top_builddir) && pwd`; \
29790 + top_distdir=`cd $(top_distdir) && pwd`; \
29791 + distdir=`cd $(distdir) && pwd`; \
29792 + cd $(top_srcdir) \
29793 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/extra/ANS/Makefile
29794 @for file in $(DISTFILES); do \
29795 d=$(srcdir); \
29796 if test -d $$d/$$file; then \
29797 Index: linux-atm-2.4.1/doc/Makefile.in
29798 ===================================================================
29799 --- linux-atm-2.4.1.orig/doc/Makefile.in 2007-06-04 13:23:54.291480336 +0200
29800 +++ linux-atm-2.4.1/doc/Makefile.in 2007-06-04 13:23:54.509447200 +0200
29801 @@ -1,4 +1,4 @@
29802 -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
29803 +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
29804
29805 # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
29806 # This Makefile.in is free software; the Free Software Foundation
29807 @@ -96,14 +96,14 @@
29808
29809 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
29810
29811 -TAR = gtar
29812 +TAR = tar
29813 GZIP_ENV = --best
29814 all: all-redirect
29815 .SUFFIXES:
29816 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
29817 - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
29818 + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile
29819
29820 -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
29821 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
29822 cd $(top_builddir) \
29823 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
29824
29825 @@ -116,6 +116,11 @@
29826 subdir = doc
29827
29828 distdir: $(DISTFILES)
29829 + here=`cd $(top_builddir) && pwd`; \
29830 + top_distdir=`cd $(top_distdir) && pwd`; \
29831 + distdir=`cd $(distdir) && pwd`; \
29832 + cd $(top_srcdir) \
29833 + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile
29834 @for file in $(DISTFILES); do \
29835 d=$(srcdir); \
29836 if test -d $$d/$$file; then \
29837 Index: linux-atm-2.4.1/debian/patches/00list
29838 ===================================================================
29839 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
29840 +++ linux-atm-2.4.1/debian/patches/00list 2007-06-04 13:23:54.509447200 +0200
29841 @@ -0,0 +1 @@
29842 +10_atmbr2684.h
29843 Index: linux-atm-2.4.1/debian/patches/10_atmbr2684.h.dpatch
29844 ===================================================================
29845 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
29846 +++ linux-atm-2.4.1/debian/patches/10_atmbr2684.h.dpatch 2007-06-04 13:23:54.510447048 +0200
29847 @@ -0,0 +1,598 @@
29848 +#! /bin/sh -e
29849 +## 01_kernel-header.dpatch by <bengen+debian@hilluzination.de>
29850 +##
29851 +## All lines beginning with ## DP:' are a description of the patch.
29852 +## DP: add header file atmbr2684.h
29853 +
29854 +if [ -e /usr/include/linux/atmbr2684.h ]; then exit 0; fi
29855 +
29856 +if [ $# -ne 1 ]; then
29857 + echo "basename $0: script expects -patch|-unpatch as argument" >&2
29858 + exit 1
29859 +fi
29860 +case "$1" in
29861 + -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
29862 + -unpatch) patch -f --no-backup-if-mismatch -E -R -p1 < $0;;
29863 + *)
29864 + echo "basename $0: script expects -patch|-unpatch as argument" >&2
29865 + exit 1;;
29866 +esac
29867 +
29868 +exit 0
29869 +@DPATCH@
29870 +
29871 +--- linux-atm.orig/src/include/linux/atmbr2684.h
29872 ++++ linux-atm/src/include/linux/atmbr2684.h
29873 +@@ -0,0 +1,101 @@
29874 ++#ifndef _LINUX_ATMBR2684_H
29875 ++#define _LINUX_ATMBR2684_H
29876 ++
29877 ++#include <linux/atm.h>
29878 ++#include <linux/if.h> /* For IFNAMSIZ */
29879 ++
29880 ++/*
29881 ++ * Type of media we're bridging (ethernet, token ring, etc) Currently only
29882 ++ * ethernet is supported
29883 ++ */
29884 ++#define BR2684_MEDIA_ETHERNET (0) /* 802.3 */
29885 ++#define BR2684_MEDIA_802_4 (1) /* 802.4 */
29886 ++#define BR2684_MEDIA_TR (2) /* 802.5 - token ring */
29887 ++#define BR2684_MEDIA_FDDI (3)
29888 ++#define BR2684_MEDIA_802_6 (4) /* 802.6 */
29889 ++
29890 ++/*
29891 ++ * Is there FCS inbound on this VC? This currently isn't supported.
29892 ++ */
29893 ++#define BR2684_FCSIN_NO (0)
29894 ++#define BR2684_FCSIN_IGNORE (1)
29895 ++#define BR2684_FCSIN_VERIFY (2)
29896 ++
29897 ++/*
29898 ++ * Is there FCS outbound on this VC? This currently isn't supported.
29899 ++ */
29900 ++#define BR2684_FCSOUT_NO (0)
29901 ++#define BR2684_FCSOUT_SENDZERO (1)
29902 ++#define BR2684_FCSOUT_GENERATE (2)
29903 ++
29904 ++/*
29905 ++ * Does this VC include LLC encapsulation?
29906 ++ */
29907 ++#define BR2684_ENCAPS_VC (0) /* VC-mux */
29908 ++#define BR2684_ENCAPS_LLC (1)
29909 ++#define BR2684_ENCAPS_AUTODETECT (2) /* Unsuported */
29910 ++
29911 ++/*
29912 ++ * This is for the ATM_NEWBACKENDIF call - these are like socket families:
29913 ++ * the first element of the structure is the backend number and the rest
29914 ++ * is per-backend specific
29915 ++ */
29916 ++struct atm_newif_br2684 {
29917 ++ atm_backend_t backend_num; /* ATM_BACKEND_BR2684 */
29918 ++ int media; /* BR2684_MEDIA_* */
29919 ++ char ifname[IFNAMSIZ];
29920 ++ int mtu;
29921 ++};
29922 ++
29923 ++/*
29924 ++ * This structure is used to specify a br2684 interface - either by a
29925 ++ * positive integer (returned by ATM_NEWBACKENDIF) or the interfaces name
29926 ++ */
29927 ++#define BR2684_FIND_BYNOTHING (0)
29928 ++#define BR2684_FIND_BYNUM (1)
29929 ++#define BR2684_FIND_BYIFNAME (2)
29930 ++struct br2684_if_spec {
29931 ++ int method; /* BR2684_FIND_* */
29932 ++ union {
29933 ++ char ifname[IFNAMSIZ];
29934 ++ int devnum;
29935 ++ } spec;
29936 ++};
29937 ++
29938 ++/*
29939 ++ * This is for the ATM_SETBACKEND call - these are like socket families:
29940 ++ * the first element of the structure is the backend number and the rest
29941 ++ * is per-backend specific
29942 ++ */
29943 ++struct atm_backend_br2684 {
29944 ++ atm_backend_t backend_num; /* ATM_BACKEND_BR2684 */
29945 ++ struct br2684_if_spec ifspec;
29946 ++ int fcs_in; /* BR2684_FCSIN_* */
29947 ++ int fcs_out; /* BR2684_FCSOUT_* */
29948 ++ int fcs_auto; /* 1: fcs_{in,out} disabled if no FCS rx'ed */
29949 ++ int encaps; /* BR2684_ENCAPS_* */
29950 ++ int has_vpiid; /* 1: use vpn_id - Unsupported */
29951 ++ __u8 vpn_id[7];
29952 ++ int send_padding; /* unsupported */
29953 ++ int min_size; /* we will pad smaller packets than this */
29954 ++};
29955 ++
29956 ++/*
29957 ++ * The BR2684_SETFILT ioctl is an experimental mechanism for folks
29958 ++ * terminating a large number of IP-only vcc's. When netfilter allows
29959 ++ * efficient per-if in/out filters, this support will be removed
29960 ++ */
29961 ++struct br2684_filter {
29962 ++ __u32 prefix; /* network byte order */
29963 ++ __u32 netmask; /* 0 = disable filter */
29964 ++};
29965 ++
29966 ++struct br2684_filter_set {
29967 ++ struct br2684_if_spec ifspec;
29968 ++ struct br2684_filter filter;
29969 ++};
29970 ++
29971 ++#define BR2684_SETFILT _IOW( 'a', ATMIOC_BACKEND + 0, \
29972 ++ struct br2684_filter_set)
29973 ++
29974 ++#endif /* _LINUX_ATMBR2684_H */
29975 +--- linux-atm.orig/src/include/linux/atmdev.h
29976 ++++ linux-atm/src/include/linux/atmdev.h
29977 +@@ -0,0 +1,468 @@
29978 ++/* atmdev.h - ATM device driver declarations and various related items */
29979 ++
29980 ++/* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */
29981 ++
29982 ++
29983 ++#ifndef LINUX_ATMDEV_H
29984 ++#define LINUX_ATMDEV_H
29985 ++
29986 ++
29987 ++#include <linux/config.h>
29988 ++#include <linux/atmapi.h>
29989 ++#include <linux/atm.h>
29990 ++#include <linux/atmioc.h>
29991 ++
29992 ++
29993 ++#define ESI_LEN 6
29994 ++
29995 ++#define ATM_OC3_PCR (155520000/270*260/8/53)
29996 ++ /* OC3 link rate: 155520000 bps
29997 ++ SONET overhead: /270*260 (9 section, 1 path)
29998 ++ bits per cell: /8/53
29999 ++ max cell rate: 353207.547 cells/sec */
30000 ++#define ATM_25_PCR ((25600000/8-8000)/54)
30001 ++ /* 25 Mbps ATM cell rate (59111) */
30002 ++#define ATM_OC12_PCR (622080000/1080*1040/8/53)
30003 ++ /* OC12 link rate: 622080000 bps
30004 ++ SONET overhead: /1080*1040
30005 ++ bits per cell: /8/53
30006 ++ max cell rate: 1412830.188 cells/sec */
30007 ++#define ATM_DS3_PCR (8000*12)
30008 ++ /* DS3: 12 cells in a 125 usec time slot */
30009 ++
30010 ++#define ATM_SD(s) ((s)->sk->protinfo.af_atm)
30011 ++
30012 ++
30013 ++#define __AAL_STAT_ITEMS \
30014 ++ __HANDLE_ITEM(tx); /* TX okay */ \
30015 ++ __HANDLE_ITEM(tx_err); /* TX errors */ \
30016 ++ __HANDLE_ITEM(rx); /* RX okay */ \
30017 ++ __HANDLE_ITEM(rx_err); /* RX errors */ \
30018 ++ __HANDLE_ITEM(rx_drop); /* RX out of memory */
30019 ++
30020 ++struct atm_aal_stats {
30021 ++#define __HANDLE_ITEM(i) int i
30022 ++ __AAL_STAT_ITEMS
30023 ++#undef __HANDLE_ITEM
30024 ++};
30025 ++
30026 ++
30027 ++struct atm_dev_stats {
30028 ++ struct atm_aal_stats aal0;
30029 ++ struct atm_aal_stats aal34;
30030 ++ struct atm_aal_stats aal5;
30031 ++} __ATM_API_ALIGN;
30032 ++
30033 ++
30034 ++#define ATM_GETLINKRATE _IOW('a',ATMIOC_ITF+1,struct atmif_sioc)
30035 ++ /* get link rate */
30036 ++#define ATM_GETNAMES _IOW('a',ATMIOC_ITF+3,struct atm_iobuf)
30037 ++ /* get interface names (numbers) */
30038 ++#define ATM_GETTYPE _IOW('a',ATMIOC_ITF+4,struct atmif_sioc)
30039 ++ /* get interface type name */
30040 ++#define ATM_GETESI _IOW('a',ATMIOC_ITF+5,struct atmif_sioc)
30041 ++ /* get interface ESI */
30042 ++#define ATM_GETADDR _IOW('a',ATMIOC_ITF+6,struct atmif_sioc)
30043 ++ /* get itf's local ATM addr. list */
30044 ++#define ATM_RSTADDR _IOW('a',ATMIOC_ITF+7,struct atmif_sioc)
30045 ++ /* reset itf's ATM address list */
30046 ++#define ATM_ADDADDR _IOW('a',ATMIOC_ITF+8,struct atmif_sioc)
30047 ++ /* add a local ATM address */
30048 ++#define ATM_DELADDR _IOW('a',ATMIOC_ITF+9,struct atmif_sioc)
30049 ++ /* remove a local ATM address */
30050 ++#define ATM_GETCIRANGE _IOW('a',ATMIOC_ITF+10,struct atmif_sioc)
30051 ++ /* get connection identifier range */
30052 ++#define ATM_SETCIRANGE _IOW('a',ATMIOC_ITF+11,struct atmif_sioc)
30053 ++ /* set connection identifier range */
30054 ++#define ATM_SETESI _IOW('a',ATMIOC_ITF+12,struct atmif_sioc)
30055 ++ /* set interface ESI */
30056 ++#define ATM_SETESIF _IOW('a',ATMIOC_ITF+13,struct atmif_sioc)
30057 ++ /* force interface ESI */
30058 ++#define ATM_GETSTAT _IOW('a',ATMIOC_SARCOM+0,struct atmif_sioc)
30059 ++ /* get AAL layer statistics */
30060 ++#define ATM_GETSTATZ _IOW('a',ATMIOC_SARCOM+1,struct atmif_sioc)
30061 ++ /* get AAL layer statistics and zero */
30062 ++#define ATM_GETLOOP _IOW('a',ATMIOC_SARCOM+2,struct atmif_sioc)
30063 ++ /* get loopback mode */
30064 ++#define ATM_SETLOOP _IOW('a',ATMIOC_SARCOM+3,struct atmif_sioc)
30065 ++ /* set loopback mode */
30066 ++#define ATM_QUERYLOOP _IOW('a',ATMIOC_SARCOM+4,struct atmif_sioc)
30067 ++ /* query supported loopback modes */
30068 ++#define ATM_SETSC _IOW('a',ATMIOC_SPECIAL+1,int)
30069 ++ /* enable or disable single-copy */
30070 ++#define ATM_SETBACKEND _IOW('a',ATMIOC_SPECIAL+2,atm_backend_t)
30071 ++ /* set backend handler */
30072 ++#define ATM_NEWBACKENDIF _IOW('a',ATMIOC_SPECIAL+3,atm_backend_t)
30073 ++ /* use backend to make new if */
30074 ++
30075 ++/*
30076 ++ * These are backend handkers that can be set via the ATM_SETBACKEND call
30077 ++ * above. In the future we may support dynamic loading of these - for now,
30078 ++ * they're just being used to share the ATMIOC_BACKEND ioctls
30079 ++ */
30080 ++#define ATM_BACKEND_RAW 0
30081 ++#define ATM_BACKEND_PPP 1 /* PPPoATM - RFC2364 */
30082 ++#define ATM_BACKEND_BR2684 2 /* Bridged RFC1483/2684 */
30083 ++
30084 ++/* for ATM_GETTYPE */
30085 ++#define ATM_ITFTYP_LEN 8 /* maximum length of interface type name */
30086 ++
30087 ++/*
30088 ++ * Loopback modes for ATM_{PHY,SAR}_{GET,SET}LOOP
30089 ++ */
30090 ++
30091 ++/* Point of loopback CPU-->SAR-->PHY-->line--> ... */
30092 ++#define __ATM_LM_NONE 0 /* no loop back ^ ^ ^ ^ */
30093 ++#define __ATM_LM_AAL 1 /* loop back PDUs --' | | | */
30094 ++#define __ATM_LM_ATM 2 /* loop back ATM cells ---' | | */
30095 ++/* RESERVED 4 loop back on PHY side ---' */
30096 ++#define __ATM_LM_PHY 8 /* loop back bits (digital) ----' | */
30097 ++#define __ATM_LM_ANALOG 16 /* loop back the analog signal --------' */
30098 ++
30099 ++/* Direction of loopback */
30100 ++#define __ATM_LM_MKLOC(n) ((n)) /* Local (i.e. loop TX to RX) */
30101 ++#define __ATM_LM_MKRMT(n) ((n) << 8) /* Remote (i.e. loop RX to TX) */
30102 ++
30103 ++#define __ATM_LM_XTLOC(n) ((n) & 0xff)
30104 ++#define __ATM_LM_XTRMT(n) (((n) >> 8) & 0xff)
30105 ++
30106 ++#define ATM_LM_NONE 0 /* no loopback */
30107 ++
30108 ++#define ATM_LM_LOC_AAL __ATM_LM_MKLOC(__ATM_LM_AAL)
30109 ++#define ATM_LM_LOC_ATM __ATM_LM_MKLOC(__ATM_LM_ATM)
30110 ++#define ATM_LM_LOC_PHY __ATM_LM_MKLOC(__ATM_LM_PHY)
30111 ++#define ATM_LM_LOC_ANALOG __ATM_LM_MKLOC(__ATM_LM_ANALOG)
30112 ++
30113 ++#define ATM_LM_RMT_AAL __ATM_LM_MKRMT(__ATM_LM_AAL)
30114 ++#define ATM_LM_RMT_ATM __ATM_LM_MKRMT(__ATM_LM_ATM)
30115 ++#define ATM_LM_RMT_PHY __ATM_LM_MKRMT(__ATM_LM_PHY)
30116 ++#define ATM_LM_RMT_ANALOG __ATM_LM_MKRMT(__ATM_LM_ANALOG)
30117 ++
30118 ++/*
30119 ++ * Note: ATM_LM_LOC_* and ATM_LM_RMT_* can be combined, provided that
30120 ++ * __ATM_LM_XTLOC(x) <= __ATM_LM_XTRMT(x)
30121 ++ */
30122 ++
30123 ++
30124 ++struct atm_iobuf {
30125 ++ int length;
30126 ++ void *buffer;
30127 ++};
30128 ++
30129 ++/* for ATM_GETCIRANGE / ATM_SETCIRANGE */
30130 ++
30131 ++#define ATM_CI_MAX -1 /* use maximum range of VPI/VCI */
30132 ++
30133 ++struct atm_cirange {
30134 ++ char vpi_bits; /* 1..8, ATM_CI_MAX (-1) for maximum */
30135 ++ char vci_bits; /* 1..16, ATM_CI_MAX (-1) for maximum */
30136 ++};
30137 ++
30138 ++/* for ATM_SETSC; actually taken from the ATM_VF number space */
30139 ++
30140 ++#define ATM_SC_RX 1024 /* enable RX single-copy */
30141 ++#define ATM_SC_TX 2048 /* enable TX single-copy */
30142 ++
30143 ++#define ATM_BACKLOG_DEFAULT 32 /* if we get more, we're likely to time out
30144 ++ anyway */
30145 ++
30146 ++/* MF: change_qos (Modify) flags */
30147 ++
30148 ++#define ATM_MF_IMMED 1 /* Block until change is effective */
30149 ++#define ATM_MF_INC_RSV 2 /* Change reservation on increase */
30150 ++#define ATM_MF_INC_SHP 4 /* Change shaping on increase */
30151 ++#define ATM_MF_DEC_RSV 8 /* Change reservation on decrease */
30152 ++#define ATM_MF_DEC_SHP 16 /* Change shaping on decrease */
30153 ++#define ATM_MF_BWD 32 /* Set the backward direction parameters */
30154 ++
30155 ++#define ATM_MF_SET (ATM_MF_INC_RSV | ATM_MF_INC_SHP | ATM_MF_DEC_RSV | \
30156 ++ ATM_MF_DEC_SHP | ATM_MF_BWD)
30157 ++
30158 ++/*
30159 ++ * ATM_VS_* are used to express VC state in a human-friendly way.
30160 ++ */
30161 ++
30162 ++#define ATM_VS_IDLE 0 /* VC is not used */
30163 ++#define ATM_VS_CONNECTED 1 /* VC is connected */
30164 ++#define ATM_VS_CLOSING 2 /* VC is closing */
30165 ++#define ATM_VS_LISTEN 3 /* VC is listening for incoming setups */
30166 ++#define ATM_VS_INUSE 4 /* VC is in use (registered with atmsigd) */
30167 ++#define ATM_VS_BOUND 5 /* VC is bound */
30168 ++
30169 ++#define ATM_VS2TXT_MAP \
30170 ++ "IDLE", "CONNECTED", "CLOSING", "LISTEN", "INUSE", "BOUND"
30171 ++
30172 ++#define ATM_VF2TXT_MAP \
30173 ++ "ADDR", "READY", "PARTIAL", "REGIS", \
30174 ++ "RELEASED", "HASQOS", "LISTEN", "META", \
30175 ++ "256", "512", "1024", "2048", \
30176 ++ "SESSION", "HASSAP", "BOUND", "CLOSE"
30177 ++
30178 ++
30179 ++#ifndef __KERNEL__
30180 ++#undef __AAL_STAT_ITEMS
30181 ++#else
30182 ++
30183 ++#include <linux/sched.h> /* wait_queue_head_t */
30184 ++#include <linux/time.h> /* struct timeval */
30185 ++#include <linux/net.h>
30186 ++#include <linux/skbuff.h> /* struct sk_buff */
30187 ++#include <linux/uio.h>
30188 ++#include <net/sock.h>
30189 ++#include <asm/atomic.h>
30190 ++
30191 ++#ifdef CONFIG_PROC_FS
30192 ++#include <linux/proc_fs.h>
30193 ++#endif
30194 ++
30195 ++
30196 ++struct k_atm_aal_stats {
30197 ++#define __HANDLE_ITEM(i) atomic_t i
30198 ++ __AAL_STAT_ITEMS
30199 ++#undef __HANDLE_ITEM
30200 ++};
30201 ++
30202 ++
30203 ++struct k_atm_dev_stats {
30204 ++ struct k_atm_aal_stats aal0;
30205 ++ struct k_atm_aal_stats aal34;
30206 ++ struct k_atm_aal_stats aal5;
30207 ++};
30208 ++
30209 ++
30210 ++enum {
30211 ++ ATM_VF_ADDR, /* Address is in use. Set by anybody, cleared
30212 ++ by device driver. */
30213 ++ ATM_VF_READY, /* VC is ready to transfer data. Set by device
30214 ++ driver, cleared by anybody. */
30215 ++ ATM_VF_PARTIAL, /* resources are bound to PVC (partial PVC
30216 ++ setup), controlled by socket layer */
30217 ++ ATM_VF_REGIS, /* registered with demon, controlled by SVC
30218 ++ socket layer */
30219 ++ ATM_VF_BOUND, /* local SAP is set, controlled by SVC socket
30220 ++ layer */
30221 ++ ATM_VF_RELEASED, /* demon has indicated/requested release,
30222 ++ controlled by SVC socket layer */
30223 ++ ATM_VF_HASQOS, /* QOS parameters have been set */
30224 ++ ATM_VF_LISTEN, /* socket is used for listening */
30225 ++ ATM_VF_META, /* SVC socket isn't used for normal data
30226 ++ traffic and doesn't depend on signaling
30227 ++ to be available */
30228 ++ ATM_VF_SESSION, /* VCC is p2mp session control descriptor */
30229 ++ ATM_VF_HASSAP, /* SAP has been set */
30230 ++ ATM_VF_CLOSE, /* asynchronous close - treat like VF_RELEASED*/
30231 ++};
30232 ++
30233 ++
30234 ++#define ATM_VF2VS(flags) \
30235 ++ (test_bit(ATM_VF_READY,&(flags)) ? ATM_VS_CONNECTED : \
30236 ++ test_bit(ATM_VF_RELEASED,&(flags)) ? ATM_VS_CLOSING : \
30237 ++ test_bit(ATM_VF_LISTEN,&(flags)) ? ATM_VS_LISTEN : \
30238 ++ test_bit(ATM_VF_REGIS,&(flags)) ? ATM_VS_INUSE : \
30239 ++ test_bit(ATM_VF_BOUND,&(flags)) ? ATM_VS_BOUND : ATM_VS_IDLE)
30240 ++
30241 ++
30242 ++enum {
30243 ++ ATM_DF_CLOSE, /* close device when last VCC is closed */
30244 ++};
30245 ++
30246 ++
30247 ++#define ATM_PHY_SIG_LOST 0 /* no carrier/light */
30248 ++#define ATM_PHY_SIG_UNKNOWN 1 /* carrier/light status is unknown */
30249 ++#define ATM_PHY_SIG_FOUND 2 /* carrier/light okay */
30250 ++
30251 ++#define ATM_ATMOPT_CLP 1 /* set CLP bit */
30252 ++
30253 ++
30254 ++typedef struct { unsigned long bits; } atm_vcc_flags_t;
30255 ++
30256 ++
30257 ++struct atm_vcc {
30258 ++ atm_vcc_flags_t flags; /* VCC flags (ATM_VF_*) */
30259 ++ short vpi; /* VPI and VCI (types must be equal */
30260 ++ /* with sockaddr) */
30261 ++ int vci;
30262 ++ unsigned long aal_options; /* AAL layer options */
30263 ++ unsigned long atm_options; /* ATM layer options */
30264 ++ struct atm_dev *dev; /* device back pointer */
30265 ++ struct atm_qos qos; /* QOS */
30266 ++ struct atm_sap sap; /* SAP */
30267 ++ void (*push)(struct atm_vcc *vcc,struct sk_buff *skb);
30268 ++ void (*pop)(struct atm_vcc *vcc,struct sk_buff *skb); /* optional */
30269 ++ int (*push_oam)(struct atm_vcc *vcc,void *cell);
30270 ++ int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
30271 ++ void *dev_data; /* per-device data */
30272 ++ void *proto_data; /* per-protocol data */
30273 ++ struct k_atm_aal_stats *stats; /* pointer to AAL stats group */
30274 ++ wait_queue_head_t sleep; /* if socket is busy */
30275 ++ struct sock *sk; /* socket backpointer */
30276 ++ struct atm_vcc *prev,*next;
30277 ++ /* SVC part --- may move later ------------------------------------- */
30278 ++ short itf; /* interface number */
30279 ++ struct sockaddr_atmsvc local;
30280 ++ struct sockaddr_atmsvc remote;
30281 ++ void (*callback)(struct atm_vcc *vcc);
30282 ++ struct sk_buff_head listenq;
30283 ++ int backlog_quota; /* number of connection requests we */
30284 ++ /* can still accept */
30285 ++ int reply; /* also used by ATMTCP */
30286 ++ /* Multipoint part ------------------------------------------------- */
30287 ++ struct atm_vcc *session; /* session VCC descriptor */
30288 ++ /* Other stuff ----------------------------------------------------- */
30289 ++ void *user_back; /* user backlink - not touched by */
30290 ++ /* native ATM stack. Currently used */
30291 ++ /* by CLIP and sch_atm. */
30292 ++};
30293 ++
30294 ++
30295 ++struct atm_dev_addr {
30296 ++ struct sockaddr_atmsvc addr; /* ATM address */
30297 ++ struct atm_dev_addr *next; /* next address */
30298 ++};
30299 ++
30300 ++
30301 ++typedef struct { unsigned int bits; } atm_dev_flags_t;
30302 ++
30303 ++
30304 ++struct atm_dev {
30305 ++ const struct atmdev_ops *ops; /* device operations; NULL if unused */
30306 ++ const struct atmphy_ops *phy; /* PHY operations, may be undefined */
30307 ++ /* (NULL) */
30308 ++ const char *type; /* device type name */
30309 ++ int number; /* device index */
30310 ++ struct atm_vcc *vccs; /* VCC table (or NULL) */
30311 ++ struct atm_vcc *last; /* last VCC (or undefined) */
30312 ++ void *dev_data; /* per-device data */
30313 ++ void *phy_data; /* private PHY date */
30314 ++ atm_dev_flags_t flags; /* device flags (ATM_DF_*) */
30315 ++ struct atm_dev_addr *local; /* local ATM addresses */
30316 ++ unsigned char esi[ESI_LEN]; /* ESI ("MAC" addr) */
30317 ++ struct atm_cirange ci_range; /* VPI/VCI range */
30318 ++ struct k_atm_dev_stats stats; /* statistics */
30319 ++ char signal; /* signal status (ATM_PHY_SIG_*) */
30320 ++ int link_rate; /* link rate (default: OC3) */
30321 ++ atomic_t refcnt; /* reference count */
30322 ++ spinlock_t lock; /* protect internal members */
30323 ++#ifdef CONFIG_PROC_FS
30324 ++ struct proc_dir_entry *proc_entry; /* proc entry */
30325 ++ char *proc_name; /* proc entry name */
30326 ++#endif
30327 ++ struct list_head dev_list; /* linkage */
30328 ++};
30329 ++
30330 ++
30331 ++/*
30332 ++ * ioctl, getsockopt, setsockopt, and sg_send are optional and can be set to
30333 ++ * NULL. */
30334 ++
30335 ++/* OF: send_Oam Flags */
30336 ++
30337 ++#define ATM_OF_IMMED 1 /* Attempt immediate delivery */
30338 ++#define ATM_OF_INRATE 2 /* Attempt in-rate delivery */
30339 ++
30340 ++struct atmdev_ops { /* only send is required */
30341 ++ void (*dev_close)(struct atm_dev *dev);
30342 ++ int (*open)(struct atm_vcc *vcc,short vpi,int vci);
30343 ++ void (*close)(struct atm_vcc *vcc);
30344 ++ int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void *arg);
30345 ++ int (*getsockopt)(struct atm_vcc *vcc,int level,int optname,
30346 ++ void *optval,int optlen);
30347 ++ int (*setsockopt)(struct atm_vcc *vcc,int level,int optname,
30348 ++ void *optval,int optlen);
30349 ++ int (*send)(struct atm_vcc *vcc,struct sk_buff *skb);
30350 ++ int (*sg_send)(struct atm_vcc *vcc,unsigned long start,
30351 ++ unsigned long size);
30352 ++#if 0 /* keep the current hack for now */
30353 ++ int (*send_iovec)(struct atm_vcc *vcc,struct iovec *iov,int size,
30354 ++ void (*discard)(struct atm_vcc *vcc,void *user),void *user);
30355 ++#endif
30356 ++ int (*send_oam)(struct atm_vcc *vcc,void *cell,int flags);
30357 ++ void (*phy_put)(struct atm_dev *dev,unsigned char value,
30358 ++ unsigned long addr);
30359 ++ unsigned char (*phy_get)(struct atm_dev *dev,unsigned long addr);
30360 ++ void (*feedback)(struct atm_vcc *vcc,struct sk_buff *skb,
30361 ++ unsigned long start,unsigned long dest,int len);
30362 ++ int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
30363 ++ int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
30364 ++ struct module *owner;
30365 ++};
30366 ++
30367 ++
30368 ++struct atmphy_ops {
30369 ++ int (*start)(struct atm_dev *dev);
30370 ++ int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void *arg);
30371 ++ void (*interrupt)(struct atm_dev *dev);
30372 ++ int (*stop)(struct atm_dev *dev);
30373 ++};
30374 ++
30375 ++struct atm_skb_data {
30376 ++ struct atm_vcc *vcc; /* ATM VCC */
30377 ++ unsigned long atm_options; /* ATM layer options */
30378 ++};
30379 ++
30380 ++#define ATM_SKB(skb) (((struct atm_skb_data *) (skb)->cb))
30381 ++
30382 ++struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
30383 ++ int number,atm_dev_flags_t *flags); /* number == -1: pick first available */
30384 ++struct atm_dev *atm_dev_lookup(int number);
30385 ++void atm_dev_deregister(struct atm_dev *dev);
30386 ++void shutdown_atm_dev(struct atm_dev *dev);
30387 ++void bind_vcc(struct atm_vcc *vcc,struct atm_dev *dev);
30388 ++
30389 ++
30390 ++/*
30391 ++ * This is approximately the algorithm used by alloc_skb.
30392 ++ *
30393 ++ */
30394 ++
30395 ++static inline int atm_guess_pdu2truesize(int pdu_size)
30396 ++{
30397 ++ return ((pdu_size+15) & ~15) + sizeof(struct sk_buff);
30398 ++}
30399 ++
30400 ++
30401 ++static inline void atm_force_charge(struct atm_vcc *vcc,int truesize)
30402 ++{
30403 ++ atomic_add(truesize, &vcc->sk->rmem_alloc);
30404 ++}
30405 ++
30406 ++
30407 ++static inline void atm_return(struct atm_vcc *vcc,int truesize)
30408 ++{
30409 ++ atomic_sub(truesize, &vcc->sk->rmem_alloc);
30410 ++}
30411 ++
30412 ++
30413 ++static inline int atm_may_send(struct atm_vcc *vcc,unsigned int size)
30414 ++{
30415 ++ return (size + atomic_read(&vcc->sk->wmem_alloc)) < vcc->sk->sndbuf;
30416 ++}
30417 ++
30418 ++
30419 ++static inline void atm_dev_hold(struct atm_dev *dev)
30420 ++{
30421 ++ atomic_inc(&dev->refcnt);
30422 ++}
30423 ++
30424 ++
30425 ++static inline void atm_dev_release(struct atm_dev *dev)
30426 ++{
30427 ++ atomic_dec(&dev->refcnt);
30428 ++
30429 ++ if ((atomic_read(&dev->refcnt) == 1) &&
30430 ++ test_bit(ATM_DF_CLOSE,&dev->flags))
30431 ++ shutdown_atm_dev(dev);
30432 ++}
30433 ++
30434 ++
30435 ++int atm_charge(struct atm_vcc *vcc,int truesize);
30436 ++struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
30437 ++ int gfp_flags);
30438 ++int atm_find_ci(struct atm_vcc *vcc,short *vpi,int *vci);
30439 ++int atm_pcr_goal(struct atm_trafprm *tp);
30440 ++
30441 ++void atm_async_release_vcc(struct atm_vcc *vcc,int reply);
30442 ++
30443 ++#endif /* __KERNEL__ */
30444 ++
30445 ++#endif
30446 Index: linux-atm-2.4.1/debian/control
30447 ===================================================================
30448 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
30449 +++ linux-atm-2.4.1/debian/control 2007-06-04 13:23:54.510447048 +0200
30450 @@ -0,0 +1,57 @@
30451 +Source: linux-atm
30452 +Section: net
30453 +Priority: optional
30454 +Maintainer: Peter De Schrijver (p2) <p2@mind.be>
30455 +Build-Depends: debhelper (>> 4.0.0), bison, flex, perl, dpatch, automake1.4
30456 +Standards-Version: 3.6.1
30457 +
30458 +Package: atm-tools
30459 +Architecture: any
30460 +Depends: ${shlibs:Depends}
30461 +Description: Base programs for ATM in Linux, the net-tools for ATM
30462 + This package provides all the basic programs needed for setting up,
30463 + monitoring and tuning ATM networks. Such as:
30464 + * atmsigd, an ATM signal daemon that implements the ATM UNI protocol.
30465 + * atmtcp, a tool to setup ATM over TCP connections.
30466 + * atmarpd, an implementation of the ATMARP protocol (RFC1577, RFC1755)
30467 + * zeppelin, an ATM LAN Emulation client daemon
30468 + * les and bus, ATM LAN Emulation service daemons
30469 + .
30470 + Notice that upstream still flags these tools as experimental software and
30471 + says that there is still a number of known bugs and issues. The
30472 + software is, however, in productive use at a number of sites and is
30473 + working reliably.
30474 + .
30475 + Homepage: http://linux-atm.sourceforge.net/
30476 +
30477 +Package: atm-dev
30478 +Depends: libatm1-dev
30479 +Architecture: all
30480 +Section: oldlibs
30481 +Description: Development files for compiling ATM programs (dummy package)
30482 + This dummy package provides a transition from the previous atm packages.
30483 + It is provided for backwards compatibility only and may be removedafter
30484 + the upgrade has completed or when when no other package depend on it.
30485 +
30486 +Package: libatm1
30487 +Section: libs
30488 +Architecture: any
30489 +Depends: ${shlibs:Depends}
30490 +Conflicts: atm-tools (<< 2.4.1-6)
30491 +Description: shared library for ATM (Asynchronous Transfer Mode)
30492 + Shared libraries needed by ATM (Asynchronous Transfer Mode) related programs
30493 + .
30494 + Homepage: http://linux-atm.sourceforge.net/
30495 +
30496 +Package: libatm1-dev
30497 +Section: libdevel
30498 +Architecture: any
30499 +Depends: libc6-dev, libatm1
30500 +Replaces: atm-dev (<< 2.4.1-7)
30501 +Conflicts: atm-dev (<< 2.4.1-7)
30502 +Provides: libatm-dev
30503 +Description: Development files for compiling ATM programs
30504 + Header files and development libraries for compiling ATM (Asynchronous
30505 + Transfer Mode) related programs.
30506 + .
30507 + Homepage: http://linux-atm.sourceforge.net/
30508 Index: linux-atm-2.4.1/debian/rules
30509 ===================================================================
30510 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
30511 +++ linux-atm-2.4.1/debian/rules 2007-06-04 13:23:54.510447048 +0200
30512 @@ -0,0 +1,136 @@
30513 +#!/usr/bin/make -f
30514 +# Sample debian/rules that uses debhelper.
30515 +# GNU copyright 1997 to 1999 by Joey Hess.
30516 +
30517 +# Uncomment this to turn on verbose mode.
30518 +#export DH_VERBOSE=1
30519 +
30520 +# This is the debhelper compatability version to use.
30521 +export DH_COMPAT=4
30522 +
30523 +export PACKAGE=linux-atm
30524 +
30525 +buildindeppackages=atm-dev
30526 +buildarchpackages=atm-tools libatm1 libatm1-dev
30527 +
30528 +# generate -ppackage1 -ppackage2 ... commandline for debhelper
30529 +dhbuildarchpackages=$(addprefix -p,$(buildarchpackages))
30530 +dhbuildindeppackages=$(addprefix -p,$(buildindeppackages))
30531 +
30532 +include /usr/share/dpatch/dpatch.make
30533 +
30534 +configure: configure-stamp
30535 +configure-stamp:
30536 + dh_testdir
30537 + ./configure --prefix /usr --mandir /usr/share/man --sysconfdir /etc
30538 + touch configure-stamp
30539 +
30540 +build: configure-stamp build-stamp
30541 +build-stamp: patch-stamp
30542 + dh_testdir
30543 +
30544 + # Add here commands to compile the package.
30545 + $(MAKE) $(EXTRA_VARS)
30546 + cat debian/copyright.header COPYING > debian/copyright
30547 +
30548 + touch build-stamp
30549 +
30550 +clean: clean1 unpatch
30551 +clean1:
30552 + dh_testdir
30553 + dh_testroot
30554 + rm -f build-stamp configure-stamp
30555 +
30556 + # Add here commands to clean up after the build process.
30557 + -$(MAKE) distclean
30558 +
30559 + dh_clean
30560 + rm -rf debian/atm-tools.8 debian/copyright
30561 +
30562 +install: build
30563 + dh_testdir
30564 + dh_testroot
30565 + dh_clean -k
30566 + dh_installdirs
30567 +
30568 + # Add here commands to install the package into debian/atm-tools
30569 + $(MAKE) DESTDIR=`pwd`/debian/tmp install
30570 +
30571 + # manpages
30572 + /usr/bin/pod2man --section=8 --release="atm-tools $(PKG_VER)" --lax \
30573 + --center="Debian GNU/Linux" debian/atm-tools.pod > debian/atm-tools.8
30574 +
30575 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/aread.8
30576 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/awrite.8
30577 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/enitune.8
30578 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/ilmid.8
30579 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/saaldump.8
30580 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/sonetdiag.8
30581 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/ttcp_atm.8
30582 + ln -s atm-tools.8 debian/tmp/usr/share/man/man8/zntune.8
30583 +
30584 +# Build architecture-independent files here.
30585 +binary-indep: build install
30586 + dh_testdir $(dhbuildindeppackages)
30587 + dh_testroot $(dhbuildindeppackages)
30588 + dh_install $(dhbuildindeppackages)
30589 +
30590 +# dh_installdebconf $(dhbuildindeppackages)
30591 + dh_installdocs $(dhbuildindeppackages)
30592 + dh_installmenu $(dhbuildindeppackages)
30593 +# dh_installlogrotate $(dhbuildindeppackages)
30594 +# dh_installemacsen $(dhbuildindeppackages)
30595 +# dh_installpam $(dhbuildindeppackages)
30596 +# dh_installmime $(dhbuildindeppackages)
30597 + dh_installinit $(dhbuildindeppackages) --init-script=atm -- start 34 0 6 . start 39 S .
30598 + dh_installcron $(dhbuildindeppackages)
30599 + dh_installman $(dhbuildindeppackages)
30600 + dh_installinfo $(dhbuildindeppackages)
30601 +# dh_undocumented $(dhbuildindeppackages)
30602 + dh_installchangelogs -i ChangeLog $(dhbuildpackages)
30603 + dh_link $(dhbuildindeppackages)
30604 + dh_strip $(dhbuildindeppackages)
30605 + dh_compress $(dhbuildindeppackages)
30606 + dh_fixperms $(dhbuildindeppackages)
30607 + dh_makeshlibs $(dhbuildindeppackages)
30608 + dh_installdeb $(dhbuildindeppackages)
30609 +# dh_perl $(dhbuildindeppackages)
30610 + dh_shlibdeps $(dhbuildindeppackages)
30611 + dh_gencontrol $(dhbuildindeppackages)
30612 + dh_md5sums $(dhbuildindeppackages)
30613 + dh_builddeb $(dhbuildindeppackages)
30614 +
30615 +# Build architecture-dependent files here.
30616 +binary-arch: build install
30617 + dh_testdir $(dhbuildarchpackages)
30618 + dh_testroot $(dhbuildarchpackages)
30619 + dh_install $(dhbuildarchpackages)
30620 +
30621 +# dh_installdebconf $(dhbuildarchpackages)
30622 + dh_installdocs $(dhbuildarchpackages)
30623 + dh_installmenu $(dhbuildarchpackages)
30624 +# dh_installlogrotate $(dhbuildarchpackages)
30625 +# dh_installemacsen $(dhbuildarchpackages)
30626 +# dh_installpam $(dhbuildarchpackages)
30627 +# dh_installmime $(dhbuildarchpackages)
30628 + dh_installinit $(dhbuildarchpackages) --init-script=atm -- start 34 0 6 . start 39 S .
30629 + dh_installcron $(dhbuildarchpackages)
30630 + dh_installman $(dhbuildarchpackages)
30631 + dh_installinfo $(dhbuildarchpackages)
30632 +# dh_undocumented $(dhbuildarchpackages)
30633 + dh_installchangelogs -a ChangeLog $(dhbuildarchpackages)
30634 + dh_link $(dhbuildarchpackages)
30635 + dh_strip $(dhbuildarchpackages)
30636 + dh_compress $(dhbuildarchpackages)
30637 + dh_fixperms $(dhbuildarchpackages)
30638 + dh_makeshlibs $(dhbuildarchpackages)
30639 + dh_installdeb $(dhbuildarchpackages)
30640 +# dh_perl $(dhbuildarchpackages)
30641 + dh_shlibdeps -a -L libatm1 -l debian/libatm1/lib $(dhbuildarchpackages)
30642 + dh_gencontrol $(dhbuildarchpackages)
30643 + dh_md5sums $(dhbuildarchpackages)
30644 + dh_builddeb $(dhbuildarchpackages)
30645 +
30646 +binary: binary-indep binary-arch
30647 +.PHONY: build binary-indep binary-arch binary install configure
30648 + get-2684 patch unpatch clean1
30649 Index: linux-atm-2.4.1/debian/atm-tools-br2684.install
30650 ===================================================================
30651 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
30652 +++ linux-atm-2.4.1/debian/atm-tools-br2684.install 2007-06-04 13:23:54.510447048 +0200
30653 @@ -0,0 +1 @@
30654 +debian/tmp/usr/sbin/br2684ctl usr/sbin
30655 Index: linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog.Debian
30656 ===================================================================
30657 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
30658 +++ linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog.Debian 2007-06-04 13:23:54.511446896 +0200
30659 @@ -0,0 +1,206 @@
30660 +linux-atm (2.4.1-16) unstable; urgency=low
30661 +
30662 + * Fix build problem with gcc 3.4 (Closes: #259422)
30663 +
30664 + -- Peter De Schrijver (p2) <p2@mind.be> Thu, 15 Jul 2004 14:28:10 +0200
30665 +
30666 +linux-atm (2.4.1-15) unstable; urgency=low
30667 +
30668 + * Updated descriptions (Closes: #239161)
30669 +
30670 + -- Peter De Schrijver (p2) <p2@mind.be> Sun, 4 Apr 2004 21:10:20 +0200
30671 +
30672 +linux-atm (2.4.1-14) unstable; urgency=low
30673 +
30674 + * Fix symlink for /usr/lib/libatm.so (Closes: #221011)
30675 +
30676 + -- Peter De Schrijver (p2) <p2@mind.be> Sun, 7 Dec 2003 21:53:19 +0100
30677 +
30678 +linux-atm (2.4.1-13) unstable; urgency=low
30679 +
30680 + * Previous version fixed #217259, but no changelog entry (Closes: #217259)
30681 + * Previous version fixed #216662, but no changelog entry (Closes: #216662)
30682 + * Added missing build dependency on automake1.4 (Closes: #221120, #221284)
30683 + * New Maintainer (Closes: #206982)
30684 +
30685 + -- Peter De Schrijver (p2) <p2@mind.be> Mon, 17 Nov 2003 23:03:58 +0100
30686 +
30687 +linux-atm (2.4.1-12) unstable; urgency=low
30688 +
30689 + * don't build atm-tools-br2684 by default. Thanks to ftpmaster for
30690 + not allowing the package to be in Debian.
30691 + * Since we don't build atm-tools-br2684 any more, revert back to
30692 + autotools output from 2.4.1-9
30693 + * Add README.br2684 documenting a way to build the package locally.
30694 +
30695 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 5 Nov 2003 21:31:42 +0000
30696 +
30697 +linux-atm (2.4.1-11) experimental; urgency=low
30698 +
30699 + * Build-Depend on dpatch
30700 + * dpatch br2684 header files from later libc for old libc (woody)
30701 +
30702 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 29 Oct 2003 19:05:07 +0000
30703 +
30704 +linux-atm (2.4.1-10) experimental; urgency=low
30705 +
30706 + * add br2684 to package (closes: #216663)
30707 + * autoreconf to actually build br2684
30708 + * have libatm1-dev provide libatm-dev (closes: #216662)
30709 + * move lib symlink to libatm1-dev as well (closes: #217259)
30710 +
30711 + -- Marc Haber <mh+debian-packages@zugschlus.de> Thu, 23 Oct 2003 17:55:43 +0000
30712 +
30713 +linux-atm (2.4.1-9) unstable; urgency=low
30714 +
30715 + * put libatm1-dev in libdevel (closes: #213170)
30716 + * make sure that new descriptions actually make it into the package
30717 +
30718 + -- Marc Haber <mh+debian-packages@zugschlus.de> Thu, 9 Oct 2003 17:08:10 +0000
30719 +
30720 +linux-atm (2.4.1-8) unstable; urgency=low
30721 +
30722 + * build arch-indep package as targets of binary-indep (closes: #212124)
30723 + * use dh_installdocs to install files to libatm1-dev/docs
30724 + * symlink shared lib to usr/bin (closes: #213146)
30725 + * Use better long descriptions. Thanks to Javier (closes: #209427)
30726 + Fernandez-Sanguino (closes: #209612)
30727 +
30728 + -- Marc Haber <mh+debian-packages@zugschlus.de> Sun, 28 Sep 2003 19:29:08 +0000
30729 +
30730 +linux-atm (2.4.1-7) unstable; urgency=low
30731 +
30732 + * libatm1 now conflicts with atm-tools (<< 2.4.1-6) (closes: #208170)
30733 + * armarp now writes output to stdout.
30734 + * add atm-dev as empty transitional package to help upgrades
30735 +
30736 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 2 Sep 2003 09:20:33 +0000
30737 +
30738 +linux-atm (2.4.1-6) unstable; urgency=low
30739 +
30740 + * split off shared libraries to libatm1
30741 + * rename atm-dev to libatm1-dev
30742 + * Standards-Version: 3.6.1
30743 +
30744 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 26 Aug 2003 15:46:27 +0000
30745 +
30746 +linux-atm (2.4.1-5) unstable; urgency=low
30747 +
30748 + * move *.a and *.la to usr/lib (closes: #199506).
30749 + * let atm-dev depend on atm-tools to avoid dangling /lib/libatm.so
30750 + symlink.
30751 + * Standards-Version: 3.5.6
30752 +
30753 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 30 Jul 2003 11:46:19 +0000
30754 +
30755 +linux-atm (2.4.1-4) unstable; urgency=low
30756 +
30757 + * add Build-Depends: on automake1.4
30758 +
30759 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 11 Jun 2003 16:58:21 +0000
30760 +
30761 +linux-atm (2.4.1-3) unstable; urgency=low
30762 +
30763 + * rebuilding libtool broke src/test/Makefile.in. Applied fix to
30764 + Makefile.am and re-built again.
30765 +
30766 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 11 Jun 2003 11:05:26 +0000
30767 +
30768 +linux-atm (2.4.1-2) unstable; urgency=low
30769 +
30770 + * rebuild configure script with new libtool (closes: #196909)
30771 +
30772 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 10 Jun 2003 21:01:50 +0000
30773 +
30774 +linux-atm (2.4.1-1) unstable; urgency=low
30775 +
30776 + * new upstream source
30777 + * remove atmarp and atmarpd from /usr/sbin as they are already in
30778 + /sbin (closes: #196216)
30779 + * lintian fixes
30780 +
30781 + -- Marc Haber <mh+debian-packages@zugschlus.de> Mon, 9 Jun 2003 16:03:45 +0000
30782 +
30783 +linux-atm (2.4.0-5) unstable; urgency=low
30784 +
30785 + * Fix for src/test/Makefile.in to allow building on hppa and ia64
30786 + which the fix introduced to 2.4.0-4 broke. Thanks to Goswin
30787 + Brederlow.
30788 + * Move init.d priority to that atmarpd is started before network
30789 + interfaces are started.
30790 + * Move atmarpd and libatm to /sbin and /lib to allow atmarpd to be
30791 + started before /usr is mounted.
30792 + * use dh_install instead of dh_movefiles.
30793 +
30794 + -- Marc Haber <mh+debian-packages@zugschlus.de> Sat, 24 Aug 2002 15:13:48 +0000
30795 +
30796 +linux-atm (2.4.0-4) unstable; urgency=low
30797 +
30798 + * new maintainer
30799 + * Fix for src/test/Makefile.in to allow building on sparc.
30800 + Thanks to Patrick Mauritz. (closes: #144225).
30801 + * added pseudo-manpage for manpage-less binaries.
30802 + * removed rpath by changing configure and make install paramaters
30803 +
30804 + -- Marc Haber <mh+debian-packages@zugschlus.de> Fri, 16 Aug 2002 20:39:05 +0000
30805 +
30806 +linux-atm (2.4.0-3) unstable; urgency=HIGH
30807 +
30808 + * Re-ran libtoolize.
30809 + Closes: #143522
30810 +
30811 + * Previous version Closes: #135328
30812 +
30813 + -- Russell Coker <russell@coker.com.au> Fri, 19 Apr 2002 01:55:00 +0200
30814 +
30815 +linux-atm (2.4.0-2) unstable; urgency=HIGH
30816 +
30817 + * Put a "grep -v EMAXERRNO" into the build process to deal with mipsel and
30818 + the "#ifdef __KERNEL__" it has in it's /usr/include/asm/errno.h .
30819 +
30820 + -- Russell Coker <russell@coker.com.au> Thu, 18 Apr 2002 19:56:00 +0200
30821 +
30822 +linux-atm (2.4.0-1) unstable; urgency=HIGH
30823 +
30824 + * New upstream version which changes source package name.
30825 + Closes: #138911
30826 +
30827 + -- Russell Coker <russell@coker.com.au> Mon, 18 Mar 2002 17:42:00 +0100
30828 +
30829 +atm (0.79-4) unstable; urgency=low
30830 +
30831 + * Added build-depends on flex.
30832 + Closes: #111072
30833 +
30834 + * Made the atm tools use a shared object to save space.
30835 +
30836 + * Fixed the copyright file and put all copyright details in both packages.
30837 +
30838 + * Added support for easy building with different kernel headers.
30839 + Closes: #110249
30840 +
30841 + -- Russell Coker <russell@coker.com.au> Sun, 7 Oct 2001 14:11:33 +0200
30842 +
30843 +atm (0.79-3) unstable; urgency=low
30844 +
30845 + * Created /etc/init.d/atm to start and stop atmarpd.
30846 + Closes: #110252
30847 +
30848 + * Added build-depends on bison.
30849 + Closes: #110576
30850 +
30851 + -- Russell Coker <russell@coker.com.au> Fri, 31 Aug 2001 15:21:44 +0200
30852 +
30853 +atm (0.79-2) unstable; urgency=low
30854 +
30855 + * Changed the main package name to atm-tools to indicate that it doesn't
30856 + provide ATM (gotta have the kernel support), it just has the daemons and
30857 + utilities.
30858 +
30859 + -- Russell Coker <russell@coker.com.au> Sat, 25 Aug 2001 17:55:00 +0200
30860 +
30861 +atm (0.79-1) unstable; urgency=low
30862 +
30863 + * Initial Release.
30864 +
30865 + -- Russell Coker <russell@coker.com.au> Fri, 24 Aug 2001 17:31:00 +0200
30866 Index: linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog
30867 ===================================================================
30868 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
30869 +++ linux-atm-2.4.1/debian/atm-tools-br2684/usr/share/doc/atm-tools-br2684/changelog 2007-06-04 13:23:54.514446440 +0200
30870 @@ -0,0 +1,3299 @@
30871 +Version 2.4.0 to 2.4.1 (25-APR-2003)
30872 +=====================
30873 +
30874 +Bug fixes
30875 +---------
30876 +
30877 + - vsprintf's changed to vsnprintf's to prevent possible stack overflows
30878 +
30879 +
30880 +Version 0.79 to 2.4.0 (18-OCT-2001)
30881 +=====================
30882 +
30883 +Bug fixes
30884 +---------
30885 +
30886 + - defined 'now' in src/lib/timer.c
30887 + - ia64 build fix for ASN (Chas Williams)
30888 +
30889 +Other changes
30890 +-------------
30891 +
30892 + - In general, the source tree was rearranged and the old cruft was removed
30893 + - Old ad hoc build system replaced in favor of a standardized autoconfiscation
30894 + - Build configuration options are now controlled by 'configure' script instead
30895 + of changes to the previous 'Rules.make' file
30896 + - libatm and libatmd merged into one lib: libatm
30897 + - Both static and shared libraries are built by default. Binaries now built
30898 + with shared library by default.
30899 + - Sample atmsigd.conf and hosts.atm are now installed when doing 'make install'
30900 + - RPM spec file is now available in src/extra/
30901 + - New RedHat init scripts available in src/config/init-redhat/ (John Strange)
30902 + (old RedHat 4.0 scripts removed)
30903 + - ATM on Linux HOWTO now included in doc/ (much derived from usage.tex). We
30904 + will publish this on the home page as well as linuxdoc.org
30905 + - tcpdump and libpcap ATM patches/build removed (they have been integrated into
30906 + their respective packages; see www.tcpdump.org)
30907 + - ATM Name Service (ANS) files coalesced into src/extra/ANS
30908 + - ANS bind patch upgraded to bind-4.9.8 (untested)
30909 + - rtf2e164_cc.pl removed in favor of src/extra/ANS/pdf2e164_cc.pl. The ITU no
30910 + longer provides E.164 country codes in RTF format. PDF used instead.
30911 +
30912 +
30913 +Version 0.78 to 0.79 (15-AUG-2001)
30914 +====================
30915 +
30916 +Bug fixes
30917 +---------
30918 +
30919 +- uni.c fix for newer versions of gcc
30920 +- mpoad/io.c quick fix for undefined OPEN_MAX
30921 +
30922 +
30923 +Version 0.77 to 0.78 (7-JUL-2000)
30924 +====================
30925 +
30926 +Bug fixes
30927 +---------
30928 +
30929 + - skb_migrate wasn't protected against functions accessing the list via
30930 + skb->list
30931 + - removal of MOD_xxx races in FORE 200E and atmtcp (by Jeff Garzik)
30932 + - CONFIG_ATM_NICSTAR_USE_IDT77105 set NEED_SUNI_MX instead of
30933 + NEED_IDT77105_MX (fix from mainstream)
30934 + - ambassador.c: changed string concatenation and offset calculation breaking
30935 + compilation with gcc 2.96 (by Jakub Jelinek)
30936 + - nicstar.c: various locking fixes for SMP (by Rui Prior)
30937 + - LANE vs. bridging build conflict solved (from mainstream)
30938 + - %%u instead of %u in mpc.c
30939 + - fixed formatting of /proc/net/atm/svc
30940 + - /proc/net/atm/clip always added + after public address, not only if followed
30941 + by private address
30942 + - atmsigd now returns EINVAL if attempting to change max_sdu
30943 + - atm_change_qos now calls adjust_to for additional parameter checking
30944 + - sendmsg now returns error if size > max_sdu (reported by Alan Kennington)
30945 + - removed explicit defaults in Config.in (by Christoph Hellwig)
30946 + - Fore200E: removed #ifdef MODULE
30947 + - ipcommon.c didn't export skb_migrate to modules (by Mitchell Blank)
30948 + - ENI: /proc/net/atm/eni:* claimed backlog was in bytes instead of packets
30949 + - br, bw, window: changed variables receiving possibly negative return values
30950 + from size_t to ssize_t (reported by Alan Kennington)
30951 + - LANE: fixed stray errors on lack of ATM address, ATM address change, or ESI
30952 + change (by Heikki Vatiainen)
30953 + - LANE: could loop forwever when trying to connect to LECS (by Heikki
30954 + Vatiainen)
30955 +
30956 +New features
30957 +------------
30958 +
30959 + - upgraded to the 2.4.0-test3-pre4 kernel
30960 +
30961 +Other changes
30962 +-------------
30963 +
30964 + - as_reject now returns the errno value in msg->reply
30965 + - removed save_qos hack in svc_change_qos
30966 + - atmsigd: sap_encode now always includes both max_sdu fields, even if one
30967 + contains the null value for some reason (by Mohsen Souissi)
30968 + - PCI updates for Ambassador, FORE 200E, Horizon, Iphase, nicstar, ENI, and
30969 + ZATM (by Jeff Garzik)
30970 + - removal of unnecessary #ifdef MODULE for nicstar, idt77105, and FORE 200E
30971 + (by Jeff Garzik)
30972 + - generalized skb_migrate to append to an arbitrary sk_buff list
30973 + - iphase.c: timer initialization cleanup (from mainstream)
30974 + - clip: dev->name initialization change (from mainstream)
30975 + - idt77105: cleaned up timer initialization
30976 + - clip.c: some general cleanup
30977 + - removed redundant return in clip.c (by Heikki Vatiainen)
30978 + - changed atm_change_qos to static
30979 + - fore200e.c: re-enabled anti-unloading code
30980 + - lec.c: now drops packets on overrun instead of growing infinite queue (by
30981 + Heikki Vatiainen)
30982 + - COPYING still mentioned the old led code with partial DEC copyright
30983 + (reported by Chris Pimlott)
30984 + - Horizon: removed const warning by casting to (hrz_flags *)
30985 + - Iphase: tried to print unsigned long with %x when errors are enabled
30986 + - ENI: eni_send tries to use do_tx instead of tasklet_schedule to reduce delay
30987 + - ENI: removed eni_dev->backlog_len (information is already in backlog->qlen)
30988 + - changed the kernel source tree references from .gz to .bz2 compression
30989 + - changed mkdiff to allow more flexible selection of additional patch
30990 +
30991 +
30992 +Version 0.76 to 0.77 (29-APR-2000)
30993 +====================
30994 +
30995 +Bug fixes
30996 +---------
30997 +
30998 + - atmaddr.8, atmarp.8, atmdump.8, atmloop.8, esi.8 didn't print all options
30999 + in bold
31000 + - atmsigd crashed if an interface had more than one local ATM address
31001 + - atmarpd continued to use VCs after closing if they were closed because
31002 + ATMARP_SETENTRY failed (reported by Joseph Gooch)
31003 +
31004 +New features
31005 +------------
31006 +
31007 + - upgraded to the 2.3.99-pre6 kernel
31008 +
31009 +Other changes
31010 +-------------
31011 +
31012 + - CLIP now uses NETDEV_GOING_DOWN instead of NETDEV_DOWN; also avoids
31013 + "clip_device_event: unknown event 9" warning
31014 + - added ubr:pcr example to qos(7)
31015 + - added -V option to atmaddr, atmarp, atmarpd, atmloop, atmsigd, atmtcp, esi,
31016 + ilmid
31017 + - sock->sk->sleep now points to vcc->sleep (by Alexander Viro)
31018 + - CLIP: ATMARP server now reponds to query for local IP address (suggested by
31019 + Joseph Gooch)
31020 + - updated t2a.pl
31021 +
31022 +
31023 +Version 0.75 to 0.76 (13-APR-2000)
31024 +====================
31025 +
31026 +Bug fixes
31027 +---------
31028 +
31029 + - ttcp_atm declared port as "short" instead of "unsigned short", yielding
31030 + confusing diagnostic output
31031 +
31032 +New features
31033 +------------
31034 +
31035 + - upgraded to the 2.3.99-pre5 kernel
31036 +
31037 +Other changes
31038 +-------------
31039 +
31040 + - eliminated eni_send-tasklet synchronization
31041 + - PCA200: merged unconditional #inclusion of linux/pci.h from pre5
31042 +
31043 +
31044 +Version 0.74 to 0.75 (7-APR-2000)
31045 +====================
31046 +
31047 +Bug fixes
31048 +---------
31049 +
31050 + - ENI: moved send operation into tasklet to correct synchronization (reported
31051 + by Heikki Vatiainen)
31052 + - MPOA: possible deadlock fix (by Heikki Vatiainen)
31053 + - atm_vcc_flags_t was too small on PPC, causing an overlap with vcc->family
31054 + (fixed by Chas Williams)
31055 + - CLIP: needs spin_lock_irqsave instead of only spin_lock (by Rui Prior)
31056 + - CLIP: clip_push may be called from an interrupt, so the kfree_skb has to
31057 + become dev_kfree_skb_any (by Heikki Vatiainen)
31058 +
31059 +Other changes
31060 +-------------
31061 +
31062 + - removed INCLUDES from atm/ilmid/asn1/Makefile (suggested by Jean Marc
31063 + Lacroix)
31064 + - atm/maint/Makefile no longer special-cases atmdiag.c (suggested by Jean Marc
31065 + Lacroix)
31066 +
31067 +
31068 +Version 0.73 to 0.74 (2-APR-2000)
31069 +====================
31070 +
31071 +Bug fixes
31072 +---------
31073 +
31074 + - atm_poll tried to sleep on two wait queues, which is no longer possible.
31075 + Removed vcc->wsleep to solve this. (Reported by Joseph Gooch)
31076 + - lec.c:lec_arp_clear_vccs changed the VCC flags of the wrong VCC, fortunately
31077 + only in commented-out code
31078 + - major revision of MPOA ingress and egress cache locking (Heikki Vatiainen)
31079 +
31080 +Other changes
31081 +-------------
31082 +
31083 + - removed last remnants of bogus bridging lock from lane_mpoa_init.c
31084 + (reported by Heikki Vatiainen)
31085 + - removed last traces of TNET1570A driver
31086 + - atmdev_init still knew about ENI, but ENI now uses new-style initialization
31087 + - improved Fore 200E configuration to catch useless settings already at
31088 + configuration time (by Christophe Lizzi)
31089 +
31090 +
31091 +Version 0.72 to 0.73 (29-MAR-2000)
31092 +====================
31093 +
31094 +Bug fixes
31095 +---------
31096 +
31097 + - ambassador.c and horizon.c had module loading races (fixed by Giuliano
31098 + Procida)
31099 + - fore200e: one set_bit was accidently converted to clear_bit, preventing VCs
31100 + from being opened (fixed by Christophe Lizzi)
31101 +
31102 +Other changes
31103 +-------------
31104 +
31105 + - fore200e: moved interrupt handler work to tasklet (by Christophe Lizzi)
31106 + - fore200e: fixed SBUS DMA direction flags (by Christophe Lizzi)
31107 + - fore200e: the compile no longer fails when the driver is compiled without
31108 + any hardware support (and displays a warning; by Christophe Lizzi)
31109 + - oops, atm/README was lagging behind a few versions
31110 +
31111 +
31112 +Version 0.71 to 0.72 (25-MAR-2000)
31113 +====================
31114 +
31115 +Bug fixes
31116 +---------
31117 +
31118 + - fore200e.h and lec.h didn't #include <linux/config.h> (fixed by David S.
31119 + Miller ?)
31120 + - atmloop.c always assumed -q to be present
31121 +
31122 +New features
31123 +------------
31124 +
31125 + - upgraded to the 2.3.99-pre3 kernel
31126 +
31127 +Other changes
31128 +-------------
31129 +
31130 + - kernel patch still included wd.c hack (reported by David S. Miller)
31131 + - removed bogus initialization of skb->rx_dev (spotted by Alexey Kuznetsov)
31132 + - removed bogus lane_bridge_hook_lock (by Heikki Vatiainen)
31133 + - added sparc64 support for ATM_QUERYLOOP (by Christophe Lizzi)
31134 + - minor Fore driver cleanup (by Christophe Lizzi)
31135 + - eni.c: moved interrupt handler work to tasklet
31136 +
31137 +
31138 +Version 0.70 to 0.71 (21-MAR-2000)
31139 +====================
31140 +
31141 +Bug fixes
31142 +---------
31143 +
31144 + - eni.c: fixed potential SMP deadlock on tx_wait
31145 + - clip.c and lec.c didn't initialize skb->rx_dev
31146 + - net/atm/svc.c:svc_connect left wait entry in queue on return in some cases
31147 + - idiot bug in skb_migrate caused weird crashes
31148 + - atmloop usage erroneously claimed -s was optional
31149 +
31150 +New features
31151 +------------
31152 +
31153 + - upgraded to the 2.3.99-pre2 kernel
31154 + - added atmloop.8 man page
31155 + - added enqueuing result NET_XMIT_BYPASS for qdiscs that send packets on a
31156 + path without dequeue (e.g. sch_atm)
31157 +
31158 +Other changes
31159 +-------------
31160 +
31161 + - ambassador.c: removed warnings when compiling with CONFIG_SMP (by Giuliano
31162 + Procida)
31163 + - changed drivers/atm target from atm.a to atm.o, to make initcalls work
31164 + - converted eni.c to use pci_register_driver and initcall
31165 + - cleaned up #ifdef hell in net/atm/signaling.c:sigd_put_skb
31166 +
31167 +
31168 +Version 0.69 to 0.70 (20-MAR-2000)
31169 +====================
31170 +
31171 +Bug fixes
31172 +---------
31173 +
31174 + - LEC compilation as a module still left it in the kernel
31175 +
31176 +Other changes
31177 +-------------
31178 +
31179 + - moved LANE-bridging interface code from lec.c to lane_mpoa_init.c (by
31180 + Heikki Vatiainen)
31181 + - made SONET and ATM statistics counters atomic to avoid cli() when reading
31182 + (not updated: similar mechanism in idt77105.c and private shadow statistics
31183 + of ambassador.c)
31184 + - changed access to VCC and device flags (ATM_VF_* and ATM_DF_*) to bit set
31185 + operations
31186 + - changed flag types to structs to fail compilation of old code
31187 + - changed last argument of atm_dev_register to a pointer to a bit set for
31188 + easier migration
31189 + - net/atm/*.c: eliminated all sleep_on and cli (except in lec.c)
31190 + - ditto for eni.c and suni.c
31191 + - corrected indentation of some "permanent" debugging code in zatm.c
31192 + - made skb_migrate partially atomic, obsoleting yet another cli() in clip.c
31193 +
31194 +
31195 +Version 0.68 to 0.69 (19-MAR-2000)
31196 +====================
31197 +
31198 +Bug fixes
31199 +---------
31200 +
31201 + - ambassador.c: corrected location of initial PLX window for use on Alpha (by
31202 + Giuliano Procida)
31203 + - zeppelin: fixed address initialization (found by Christophe Lizzi)
31204 + - atmsigd.conf man page erroneously described the option "q.2963.1" as
31205 + "q2963_1"
31206 + - LANE didn't compile when bridging was enabled (fixed by Heikki Vatiainen;
31207 + note that bridging also needs an update which is being merged via the
31208 + mainstream kernel)
31209 +
31210 +New features
31211 +------------
31212 +
31213 + - atmsigd: added command-line option -u to set the UNI mode
31214 + - added ioctl ATM_QUERYLOOP to determine supported loopback modes
31215 + - added atmloop(8) option -q
31216 +
31217 +Other changes
31218 +-------------
31219 +
31220 + - added CREDITS entry of Giuliano Procida
31221 + - various cosmetic changes to horizon.c (by Giuliano Procida)
31222 + - ambassador.c: various bits of cleanup (by Giuliano Procida)
31223 + - added -S <tos> option to ttcp_atm to set the IPv4 TOS byte (this is not
31224 + really related to ATM)
31225 + - changed loopback mode values to a bit set
31226 + - idt77105_ioctl: returned sizeof(int) instead of 0 on ATM_GETLOOP
31227 + - added phy_ops->stop to suni.c and uPD98402_stop, cleaned up suni.c in the
31228 + process
31229 + - removed (very obsolete) mmuio.o from net/atm/Makefile
31230 +
31231 +
31232 +Version 0.67 to 0.68 (28-FEB-2000)
31233 +====================
31234 +
31235 +Bug fixes
31236 +---------
31237 +
31238 + - removed potential dev_kfree_skb(NULL) from *_send of eni.c, zatm.c, iphase.c
31239 + - eni.c, zatm.c, iphase.c sometimes returned PCI error codes instead of errno
31240 + codes
31241 + - arpd/io.c could try to de-reference entry->addr with addr == NULL (fixed by
31242 + Thomas Dietz)
31243 + - LANE copied more than dev->addr_len address bytes (fixed by Heikki
31244 + Vatiainen)
31245 + - sch_atm didn't remove filters on destroy
31246 + - fixed typo in esi.c error message
31247 + - esi.8 claimed to be the man page of atmarp, and it wasn't installed
31248 + - added checking for VPI/VCI when sending AAL0 cells (by Mitchell Blank)
31249 + - atmtcp allowed sending on receive-only VCs
31250 + - various ioctl permission checks were missing (fixed by Mitchell Blank)
31251 + - fore200e.c and horizon.c didn't always free skbs on send error (fixed by
31252 + Mitchell Blank)
31253 + - included an ugly hack to fix the wd.c driver that was broken around 2.3.47
31254 + (not related to ATM at all...)
31255 +
31256 +New features
31257 +------------
31258 +
31259 + - upgraded to the 2.3.48 kernel
31260 + - added device-independent SAR/PHY loopback setting interface (with many good
31261 + ideas from Greg Banks and Mitchell Blank), and removed old loopback ioctls
31262 + - new utility atmloop to set loopback mode
31263 + - added "stop" to atmphy_ops (requested by Mitchell Blank)
31264 +
31265 +Other changes
31266 +-------------
31267 +
31268 + - mkdiff can now also use pre-release kernels
31269 + - changed *kfree_skb to dev_kfree_skb_{irq,any} in eni.c, zatm.c, and raw.c,
31270 + where necessary (with help from Heikki Vatiainen)
31271 + - changed {dev_,}kfree_skb to dev_kfree_skb_any in ambassador.c, horizon.c,
31272 + iphase.c, and nicstar.c (needs further cleanup)
31273 + - softnet updates for LANE (by Heikki Vatiainen)
31274 + - fixed firmeware license of Fore 200E driver and general 0.46/0.47 updates
31275 + (Christophe Lizzi)
31276 + - more CREDITS file additions
31277 + - softnet updates for sch_atm
31278 + - softnet updates for CLIP (also cleaned up flow control for > 1 VCC/itf;
31279 + reported by Alexey Kuznetsov)
31280 + - updated documentation for iproute2-2.2.4-now-ss000225 and streamlined the
31281 + build procedure
31282 + - PCI DMA updates for ENI driver
31283 + - changed the default install location of executables and man pages from
31284 + /usr/local to /usr
31285 + - make install no longer installs align, aping, br, bw, delay, isp, svctor,
31286 + sw_debug, sw_tcp, swc, and window
31287 + - eni.c: made highly controversial aal5 = ... line more readable
31288 + - moved /proc/atm to /proc/net/atm
31289 + - added vcc->send function to allow for AAL-specific processing (may be set
31290 + to dev->ops->send)
31291 + - atm_do_connect_dev now calls bind_vcc before AAL initialization to make
31292 + vcc->dev available
31293 + - change_qos no longer allows changing of AAL or traffic class (by Mitchell
31294 + Blank)
31295 + - changes for new loopback support to fore200e driver and sparc64 code (by
31296 + Christophe Lizzi)
31297 +
31298 +
31299 +Version 0.66 to 0.67 (2-FEB-2000)
31300 +====================
31301 +
31302 +New features
31303 +------------
31304 +
31305 + - upgraded to 2.3.42
31306 + - added sunimode utility to set SUNI loopback mode (by Christophe Lizzi)
31307 +
31308 +Other changes
31309 +-------------
31310 +
31311 + - removed unused variable warning in net/sched/sch_atm.c
31312 + - changed ENI_SETMULT from ATMIOC_SARPRV+1 to ATMIOC_SARPRV+7
31313 + - changed atmarpd's complaint about VCC-less non-ATMARP-server entries from
31314 + DIAG_ERROR to DIAG_INFO (the condition is okay for an ATMARP server)
31315 +
31316 +
31317 +Version 0.65 to 0.66 (31-JAN-2000)
31318 +====================
31319 +
31320 +Bug fixes
31321 +---------
31322 +
31323 + - atmsigd crashed on reception of as_accept, etc., because of inverted NULL
31324 + pointer test (reported by Kevin Vargo, Rui Prior, fixed by Julian Cable)
31325 + - fixed various SPARC build problems (by Christophe Lizzi)
31326 + - atmsigd insisted that calling party number is local in switch mode
31327 + - debug switch didn't initialize any ports
31328 + - net/atm/signaling.c:sigd_enq didn't properly zero the message, yielding
31329 + kernel pointers partially containing junk
31330 + - accept(2) didn't copy local ATM address to VCC descriptor (reported by
31331 + Pedro Brandao)
31332 + - ilmid/io.c didn't compile on SPARC (reported by Christophe Lizzi)
31333 + - usage.txt didn't define the %: macro, leaving garbage in usage.txt
31334 +
31335 +New features
31336 +------------
31337 +
31338 + - upgraded to 2.3.41
31339 + - Fore 200E driver now also works for SBA-200E (by Christophe Lizzi)
31340 +
31341 +Other changes
31342 +-------------
31343 +
31344 + - added various CREDITS entries
31345 + - changed TIOC{IN,OUT}Q to SIOC{IN,OUT}Q (no user space rebuild required;
31346 + the values are identical)
31347 + - added script atm/switch/tcp/mkfiles for automatic extraction of
31348 + configuration files
31349 + - atmsigd called ATM_GETLINKRATE "ATM_GETLINERATE" in complaints
31350 + - atmsigd tried to obtain link speed in switch mode, although it's not used
31351 + - Ambassador NIC: various files still had the wrong copyright/licensing text
31352 + (patch by Giuliano Procida)
31353 +
31354 +
31355 +Version 0.64 to 0.65 (21-JAN-2000)
31356 +====================
31357 +
31358 +Bug fixes
31359 +---------
31360 +
31361 + - fixed 32/64 bit %p formatting problem in /proc/atm/vc
31362 + - atmtcp: fixed RX/TX statistics (by Jens Axboe)
31363 + - sparc64-specific ioctl 32/64 bit marshalling fixes (by Christophe Lizzi,
31364 + with further improvements by Jens Axboe)
31365 + - zeppelin -l option handling (reported by Mike Prudence, fixed by Heikki
31366 + Vatiainen)
31367 + - mkpatch didn't include drivers/atm/eni.h
31368 + - updated eni.h (tx->backlog_len was missing)
31369 + - fixed various uint32_t build problems of user space tools by including
31370 + atm.h before anything other ATM headers (first reported by Rashmi Dravid)
31371 + - "natmtcp virtual" didn't parse the command line properly
31372 + - natmtcp's TCP link changed VPI/VCI to 0.0 on close
31373 + - CLIP: fixed crash after sending ARP (reported by Rui Prior)
31374 +
31375 +New features
31376 +------------
31377 +
31378 + - upgraded to 2.3.40 (with help from Jens Axboe)
31379 + - added sparc64 changes for ENI driver (by Heikki Vatiainen)
31380 + - added the Fore PCA-200E(/SBA-200E) driver (by Uwe Dannowski and Christophe
31381 + Lizzi)
31382 + - added the Interphase ATM PCI (i)Chip (x575, x525, x531, etc.) driver (by
31383 + Monalisa Agrawal and Peter Wang)
31384 + - added ABR fields to struct atm_trafprm (by Peter Wang)
31385 + - nicstar driver now supports setting of the CLP bit (by Rui Prior)
31386 + - added ENI_SETMULT ioctl and enitune utility to change ENI buffer size
31387 + multipliers at run time
31388 +
31389 +Other changes
31390 +-------------
31391 +
31392 + - atmsigd: changed default UNI version from 3.0 to dynamic (which defaults
31393 + to 3.0)
31394 + - atmtcp: removed ugly ../../net/atm/protocols.h include
31395 + - ioctls now internally return -ENOIOCTLCMD if ioctl command number is not
31396 + recognized
31397 + - removed ATM_CREATE_LEAF ioctl (wasn't used and suggested the wrong design
31398 + approach anyway)
31399 + - updated README.DRIVERS
31400 + - natmtcp now uses port 2812 (assigned by IANA)
31401 + - moved Documentation/atm.txt to Documentation/networking
31402 + - improved atm_kptr_int_t for non-Sparc architectures (by Christophe Lizzi)
31403 + - removed two compiler warnings from nicstar.c
31404 + - some minor nicstar cleanup (by Rui Prior)
31405 + - added "vbr" and "abr" to text2qos/qos2text ("vbr" not used for anything
31406 + right now)
31407 + - natmtcp: added commands "create", "remove", "switch", corresponding to
31408 + options -p, -r, and -s of atmtcp
31409 + - natmtcp: added link type "print" (write PDU content to stdout)
31410 + - natmtcp: now uses atm_kptr_int_t for VCC kernel pointer instead of unsigned
31411 + long
31412 + - added apologetic man page for natmtcp
31413 + - renamed natmtcp to atmtcp and removed the old atmtcp
31414 + - changed some user-space code to avoid patronizing "ambiguous `else'"
31415 + warnings from egcs, adding as few ugly redundant curly braces as possible
31416 + - fixed some other compiler warnings
31417 + - kernel part: trimmed operations structure initializers which consisted
31418 + mainly of NULL pointers
31419 + - kernel pointers sent as opaque references to user space are now of type
31420 + atm_kptr_t. Added support functions kptr_eq and kptr_print. (With help from
31421 + Richard Johnson and Mitchell Blank)
31422 + - removed various "overriding commands" warnings in user-space build process
31423 + - mkdist now creates arcvie in current directory if ~/l/arch doesn't exist
31424 + - make clean && make now works also if dependencies are present (make clean
31425 + used to remove sigd/q.out.h, which the dependencies required)
31426 + - atmtcp uses command bg instead of -b for backgrounding. Also, listen-bg
31427 + listens and backgrounds before calling accept.
31428 +
31429 +
31430 +Version 0.63 to 0.64 (1-DEC-1999)
31431 +====================
31432 +
31433 +Bug fixes
31434 +---------
31435 +
31436 + - atmapi.h logic was still wrong (fixed by Christophe Lizzi)
31437 + - LANE: fixed BUS filtering and net/atm/lec.c cleanup (by Heikki Vatiainen)
31438 + - arpd/io.c assumed that diag() preserves errno
31439 + - atmarpd didn't include QOS in output if getsockopt failed
31440 +
31441 +New features
31442 +------------
31443 +
31444 + - /proc/atm/eni:* now also shows transmit queue and backlog length
31445 + - added option "sndbuf" to atmarp
31446 + - added option "sndbuf" to tc ... atm ...
31447 + - /proc/atm/vc lists internal details for all VCs (flags, buffers, etc.);
31448 + added ATM_VF2TXT_MAP to atmdev.h to allow translation of flag values
31449 +
31450 +Other changes
31451 +-------------
31452 +
31453 + - ATM now uses sk->sndbuf/rvcbuf instead of atm_vcc->tx_quota/rx_quota
31454 + - removed rx_quota hack from zatm.c
31455 + - removed net/atm/tunable.h
31456 + - CLIP and sch_atm now only send packets if the VC's send queue allows them to
31457 + - implemented correct "requeue" function in sch_atm
31458 + - updated zeppelin(8) man page (Heikki Vatiainen)
31459 + - atmarp: atmarp -q qos_spec usage is obsolete; use atmarp -q qos qos_spec
31460 + instead
31461 + - /proc/atm/svc now prints "N/A@xxxxxxxx" instead of "Unassigned", with the
31462 + address of the descriptor in xxxxxxxx
31463 + - removed all traces of CONFIG_MMU_HACKS
31464 + - obsoleted ATM_SETSC (single-copy control)
31465 +
31466 +
31467 +Version 0.62 to 0.63 (22-NOV-1999)
31468 +====================
31469 +
31470 +Bug fixes
31471 +---------
31472 +
31473 + - horizon.c: cleared weird rate_lock/rates_lock patch conflict
31474 + - saaldump output formatting was completely wrecked; added option -q for
31475 + "quiet" output (no Q.2931 printing)
31476 + - fixed LANE Ethernet interface MTU mapping (patch by Rob Scott)
31477 + - atmsigd incorrectly rejected CONNECTION AVAILABLE (Q.2963.1)
31478 + - SVC address was wrong in /proc/atm/arp if using private and public part
31479 + - RESTART ACKNOWLEDGE was not sent with the correct global call reference
31480 + value (reported by Peter Ryan)
31481 + - zatm: usec timestamps need 64 division of x86, so this option must be
31482 + unavailable on other architectures (reported by Matti Aarnio)
31483 + - nicstar: added "fix3" and "fix4" (by Rui Prior)
31484 + - LANE: non-proxy didn't filter packets coming from BUS (fix by Marko Kiiskila
31485 + and Heikki Vatiainen)
31486 +
31487 +New features
31488 +------------
31489 +
31490 + - upgraded to kernel version 2.3.28
31491 + - atmtcp now reports VC open/close and generates timestamps (Note: the
31492 + protocol used between the kernel and the atmtcp utility has changed)
31493 + - new utility "natmtcp" which combines the ATMTCP protocol, ATMTCP ("virtual")
31494 + interfaces, "real" ATM interfaces, and log files (experimental)
31495 + - added ILMI 4.0 MIB variables atmfPortMyIdentifier and atmfMySystemIdentifier
31496 + (by Thomas Seidel)
31497 + - zeppelin: new command line option -I to select interface, allowing the use
31498 + of LANE with multiple physical interfaces (by Heikki Vatiainen)
31499 + - UltraSparc (sparc64) support (by Christophe Lizzi)
31500 + - nicstar: added IDT77105 PHY support (by Greg Banks)
31501 + - added utility loop25 to control ForeRunner LE loopback mode (by Greg Banks)
31502 + - added support for DNS lookup of NSAP addresses (by Rui Prior)
31503 + - added utility debug/dnstest (by Rui Prior)
31504 +
31505 +Other changes
31506 +-------------
31507 +
31508 + - net/atm/tunable.h cleanup
31509 + - removed SO_BCTXOPT, SO_BCRXOPT, and struct atm_buffconst
31510 + - removed obsolete field "next" from struct atm_blli
31511 + - changed potentially unaligned 32 bit accesses in SAAL to use read_netl
31512 + (spotted by Christophe Lizzi)
31513 + - added __attribute__ ((aligned(8))) to many structures containing structures
31514 + which are shared by kernel and user space to enfore uniform packing on
31515 + sparc64 (with help from Christophe Lizzi)
31516 + - changed unsigned long to unsigned int at API for compatibility with
31517 + architecture where sizeof(long) differs between user and kernel space
31518 + (e.g. sparc64; suggested by Christophe Lizzi)
31519 + - changed struct atmsvc_msg.{vcc,listen_vcc} from unsigned long to new type
31520 + atm_kptr_int_t; changed atmsigd accordingly (NB: debugging output may strip
31521 + upper bits)
31522 + - changed various casts pointer->int to pointer->long->int (where the pointer
31523 + does indeed only contain an int, e.g. in ioctl) for Alpha (reported by
31524 + Matti Aarnio)
31525 + - nicstar: changes card->membase from u32 to unsigned long
31526 + - added __attribute__ ((unused)) to mpc.c and mpoa_caches.c to remove
31527 + warnings about variables used only for debugging
31528 + - drivers/atm/Config.in: changed ! "$foo" = "x" to "$foo" != "x"
31529 +
31530 +
31531 +Version 0.61 to 0.62 (27-AUG-1999)
31532 +====================
31533 +
31534 +Bug fixes
31535 +---------
31536 +
31537 + - lib/diag.c:set_logfile didn't set log_to_initialized (reported by Lars
31538 + Burgstahler)
31539 + - sch_atm did not use classifiers attached to the x:0 class (reported by Lars
31540 + Burgstahler)
31541 + - net/atm/atm_misc.c EXPORT'ed atm_return, which is an inline function (fixed
31542 + by Mitchell Blank)
31543 + - work-around for SO_LEVEL range problems (by Mitchell Blank)
31544 + - nicstar oops fix (by Rui Prior and John Brosnan)
31545 + - nicstar should now work also as non-module (by Rui Prior)
31546 + - nicstar fix for chip bug showing up on 64-bit CPCI bus systems (by Jay
31547 + Talbott)
31548 + - cleared confusion about inclusion of suni.o when building both nicstar and
31549 + ENI
31550 + - suni.c now always exports suni_init
31551 + - various fixes and cleanups in the Madge drivers (by Giuliano Procida)
31552 + - fixed new set of atm_pdu2truesize problems by introducing atm_alloc_charge
31553 + which handles the allocation too (problem report and work-around by Alexey
31554 + Kuznetsov)
31555 + - getsockname on unbound PVC socket caused an oops
31556 + - LANE: Token Ring source route bridge support fix (by Heikki Vatiainen)
31557 +
31558 +New features
31559 +------------
31560 +
31561 + - upgraded to kernel version 2.3.15 (mainly by Alexey Kuznetsov and Mitchell
31562 + Blank)
31563 + - new socket option SO_ATMPVC to retrieve the "PVC" address (PVC & SVC) (based
31564 + on a patch by Jay Talbott)
31565 + - zeppelin -l now also accepts only the selector byte (by Robert Slaski)
31566 +
31567 +Other changes
31568 +-------------
31569 +
31570 + - removed obsolete drivers/atm/nicstar.c.old_skb
31571 + - removed all references to Arequipa (obsolete)
31572 + - SO_BCTXOPT/SO_BCRXOPT are now obsolete, given that the final verdict on page
31573 + flipping has been spoken in linux-kernel
31574 + - interface statistics are now counted in struct net_device_stats instead of
31575 + struct enet_statistics (by Mitchell Blank)
31576 + - added pointer to mailing list to Documentation/atm.txt
31577 + - Documentation/Configure.help now points to Documentation/atm.txt instead of
31578 + directly to the Web page.
31579 + - usage.tex: clarified the consequences of interrupting atmtcp
31580 + - changed the highly misleading "atmarpd:ITF: no such interface" message to
31581 + DIAG_DEBUG
31582 +
31583 +
31584 +Version 0.60 to 0.61 (11-JUN-1999)
31585 +====================
31586 +
31587 +Bug fixes
31588 +---------
31589 +
31590 + - nicstar: driver sometimes crashed when starting for 25 Mbps cards (Rui
31591 + Prior)
31592 + - Zeitnet driver: uPD98402.c wasn't compiled with -DEXPORT_SYMTAB when
31593 + building as a module
31594 + - net/atm/raw.c didn't export atm_init_aal5, so ATMTCP didn't load as a module
31595 + - atmtcp could still be accessed after loading and then unloading, yielding an
31596 + Oops
31597 +
31598 +Other changes
31599 +-------------
31600 +
31601 + - PPC configuration now also includes ATM (Jay Talbott)
31602 + - lots of cleanup in the Madge drivers (Giuliano Procida)
31603 + - tamed down a bit the tone in README
31604 +
31605 +
31606 +Version 0.59 to 0.60 (3-JUN-1999)
31607 +====================
31608 +
31609 +New features
31610 +------------
31611 +
31612 + - upgraded to kernel version 2.3.3 (main change is slightly different wait
31613 + queue handling; affects all drivers)
31614 +
31615 +Other changes
31616 +-------------
31617 +
31618 + - mkdiff script now takes .bz2 kernel if no .gz can be found
31619 + - made a few changes to the Madge drivers to reduce the number of warnings
31620 +
31621 +
31622 +Version 0.58 to 0.59 (3-JUN-1999)
31623 +====================
31624 +
31625 +New features
31626 +------------
31627 +
31628 + - upgrade to kernel version 2.2.9
31629 + - zeppelin now adjusts MTU when joining ELAN (Heikki Vatiainen)
31630 +
31631 +Other changes
31632 +-------------
31633 +
31634 + - adjusted tr interface name limit to 8 characters (down from a wasteful 9)
31635 +
31636 +
31637 +Version 0.57 to 0.58 (3-JUN-1999)
31638 +====================
31639 +
31640 +Bug fixes
31641 +---------
31642 +
31643 + - ENI drivers sometimes directly dereferenced pointers instead of using readl/
31644 + writel (fixed by Mitchell Blank)
31645 + - nicstar driver no longer uses floating point (fixed by Rui Prior)
31646 + - nicstar driver may have refused CBR VC in some cases even with enough
31647 + bandwidth available (fixed by Rui Prior)
31648 + - usage.tex failed to build (fixed by Bill Brooks)
31649 + - zeppelin got byte order in BLLI wrong (reported by Chas Williams; fixed by
31650 + Mitchell Blank and Heikki Vatiainen)
31651 + - zeppelin did not work when the host had multiple ATM addresses (reported by
31652 + Benoit Steiner; fixed by Heikki Vatiainen)
31653 + - zeppelin incorrectly parsed -i command line option (reported by Benoit
31654 + Steiner; fixed by Heikki Vatiainen)
31655 + - atm_connect_vcc and /proc/atm/pvc report AAL0 now properly (reported by Zhu
31656 + Qun Ying and Uwe Dannowski)
31657 +
31658 +New features
31659 +------------
31660 +
31661 + - nicstar driver now support SONET diagnostics (by Rui Prior)
31662 + - nicstar driver now works on PowerPC (by Jay Talbott)
31663 + - LANE now also supports Token Ring (Heikki Vatiainen, with testing by
31664 + Holger Smolinski)
31665 +
31666 +Other changes
31667 +-------------
31668 +
31669 + - major non-i386 architecture and other cleanup in ENI driver (by Mitchell
31670 + Blank)
31671 + - number of lec devices is 40+8 (lec0-lec39 are Ethernet and lec40-lec47 are
31672 + Token Ring; Heikki Vatiainen)
31673 + - lec.c and mpc.c now use atm_force_charge (Heikki Vatiainen)
31674 + - net/802/tr.c limited interface names to 4 characters (fixed by Heikki
31675 + Vatiainen)
31676 + - zeppelin man page updated (Heikki Vatiainen)
31677 + - "zeppelin.new" is now "zeppelin", the old "zeppelin" is gone
31678 + - set "atm_connect" printk to KERN_DEBUG
31679 + - removed ATM_SAAL from include/linux/atm.h (there never was any support for
31680 + SAAL in the kernel)
31681 +
31682 +
31683 +Version 0.56 to 0.57 (18-MAY-1999)
31684 +====================
31685 +
31686 +Bug fixes
31687 +---------
31688 +
31689 + - atmarpd complained "invalid control msg type" when changing interface
31690 + characteristics (reported by Soo-Khim Ho)
31691 + - sch_atm didn't compile without CLIP (reported by Zhu Qun Ying)
31692 + - LANE & MPOA: plugged a few memory leaks after failure to atm_charge (Heikki
31693 + Vatiainen)
31694 + - mpcd could not be killed if MPS's address was not known (fixed by Heikki
31695 + Vatiainen)
31696 + - nicstar: fixed the sleeping in interrupt issue (Rui Prior)
31697 +
31698 +New features
31699 +------------
31700 +
31701 + - drivers for the Madge "Ambassador" and "Horizon [Ultra]" NICs, also known
31702 + as Collage PCI 155 Server, 25, and 155 Client (by Giuliano Procida)
31703 +
31704 +Other changes
31705 +-------------
31706 +
31707 + - MPOA code cleanup and debugging printks are now conditional (Heikki
31708 + Vatiainen)
31709 + - removed both led/USAGE files
31710 + - removed the old atmsigd (was in atm/sig.old/)
31711 + - nicstar driver now works around TSQ bug on older chips (77201) (by Rui
31712 + Prior, with the detective work by Jay Talbott)
31713 +
31714 +
31715 +Version 0.55 to 0.56 (22-APR-1999)
31716 +====================
31717 +
31718 +Bug fixes
31719 +---------
31720 +
31721 + - atm/doc/Makefile assumed . to be included in PATH when invoking rlatex
31722 + (fix by Heikki Vatiainen)
31723 + - usage.txt leaked Arequipa configuration examples (fix by Heikki Vatiainen)
31724 + - plugged a small memory leak in led.new which occurred when using the LANE
31725 + client as a proxy (Heikki Vatiainen)
31726 + - atmarpd crashed when printing ATMARP table entries with flag 0x8000 set
31727 + (reported by Vinay Kulkarni)
31728 + - CLIP interfaces now follow netmask changes
31729 + - Nicstar: 25.6 Mbps cell rate corrected (by Rui Prior)
31730 + - atm_equal could loop forever when comparing NSAP-encoded E.164 addresses
31731 + (reported by Valley Zhizhkun)
31732 + - [AP]F_ATM[PS]VC definitions in lib/atm.h conflicted with glibc 2.1
31733 + (reported by Heikki Vatiainen and Jens Vagelpohl)
31734 + - changed a few non-int main to int main (reported by Heikki Vatiainen)
31735 + - changed lib/diag.c work with glibc 2.1, where stderr is no longer a constant
31736 + (based on a patch by Heikki Vatiainen, also reported by Giuliano Procida)
31737 + - make clean didn't remove qgen/q.test.c, qgen/qd.out.h, qgen/qd.test.c,
31738 + sigd/q.out.h and sigd.old/q.out.h (reported by Giuliano Procida)
31739 + - optional headers were installed even with system headers present if
31740 + INSTROOT was different from / (reported by Giuliano Procida)
31741 + - lib/stdint.h was used even on systems that had a "real" stdlib.h (based on a
31742 + patch by Heikki Vatiainen, also reported by Giuliano Procida)
31743 + - renamed net/atm/misc.c to atm_misc.c to avoid name clash with
31744 + drivers/char/misc.c on include/linux/modules/misc.* (reported by Borek
31745 + Lupomesky)
31746 +
31747 +New features
31748 +------------
31749 +
31750 + - new ioctl ATM_GETLINKRATE to query link rate of an interface (suggested by
31751 + Vitaly Lavrov)
31752 + - new atmsigd.conf option io max_rate to specify rate to signal if
31753 + application requests the "maximum"
31754 + - added decription of CONFIG_ATM_LANE and CONFIG_ATM_MPOA to the kernel
31755 + configuration help (Heikki Vatiainen)
31756 + - added description of LANE to usage.tex (Heikki Vatiainen)
31757 + - new function atm_force_charge to unconditionally add data to a receive
31758 + buffer
31759 +
31760 +Other changes
31761 +-------------
31762 +
31763 + - atmsigd now determines maximum link rate by querying interfaces (suggested
31764 + by Vitaly Lavrov)
31765 + - moved local address registry from a global table to VPCI structures
31766 + - changed unknown net device notification severity from KERN_ERR to
31767 + KERN_WARNING
31768 + - atmarpd now overwrites old atmarpd.table on startup (it used to keep it
31769 + until the first configuration change)
31770 + - shutdown(2) of native ATM VCs now returns 0 instead of -EOPNOTSUPP
31771 + (suggested by Mitchell Blank)
31772 + - Nicstar: IRQ sharing is now allowed (by Rui Prior)
31773 + - Nicstar: default maximum number of cards is now 4 (by Rui Prior)
31774 + - Nicstar: when compiled as a module, the driver may no longer be removed
31775 + while in use (by Rui Prior)
31776 + - Nicstar: loss of cells is no longer reported as a plain CRC error (by Rui
31777 + Prior)
31778 + - atmsigd now always clears the endpoint reference flag if in UNI 3.0 mode
31779 + (based on a patch by Heikki Vatiainen)
31780 +
31781 +
31782 +Version 0.54 to 0.55 (1-MAR-1999)
31783 +====================
31784 +
31785 +Bug fixes
31786 +---------
31787 +
31788 + - SELECT_TOP_PCR didn't take intro account the "pcr" field, causing SVC with
31789 + QoS pcr=xxx to be set up at link speed
31790 + - qos_equal didn't detect differences in the "pcr" fields
31791 + - sch_atm only accepted parent == root or absent (reported by John Loughney)
31792 + - sch_atm:atm_tc_put accessed flow structure after kfree'ing it
31793 + - sch_atm:atm_tc_change didn't put excess traffic class if class creation
31794 + failed
31795 + - sch_atm:atm_tc_dump_class didn't return class ID in tcm->tcm_handle
31796 + - sch_atm:atm_tc_delete refused to delete classes because it expected
31797 + ref == 1, but ref == 2 (reported by John Loughney)
31798 +
31799 +
31800 +Version 0.53 to 0.54 (19-FEB-1999)
31801 +====================
31802 +
31803 +Bug fixes
31804 +---------
31805 +
31806 + - led.new: fixed build problem and warning (Heikki Vatiainen)
31807 + - fixed LANE arp cache timeouts (Heikki Vatiainen)
31808 + - ilmid -i option fell through into -l, causing logging to go into a file
31809 + named after the local address
31810 + - flipping the highest bit of ep_ref made it negative which was erroneously
31811 + interpreted to mean "absent" (reported by Giuliano Procida and Chas
31812 + Williams)
31813 + - ilmid used the result of AsnOidCompare inconsistently, causing network
31814 + prefix registration to fail with some switches (based on a patch by Giuliano
31815 + Procida)
31816 +
31817 +New features
31818 +------------
31819 +
31820 + - tc:q_atm: new option "clip" to select Classical IP processing of inbound
31821 + traffic
31822 + - new sch_atm class attribute TCA_ATM_STATE to retrieve VC state
31823 +
31824 +Other changes
31825 +-------------
31826 +
31827 + - led.new: improved handling of LANE flush protocol (Heikki Vatiainen)
31828 + - copied USAGE from led/ to led.new/
31829 + - added description of ilmid options -i and -u to USAGE (Heikki Vatiainen)
31830 + - ilmid -u now also works without -DDYNAMIC_UNI (all values but the default
31831 + are refused)
31832 + - tcpdump patch updated to tcpdump version 3.4 (Heikki Vatiainen)
31833 + - updated "tc" patch to iproute2 version 2.1.99-now-ss990203
31834 +
31835 +
31836 +Version 0.52 to 0.53 (9-FEB-1999)
31837 +====================
31838 +
31839 +Bug fixes
31840 +---------
31841 +
31842 + - atmsigd: selecting the UNI version via compile-time options didn't yield
31843 + the desired result in some cases (reported by Vinay Kulkarni and others)
31844 + - ATM VCCs now use struct sock, as required by protocol-independent layer
31845 + starting with recent 2.1 kernels (by Mitchell Blank)
31846 + - led fixes: htons/htonl bugs in LANEv2 code, one duplicate close() removed
31847 + (by Heikki Vatiainen)
31848 +
31849 +New features
31850 +------------
31851 +
31852 + - upgraded to the 2.2.1 kernel (by Mitchell Blank)
31853 + - LANE: added bridging support (by Heikki Vatiainen)
31854 + - complete rewrite of led (in led.new), which is now leaner and no longer
31855 + contains code (c) Digital (by Heikki Vatiainen)
31856 + - added macros for local AESA format and group addresses, and support in
31857 + atm2text (by Heikki Vatiainen)
31858 +
31859 +Other changes
31860 +-------------
31861 +
31862 + - ENI: buffer sizes are now limited to MID_MAX_BUF_SIZE even if max_sdu >
31863 + MID_MAX_BUF_SIZE/3 (reported by Andrew Lunn)
31864 + - plenty of NICStAR changes (Rui Prior and Mitchell Blank)
31865 + - LANE interface to upper layer looks more like Ethernet, so adding bridge and
31866 + 802.1Q support is easier, and tcpdump does not need any extra patches (by
31867 + Heikki Vatiainen)
31868 +
31869 +
31870 +Version 0.51 to 0.52 (5-DEC-1998)
31871 +====================
31872 +
31873 +Bug fixes
31874 +---------
31875 +
31876 + - atmsigd crashed when receiving STATUS ENQUIRY for call in Null state
31877 + (reported by Heikki Vatiainen)
31878 + - outbound endpoint reference didin't have the 16th bit toggled (fixed by
31879 + Andrew Lunn)
31880 + - lec.c: fixed a bug in kernel which could cause kernel part to deadlock when
31881 + signalling was not started successfully (by Heikki Vatiainen)
31882 + - MPOA: bug fixes and other changes, see atm/mpoa/CHANGELOG (by Heikki
31883 + Vatiainen)
31884 +
31885 +New features
31886 +------------
31887 +
31888 + - LANE: both kernel & daemon: support for ELANs which have MTUs greater than
31889 + 1516 (by Eric H. Kinzie)
31890 + - MPOA: can now ask LECS for configuratino information (by Heikki Vatiainen)
31891 +
31892 +Other changes
31893 +-------------
31894 +
31895 + - zeppelin.8: updated (Heikki Vatiainen)
31896 +
31897 +
31898 +Version 0.50 to 0.51 (6-NOV-1998)
31899 +====================
31900 +
31901 +Bug fixes
31902 +---------
31903 +
31904 + - atmsigd: typo prevented kernel.c from compiling with UNI30 disabled (fix by
31905 + Andrew Lunn and Uwe Dannowski)
31906 + - option -u crashed ilmid (reported by Michael Wolf)
31907 +
31908 +Other changes
31909 +-------------
31910 +
31911 + - bearer capability is now set to "CBR" for CBR (suggested by Heikki
31912 + Vatiainen)
31913 +
31914 +
31915 +Version 0.49 to 0.50 (3-NOV-1998)
31916 +====================
31917 +
31918 +Bug fixes
31919 +---------
31920 +
31921 + - atmsigd didn't compile for -DUNI31 -DALLOW_UNI30 (fixed by Richard Gooch)
31922 + - atmsigd crashed on as_bind and also had problems with as_connect after
31923 + as_bind (reported by Heiko Krupp, Heikki Vatiainen, and many others)
31924 +
31925 +Other changes
31926 +-------------
31927 +
31928 + - atmsigd now enables tracing by default (use -t 0 to turn it off)
31929 + - added "terminate" message to test/isp
31930 + - mpoad defaults to UBR if service category is absent (by Heikki Vatiainen)
31931 + - LANE now avoids blocking intact connections when other connections have
31932 + problems by queuing packets independently per destination while waiting for
31933 + a connection (by Heikki Vatiainen)
31934 +
31935 +
31936 +Version 0.48 to 0.49 (1-NOV-1998)
31937 +====================
31938 +
31939 +Bug fixes
31940 +---------
31941 +
31942 + - q_atm.c passed TCA_ATM_EXCESS even if zero, while the kernel expected it
31943 + to be absent in this case (changed q_atm.c)
31944 + - q_atm: tc class show didn't separate fields properly with blanks
31945 + - removed double inclusion of atm/config from mkdist
31946 +
31947 +New features
31948 +------------
31949 +
31950 + - upgraded to the 2.1.126 kernel
31951 +
31952 +Other changes
31953 +-------------
31954 +
31955 + - "new" atmsigd is now the default (atm/sigd got renamed to atm/sigd.old,
31956 + atm/sigd.new to atm/sigd)
31957 + - updated extra/tc/README
31958 +
31959 +
31960 +Version 0.47 to 0.48 (30-OCT-1998)
31961 +====================
31962 +
31963 +Bug fixes
31964 +---------
31965 +
31966 + - ilmid didn't recognize the -u option
31967 + - ATM_GETCIRANGE copied wrong amount of data (fix by Heikki Vatiainen)
31968 + - sch_atm didn't compile without policing enabled (reported by Calin Poenaru)
31969 + - BHLI octets: qgen/msg.fmt allowed nine instead of eight bytes for ISO and
31970 + user specified, include/linux/atmsap.h:ATM_MAX_HLI was 7 instead of 8 (by
31971 + Damian Gilmurray and Paisit Thamsakorn)
31972 + - MPOA: bug fixes and other changes, see atm/mpoa/CHANGELOG (by Heikki
31973 + Vatiainen)
31974 +
31975 +New features
31976 +------------
31977 +
31978 + - ilmid: new option -i to set local IP address (suggested by Andrew May)
31979 + - ilmid now also supports the MIB variables atmfAtmLayerMaxVpiBits and
31980 + atmfAtmLayerMaxVciBits (based on a patch by Uwe Dannowski)
31981 +
31982 +Other changes
31983 +-------------
31984 +
31985 + - ilmid: search for local IP address didn't consider LANE interfaces (lec*)
31986 + - consolidated most of the various calls to gethostbyname and friends into
31987 + text2ip (libatmd)
31988 + - corrected some glitches in net/sched/sch_atm.c (untested)
31989 + - removed debug/encopy, debug/endump, and debug/zndump from the distribution.
31990 + They were almost useless and caused problems with make depend
31991 + - SYMFILES in qgen/Makefile now determines location of atmsap.h at run time to
31992 + avoid problems when kernel headers are not in /usr/include/linux (reported
31993 + by Uwe Dannowski)
31994 +
31995 +
31996 +Version 0.46 to 0.47 (6-OCT-1998)
31997 +====================
31998 +
31999 +Bug fixes
32000 +---------
32001 +
32002 + - qgen didn't build for all UNI versions (fixed by Richard Gooch)
32003 +
32004 +New features
32005 +------------
32006 +
32007 + - ilmid: new option -u to set UNI version (3.0, 3.1, or 4.0). Only available
32008 + if compiled with -DDYNAMIC_UNI.
32009 +
32010 +Other changes
32011 +-------------
32012 +
32013 + - ilmid: getIpAddr: improved robustness and added debugging output
32014 +
32015 +
32016 +Version 0.45 to 0.46 (5-OCT-1998)
32017 +====================
32018 +
32019 +Bug fixes
32020 +---------
32021 +
32022 + - ENI and ZATM driver used to read IRQ directly from PCI configuration,
32023 + bypassing any fixups (reported by Richard Gooch)
32024 + - atmsigd.new: removed "Known bug" memory leak (when tracing)
32025 + - led/lec_ctrl.c: signalling bug fixed, max_sdu now has correct value instead
32026 + of 1 (by Heikki Vatiainen, reported by Josh Baratz <jbaratz@lucentctc.com>
32027 + and Wolfgang Platzer <wplatzer@iaik.tu-graz.ac.at>)
32028 + - lots of MPOA bug fixes and other changes, see atm/mpoa/CHANGELOG (by Heikki
32029 + Vatiainen)
32030 + - atmsigd reported "Q.2931.1" when configured to support Q.2963.1
32031 +
32032 +New features
32033 +------------
32034 +
32035 + - atmsigd.new now supports run-time configuration of the signaling protocol
32036 + version (via atmsigd.conf)
32037 +
32038 +Other changes
32039 +-------------
32040 +
32041 + - added 16W bursts to ENI burst size configuration (NB: 16W may actually be
32042 + *slower* than 8W)
32043 + - lec_ctrl.c: zeppelin now uses LE_REGISTER protocol when TLVs are associated
32044 + with client's MAC address (by Heikki Vatiainen)
32045 +
32046 +
32047 +Version 0.44 to 0.45 (1-OCT-1998)
32048 +====================
32049 +
32050 +Bug fixes
32051 +---------
32052 +
32053 + - ENI driver didn't do four-word bursts on RX for sizes < 8 words
32054 + - arequipad, atmarpd, bus, lecs, les, mpcd, sw_*, and zeppelin silently
32055 + ignored extra command-line arguments instead of complaining
32056 +
32057 +New features
32058 +------------
32059 +
32060 + - ENI: added configuration options to fine-tune burst sizes (in reponse to
32061 + incompatibility found by Dave Airlie)
32062 +
32063 +Other changes
32064 +-------------
32065 +
32066 + - changed the way how ATM-specific data is stored in skbs. Tentatively updated
32067 + the the stack, including drivers. Use CONFIG_ATM_SKB to enable the new-style
32068 + skbs.
32069 + - Rules.make no longer discards the previous value of LDLIBS
32070 + - sw_tcp now only establishes bi-directional VCs if both directions are really
32071 + requested in the QoS structure
32072 + - moved manual switch control from sw_tcp to the generic switch code; "tcpswc"
32073 + is now called "swc", the corresponding switch.conf clause is now
32074 + 'control <path>' instead of 'option control "<path>"'
32075 +
32076 +
32077 +Version 0.43 to 0.44 (24-SEP-1998)
32078 +====================
32079 +
32080 +Bug fixes
32081 +---------
32082 +
32083 + - CONNECT messages no longer contain the AAL type IE if EP ref is present and
32084 + non-zero (reported by Heikki Vatiainen)
32085 + - SSCOP: added mode for partial compatibility with Q.SAAL1 (to get rid of
32086 + warnings reported by Heikki Vatiainen and of interoperability problems with
32087 + Virata switches reported by Damian Gilmurray)
32088 + - ilmid now returns a valid response for atmfMyIpNmAddress (by Uwe Dannowski)
32089 + - configuration on-line help for CLIP didn't work because tag was different
32090 + from configuration variable
32091 + - atmsigd crashed when adding multiple local addresses on an interface
32092 + (reported by Heiko Krupp)
32093 + - atmaddr.8 said "ATMARP" in the header (reported by Hans Einsiedler)
32094 + - net/atm/misc.c didn't include linux/config.h and linux/module.h, causing
32095 + symbols to be missing when rebuilding the kernel after enabling modules
32096 + (reported by Thomas Parvais)
32097 +
32098 +New features
32099 +------------
32100 +
32101 + - new maintenance utility tcpswc to control sw_tcp "switches" (description at
32102 + the end of switch/tcp/README)
32103 + - added support for setting the CLP bit (untested; see doc/README.CLP)
32104 + - added support for policing to the ATM qdisc (untested; see extra/tc/README)
32105 + - ilmid: added support for atmfAtmLayerUniVersion (by Uwe Dannowski)
32106 +
32107 +Other changes
32108 +-------------
32109 +
32110 + - updated the NICStAR driver to version 008b (by Rui Prior)
32111 + - new switch fabric function fab_option to pass configuration options
32112 + - atm2text now also supports unspecified and wildcard components in PVC
32113 + addresses
32114 + - added configuration option CONFIG_ATM_CLIP_NO_ICMP to discard packets for
32115 + which no ATMARP entry exists silently instead of sending an ICMP (this is an
32116 + ugly hack-around for the revalidation problem reported by Gerald Hanusch)
32117 + - various minor documentation updates
32118 + - atmarpd now sends InARP requests when active VC setup completes in order to
32119 + tell the peer our IP address(es)
32120 +
32121 +
32122 +Version 0.42 to 0.43 (21-AUG-1998)
32123 +====================
32124 +
32125 +Bug fixes
32126 +---------
32127 +
32128 + - trying to use atmtcp when compiled as a module with the module not loaded
32129 + crashed the kernel
32130 +
32131 +New features
32132 +------------
32133 +
32134 + - upgraded to the 2.1.117 kernel
32135 + - included NICStAR driver by Rui Prior at INESC (this driver also includes
32136 + parts of an earlier driver written by Matt Welsh, then enhanced by R. D.
32137 + Rechenmacher and Jawaid Bazyar)
32138 + - new atmsigd with support for multiple signaling entities (experimental)
32139 +
32140 +Other changes
32141 +-------------
32142 +
32143 + - removed register dumping code from suni.c (leaked out into the distribution)
32144 +
32145 +
32146 +Version 0.41 to 0.42 (19-AUG-1998)
32147 +====================
32148 +
32149 +Bug fixes
32150 +---------
32151 +
32152 + - atm.patch was out of sync again :-(
32153 +
32154 +
32155 +Version 0.40 to 0.41 (19-AUG-1998)
32156 +====================
32157 +
32158 +Bug fixes
32159 +---------
32160 +
32161 + - 0.40 contained an older atm.patch than the one that was supposed to go with
32162 + it (some changes to sch_atm and MPOA were missing)
32163 + - kernel didn't build with LANE enabled and MPOA disabled (fix by Mitchell
32164 + Blank Jr)
32165 +
32166 +New features
32167 +------------
32168 +
32169 + - MPOA now also supports CBR SVCs (by Heikki Vatiainen and Sampo Saaristo)
32170 +
32171 +Other changes
32172 +-------------
32173 +
32174 + - atmtcp may work as a module (untested)
32175 + - kernel code now uses capabilities instead of suser()
32176 + - removed obsolete recycle_buffer code
32177 + - distribution now also includes mkpatch, the script that's used to create
32178 + atm.patch
32179 +
32180 +
32181 +Version 0.39 to 0.40 (13-AUG-1998)
32182 +====================
32183 +
32184 +Bug fixes
32185 +---------
32186 +
32187 + - ilmid defined the value of "invalid" as 0 instead of 2 (fix by Timo
32188 + Parnanen)
32189 + - bash-2 doesn't like for n in $(SUBDIR); ... if SUBDIR is undefined (fix
32190 + by Heikki Vatiainen)
32191 + - LANE still cleared ATM_VF_RELEASED instead of calling atm_async_release_vcc,
32192 + which apparently led to stray kernel crashes in signaling (found with a lot
32193 + of help from John McPherson)
32194 + - ATM qdisc now properly re-allocates skb memory to grow headers, if necessary
32195 + - atm/switch/Makefile didn't build SUBDIRS
32196 + - atmarpd sent garbage ATM addresses in InARP responses over PVCs (reported by
32197 + Stefan Keller-Tuberg)
32198 +
32199 +New features
32200 +------------
32201 +
32202 + - MPOA (Multi-Protocol Over ATM) client support written by Heikki Vatiainen
32203 + and Sampo Saaristo
32204 + - LANE client (zeppelin) now also supports LANE2 (by Heikki Vatiainen)
32205 +
32206 +Other changes
32207 +-------------
32208 +
32209 + - accept() now also returns on ATM_VF_CLOSE
32210 + - ATM qdisc now uses the same data format on rtnetlink as other qdiscs; new
32211 + option for user-provided headers
32212 + - atm/switch can now use "external" routing (e.g. provided by the fab control)
32213 +
32214 +
32215 +Version 0.38 to 0.39 (4-AUG-1998)
32216 +====================
32217 +
32218 +Bug fixes
32219 +---------
32220 +
32221 + - added missing #include <atm.h> in tcpsw.c (fixed by Heikki Vatiainen)
32222 + - atmsigd allowed both sides to initiate PCR modification; Q.2963.1 only
32223 + allows the connection owner (i.e. the caller) to do this
32224 + - atmarpd no longer tries to use incoming SVCs with zero backward bandwidth
32225 + for ATMARP
32226 + - ENI and ZATM drivers didn't invoke vcc->pop on dev->ops->send failure
32227 + - make install didn't probe correctly for presence of /usr/include/stdint.h
32228 + (needed on GLIBC 1 systems)
32229 + - net/atm/resources.c didn't export bind_vcc to modules (fix by Oliver
32230 + Frommel)
32231 + - net/arpd/atmarp didn't build without make depend (reported by Stefano
32232 + Giacometti)
32233 + - clip_mkip zeroed vcc->rx_inuse and didn't take into account that clip_push
32234 + calls atm_return, which subtracts from vcc->rx_inuse too
32235 + - fixed typos in qgen/uni.h (and msg.fmt) for causes 38, 41, and 43
32236 + - atmsigd wrote exit trace to stderr when it had a dump directory and vice
32237 + versa
32238 + - documentation still claimed that atmtcp yields messages at boot time
32239 +
32240 +New features
32241 +------------
32242 +
32243 + - added flow to ATM VCC mapping queuing discipline (experimental)
32244 + - module for setting up ATM PVC/SVC mappings with "tc" in extra/tc (see
32245 + extra/tc/README)
32246 + - atmarpd: new request type art_query to request resolution without VC setup
32247 + - atmarp: new undocumented option -Q to test art_query
32248 + - added ATMTCP interfaces that survive disconnects (persistent; new atmtcp(8)
32249 + options -p and -r; new ioctls ATMTCP_CREATE and ATMTCP_REMOVE)
32250 +
32251 +Other changes
32252 +-------------
32253 +
32254 + - zeppelin didn't explicitly set the AAL type for outbound connections (by
32255 + Heikki Vatiainen)
32256 + - CLIP also allows SVCs to have no idle timeout at all (timeout = 0)
32257 + - moved SUNI private ioctls (SUNI_GETLOOP and SUNI_SETLOOP) from
32258 + drivers/atm/suni.h to include/linux/atm_suni.h
32259 + - atmarpd now shows QoS information for VCs where it differs from the default
32260 + or where no default is applicable
32261 + - removed the file atm/WARNING, which gave an overly pessimistic perspective
32262 + of the state of things
32263 + - switch: fab_op now returns the cause value plus (optionally) a pointer to
32264 + diagnostics in the callback instead of a simple okay/not okay indication
32265 + - updated and corrected the atmtcp man page
32266 + - further cleanup of the build procedure
32267 + - README now mainly refers to http://lrcwww.epfl.ch/linux-atm/info.html
32268 + - updated and trimmed BUGS
32269 + - added a note to CREDITS indicating its obsolescence
32270 +
32271 +
32272 +Version 0.37 to 0.38 (25-JUN-1998)
32273 +====================
32274 +
32275 +Bug fixes
32276 +---------
32277 +
32278 + - fixed the remaining few #include <linux/atm.h>
32279 + - invoking fcntl() or socketpair() on an ATM socket caused an "Oops" (reported
32280 + by Jonathan Chan)
32281 + - CLIP PVCs caused an "Oops" when cat'ing /proc/atm/pvc (reported by Marko
32282 + Kiiskila and Robert Olsson)
32283 + - atm/qgen/default.nl wasn't removed after build failure
32284 + - debugging switch (sw_debug) did not stop operations after the first error
32285 + - svc_accept returned apparent success instead of -EAGAIN, usually leading to
32286 + a later -ENOTCONN
32287 + - ttcp.c didn't initialize port_name, leading to erratic behaviour when making
32288 + slight changes to the build process
32289 + - atm_pdu2truesize diverged from alloc_skb, leading to sudden failure of VCs
32290 + or of ATMARP (reported by Robert Olsson)
32291 + - corrected use of '~' when applied to unsigned longs representing memory
32292 + addresses in aread, ENI, and ZATM (reported by Wai-Sun Chia)
32293 + - atmtcp and LANE didn't use bind_vcc when setting up control VCs
32294 + - atmtcp got ENOMEM/EBUSY wrong when failing to create an interface
32295 + - sig level <level> in atmsigd.conf didn't affect UNI diagnostics
32296 +
32297 +New features
32298 +------------
32299 +
32300 + - upgraded to the 2.1.105 kernel
32301 + - added ATMTCP "switch" in atm/switch/tcp
32302 + - atmtcp: new mode -s to connect to an ATMTCP "switch"
32303 + - atmtcp: new option -d for debugging output
32304 + - added -b option (the usual "background") to switch/relay.c
32305 +
32306 +Other changes
32307 +-------------
32308 +
32309 + - changed "PDU" to "SDU" in the atmtcp(8) man page
32310 + - atmarpd now includes the interface netmask in ATMARP table dumps
32311 + - added ATM devices also to the Alpha architecture, because at least ATMTCP
32312 + works (by Wai-Sun Chia)
32313 + - added the removal of -Wmissing-prototypes to the 0.37 changes
32314 + - removed -Wcast-align from Rules.make because of a conflict with
32315 + /usr/include/socketbits.h of glibc 2 on Alphas (reported by Wai-Sun Chia)
32316 + - atmsigd.conf.4: documented that debug log stderr works too
32317 + - sap_equal now also allows wildcard matches for BHLI (with SXE_COMPATIBLE)
32318 + - atmsigd now uses -m <mode> instead of -N and -A
32319 + - atmsigd.conf now uses sig mode <mode> instead of sig net
32320 +
32321 +
32322 +Version 0.36 to 0.37 (6-JUN-1998)
32323 +====================
32324 +
32325 +Bug fixes
32326 +---------
32327 +
32328 + - lib/atm.h defined AF_ATMPVC to 20, but the correct value is 8. Likewise,
32329 + AF_ATMSVC should be 20, not 21. (Reported by Luke Diamand)
32330 + - fixed bad ASN encoding in ilmid (by Vesa-Matti Puro)
32331 + - make install and make instdirs didn't stop on error
32332 +
32333 +New features
32334 +------------
32335 +
32336 + - upgraded to the 2.1.104 kernel
32337 + - included a script to demonstrate the debug switch (see switch/debug/README)
32338 +
32339 +Other changes
32340 +-------------
32341 +
32342 + - moved definitions not used by the kernel from linux/atmarp.h to atmarp.h
32343 + - removed linux/atm_stdint.h (linux/types.h has now caught up)
32344 + - changed ENI and ZATM driver to use new PCI interface
32345 + - net/atm/clip.c no longer uses ether_setup (suggested by Alexey Kuznetsov)
32346 + - more header file cleanup (main change: applications should now
32347 + #include <atm.h> instead of #include <linux/atm.h>)
32348 + - removed -Wmissing-prototypes from Rules.make because of a conflict with
32349 + include/linux/byteorder/swab.h
32350 +
32351 +
32352 +Version 0.35 to 0.36 (23-APR-1998)
32353 +====================
32354 +
32355 +Bug fixes
32356 +---------
32357 +
32358 + - changed the numeric values of PF/AF_ATMPVC/SVC and SOL_ATM/AAL to avoid
32359 + conflicts with other allocations. This breaks binary compatibility with
32360 + ATM programs compiled under older kernels
32361 + - RESTART ACK was sent with the wrong class when acknowledging the restart of
32362 + the indicated virtual channel (fix by Mohsen Souissi)
32363 + - RELEASE was retransmitted forever (to avoid having to perform a RESTART),
32364 + although it's sufficient to retransmit once and then drop the connection
32365 + - esi.c checked the kernel version code without including linux/version.h
32366 + - CLIP changes magically fixed hangs on SICGIFCONF (reported by Wayne Salamon)
32367 + - atmsigd usually didn't set pvc.sap_family in ISP messages
32368 +
32369 +New features
32370 +------------
32371 +
32372 + - added build-time option -DTHOMFLEX to send RESTART when SAAL comes up, which
32373 + works around a bug in some Thomson Thomflex 5000 switches (by Mohsen
32374 + Souissi)
32375 + - atmtcp: new option "-i itf" to request a specific interface number
32376 + - the "debug switch" (switch/debug/sw_debug) is now capable of successfully
32377 + signaling a UNI 3.x call (see switch/debug/README for details)
32378 +
32379 +Other changes
32380 +-------------
32381 +
32382 + - atm_equal can now also compare PVC addresses. The argument type has
32383 + therefore been changed from struct sockaddr_atmsvc * to struct sockaddr *
32384 + - moved driver-private data from skb->atm.* into skb->cb
32385 + - complete redesign of communication between atmarp(8) and atmarpd(8) (now
32386 + uses a UNIX domain socket; suggested by Alexey Kuznetsov)
32387 + - atmarp -a now also produces correct output if atmarpd is running with -d
32388 + - removed clip(8)
32389 + - moved atmarp(8) from atm/ip into atm/arpd, removed atm/ip
32390 + - /proc/atm/svc shows listening sockets again
32391 + - cleaned up a few cases where diag(...,DIAG_FATAL,...) was followed by an
32392 + "else" or a "return".
32393 + - atmsigd now uses Unix domain sockets (instead of named pipes) to communicate
32394 + with non-kernel ISP users (updated test/isp too)
32395 + - net/atm/resources.c:atm_dev_register can now be asked to assign a specific
32396 + interface number (-1 yields the old behaviour)
32397 +
32398 +
32399 +Version 0.34 to 0.35 (27-MAR-1998)
32400 +====================
32401 +
32402 +Bug fixes
32403 +---------
32404 +
32405 + - ilmid compared memcmp results with -1,1, which fails under optimization
32406 + (fixed by Damian Gilmurray)
32407 + - various fixes and cleanup in how CLIP interacts with the neighbour cache
32408 + (spotted by Alexey Kuznetsov)
32409 + - Rules.make complained about missing "optprocess" command on some occasions
32410 +
32411 +New features
32412 +------------
32413 +
32414 + - upgraded to the 2.1.90 kernel
32415 + - added some components for ATM switch control (not properly integrated yet,
32416 + so they don't do anything useful at the moment; written by Roman Pletka)
32417 +
32418 +Other changes
32419 +-------------
32420 +
32421 + - eliminated various compiler warnings when compiling with glibc2
32422 + - removed clip_hard_header (suggested by Alexey Kuznetsov)
32423 +
32424 +
32425 +Version 0.33 to 0.34 (13-MAR-1998)
32426 +====================
32427 +
32428 +Bug fixes
32429 +---------
32430 +
32431 + - eni.c didn't include config.h (fix by Pete Wyckoff)
32432 + - (yet another) VCC list handling bug (fixed by Heikki Vatiainen)
32433 + - kernel also applied idle timeout to CLIP PVCs
32434 + - make clean didn't remove test/errnos.inc
32435 + - atmsigd errored as_connect and as_accept with as_close instead of as_error
32436 + - eni: bandwidth was sometimes reserved for UBR VCs
32437 + - eni: checking of bandwidth changes was broken
32438 + - eni: error handling after failed bw change checks destroyed the free list
32439 + - test/errnos.inc sometimes wasn't generated because of mtime granularity (fix
32440 + by Brian Armstrong and Corinne Rosier)
32441 + - fixed use of return code of get/put_user and copy_from/to_user
32442 + - kernel: fixed a few minor race conditions
32443 + - ATM_GETADDR left address list locked on fault
32444 + - maximum length of high layer information was 7 bytes instead of 8 for ISO
32445 + and User Specific high layer information (reported by Damian Gilmurray)
32446 + - some tools didn't include errno.h although they use errno or Exxx
32447 + - atmsigd usually accessed deallocated memory when writing traces, which
32448 + sometimes led to crashes (reported by Heikki Vatiainen)
32449 + - indentation of the first two lines of UNI signaling messages in traces was
32450 + missing
32451 + - LANE: duplicate data direct connections to entities where we already
32452 + have a connection are now forbidden. LES and BUS can now co-reside.
32453 + (Reported by Jean-Francois Moine, fixed by Heikki Vatiainen)
32454 + - LANE: plugged a file descriptor leak (by Heikki Vatiainen)
32455 + - atmsigd.conf.4 incorrectly stated that diagnostics must have a higher
32456 + priority than the specified level to get printed (they're also printed if
32457 + their priority is equal to that level)
32458 + - zatm driver didn't virt_to_bus the back pointer of TX rings, leading to
32459 + crash after sending the 32nd PDU of a VCC (reported by Ajay Bakre)
32460 + - zatm_feedback sometimes returned with interrupts disabled
32461 + - ENI driver didn't treat requests for UBR at link speed as "unlimited" and
32462 + allocated one shaper for each such VCC
32463 + - atm_async_release_vcc now has its own flag ATM_VF_CLOSE. Overloading
32464 + ATM_VF_RELEASED caused hung SVCs under some conditions.
32465 + - atmsigd sometimes released listening sockets before kernel completed its
32466 + cleanup, yielding warnings and zombies
32467 + - atmsigd accessed already deallocated data structures when handling
32468 + unparseable signaling messages
32469 +
32470 +
32471 +New features
32472 +------------
32473 +
32474 + - upgraded to the 2.1.79 kernel
32475 + - CLIP now handles NETDEV_CHANGE (proposed by Pete Wyckoff; untested)
32476 + - various minor signaling changes for operation as switch control
32477 + - new device operation proc_read: device drivers can now register in /proc
32478 + (e.g. /proc/atm/eni:0)
32479 + - added some more BHLI definitions to include/atmsap.h, including draft
32480 + mapping of well-known TCP/UDP port numbers
32481 + - added support for TIOCOUTQ/TIOCINQ on native ATM
32482 + - new library function sap_equal
32483 + - added convenience function atmpvc_addr_in_use to linux/atm.h
32484 + - major overhaul of "isp", which is now a good tool for signaling regression
32485 + tests. See atm/test/README.isp
32486 + - LANE can now be compiled as a kernel module (by Heikki Vatiainen)
32487 + - new tool debug/svctor.c to torture signaling by setting up and releasing
32488 + lots of SVCs (see the source for details)
32489 +
32490 +Other changes
32491 +-------------
32492 +
32493 + - cleaned up the copying terms: libraries are now covered by LGPL instead of
32494 + GPL and qgen doesn't "taint" the code it generates
32495 + - atmarpd: IP addresses are now __u32 instead of unsigned long
32496 + - atmarpd: changed printf("... %08x ...",(unsigned long) ptr) to %p ...",ptr
32497 + - /proc support now allocates inode numbers dynamically
32498 + - added comment to clarify motivation for useless buffer alignment in aread.c
32499 + (reported by Jeon Jong Hwan)
32500 + - suni.c and uPD98402.c: SONET_GETSTATZ no longer clears the statistics if the
32501 + copy faults
32502 + - ilmid should now work on any interface (patch by Heikki Vatiainen)
32503 + - changed all __uNN of tools to uintNN_t for glibc2-compatibility
32504 + - added stdint.h to lib for compatibility with future versions of glibc2
32505 + - various other evil hacks in tools to make things compile with glibc2
32506 + - the NIC debugging programs ed, encopy, endump, zndump, and znth are no
32507 + longer built and installed by default
32508 + - for compatibility with POSIX 1003.1g, accept now returns ECONNABORTED
32509 + instead of ECONNREFUSED if connection is already gone (proposed by Heikki
32510 + Vatiainen)
32511 + - listening sockets now return instantly if the signaling demon dies
32512 + - various minor LANE updates to track API changes (by Heikki Vatiainen)
32513 + - SUNI now also warns if signal is missing at initialization time
32514 + - zatm: added work-around for unfair buffer space accounting
32515 + - clarified some of atmarpd's diagnostics
32516 + - documentation updates
32517 +
32518 +
32519 +Version 0.32 to 0.33 (19-NOV-1997)
32520 +====================
32521 +
32522 +Bug fixes
32523 +---------
32524 +
32525 + - SSCOP did poll sequence number comparisons in the (data) sequence number
32526 + space, typically leading to periodic SSCOP restarts (reported by Heikki
32527 + Vatiainen)
32528 + - atmsigd now releases calls on receipt of STATUS with call state 0 (reported
32529 + by Heikki Vatiainen)
32530 + - qgen tried to print the names of unnamed groups (fix by Simon Leinen)
32531 + - make clean in qgen left all the .c and .h files produced by qgen
32532 + - minor fixes to signaling message format description (qgen/msg.fmt,
32533 + previously qgen/uni*)
32534 + - /usr/include/atm.h was calling itself "atmlib" (found by Leena Chandran)
32535 + - atmsigd: the address format of the calling party number was used to
32536 + determine the format of the called party number in a SETUP message
32537 + - added some semicolons to Rules.make for bash 2.0 compatibility (by Tan Chang
32538 + Hu and Rolf Kunisch)
32539 + - select/poll indicated an exception when a non-blocking connect terminated.
32540 + Now it indicates writability, and an error only if the connect failed.
32541 + - LES/BUS can now co-exist at the same address (by Heikki Vatiainen)
32542 + - fixed race condition between asynchronous release (e.g. on ATMARP idle timer
32543 + expiration) and signaling demon response
32544 + - fixed a typo "[itf]." instead of "[itf.]" in atmsigd.conf.8
32545 + - "ATM drivers" kernel configuration section is no longer a top-level menu
32546 + item but it's now under "Network devices"
32547 + - sigd_close forgot to purge VCs not connected to devices (e.g. closing ones),
32548 + so they hung
32549 + - the list of unconnected VCs was sometimes garbled
32550 + - atmsigd printed null string for as_itf_notify message name when debugging
32551 + - Arequipa: check_aq_vcc also accepted VCs that were already released by
32552 + signaling
32553 + - ATM_VF_PARTIAL and ATM_VF_BOUND had the same value
32554 + - atmaddr still used old calling convention of ATM_GETNAMES
32555 + - the atmarpd man page referred to atmarpd as "atmsigd"
32556 + - various atmtcp bug fixes
32557 + - atm_recvmsg sometimes returned with interrupts disabled (reported by Pete
32558 + Wyckoff)
32559 + - fixed ttcp_atm dependencies (.depend contains dependencies for "ttcp.o")
32560 + - UNI message format: "more" was missing for def_pck_size
32561 + - eni/suni didn't compile as modules (fixed by Pete Wyckoff and Ladislav
32562 + Lhotka)
32563 + - further net/atm/Makefile cleanup
32564 + - arequipa_close always left the socket with arequipa_expect enabled. Now it
32565 + returns it to the previous state.
32566 + - ENI driver was leaking buffer memory on failure of set_tx
32567 + - atmarpd didn't print symbolic names of "new" flags (ATF_ARPSRV, etc.)
32568 + - ATM ARP server didn't make client entries public (reported by Tom Mahieu)
32569 + - drivers/atm/Config.in had extra "endmenu" (fixed by Ladislav Lhotka)
32570 + - atmarpd got confused when receiving InARP reply without source ATM address
32571 + - atmsigd sometimes didn't stop timers if Q.2963.1 wasn't enabled
32572 + - when rejecting a call, the kernel freed the VCC twice
32573 +
32574 +New features
32575 +------------
32576 +
32577 + - merged source tree (except Arequipa, single-copy, and various NIC drivers)
32578 + with 2.1.65-Linus tree
32579 + - qgen can now handle repeated information elements
32580 + - added ATM_SETESI[F] ioctl and esi utility (boards without a real ESI in ROM
32581 + should now set the default ESI to 0x000000000000)
32582 + - new socket option SO_ATMSAP along with struct atm_sap (using a fixed-size
32583 + BLLI array instead of the linked list in struct sockaddr_atmsvc)
32584 + - added Q.2963.1 PCR modification in signaling and the ENI driver
32585 + - aread: new option -c to print received data as characters (similar to od -c)
32586 + - new tool test/align to test handling of mis-alignment in NIC drivers
32587 + - atmsigd now supports policy restrictions for incoming/outgoing calls (see
32588 + atmsigd.conf.4, "policy")
32589 + - atmsigd can now also use a pair of named pipes (or, actually, any named
32590 + object in the file system) for communicating with the user of signaling
32591 + (normally the kernel)
32592 + - new tool called "isp" (for "Internal Signaling Protocol") to talk ISP with
32593 + atmsigd over named pipes
32594 + - new functions sap2text and text2sap to converts SAPs to/from textual
32595 + representation, and a sap(7) man page
32596 + - new traffic parameter field "pcr" to indicate the desired PCR. min_pcr and
32597 + max_pcr can the be used to indicate the acceptable range.
32598 + - new function atm_pcr_goal to help drivers to interpret traffic parameters
32599 +
32600 +Other changes
32601 +-------------
32602 +
32603 + - removed some more obsolete CLIP-related ioctls
32604 + - qgen: simplified generation of engines with a prefix other than "q" or "qd"
32605 + - ENI and ZATM drivers now use shareable interrupts
32606 + - cleaned up some 32bit-isms in ENI driver
32607 + - cleaned up several 32bit-isms in SSCOP (reported by Tan Chang Hu)
32608 + - SSCOP: work-arounds for buggy ntohl prototype in some early versions of
32609 + glibc (reported by Tan Chang Hu, further explored by David S. Miller and
32610 + Richard Henderson)
32611 + - started updating the ZATM driver for 2.1 (still crashes under load)
32612 + - added missing 2.1 pieces in ENI's SUNI driver
32613 + - added __initfunc and __initdata where appropriate
32614 + - tools tree now compiles under 0.31 (2.0.25 kernel) and 0.33 (2.1.55 kernel)
32615 + - gratuitous improvement of identifier tree allocation in qgen
32616 + - the interface number is now optional for sonetdiag (like for atmdiag)
32617 + - started implementing the kernel side of point-to-multipoint signaling
32618 + support
32619 + - /proc/atm/arp now displays "resolving" or "expired" (with the number of
32620 + times the entry is referenced) instead of "incomplete".
32621 + - moved ATM_MAX_BLLI from linux/atm.h to linux/atmsap.h
32622 + - changed ttcp_atm to use SO_ATMSAP (if available) to set BHLI
32623 + Note: ttcp_atm previously didn't use a BHLI, so old and new versions of
32624 + ttcp_atm don't interoperate.
32625 + - updated all other programs using SAPs too, except for LANE
32626 + - ENI: failure to allocate a traffic shaper now yields EBUSY instead of EAGAIN
32627 + - instead of just complaining, the ENI driver now handles all kinds of
32628 + mis-alignment in the TX path properly
32629 + - re-implemented send and receive side of Arequipa
32630 + - merged qgen/uni3x and qgen/uni40 into msg.fmt
32631 + - added missing Q.2931/UNI 4.0 items to qgen/q2931.h and msg.fmt
32632 + - also added BLLI L3 H.310 codepoint with related encodings
32633 + - various file name and identifier changes to give a more appropriate name
32634 + (e.g. "uni" or "call") to something that's never been Q.2931
32635 + - added library dependencies
32636 + - atmsigd produces more readable and usually more comprehensive debugging
32637 + output
32638 + - atmsigd.conf.4 now mentions that -d is the debugging output addict's choice
32639 + - all programs accepting -l syslog now also accept -l stderr. (This is useful
32640 + for atmsigd if atmsigd.conf sets logging to something else.)
32641 + - atmsigd now issues ATM_GETADDR ioctls on the signaling socket, not on the
32642 + kernel socket
32643 + - WARNING: text2qos: "pcr" is no longer a synonym for "max_pcr" !
32644 + - text2qos now refuses min_pcr=max
32645 + - device driver interface: removed vcc->peek; device drivers now choose their
32646 + own allocation strategy (change motivated by bug report from Furquan Ansari)
32647 + - drive driver interface: new helper functions atm_charge/atm_return to handle
32648 + buffer space allocation
32649 + - device driver interface: vcc->push no longer allocates buffer space. This is
32650 + now done by the driver, via atm_charge
32651 + - updated eni, zatm, and atmtcp to use the new mechanism
32652 + - zero padding in eni driver failed due to mis-alignment on some systems
32653 + (fixed by Pete Wyckoff)
32654 + - various compiler warnings removed (by Pete Wyckoff)
32655 + - removed support for pre-AREQUIPA_WORK mechanism
32656 + - arequipa close mechanism cleanup
32657 + - further cleaned up QOS parameter checking
32658 + - new ISP message as_identify for parallel call processing (not supported yet)
32659 + - zatm: renamed struct zatm_thist to struct zatm_t_hist after wondering
32660 + myself what on earth "this t" could be ...
32661 + - doc/Makefile now invokes dvips with -o
32662 +
32663 +
32664 +Version 0.31 to 0.32 (10-JUL-1997)
32665 +====================
32666 +
32667 +Bug fixes
32668 +---------
32669 +
32670 + - manipulation of local ATM addresses didn't check for permission
32671 +
32672 +New features
32673 +------------
32674 +
32675 + - ilmid now supports the system group and a couple of ILMI MIB objects (by
32676 + Scott Shumate)
32677 + - device and VCC allocation is now dynamic
32678 + - E.164 addressing support and corrections to address coding in uni3x/uni40
32679 + (by S. A. Wright, T. C. Jepsen, and Z. Zhang)
32680 + - support for device de-allocation via per-device operation dev_close
32681 +
32682 +Other changes
32683 +-------------
32684 +
32685 + - upgrade to kernel version 2.1.37
32686 + - ENI driver cleanup (uses readl/writel, skb_put, etc.)
32687 + - socket option handling has changed: optval is now void * (to improve
32688 + compile-time type checking) and optlen is int (not int *) in getsockopt
32689 + - socket option "names" now encode the level and the size (based on an idea of
32690 + Elwyn Davies)
32691 + - cleaned up some of the #includes in net/atm/proc.c
32692 + - total rewrite of ATMTCP (now the data forwarding is done in user space,
32693 + which makes things slower but a lot more flexible)
32694 + - separated PDU parsing and printing from SSCOP state machine
32695 + - new per-device operation dev_close to shut down devices
32696 + - changed a few DIAG_WARNs to DIAG_INFO in ilmid
32697 +
32698 +Removed features
32699 +----------------
32700 +
32701 + - polled ATM devices are no longer supported
32702 + - CLIP is gone (use ATMARP instead)
32703 + - Arequipa and LANE don't work yet (will come back later)
32704 +
32705 +
32706 +Version 0.30 to 0.31 (22-APR-1997)
32707 +====================
32708 +
32709 +Bug fixes
32710 +---------
32711 +
32712 + - atmarpd even refused IP address changes by the ATMARP server, which
32713 + typically led to the creation of one extra SVC
32714 + - ATMARP timeouts were computed at the wrong place (found by Gerald Hanusch)
32715 + - aqtest's usage didn't mention the -v option
32716 + - some tools used 0x%p instead of %p (which is fine in the kernel, by the way)
32717 + - skb_migrate didn't update skb->list
32718 + - zeppelin: incurred spurious core dumps on unsuccessful attempts to connect
32719 + to LANE servers, ESI parsing from command line seg faulted, obtaining ESI
32720 + from NIC left an ATM socket hanging, man page didn't describe all options
32721 + (by Marko Kiiskila and Heikki Vatiainen)
32722 +
32723 +Other changes
32724 +-------------
32725 +
32726 + - arequipa_close now only returns after the Arequipa connection has been
32727 + successfully closed. This allows applications to reliably close and
32728 + re-create Arequipa SVCs, e.g. to change the traffic parameters.
32729 + - the arequipad operations 3rd party close and synchronization are now handled
32730 + inside the kernel and survive arequipad restarts
32731 +
32732 +
32733 +Version 0.29 to 0.30 (10-APR-1997)
32734 +====================
32735 +
32736 +Bug fixes
32737 +---------
32738 +
32739 + - atmtcp didn't use vcc->push and therefore got the buffer usage accounting
32740 + wrong (fix by Gerald Hanusch)
32741 + - when closing a VC, the ENI driver didn't wait until all TX data has really
32742 + left the board, which created a close/open race (found by Richard Jones)
32743 + - SSCOP sometimes omitted the last element in a STAT PDU (fix - even with
32744 + optimization vs. Q.2110 - by Ngo Bach Long)
32745 + - atmarpd allowed ARP information to change permanent entries (found by Gerald
32746 + Hanusch)
32747 + - atmsigd's get_pvc used the maximum SDU size, thereby wasting buffer space
32748 + very quickly, which led to signaling problems (reported by Richard Jones and
32749 + Rik Wade)
32750 + - oops, the BUGS file was always one version number ahead
32751 + - ATMARP had a race between packets sent by the remote station and the
32752 + ATMARP_MKIP ioctl. This caused the dreaded "unknown hw protocol 0xaaaa"
32753 + error. (Finally fixed thanks to a dump provided by Patrick Flynn)
32754 + - Arequipa had the same race for AREQUIPA_INCOMING. This probably caused the
32755 + occasional "loss" (they were actually kept in vcc->recvq until the
32756 + connection was closed) of the first packet(s).
32757 +
32758 +
32759 +Version 0.28 to 0.29 (4-APR-1997)
32760 +====================
32761 +
32762 +Bug fixes
32763 +---------
32764 +
32765 + - saal/sscop.c: NORMALIZE macro was weird and broken (fix by Ngo Bach Long)
32766 + - InARP queries didn't contain the target ATM address, even if it is known,
32767 + which stretches the allowances RFC1577 makes for violating RFC1293 (found
32768 + by Juha Heinanen)
32769 + - tcp_conn_request: Arequipa modification to MTU size calculation used wrong
32770 + socket (fix by Gerald Hanusch)
32771 + - kernel ATMARP table handling had some obscure races
32772 + - temporary work-around: added A2T_LOCAL when using A2T_NAME in atmsigd and
32773 + atmarpd. Before, systems using ANS where the name server is reached via (IP
32774 + over) ATM exhibited truly bizarre failure patterns when refreshing ATMARP
32775 + entries. (With a lot of help from Juha Heinanen)
32776 + - ditto for arequipad, although the effects were less dramatic
32777 + - atmarpd: if not using -m, incoming connections for which a valid entry
32778 + already existed (e.g. due to manual configuration) were not entered in the
32779 + kernel ATMARP table until after the entry timed out for the first time (by
32780 + Gerald Hanusch)
32781 + - skb data areas are now aligned using skb_reserve instead of directly
32782 + tampering with skb->data (and forgetting skb->tail in the process ...)
32783 + (found by Uwe Dannowski)
32784 +
32785 +New features
32786 +------------
32787 +
32788 + - atmarpd is now automatically notified of IP over ATM interfaces already
32789 + existing at startup. This greatly simplifies the atmarpd restart ritual.
32790 + (All ATMARP table entries and the default QoS are still lost, though.)
32791 +
32792 +Other changes
32793 +-------------
32794 +
32795 + - cleaned up some weird and partially dead code in arpd/arp.c (found by
32796 + Gerald Hanusch)
32797 + - removed superfluous continue in arp.c:atmarp_setentry
32798 + - device-driver specific declarations now reside in
32799 + /usr/include/linux/atm_<drv_name>.h, so that disgusting hacks like
32800 + #include "/usr/src/linux/..." can be avoided (based on proposal by Uwe
32801 + Dannowski)
32802 + - updated the list of supported NICs in README and the on-line help
32803 + - arpd/atmarpd.8: documented that atmarpd -m may violate RFC1577 in subtle
32804 + ways (pointed out by Gerald Hanusch)
32805 + - updated MPR usage description to version 1.5 and removed mpr.patch
32806 + - removed MEM_DEBUG from the build process (MPR 1.5 initializes itself
32807 + automatically)
32808 +
32809 +
32810 +Version 0.27 to 0.28 (27-MAR-1997)
32811 +====================
32812 +
32813 +Bug fixes
32814 +---------
32815 +
32816 + - atmarpd restarted timers on as_valid -> as_valid transitions, illegally
32817 + delayed necessary refreshes (reported by Juha Heinanen)
32818 + - SSCOP cleared POLL timer on IDLE timer expiry (fix by Ngo Bach Long)
32819 + - atmsigd didn't initialize "now" soon enough, causing an unnecessary
32820 + retransmission of the first BGN PDU (by Ngo Bach Long)
32821 + - atmsigd responded to RELEASE COMPLETE in ss_rel_ind with a STATUS instead of
32822 + entering ss_wait_close (by Steve Pope)
32823 +
32824 +New features
32825 +------------
32826 +
32827 + - new tool aqpvc to declare incoming Arequipa traffic on a PVC to the system
32828 + (caveat: removing such a PVC can turn out to be surprisingly difficult)
32829 +
32830 +Other changes
32831 +-------------
32832 +
32833 + - removed some useless code in atmarpd's handling of VC disconnects
32834 + - removed unused signaling state ss_hold (equivalent to ss_wait_rel)
32835 +
32836 +
32837 +Version 0.26 to 0.27 (11-MAR-1997)
32838 +====================
32839 +
32840 +Bug fixes
32841 +---------
32842 +
32843 + - oops, forgot to include atm/lib/rtf2e164_cc.pl in the distribution
32844 + - atmsigd's VCI allocation in -N mode was too simplistic and failed after some
32845 + signaling activity (reported by Richard Jones)
32846 + - atm_connect was rejecting ATM_{VPI,VCI}_ANY
32847 + - aq_prev in the list of Arequipa connections wasn't set properly, leading to
32848 + random crashes when using Arequipa (found and fixed by Richard Jones, after
32849 + weeks of tearing his hair out)
32850 + - arequipa_close didn't remove the Arequipa route, which kept the upper layer
32851 + protocol connection alive for a rather long time (reported by Richard Jones)
32852 +
32853 +New features
32854 +------------
32855 +
32856 + - ilmid enhancements: vastly improved retry mechanism, workaround for a bug in
32857 + the ATML Virata switch, -v option for very detailed debug output (Scott
32858 + Shumate)
32859 + - atmsigd now also accepts the signaling VC as a command line argument
32860 + - qos2text appended colon to traffic type even if nothing else followed
32861 + - new program debug/aqtest to test Arequipa (based on work by Mehdi Tazi)
32862 +
32863 +Other changes
32864 +-------------
32865 +
32866 + - added a few missing NULLs to struct atmdev_ops initialization in various
32867 + drivers (this change does not alter any semantics)
32868 + - changed printk ...%lx... (unsigned long) ptr to ...%p... ptr at many
32869 + places
32870 + - removed atm/lib/rtf2cc.pl and atm/lib/cc.inc (they were only used by an
32871 + interim version of cc_len)
32872 + - atmarp's usage no longer contains lines longer than 80 characters
32873 + - added get_logfile() and get_verbosity() to libatm (for ilmid, by Scott
32874 + Shumate)
32875 + - select() consumed CPU time unnecessarily if testing for one direction while
32876 + there's a lot of activity in the other direction (e.g. atmarpd wasted cycles
32877 + in select() for each outbound packet while waiting for ARP messages)
32878 + - the value of ATM_AAL0 has changed (from zero to 13), so all programs using
32879 + AAL0 need to be recompiled
32880 + - MAX_ATM_QOS_LEN has changed, so most programs using qos2text need to be
32881 + recompiled
32882 + - the AAL can now also be set along with the QoS parameters. This approach
32883 + should be used instead of specifying it in the socket() call.
32884 + - if no AAL is specified, the kernel now defaults to AAL5 (was AAL0)
32885 + - updated most demons, tools, and library functions to set the AAL along with
32886 + the QoS parameters
32887 +
32888 +
32889 +Version 0.25 to 0.26 (29-JAN-1997)
32890 +====================
32891 +
32892 +Bug fixes
32893 +---------
32894 +
32895 + - ATMARP VCCs could stay around forever even after timing out, because the
32896 + process was not woken up.
32897 + - the ATMARP "fix" in 0.25 introduced an infinite loop. Fixed that one too.
32898 + - bit 8 in octets 6 and 7 of BLLI ("ext") were set to 1 instead of 0 when
32899 + using ATM_L2_USER/ATM_L3_USER (reported by ukl2@rz.uni-karlsruhe.de)
32900 + - qlib added silly offset (which fortunately happened to be zero most of the
32901 + time) to dumps of large fields (fixed by Jean-Francois Moine)
32902 + - IP over ATM restricted MTU changes to valid Ethernet MTU sizes
32903 + - LANE: fixed two bugs that crashed zeppelin when the connection to the
32904 + servers failed (by Marko Kiiskila)
32905 +
32906 +New features
32907 +------------
32908 +
32909 + - lib/ans.c now properly computes the length of the country prefix of E.164
32910 + addresses for reverse lookups (needs file /etc/e164_cc, see USAGE)
32911 + - if the new -m option is set, atmarpd now merges incoming calls into the
32912 + ATMARP table if the ATM address is known (see atmarpd.8 for details)
32913 + - included an RPM spec file (this is still very experimental)
32914 + - NICStAR driver now also works with IP over ATM (by Stuart Daniel)
32915 + - usage.txt: added description of how to run ATM NICs back-to-back (by Richard
32916 + Jones)
32917 +
32918 +Other changes
32919 +-------------
32920 +
32921 + - signaling traces now also include SAAL up/down transitions
32922 + - qgen no longer (unnecessarily) depends on libatm.a
32923 + - started work on letting qgen handle items that appear at more than one
32924 + place, e.g. repeated IEs (after an idea by Jean-Francois Moine)
32925 + - did some cleanup and added comments to qlib.[ch]
32926 + - added -m option to atmarp in config/redhat-4.0/atm.init
32927 + - added new make target "filenames" to generate a list of all the files which
32928 + are installed
32929 + - config/redhat-4.0 now contains an example hosts.atm file and also a Makefile
32930 + for more convenient installation
32931 + - atmsigd now reads atmsigd.conf before parsing the command-line options,
32932 + thereby allowing values set in the file to be superseeded
32933 + - atmsigd now also logs the internal reference and the caller's address on
32934 + calls establishment
32935 + - ilmid: very dirty hack to give switches some time to process ILMI cold start
32936 + (by Joseph Evans)
32937 +
32938 +
32939 +Version 0.24 to 0.25 (20-DEC-1996)
32940 +====================
32941 +
32942 +Bug fixes
32943 +---------
32944 +
32945 + - net/atm/atmarp.c:idle_timer_check only expired every other entry (reported
32946 + by Marko Kiiskila)
32947 +
32948 +New features
32949 +------------
32950 +
32951 + - LANE now also supports IPX (SNAP and 802.3; by Marko Kiiskila)
32952 + - NICStAR driver now supports VPI != 0 and has configurable settings in
32953 + nicstar.h (by Stuart Daniel)
32954 +
32955 +Other changes
32956 +-------------
32957 +
32958 + - ENI: TX DMA scratch are is now stored per device. This should allow multiple
32959 + NICs to coexist.
32960 +
32961 +
32962 +Version 0.23 to 0.24 (29-NOV-1996)
32963 +====================
32964 +
32965 +Bug fixes
32966 +---------
32967 +
32968 + - atm/test/window.c was missing in 0.23
32969 + - atm/debug/delay didn't build unless atm/lib headers were already installed
32970 + in /usr/include
32971 + - atm/debug/znth had undefined return value
32972 + - SSCOP: fixed typo (that could probably kill the SSCOP connection in case of
32973 + a retransmission); fix by Olivier Bonaventure
32974 + - corrected unnecessarily large buffer allocation in zatm.c:pool_index (by
32975 + Jonathan Larmour)
32976 + - hosts2ans.pl generated reverse addresses for the domain "ATM.INT" instead of
32977 + "ATMA.INT"
32978 + - atmarpd "forgot" any pre-set QOS when receiving new ARP information for the
32979 + respective entry (reported by Gerald Hanusch)
32980 + - window scale didn't scale the window sent in the SYNACK packet (reported by
32981 + Juan-Antonio Ibanez)
32982 + - LANE: better connection failure handling in zeppelin (by Marko Kiiskila)
32983 + - LEC kernel timer wasn't restarted when restarting zeppelin (found by Gerald
32984 + Hanusch, fixed by Marko Kiiskila)
32985 + - LANE: le_flush_request was sent too early when establishing connection (by
32986 + Marko Kiiskila)
32987 + - zeppelin stopped operation (unwantedly) in random cases when LANE servers
32988 + were down (by Marko Kiiskila)
32989 + - LANE: non-blocking connections, VCC and LE ARP timeouts, and TLV fields in
32990 + LE_CONFIG_RESPONSE fixed (by Marko Kiiskila)
32991 +
32992 +New features
32993 +------------
32994 +
32995 + - atm2text now also uses ANS
32996 + - signaling traces now also contain error reports from qgen
32997 + - added new build-time configuration option "CISCO" (in atm/Rules.make) to
32998 + work around a bug in Cisco's point-to-multipoint signaling
32999 + - included example configuration files for RedHat 4.0 (see
33000 + atm/config/redhat-4.0/README)
33001 +
33002 +Other changes
33003 +-------------
33004 +
33005 + - local variable "link" in atm/debug/delay.c:loop was shadowing "link" system
33006 + call
33007 + - cleaned up various Makefiles
33008 + - qgen: bytes left in qet_space are now more meaningful
33009 + - named (ANS) now also starts even if atmsigd is not running and retries to
33010 + create the ATM socket in 15 minute intervals until is succeeds (by Marko
33011 + Kiiskila)
33012 + - LANE: (too) short le_flush_responses (Cisco 7010, sw ??.??) are now handled
33013 + (by Marko Kiiskila)
33014 +
33015 +
33016 +Version 0.22 to 0.23 (16-NOV-1996)
33017 +====================
33018 +
33019 +Bug fixes
33020 +---------
33021 +
33022 + - fixed stupid typos in atm/lib/atmres.h and an unnecessary dependency on
33023 + libresolv.a in atm/lib/Makefile (reported by Gerald Hanusch)
33024 + - fixed warning about implicit declaration of function bigphysarea_init in
33025 + init/main.c
33026 + - I think I fixed the SSCOP VR(MR) problems that were first reported by
33027 + Edouard Lamboray in '95, then by Heinz Schuerch, and that finally led to a
33028 + total SSCOP breakdown (in 0.22) reported by Gerald Hanusch
33029 +
33030 +New features
33031 +------------
33032 +
33033 + - integrated the IDT 77201 (NICStAR) driver by Matt Welsh and Stuart Daniel
33034 + <stuartd@eecs.umich.edu>. Note that this driver currently only supports
33035 + native ATM.
33036 + - new throughput and latency benchmark test/window (by Matt Welsh)
33037 +
33038 +Other changes
33039 +-------------
33040 +
33041 + - upgrade to kernel version 2.0.25
33042 + - changed drivers/atm/eni.c:do_tx:dma to static in order to reduce kernel
33043 + stack use (by 480 bytes). Note that this hack may crash systems with more
33044 + than one ENI adapter.
33045 + - qlib now also complains if changing a field without a fixed list of values
33046 + - made a few changes to the native ATM data delivery path to handle some
33047 + strangeness required by the IDT driver
33048 +
33049 +
33050 +Version 0.21 to 0.22 (13-NOV-1996)
33051 +====================
33052 +
33053 +Bug fixes
33054 +---------
33055 +
33056 + - (dummy) depend target was missing in atm/man (reported by Bernd Wolf)
33057 + - net/atm/arequipa.c:make_aq_vcc didn't set ATM_VF_AQINUSE, thereby allowing
33058 + race conditions to slip through
33059 + - fixed a few potential race conditions when activating Arequipa
33060 + - text2qos didn't complain if unit was omitted after multiplier, allowing
33061 + misleading settings like pcr=50M (that's 19.2 Gbps)
33062 + - SSCOP: took wrong branch if POLL_AFTER_RETRANSMISSION was enabled (fix by
33063 + Jonathan Larmour)
33064 + - SSCOP: rel_ind for ENDAK and BGREJ PDU in sscop_inconn was sent with "user"
33065 + = 1 (must be 0 for "Source := SSCOP")
33066 + - initialize_vr_mr now initializes vr_mr to a constant value (instead of
33067 + garbage plus constant value)
33068 + - atm_recvmsg now ignores msg->msg_name, as it should by POSIX 1003.1g (fix by
33069 + Mike Wooten)
33070 + - atm_sendmsg now fails with EISCONN instead of with EINVAL if msg->msg_name
33071 + is set, as it should by POSIX 1003.1g (reported by Mike Wooten)
33072 + - atm_recvmsg and atm_sendmsg now return ENOTCONN if not connected and
33073 + EOPNOTSUP if flags are passed, as they should by POSIX 1003.1g
33074 + - the QOS zeppelin uses for its connections can now be set with the option -q
33075 + - atmarpd didn't include the QOS in PVC entries, so atmarp -a complained about
33076 + them
33077 +
33078 +New features
33079 +------------
33080 +
33081 + - kernel changes to support tcpdump with LANE (by Marko Kiiskila)
33082 + - patch for tcpdump 3.0.4 (installed as tcpdump_atm) to support Classical IP
33083 + and LANE (by Marko Kiiskila)
33084 + - patch for BIND 4.9.5 to support ANS (ATM Name Service) functionality (by
33085 + Marko Kiiskila)
33086 + - added hierarchy extra/ for packages for which only patches are contained in
33087 + the ATM on Linux distribution
33088 + - enhanced text2atm to use ANS if local lookups fail (atm2text will be updated
33089 + later)
33090 + - wrote script extra/hosts2ans.pl to convert hosts.atm file to ANS zone files
33091 +
33092 +Other changes
33093 +-------------
33094 +
33095 + - changed ATM_VF_AQINUSE to ATM_VF_AQDANG and changed aq_list membership to
33096 + be for dangling VCs only
33097 + - added the new command-line options to ttcp_atm's online help (finally !)
33098 + - atm_sendmsg now returns error codes from the driver's send function
33099 + (suggested by Jonathan Larmour)
33100 + - text2qos now performs a syntax check if NULL is passed in the qos argument
33101 + - various minor LANE cleanup (Marko Kiiskila)
33102 + - upgraded to the latest version of t2a.pl
33103 + - {A2T,T2A}_REMOTE is obsolete; instead, {A2T,T2A}_LOCAL should be used if
33104 + ANS lookups are _not_ desired
33105 +
33106 +
33107 +Version 0.20 to 0.21 (18-OCT-1996)
33108 +====================
33109 +
33110 +Bug fixes
33111 +---------
33112 +
33113 + - net/atm/common.c:atm_connect didn't refuse traffic_class == ATM_NONE in both
33114 + directions
33115 + - include/linux/atmsvc.h:SELECT_TOP_PCR didn't default to ATM_MAX_PCR if
33116 + min_pcr == 0 && max_pcr == 0
33117 + - debug/delay swallowed one-byte packets
33118 + - oops, forgot man/Makefile, so qos.7 wasn't installed
33119 + - atmarpd left max_sdu at zero for automatically generated entries
33120 + - atmarpd now only uses the default QOS if the traffic type is set in neither
33121 + direction
33122 + - signaling: if the listen queue was full, new connections were rejected with
33123 + as_close instead of as_reject, thereby upsetting atmsigd
33124 + - svc_accept didn't adjust the listen queue quota when rejecting incoming
33125 + connection requests
33126 + - fixed a few bad font selections in atmsigd(8)
33127 +
33128 +New features
33129 +------------
33130 +
33131 + - included the window scale patch by Randy Scott <scottr@belle.bork.com> and
33132 + Robert Hill <rhill@tisl.ukans.edu>
33133 + - -q option for ilmid to set the QOS (like in atmsigd)
33134 + - new script mkbindist to install the utilities into a tar.gz file
33135 +
33136 +Other changes
33137 +-------------
33138 +
33139 + - debug/delay now prints the usage if invoked without arguments
33140 + - removed the pretentious usec resolution for delays in debug/delay
33141 + - removed the UBR semantics change warning
33142 + - qos.7: clarified that bps are the user data rate
33143 + - arequipa_attach_unchecked now also adjusts the upper layer MTU (which can
33144 + violate RFC1122, but I'll tackle that later)
33145 + - text2qos now also accepts fractional values, e.g. 9.6kbps
33146 +
33147 +
33148 +Version 0.19 to 0.20 (14-OCT-1996)
33149 +====================
33150 +
33151 +Bug fixes
33152 +---------
33153 +
33154 + - fixed a few typos and errors in the 0.18 to 0.19 change log
33155 + - signaling traces only included hl_type bytes instead of hl_length
33156 + bytes
33157 + - TNET1570 driver: various fixes (DMA allocation, seg ring overflow,
33158 + timeouts, etc.) (Christian Paetz)
33159 + - TNET1570 driver: removed most compiler warnings (Christian Paetz)
33160 + - listen() on an arequipa_preset() socket and arequipa_preset() on a listening
33161 + socket now both return EPROTO
33162 + - oops, forgot to enable the "rm" in make uninstall
33163 + - kernel didn't set interface number field in act_create messages to atmarpd
33164 +
33165 +New features
33166 +------------
33167 +
33168 + - added ioctl ATM_SETSC to enable or disable RX and TX single-copy per VC
33169 + - new device driver operation change_qos (not yet implemented)
33170 + - TNET1570 driver supports DEC Alphas and 64 bit PCI transfer (for CIA PCI
33171 + chipsets) (Christian Paetz)
33172 + - TNET1570 driver also supports the UniNET1570 board (Christian Paetz)
33173 + - new functions text2qos and qos2text to convert between textual and binary
33174 + QOS specifications (the format is described in man qos)
33175 + - atmarp -q ip_addr qos sets the default QOS to use for all VCs created for
33176 + that IP interface
33177 + - new utility debug/delay to use machine as AAL5-level delay line
33178 +
33179 +Other changes
33180 +-------------
33181 +
33182 + - NLPIDs and vendor-specific application identifiers are now collected in
33183 + the new file /usr/include/atmsap.h
33184 + - SO_ATMQOS now attempts to change the QOS settings when invoked on an active
33185 + connection
33186 + - included Matt Welsh's bigphysarea patch (this isn't related to ATM, but it
33187 + keeps my development source tree simpler)
33188 + - arequipa_preset now initializes max_sdu to RFC1626_MTU+RFC1483LLC_LEN if
33189 + zero
33190 + - atmarp: new option qos <spec> to set the QOS parameters (uses text2qos)
33191 + Use of pcr <pcr> is deprecated.
33192 + - ttcp_atm's -P option now also accepts a QOS specification string. (use of
33193 + -P <number> is deprecated.
33194 + - atmsigd: new option -q <qos> and configuration clause io qos <qos> to
33195 + set the QOS of the signaling VC. Use of -P <pcr> or io pcr <pcr> is
33196 + deprecated.
33197 + - removed the backward compatibility #define class traffic_class in
33198 + linux/atm.h
33199 + - removed obsolete keywords from atmsigd.conf language
33200 + - atmarp -a now also includes QOS parameters
33201 + - UBR now respects txtp.max_pcr if set
33202 + - new rules for the use of [rt]xtp.traffic_class: both fields must be either
33203 + equal or zero, e.g. ATM_CBR in TX and ATM_UBR in RX no longer works
33204 + - doc/usage.tex now points to the man pages instead of repeating their content
33205 +
33206 +
33207 +Version 0.18 to 0.19 (27-SEP-1996)
33208 +====================
33209 +
33210 +Bug fixes
33211 +---------
33212 +
33213 + - sscop.c:data_sd had a comparison inversed, so generation of USTAT PDUs was
33214 + wrong in some cases (by Juhana Rasanen)
33215 + - sigd_enq: accessed vcc->qos without checking for vcc == NULL, causing an
33216 + "Oops" in atmaddr
33217 + - svc_accept: generated a general protection fault when atmsigd was killed
33218 + while a process was waiting for new incoming connections
33219 + - atmaddr didn't zero the address structure before calling text2atm
33220 + - LANE: fixed usage of kernel timers and LE_ARP_REQUESTs should now get sent
33221 + until the entry expires or a response is received (by Marko Kiiskila)
33222 + - less compiler warnings from LANE servers (Marko Kiiskila)
33223 + - SSCOP: fixed SDU size in AA-RETRIEVE.indication (reported by Heinz Schuerch)
33224 + - NULL encapsulation for ATMARP works now (reported by Gerald Hanusch)
33225 + - fixed stray EINVAL from get{sock,peer}name on PVCs (reported by Gerald
33226 + Hanusch)
33227 + - clip now sets max_sdu to RFC1626_MTU+RFC1483LLC_LEN when using LLC/SNAP
33228 + encapsulation
33229 + - if parsing of a Q.2931 message fails, atmsigd now aborts the call instead of
33230 + (stupidly) trying to process the incomplete and probably inconsistent data
33231 + - SUNI driver didn't properly mask out unused highest bits of some statistics
33232 + counters, thereby yielding absurdly high values
33233 + - zatm: changed timing of RX channel closing, so the dreaded "can't close RX
33234 + channel" message should be history
33235 + - fixed race between Arequipa attachment due to packet reception and closing
33236 + of the Arequipa VC
33237 + - local address validity check (for ATM_???ADDR) was all wrong (reported by
33238 + David Simpson)
33239 + - message dumper ignored fatal errors if debugging was not enabled
33240 +
33241 +New features
33242 +------------
33243 +
33244 + - man pages for lecs, les, bus, and zeppelin (Marko Kiiskila)
33245 + - configuration file name for les and bus can be defined (Marko Kiiskila)
33246 + - zatm: new kernel configuration option CONFIG_ATM_ZATM_EXACT_TS now supports
33247 + reception timestamps with microsecond resolution (the accuracy is only in
33248 + the ms range, though)
33249 + - new utility znth (ZeitNet Timer History) to monitor timer synchronization
33250 + - LANE now supports up to 4 LEC network interfaces (Marko Kiiskila)
33251 + - the Q.2931 message parser now recovers nicely from IE errors, logs the
33252 + event, and continues parsing. The higher layers of the signaling stack
33253 + don't use this information yet, though.
33254 +
33255 +Other changes
33256 +-------------
33257 +
33258 + - Arequipa's BHLI now uses a "vendor-specific application identifier" under
33259 + the EPFL OUI
33260 + - moved buffer/queue handling from lib/libatmd to saal/, because it is rather
33261 + SSCOP-specific anyway
33262 + - atm_release_vcc now complains if rx_inuse != 0 when closing (if this ever
33263 + happens, it may point out dangerous races with upper layer protocols)
33264 + - SO_ATMQOS now issues a warning when using UBR with {min,max}_pcr != 0
33265 + - max_sdu is now set by atmarpd to MTU+RFC1483LLC_LEN (atmarp could still
33266 + override this, if necessary)
33267 + - atmdump: new option -i to display the arrival interval instead of the
33268 + absolute time. Also changed the time format to be more readable.
33269 + - updated the kernel configuration documentation to indicate that the SMC
33270 + ATM Power155 adapters are compatible with the Efficient ENI-155
33271 + - atmarpd now deletes the old table file (containing stale information) if
33272 + invoked with -d (debug)
33273 +
33274 +
33275 +Version 0.17 to 0.18 (9-SEP-1996)
33276 +====================
33277 +
33278 +Bug fixes
33279 +---------
33280 +
33281 + - atmsigd didn't respond to SETUP followed by RELEASE with a RELEASE COMPLETE
33282 + - atmsigd now implements incoming call rejection (as_indicate -> as_close)
33283 + - kernel now opens the VC before sending the as_accept. This a) allows to
33284 + check if the parameters are acceptable, and b) avoids a race condition
33285 + between the sender and the local VC open procedure, which frequently led to
33286 + loss of the beginning of the first PDU sent on a new connection.
33287 + - qdump: _q_parse used the wrong length when dumping variable-length fields,
33288 + yielding a fatal internal error
33289 + - clip didn't set rxtp.max_sdu
33290 + - svc_accept didn't set ATM_VF_HASQOS, so getsockopt SO_ATMQOS didn't work
33291 + (by Marko Kiiskila)
33292 + - ttcp_atm calculated Mbps as 2^20 bits/sec instead of 10^6, thereby making
33293 + all results come out approximately 5% too low (by Fraz Ahmad)
33294 + - added $(LDLIBS) to linking of lane/lecs (by Lawrence MacIntyre)
33295 + - interface number allocation in clip and atmarp did not check for collision
33296 + with the respective other name space
33297 + - atmarp's -c option didn't work when omitting the "atm" in the interface name
33298 +
33299 +New features
33300 +------------
33301 +
33302 + - new man page: arequipad.8
33303 +
33304 +Other changes
33305 +-------------
33306 +
33307 + - simplified the internal signaling protocol by adding the as_reject message
33308 + (sent by kernel in response to as_indicate; not acknowledged by demon)
33309 + - packets received from Arequipa are no longer forwarded to other hosts
33310 + - further ilmid improvements to use RSTADDR less frequently (by Gerald
33311 + Hanusch; with a slight modification)
33312 +
33313 +
33314 +Version 0.16 to 0.17 (2-SEP-1996)
33315 +====================
33316 +
33317 +Bug fixes
33318 +---------
33319 +
33320 + - lib/diag.c didn't fflush when logging to a file
33321 + - arequipad didn't accept the -l option
33322 + - qgen: possible weird crashes because second.c:find_required accessed
33323 + value->tag even if vt_id
33324 + - qgen: fixed wrong PC indication in one error message in _q_parse
33325 + - make spotless didn't know about new $(*PGMS) targets
33326 + - atmsigd: fixed memory leak when sending messages to the kernel
33327 + - atmarpd: fixed memory leak when sending messages to the network
33328 + - atmsigd: didn't send final as_close when kernel closed connection
33329 + immediately after requesting it (as_connect)
33330 + - several minor corrections
33331 +
33332 +New features
33333 +------------
33334 +
33335 + - added make target "uninstall" to remove all files installed by
33336 + make install
33337 + - atmsigd has two new options: -D dump_dir to set the dump directory and
33338 + -t trace_length to set the length of the trace buffer
33339 + - wrote a few man pages: atmarp.8, atmarpd.8, atmsigd.8, atmsigd.conf.4
33340 + - added automatic support for memory debugging if MPR is installed (and
33341 + included a patch to make MPR 1.1 work with ELF). atmarpd and atmsigd
33342 + currently use this feature.
33343 +
33344 +Other changes
33345 +-------------
33346 +
33347 + - changed "class" to "traffic_class" everywhere
33348 + - make install is now implemented in a more elegant way
33349 + - q.dump is now much better at finding symbolic names for numbers
33350 + - q.dump no longer prints zero-length fields
33351 + - qgen no longer includes constructor "microcode" in dumper
33352 + - atmarp now gives more informative error messages on ioctl failure
33353 + - removed obsolete ioctls SIOCGIFATMADDR and SIOCSIFATMADDR
33354 + - added hack to allow ilmid to be less hostile to locally configured addresses
33355 + (by Gerald Hanusch; with slight modifications)
33356 + - atmarpd now automatically sets ATF_PERM of PVC entries with NULL
33357 + encapsulation
33358 +
33359 +
33360 +Version 0.15 to 0.16 (29-AUG-1996)
33361 +====================
33362 +
33363 +Bug fixes
33364 +---------
33365 +
33366 + - fixed an "unterminated character constant" warning by CPP in qgen/uni3x
33367 + - atm/sigd/q2931.c always tried to read the Cause IE of RELEASE COMPLETE
33368 + messages even if it wasn't included
33369 + - LANE: fixed buffer allocation and VCC timeouts (Marko Kiiskila)
33370 + - LANE: when connecting directly to LES, name of the ELAN was not set
33371 + properly (discoverd by Gerald Hanusch; fixed by Marko Kiiskila)
33372 + - LANE, ATMARP, signaling: control sockets didn't account for messages sent
33373 + back from demons (fixed by Marko Kiiskila)
33374 + - permanent ATMARP entries for SVCs were ignored if no ATMARP server was
33375 + configured (reported by Gerald Hanusch)
33376 + - atmarp option "temp" mis-spelled as "term" (fixed by Gerald Hanusch)
33377 + - forgot to undo experimental rcvbuf/sndbuf change to unsigned long
33378 + - make modules didn't generate ATM modules
33379 + - atmtcp_attach_hook wasn't defined when compiling ATMTCP as a module
33380 + - ATM patch set dev->ip_atm to ether_arp in net/ppp.c and net/eql.c, so they
33381 + failed to work as modules
33382 +
33383 +New features
33384 +------------
33385 +
33386 + - added LANE servers (LECS, LES, and BUS) by Marko Kiiskila
33387 + - Rules.make: new variable INSTROOT for easier cross-installation
33388 + - atmsigd: added option -P to set the maximum PCR used on the signaling VC
33389 + - atmarp: added option "pcr <value>" (proposed by Gerald Hanusch)
33390 + - added the usual -l <logfile> option to arequipad
33391 +
33392 +Other changes
33393 +-------------
33394 +
33395 + - upgrade to kernel version 2.0.14
33396 + - SVCs can now be bound with any SEL value
33397 + - messages of size > quota can be sent if the send buffer is empty
33398 + - ilmid no longer empties the address list when refreshing the NSAP address
33399 + (by Gerald Hanusch)
33400 + - LANE client should now survive network reset (e.g. restart) gracefully
33401 + (Marko Kiiskila)
33402 + - LANE: major cleanup of zeppelin code (Marko Kiiskila)
33403 + - improved loadable module support for eni and zatm (i.e. loading works now)
33404 + - the message dumper can now be linked to programs that also use the
33405 + compilation/parsing functions
33406 +
33407 +
33408 +Version 0.14 to 0.15 (31-JUL-1996)
33409 +====================
33410 +
33411 +Bug fixes
33412 +---------
33413 +
33414 + - zatm: fixed traffic shaper settings for UBR (with a little help from Joern
33415 + Wohlrab)
33416 + - atmsigd compilation didn't use the same UNI version configuration as qgen
33417 + - field "class" in struct atm_traform broke compilation of ATM applications
33418 + written in C++, so it has been renamed to "traffic_class" (reported by
33419 + Furquan Ansari)
33420 + - AAL parameters IE wasn't included in CONNECT, which violated RFC1755
33421 + (discovered by Robert Olsson)
33422 + - zatm: removed broken sanity check for in-sequence skb delivery on RX
33423 + - clip didn't have clip_open function, so SIOCSIFFLAGS on the interface failed
33424 + with ENODEV
33425 + - single-copy compiles again
33426 + - zatm: driver doesn't pretend any longer to support single-copy (but
33427 + single-copy will come back later)
33428 + - QOS IE was sent with the wrong coding standard when using UNI 3.1 (with help
33429 + from Fraz Ahmad)
33430 + - zatm: forgot to remove some debugging code (around ZATM_TUNE)
33431 + - qlib.c didn't zero the length array, leading to (rare) "not enough space"
33432 + errors from QMSG (actually, the "break" mechanism seems to be flaky - will
33433 + have to check)
33434 + - fixed Arequipa race condition when the upper layer protocol and signaling
33435 + decided to close the SVC at the same time
33436 + - alloc_tx used to return NULL in out of memory conditions, thereby possibly
33437 + hanging atm_sendmsg
33438 +
33439 +New features
33440 +------------
33441 +
33442 + - ttcp_atm now also accepts names with -p
33443 + - (finally !) added send/receive buffer limits and cleaned up the use of
33444 + vcc->[rt]x_{inuse,quota}
33445 + - added mkdiff script for automatic generation of diffs
33446 + - Arequipa now works for PVCs too (but arequipad is now required for any
33447 + use of Arequipa, not only for incoming connections)
33448 +
33449 +Other changes
33450 +-------------
33451 +
33452 + - atm/atm-<version>.patch is now called atm/atm.patch (to make the diffs more
33453 + useful)
33454 + - the maximum SDU size is now checked in net/atm/common.c:adjust_tp
33455 + - text2atm/atm2text now accepts/generates E.164 addresses with a leading +
33456 + sign, as required by ANS (atm95-1532)
33457 + - internal signaling protocol: added message as_error to un-overload as_close
33458 + - internal signaling protocol: split as_establish into as_connect and
33459 + as_accept
33460 + - internal signaling prococol: as_close.reply no longer contains positive
33461 + numbers
33462 + - internal signaling prococol: as_bind now also carries the AAL type
33463 + - atmsigd: now also checks the AAL type in as_bind messages
33464 + - kernel signaling: a few minor changes
33465 + - STANDARDS (i.e. UNI version) configuration option has been moved from
33466 + atm/qgen/Makefile to atm/Rules.make
33467 + - atmsigd's startup message now gives more useful indication of which UNI
33468 + version(s) it supports
33469 + - signaling no longer uses sa[sp]_[rt]xtp, so ...
33470 + - sa[sp]_[rt]xtp is gone
33471 + - removed atm/sigd/svc.c from the distribution. We now have many other tools
33472 + for testing SVCs, so it's superfluous.
33473 + - atmarpd: revalidation is now less frequent (use -DFREQUENT_REVAL for
33474 + the faster timeout)
33475 + - ioctl CLIP_PVC now returns the number of the new interface and clip prints
33476 + its name to standard output (like atmarp -c)
33477 + - clip now issues the CLIP_PVC ioctl after binding, which avoids wasting
33478 + interface numbers on failed setup attempts
33479 + - atmsigd -d now sets the debug level for qgen and SSCOP to DIAG_INFO, and
33480 + doesn't set q_dump
33481 + - zatm: added protection against I > M
33482 + - atm_peek_aal5 now only aligns to page boundaries for pdu_size >= PAGE_SIZE
33483 + - eni driver now spits out CRC error messages at most every other second
33484 + - zatm driver now repeats RX error messages at most every other second
33485 + - ttcp_atm now sleeps for a second after setting up an SVC, because the
33486 + switch seems to lag behind (need to examine this further)
33487 + - moved SAAL from sigd/ to saal/ (for sharing with UNI 4.0 signaling)
33488 + - Arequipa sockets are now closed via arequipad instead of via atmsigd (new
33489 + ioctls AREQUIPA_CTRL and AREQUIPA_CLS3RD)
33490 + - various minor changes
33491 +
33492 +
33493 +Version 0.13 to 0.14 (19-JUL-1996)
33494 +====================
33495 +
33496 +Bug fixes
33497 +---------
33498 +
33499 + - LANE: reaction to LE_ARP_RESPONSE's wasn't always correct
33500 + - LANE: compiler warnings fixed
33501 + - LANE: comparing ATM addresses in checking whether connection is formed was
33502 + wrong
33503 + - zntune didn't divide by 1024 when displaying the "k"
33504 + - .depend wasn't deleted by make spotless
33505 + - ATM_GETSTAT and ATM_GETSTATZ used wrong argument type for coding ioctl
33506 + number. WARNING: programs using ATM_GETSTAT{,Z} need to be recompiled.
33507 + - requests to set up SVCs with ATM_NONE in both directions are now caught by
33508 + svc_connect (used to yield an invalid SETUP message)
33509 + - signaling: fixed connection identifier setting when acting as network side
33510 + (fix by Elwyn B Davies)
33511 + - ATMARP server ARP entries were undeletable
33512 + - atmarp showed wrong argument in error message when given an invalid ATM
33513 + address
33514 + - zatm: do_tx left interrupts turned off when returning with RING_BUSY
33515 + - LANE ARP hash table handling bugs fixed
33516 + - atmarp: act_create is now only sent on interface creation
33517 + - atmarp: act_down is now only sent once per transition
33518 + - demon control SVCs are no longer closed when atmsigd dies (new VCC flag
33519 + ATM_VF_META)
33520 + - netdevice notifier is now properly unregistered when atmarpd goes down
33521 + (not doing so caused endless loop in kernel on atmarpd restart)
33522 + - sigd_enq{_atomic} never calls schedule()
33523 + - atmsigd no longer "forgets" to bring up ARP server SVC before sending an
33524 + InARP
33525 + - atmarpd no longer dies with "timer in state 3" when the ARP server becomes
33526 + unreachable
33527 + - atm/atmarp.c: clip_create() now refuses creation of already existing
33528 + interface
33529 + - Documentation/Configure.help gave an obsolete URL for CONFIG_AREQUIPA
33530 + and doc/usage.tex also mentioned the old file name
33531 + - Arequipa didn't work in the outbound direction for TCP, because
33532 + net/ipv4/tcp.c was missing in the kernel patch
33533 + - drivers/atm/eni.c:foo raced with initialization of eni_boards if the
33534 + board lost the signal _immediately_ after being initialized
33535 + - atmarpd: fixed a few uninitialized entry->timer pointers (discovered by
33536 + Gerald Hanusch)
33537 + - atmarpd: arps entry should no longer get stuck in as_resolv
33538 +
33539 +New features
33540 +------------
33541 +
33542 + - compiles on SparcLinux too (but only atmtcp works)
33543 +
33544 +Other changes
33545 +-------------
33546 +
33547 + - upgrade to kernel version 2.0.0
33548 + - BHLI matching changed: SAPs without BHLI are now incompatible with calls
33549 + that specify a BHLI
33550 + - LANE: interface stays up when zeppelin dies -> possibility for
33551 + wrapper script around zeppelin
33552 + - LANE: LUNI interoperability test (ATM Forum/96-0805) is now followed
33553 + in setting ELAN name in LE_CONFIG_RESPONSE and LE_JOIN_RESPONSE,
33554 + there is also a delay of 1 second before sending LE_CONFIG_REQUEST and
33555 + LE_JOIN_REQUEST. This allows 'slow' LE servers to catch up.
33556 + - LANE: no longer uses sa[sp]_[rt]xtp
33557 + - LANE: now adjusts better to ATM address changes
33558 + - zeppelin: new option -m to select debugging output
33559 + - updated aping, aread, awrite, br, bw, atmdump, ilmid, atmarp, clip, atmarpd,
33560 + and zeppelin to use setsockopt SO_ATMQOS
33561 + - added option -x for ilmid to disable variable bindings (caused
33562 + interoperability problems with certain switches, e.g. the LS100)
33563 + - changed SO_CIRANGE into a pair of ioctls
33564 + - changed return value of fetch() (passed to atm_vcc->peek) from unsigned long
33565 + to __u32
33566 + - atmarp now accepts arpsrv option also for -d
33567 + - zatm driver can now also read ESIs of rev. 10 boards (with help from Nikos
33568 + Anerousis)
33569 + - awrite: fixed txtp.max_sdu calculation in awrite (was using uninitialized
33570 + variable "offset")
33571 + - atmarpd: IP interface removal now has the desired effect (used to do
33572 + nothing)
33573 + - atmarpd: now reports and ignores unexpected interface transitions
33574 + - added sigd_enq_atomic for atomic sigd_enq (so that non-Arequipa SVCs can
33575 + still use the "safe" but non-atomic version)
33576 + - made SIOCGIF* failures in atmarpd non-fatal (itf.c:itf_up was handling them
33577 + anyway)
33578 + - moved Arequipa-specific code from net/atm/clip.c to net/atm/arequipa.c, and
33579 + put code common to CLIP, Arequipa, and - to a lesser extent - ATMARP into
33580 + net/atm/ipcommon.[ch]
33581 + - Arequipa can now be complied without CLIP
33582 + - various minor documentation changes
33583 + - moved ATM device initialization from net/atm/pvc.c to drivers/block/genhd.c,
33584 + where most other devices are initialized too
33585 + - preparation for new binary locations: tools build process now knows about
33586 + four types of programs: for booting, for system use, for users, and for
33587 + internal use during build
33588 + - make install now hides the for loops
33589 + - non-user binaries are now installed in /usr/local/sbin
33590 + - struct atm_iobuf.buffer is now of type void * (was int*). Also,
33591 + ATM_GETNAMES now returns the length in bytes in that field.
33592 +
33593 +
33594 +Version 0.12 to 0.13 (7-JUN-1996)
33595 +====================
33596 +
33597 +Bug fixes
33598 +---------
33599 +
33600 + - BHLI type used the ATM_HL_* values (which are off by one) in qgen/uni3x
33601 + - atmarpd ended up in a tight select-accept loop if atmsigd went away
33602 + - removed sleep in ZATM's do_tx (so it works with IP over ATM again)
33603 +
33604 +New features
33605 +------------
33606 +
33607 + - added experimental support for Application requested IP over ATM (Arequipa),
33608 + prototyped by Jean-Michel Pittet
33609 + - new traffic class ATM_ANYCLASS to accept incoming SVCs without looking at
33610 + the traffic parameters
33611 + - added (untested) support for SO_BCTXOPT/SO_BCRXOPT
33612 +
33613 +Other changes
33614 +-------------
33615 +
33616 + - SVCs used to listen are now marked as "LISTEN" in /proc/atm/svc
33617 + - added option -Q <atm_addr> to ttcp_atm to support AREQUIPA
33618 + - cleaned up the FILE macro and removed atm_dir in net/atm/proc.c
33619 +
33620 +
33621 +Version 0.11 to 0.12 (3-JUN-1996)
33622 +====================
33623 +
33624 +Bug fixes
33625 +---------
33626 +
33627 + - atm/lib/Makefile: had to comment out PGMS=test
33628 + - distribution didn't include atm/doc/usage.txt
33629 + - patch didn't include arch/i386/config.in
33630 + - return 0; was missing at the end of net/atm/mmuio.c:mmu_step
33631 + - atm/ilmid didn't install into INSTBIN; also made some other Makefile
33632 + changes
33633 + - read() returned garbage instead of error when network drops connections
33634 + - POLL_AFTER_RETRANSMISSION in SSCOP didn't even compile
33635 + - SVCs: bind to wildcard addresses should now work even if no local address
33636 + is known yet
33637 + - make clean in atm/qgen left some dirt
33638 + - ATM drivers didn't free skbs when detecting an error in TX direction
33639 + - SIOCMKCLIP was in the wrong #ifdef, so CLIP had to be enabled to make
33640 + ATMARP usable
33641 + - signaling didn't respond properly to messages with non-existent call
33642 + reference
33643 +
33644 +New features
33645 +------------
33646 +
33647 + - merged in LAN Emulation client support written by Marko Kiiskila
33648 + - new socket option SO_ATMQOS at SOL_ATM to set/get QOS parameters
33649 +
33650 +Other changes
33651 +-------------
33652 +
33653 + - t2a.pl now also works with Perl 5.001
33654 + - changed the TX side of the ZATM driver to use a ring instead of a list in
33655 + order to improve stability and throughput (needs some more testing)
33656 +
33657 +
33658 +Version 0.10 to 0.11 (21-MAY-1996)
33659 +====================
33660 +
33661 +Bug fixes
33662 +---------
33663 +
33664 + - README.DRIVERS still referenced INSTALL (it's now in USAGE)
33665 + - sap_decode didn't clear BLLI part of address structure
33666 + - trying to connect to NULL address fails locally instead of yielding an
33667 + invalid SETUP message
33668 + - bind now properly sets the local address
33669 + - SVC getname now returns the traffic parameters
33670 + - oops, zatm open_tx didn't return PCR
33671 + - awrite printed errors for connect() as "bind: ..."
33672 + - atmsigd no longer generates dummy call references (0x7fffff)
33673 + - atmtcp: changed a few kfree_skb to dev_kfree_skb, which should make it
33674 + work better (does anybody care to try ?)
33675 + - some more dev_kfree_skb fixed for control messages from or to demons (led
33676 + to some minor memory leaks)
33677 + - various major fixes for CBR SVCs
33678 + - RELEASE was signaled for SVCs before all data was sent
33679 + - single copy tried to access mem_map with user space addresses, leading to
33680 + crashes or worse
33681 + - zatm: sleep_on was racing with TX completion in close_tx, leading to hangs
33682 + - zatm: now fails attempts to open AAL0 VCs (used to accept them and to
33683 + crash later)
33684 + - BHLI encoding/decoding was broken in several ways
33685 +
33686 +New features
33687 +------------
33688 +
33689 + - hacked in primitive leaf-only p2m support (based on an idea by Marko
33690 + Kiiskil{)
33691 + - the socket layer, and the zatm, eni, and atmtcp drivers now support
33692 + two-phase connect
33693 + - PVCs now respect max_pcr (SVCs can't for now)
33694 + - lib/diag.c can now also log to a file or to syslog, and atmarpd, atmsigd,
33695 + and ilmid now have a -l option to use that
33696 + - new option -c config_file for atmsigd
33697 + - zatm and atmtcp now also support timestamps (but zatm timestamps can be
33698 + improved a lot by using the timestamps the uPD98401 generates)
33699 + - Classical IP over ATM support is now configurable
33700 + - added on-line help texts for configuration
33701 + - added atm/test/aping, a round-trip tester for PVCs
33702 + - added "flags" field to struct atm_dev and to atm_dev_register, on request
33703 + by Bureau 13
33704 +
33705 +Other changes
33706 +-------------
33707 +
33708 + - past versions of the BUGS list aren't included in the distribution anymore
33709 + because I didn't update them anyway
33710 + - invalid connect() calls now return an error instead of panicing atmsigd
33711 + - text2atm no longer clobbers sas_addr.{blli,bhli}
33712 + - greatly simplified zatm traffic shaper settings calculation (and it's
33713 + better than before too)
33714 + - atmsigd: diagnostics class "sig" (in atmsigd.conf) now also includes "SAP"
33715 + - DPRINTK now uses GNU-specific #define foo(bar...)
33716 + - signaling: PCR is now also indicated (0) for directions in which ATM_NONE
33717 + is requested, which is probably "cleaner" (for CBR)
33718 + - added logging priorities to most printks
33719 + - the default location for atmsigd.conf changed from . to /etc
33720 + - ipv4/af_inet.c: atmtcp_attach_hook is now only included when using ATM over
33721 + TCP
33722 + - configuration options for extended driver debugging, (old) CLIP, and
33723 + ATM over TCP are turned off by default
33724 +
33725 +
33726 +Version 0.9 to 0.10 (21-MAR-1996)
33727 +===================
33728 +
33729 +Bug fixes
33730 +---------
33731 +
33732 + - zatm: deallocated UBR shaper when closing UBR VC, which the other UBR VCs
33733 + didn't really appreciate
33734 + - fixed nasty memory leak for native ATM (spotted by Rolf Fiedler)
33735 +
33736 +New features
33737 +------------
33738 +
33739 + - added Rolf Fiedler's driver for his adapter based on the TI TNETA1570
33740 + - single-copy is back again !
33741 +
33742 +Other changes
33743 +-------------
33744 +
33745 + - eni buffers are now slightly (50%) bigger, allowing for more effective
33746 + overlapped operations
33747 + - documented zntune
33748 +
33749 +
33750 +Version 0.8 to 0.9 (14-MAR-1996)
33751 +==================
33752 +
33753 +Bug fixes
33754 +---------
33755 +
33756 + - oops, accidently removed ZN1221 from drivers/pci/pci.c (so /proc/pci
33757 + reported it as "unknown")
33758 + - sigd didn't poll for the default interface on startup
33759 + - atmarpd didn't initialize timer field in newly allocated table entries,
33760 + which led to crashes
33761 + - removed a few stray debugging printks in net/atm/svc.c:svc_bind
33762 + - ATMARP tried to send queued packet before adding new table entry, so the
33763 + packet was always discarded
33764 + - sigd/sap.c: didn't allow to use different traffic classes for fwd and bwd
33765 + direction
33766 + - atm2text accepted SVC addresses of all zeroes
33767 + - atmsigd didn't refresh its local address list properly after ilmid restart
33768 + - net/atm/common.c: returned positive error codes (-vcc->reply) instead of
33769 + negative ones
33770 + - forgot to include maint/zntune.c in the distribution
33771 +
33772 +New features
33773 +------------
33774 +
33775 + - sigd/svc now accepts ATM addresses in all formats supported by text2atm
33776 +
33777 +Other changes
33778 +-------------
33779 +
33780 + - upgraded to kernel version 1.3.73
33781 + - the called party number must now match the local address (if bound)
33782 + - renamed ttcp.atm to ttcp_atm
33783 + - all executables are now explicitly linked (so make works even without
33784 + dependencies)
33785 +
33786 +
33787 +Version 0.7 to 0.8 (12-MAR-1996)
33788 +==================
33789 +
33790 +Bug fixes
33791 +---------
33792 +
33793 + - fixed stray segmentation violation in arpd/arp.c:learn
33794 + - fixed coding standard of the QoS IE if using UNI 3.0 (and made coding
33795 + standard variable)
33796 + - made coding standard variable for Cause IE
33797 + - SSCOP didn't properly set N(MR)
33798 + - list elements in STAT PDUs had host byte order
33799 + - SSCF didn't call sscop_estab_resp on restart (AA-EST.ind in 1/1)
33800 + - signaling didn't handle SAPs with >= 2 BLLI IEs properly
33801 + - uni3x: iso_hli and user_hli were confined to 7 bytes, but UNI allows up to 8
33802 + - q_read choked on non-variable-length fields
33803 + - qgen sometimes didn't read all IEs of a signaling message
33804 + - fixed usage line of test/bw
33805 + - qgen no longer complains about missing required fields after a break
33806 + - fixed compiler warning in zntune.c
33807 + - fixed ATMARP table additions (caused GPF when flushing ATMARP entry at
33808 + the end of the table and possibly other problems)
33809 + - qgen: q_put or'ed data instead of overwriting it, which caused problems
33810 + only on surprisingly few occasions
33811 +
33812 +New features
33813 +------------
33814 +
33815 + - atm2text and text2atm now also do name lookups via a /etc/hosts.atm file
33816 + - atmaddr, atmarpd, and atmsigd now pretty-print addresses using name
33817 + translation (unless invoked with -n)
33818 + - atmarpd now dumps its table into /var/run/atmarpd.table and atmarp -a
33819 + reads it from there
33820 + - started modularizing the ENI and ZATM drivers
33821 + - ilmid and atmsigd now support multiple interfaces (untested)
33822 +
33823 +Other changes
33824 +-------------
33825 +
33826 + - the documentation is now available in LaTeX and in ASCII
33827 + - rewrote most of the SAP handling code (now everything is in sigd/sap.c)
33828 + - proto.c:lookup_sap now picks wildcard SAP last
33829 + - signaling always includes SSCS type = 0 in SETUP messages (for LANE)
33830 + - changed the message format for the the kernel-demon signaling protocol
33831 + - qgen is now a bit more tolerant when being fed with bad data
33832 + - qgen now assumes that q_report(Q_FATAL,...) doesn't return
33833 + - marked sigd/test.c as obsolete
33834 + - svc_accept failing in atm_connect no longer returns success
33835 + - atmsigd -n is now atmsigd -N
33836 + - qgen now puts the PC in q.out.c and qd.out.c at the beginning of the code
33837 + line and not on a line by itself
33838 +
33839 +
33840 +Version 0.6 to 0.7 (2-FEB-1996)
33841 +==================
33842 +
33843 +Bug fixes
33844 +---------
33845 +
33846 + - removed TTL setting ioctl (1234) used for something entirely unrelated to
33847 + ATM, oops
33848 + - changed kfree_skb in atm_pop_raw to dev_kfree_skb (this fixes the socket
33849 + "leak")
33850 + - more unusual configurations (no PCI, no IP, no /proc) should compile now
33851 + - atm_equal didn't recognize wildcards in embedded E.164 addresses
33852 + - fixed net/atm/proc.c:svc_addr (too many bugs to mention)
33853 + - atmarpd didn't check for ARP traffic on inbound connections
33854 + - atmarpd didn't properly merge incoming connections with existing entries
33855 + - various other ATMARP fixes
33856 + - free list was too short in ENI driver for worst case fragmentation on
33857 + 2 MB boards
33858 + - signaling didn't set ISO/IEC TR9577 IPI and NLPID correctly in active open
33859 + - getname looked at *sockaddr_len, which is uninitialized (need to fix this
33860 + later in the common socket code)
33861 + - SSCOP generated incorrect error code ("1" instead of "B") for BGN PDU
33862 + problems
33863 +
33864 +New features
33865 +------------
33866 +
33867 + - new ioctls ATM_GETADDR, ATM_RSTADDR, ATM_ADDADDR, and ATM_DELADDR to
33868 + manage local ATM addresses
33869 + - signaling now handles incoming RESTART, SAAL failure, and SAAL
33870 + re-establishment
33871 + - ATMARP now times out idle connection; ATMARP_MKIP ioctl takes a timeout
33872 + argument
33873 + - ATMARP (kernel) now queues one skb per pending ARP request and limits the
33874 + rate of requests for the same address (default 2 req/min)
33875 + - atmsigd now prints cause values when receiving a RELEASE or a RELEASE
33876 + COMPLETE and returns more informative error codes
33877 + - atmarpd falls back to PVC-only operation if signaling is unavailable at
33878 + startup
33879 + - kernel can now assign next free number on IP interface creation (atmarp
33880 + prints the interface name)
33881 + - qgen -D generates a Q.2931 message dumper (see USAGE for details)
33882 + - qgen now checks for proper use of repetition indicator (but doesn't
33883 + support repeated IEs yet)
33884 + - protocols and device drivers can now use their own memory allocator in the
33885 + TX direction by changing vcc->alloc_tx
33886 +
33887 +Other changes
33888 +-------------
33889 +
33890 + - upgraded to kernel version 1.3.53
33891 + - build process now uses Perl
33892 + - ATM ioctls writing back data now always return the size of the data
33893 + structure written
33894 + - struct atmif_sioc now has a length field (recompile all atmarpd, ilmid,
33895 + debug/ed, and everything in maint)
33896 + - PHY driver no longer has to check validity (permissions and access) for
33897 + "standard" ioctls
33898 + - signaling should now also work on an interface > 0 (but there's still only
33899 + one interface using signaling per host)
33900 + - make install now adds /usr/include/atm.h and /usr/include/atmd.h
33901 + - atmarpd now also displays if SVC has been opened actively or passively
33902 + - atmaddr(8) now uses new ioctls and has different command-line syntax
33903 + and even has a man page
33904 + - example IP addresses in USAGE now conform to RFC1597
33905 + - diagnostics now also include the application name (optional)
33906 +
33907 +
33908 +Version 0.5 to 0.6 (21-DEC-1995)
33909 +==================
33910 +
33911 +Bug fixes
33912 +---------
33913 +
33914 + - ARP ioctls stopped working for most non-ATM devices, oops
33915 + - ATMTCP driver counted lack of memory as rx_err instead of rx_drop
33916 + - select on driver using polling may have hung
33917 + - atmarp man page and usage didn't indicate that the interface number is
33918 + optional
33919 + - restricted atmarpd and signaling control, and SIOCSIFATMADDR to the super
33920 + user
33921 + - atmtcp: fixed handling of VPI/VCI <= 0 for setsockopt(SO_CIRANGE)
33922 + - eni and zn driver had static UBR shaper pointer, making it difficult to have
33923 + more than one such device per system
33924 + - eni driver initialization didn't work properly in systems with ASIC Tonga
33925 + - suni.[ch]: confused MC (Master Config) and MCT (Master ConTrol) registers
33926 + - (SVC) accept now returns PVC -EAGAIN as -EBUSY because the operation cannot
33927 + be retried
33928 + - qgen: fixed several bugs in case handling (and made defaults work for
33929 + parsing)
33930 + - svc_dup passed PF_ATMSVC instead of AAL to svc_create
33931 + - plugged a few skb leaks in svc_accept
33932 + - text2atm didn't properly NUL-terminate E.164 addresses
33933 +
33934 +New features
33935 +------------
33936 +
33937 + - ZN1221 driver works partially for AAL5 (still hangs after a few dozen MB)
33938 + (also wrote maint/zntune to monitor/adjust free buffer pools)
33939 + - ENI driver now supports new Tonga ASIC boards
33940 + - added Scott Shumate's ILMI demon (for automatic address registration)
33941 + - text2atm: added wildcard support for SVCs (syntax: addr/bits)
33942 + - new library function atm_equal to compare SVC addresses
33943 + - new ioctl ATM_GETTYPE to obtain interface type name
33944 + - new ioctl ATM_GETESI to obtain ESI (parallels /proc/atm/devices)
33945 + - new ioctls SONET_SETFRAMING, SONET_GETFRAMING, and SONET_GETFRSENSE to
33946 + handle SONET vs. SDH framing
33947 + - added socket option SO_AALTYPE (SOL_AAL) to query AAL type (getsockopt
33948 + only)
33949 + - signaling demon is now notified on address changes (new message
33950 + as_itf_notify)
33951 +
33952 +Other changes
33953 +-------------
33954 +
33955 + - known bugs are now listed in a file called BUGS
33956 + - all utility programs (aread, awrite, atmdump, br, bw, clip, ttcp) now use
33957 + the notation [itf.]vpi.vci for PVCs (was itf vpi vci , except for ttcp,
33958 + where it was only vpi vci (no itf))
33959 + - all ioctl values have changed
33960 + Note: most programs have to be recompiled because of this
33961 + - sigd and arpd now register their control sockets via ioctls
33962 + - (old) clip now creates interfaces with an ioctl
33963 + - text2atm now returns the wildcard length, i.e. a non-zero return value
33964 + no longer implies failure
33965 + - push_oam now returns an int (was void)
33966 + - push_oam now has several flags (in a bit set) instead of the immed
33967 + argument
33968 + - the peek function must now update the statistics if it rejects a packet
33969 + - (ATM device) close is now only invoked after a successful open
33970 + - the SUNI_GETLOOP ioctl now has an int * argument (was unsigned long *)
33971 + - uPD98402 driver no longer tries to detect return of the signal (didn't
33972 + work anyway - would have to sample section errors)
33973 + - ATMARP no longer supports mixed PVC/SVC entries (I'm sure this will be
33974 + missed a lot :-)
33975 + - ATMARP no longer supports "IP address discovery" via InARP for PVCs
33976 + (maybe later)
33977 + - specifying an invalid AAL now yields EPROTOTYPE
33978 + - specifying an invalid address family (connect, bind) now yields EAFNOSUPPORT
33979 + - make install now also installs libraries (in /usr/lib)
33980 + - improved many header file comments
33981 + - re-arranged some comments to simplify automated document generation
33982 + - added copyright statement
33983 + - UNI 3.0 IE fields are now always recognized (but we shouldn't generate them)
33984 + - UNI 3.0 wants octet 5a when using BCOB-X, so we'll set it to twice "No
33985 + indication"
33986 + - aread, awrite, br, bw, ttcp, atmsigd, and atmdump now set max_sdu
33987 + - aread and awrite no longer print strerror(errno) on success
33988 +
33989 +
33990 +Version 0.4 to 0.5 (26-OCT-1995)
33991 +==================
33992 +
33993 +Bug fixes
33994 +---------
33995 +
33996 + - now only root can open a CLIP socket (thereby creating an IP interface)
33997 + - now only root can issue CLIP_NULENCAP and CLIP_LLCENCAP ioctls
33998 + - atmdump: forgot default in getopt switch
33999 + - eni driver: called misc_int on every interrupt
34000 + - Q.2931 message description: various fixes and improvements
34001 + - linux/atm.h: ATM_*_UNSPEC used the same value as ATM_*_ANY, oops !
34002 + - SSCOP is now more careful about not accessing the descriptor if it might
34003 + possibly have been deleted
34004 + - typo in SSCF leading to wrong response to AA-RECOVER.indication
34005 + - SSCOP now correctly copies N(PS) from POLL to STAT PDUs
34006 + - SSCF now discards data when not ready instead of issuing a fatal error
34007 + - AAL initialization failure no longer leaks memory
34008 + - closing an SVC without VCC no longer yields a GPF
34009 +
34010 +New features
34011 +------------
34012 +
34013 + - ZN1221 driver is starting to work
34014 + - new, ARP-based mechanism for IP over ATM (with atmarpd, atmarp, etc.)
34015 + - /proc/atm/pvc now displays more information for CLIP PVCs (after a patch
34016 + by Raghavan Menon)
34017 + - added max_pcr to struct atm_trafprm (also fixed a few comments in atm.h)
34018 + Note: all programs using sockaddr_atm* will have to be recompiled.
34019 + - qgen now handles value lists in named selections
34020 + - signaling now supports bhli/blli, plus various other minor extensions
34021 + - new ioctls to set/get local ATM address
34022 + - added library with address to/from text conversion functions
34023 + - finally implemented getname()
34024 +
34025 +Other changes
34026 +-------------
34027 +
34028 + - eni driver: avoided potential generation of superfluous code if extended
34029 + debugging is disabled
34030 + - eni driver: detects new boards using ASIC PCI chip (doesn't support them
34031 + yet, though)
34032 + - qgen: semicolon is now comment character and no longer used to terminate
34033 + clauses
34034 + - qgen: replaced term "item" with "field"
34035 + - linux/include/atmsap.h: removed obsolete comment "protocol cannot be fully
34036 + encoded in current structure". Also re-arranged some comments to simplify
34037 + automated document generation.
34038 + - saal,sscf,sscop: callbacks don't pass the pointer to the descriptor of the
34039 + calling protocol anymore
34040 + - SSCOP no longer prints a number for non-'V' errors
34041 + - improved handling of STATUS messages
34042 + - select now indicates ready for writing if max_sdu packet can be enqueued
34043 + without blocking
34044 + - select can now also be used to check status of non-blocking connect
34045 + - moved some common demon functions from sigd into a common demon library
34046 +
34047 +
34048 +Version 0.3 to 0.4 (27-SEP-1995)
34049 +==================
34050 +
34051 +Bug fixes
34052 +---------
34053 +
34054 + - various minor documentation fixes
34055 + - clip.c:atm_push_clip now updates statistics before forwarding the skb to
34056 + the upper layer (which may free and overwrite the skb)
34057 +
34058 +New features
34059 +------------
34060 +
34061 + - added partial UNI 3.x signaling
34062 + - added various adapter debugging programs to the distribution
34063 + - new config option CONFIG_ATM_ENI_DEBUG to enable extended debugging
34064 + in eni driver
34065 +
34066 +Other changes
34067 +-------------
34068 +
34069 + - upgraded to kernel version 1.3.24
34070 + - changed the distribution directory structure (programs are now in maint/,
34071 + test/, ip/, debug/, and sigd/, see INSTALL)
34072 + - ATM interfaces are no longer named, only numbered. This affects the
34073 + ATM_GETNAMES ioctl, all ioctls using struct atmif_sioc, the usage of atmdiag
34074 + and sonetdiag, and various diagnostic kernel messages.
34075 + - ATM socket state is now recorded in field "flags" (this also replaces the
34076 + SVC fields "released", "registered", and "state")
34077 + - added #ifdef __KERNEL__ to some header files
34078 + - added "int immed" argument to send_oam
34079 + - some minor modifications to the distribution process (mkdist)
34080 + - removed devmap.c
34081 + - SVC sockets no longer hang if the signaling demon dies
34082 +
34083 +
34084 +Version 0.2 to 0.3 (8-SEP-1995)
34085 +==================
34086 +
34087 +Bug fixes
34088 +---------
34089 +
34090 + - select(2) didn't work (was sleeping on sock->wait instead of
34091 + &ATM_SD(sock)->sleep)
34092 + - ENI driver did allow binding to VPI/VCI already in use
34093 + - ENI driver now properly handles PDUs with CRC errors
34094 + - ENI driver had race condition when discarding PDUs causing new PDUs to be
34095 + shifted in adapter memory by one word (which confused the driver quite a
34096 + bit)
34097 + - ENI driver now enables VC _after_ setting all pointers (caused crashes if
34098 + data was already coming in while opening VC)
34099 + - various bugs fixes related to SVC sockets
34100 + - fixed GPF (in kernel) when running atmdiag without arguments
34101 + - atmdiag now left-adjusts interface names
34102 + - fixed ttcp.atm crash when not specifying vpi.vci
34103 + - clip_xmit now checks for NULL vcc (e.g. after failure to connect)
34104 +
34105 +New features
34106 +------------
34107 +
34108 + - zatm driver now reads ESI correctly
34109 + - blocking svc_connect is now interruptible
34110 + - atmdump now also displays the numeric PTI value of incoming cells
34111 + - added RX/TX buffer quotas (default is 64 kB)
34112 + - added OAM hooks to device driver interface (but there's no OAM support yet)
34113 +
34114 +Other changes
34115 +-------------
34116 +
34117 + - ENI driver now checks ID field of reassembly buffer descriptors
34118 + - ENI driver now uses vremap
34119 + - ENI driver now prints more useful physical layer type information (e.g.
34120 + "MMF" and "UTP" instead of "UTOPIA")
34121 + - some redesign of the protocol used for signaling between kernel and demon
34122 + - disabled "Grr, servicing VCC twice" message in ENI driver
34123 + - device drivers now have to adapt AAL0 cell header byte order
34124 + - some cleanup in common.c:atm_getsockopt
34125 + - device drivers are now required to use the peek function; protocols now
34126 + must provide it
34127 +
34128 +
34129 +Version 0.1 to 0.2 (15-AUG-1995)
34130 +==================
34131 +
34132 +Bug fixes
34133 +---------
34134 +
34135 + - VCC family field is now correctly set to protocol family in
34136 + common.c:atm_create (was pvc.c:pvc_create). With protocol set to zero,
34137 + this created all types of strange problems, because the family field
34138 + is used to indicate whether an VCC slot is busy/free.
34139 + - fixed race condition in common.c:atm_read (reader might have blocked
34140 + even if data is ready)
34141 + - fixed dereferencing of uninitialized skb->dev pointer in
34142 + clip.c:atm_push_clip
34143 + - SIOCSIFATMTCP now refuses to attach the same socket twice
34144 + - zatm.c: fixed setting of the VPI/VCI mask
34145 + - USAGE said ttcp uses -B for the bandwidth, but it's -P
34146 + - mkdist didn't include man pages
34147 +
34148 +New features
34149 +------------
34150 +
34151 + - added some /proc/atm functionality
34152 + - added support for ATM_{VPI,VCI}_ANY
34153 + - SIOCSIFATMTCP now returns the interface number and atmtcp(8) prints it
34154 + - wrote atmtcp man page
34155 + - added kernel part of SVC support
34156 +
34157 +Other changes
34158 +-------------
34159 +
34160 + - common.c: only root is now allowed to bind to reserved VCIs
34161 + - Classical IP interfaces are now removed by downing by ifconfig; clip(8)
34162 + returns immediately
34163 + - PVC-connect for non-existing device now returns ENODEV instead of EINVAL
34164 + - new field (type) in struct atm_dev to indicate device type
34165 + - moved getsockopt(SO_CIRANGE) to common.c (removed atmtcp's own version)
34166 + - added ci_range to struct atm_dev (and removed it from atmtcp's private
34167 + structure)
34168 + - added code to read the ESI to zatm.c (but that code doesn't seem to work
34169 + yet)
34170 Index: linux-atm-2.4.1/debian/atm-tools-br2684.manpages
34171 ===================================================================
34172 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34173 +++ linux-atm-2.4.1/debian/atm-tools-br2684.manpages 2007-06-04 13:23:54.515446288 +0200
34174 @@ -0,0 +1 @@
34175 +debian/tmp/usr/share/man/man8/br2684ctl.8
34176 Index: linux-atm-2.4.1/debian/atm-tools.atm
34177 ===================================================================
34178 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34179 +++ linux-atm-2.4.1/debian/atm-tools.atm 2007-06-04 13:23:54.515446288 +0200
34180 @@ -0,0 +1,27 @@
34181 +#!/bin/sh
34182 +# Start/stop the atm daemon(s).
34183 +
34184 +DAEMON="/sbin/atmarpd"
34185 +
34186 +test -f $DAEMON || exit 0
34187 +
34188 +case "$1" in
34189 +start) echo -n "Starting ATM ARP Daemon: "
34190 + start-stop-daemon --start --quiet --exec $DAEMON -b
34191 + /bin/sleep 2
34192 + echo "atmarpd."
34193 + ;;
34194 +stop) echo -n "Stopping ATM ARP Daemon: "
34195 + start-stop-daemon --stop --quiet --exec $DAEMON
34196 + echo "atmarpd."
34197 + ;;
34198 +restart|force-reload) echo -n "Re-starting ATM ARP Daemon: "
34199 + start-stop-daemon --stop --quiet --exec $DAEMON
34200 + start-stop-daemon --start --quiet --exec $DAEMON -b
34201 + /bin/sleep 2
34202 + echo "atmarpd."
34203 + ;;
34204 +*) echo "Usage: /etc/init.d/atm start|stop|restart|force-reload"; exit 1
34205 + ;;
34206 +esac
34207 +exit 0
34208 Index: linux-atm-2.4.1/debian/atm-tools.docs
34209 ===================================================================
34210 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34211 +++ linux-atm-2.4.1/debian/atm-tools.docs 2007-06-04 13:23:54.515446288 +0200
34212 @@ -0,0 +1,4 @@
34213 +BUGS
34214 +README
34215 +doc/README.tc
34216 +debian/README.br2684
34217 Index: linux-atm-2.4.1/debian/control.old
34218 ===================================================================
34219 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34220 +++ linux-atm-2.4.1/debian/control.old 2007-06-04 13:23:54.515446288 +0200
34221 @@ -0,0 +1,72 @@
34222 +Source: linux-atm
34223 +Section: net
34224 +Priority: optional
34225 +Maintainer: Peter De Schrijver (p2) <p2@mind.be>
34226 +Build-Depends: debhelper (>> 4.0.0), bison, flex, perl, dpatch, automake1.4
34227 +Standards-Version: 3.6.1
34228 +
34229 +Package: atm-tools
34230 +Architecture: any
34231 +Depends: ${shlibs:Depends}
34232 +Description: Base programs for ATM in Linux, the net-tools for ATM
34233 + This package provides all the basic programs needed for setting up,
34234 + monitoring and tuning ATM networks. Such as:
34235 + * atmsigd, an ATM signal daemon that implements the ATM UNI protocol.
34236 + * atmtcp, a tool to setup ATM over TCP connections.
34237 + * atmarpd, an implementation of the ATMARP protocol (RFC1577, RFC1755)
34238 + * zeppelin, an ATM LAN Emulation client daemon
34239 + * les and bus, ATM LAN Emulation service daemons
34240 + .
34241 + Notice that upstream still flags these tools as experimental software and
34242 + says that there is still a number of known bugs and issues. The
34243 + software is, however, in productive use at a number of sites and is
34244 + working reliably.
34245 + .
34246 + Homepage: http://linux-atm.sourceforge.net/
34247 +
34248 +Package: atm-tools-br2684
34249 +Architecture: any
34250 +Depends: ${shlibs:Depends}
34251 +Description: br2864ctl - RFC1483/2864 Bridge Daemon for ATM Networks
34252 + br2684ctl handles RFC1483/2684 bridged PDUs. This is most often
34253 + used in ADSL scenarios where usually the subscribers' ethernet
34254 + traffic is encapsulated in ATM AAL5 (by bridging ADSL modems)
34255 + according to RFC2684
34256 + .
34257 + The sources for br2684ctl has been pulled from linux-atm's CVS
34258 + repository. Warning: This is unreleased software that can break any
34259 + time, any place. If it does, you get to keep the pieces. linux-atm's
34260 + upstream flags even the released software as experimental software.
34261 + There is still a number of known bugs and issues.
34262 +
34263 +Package: atm-dev
34264 +Depends: libatm1-dev
34265 +Architecture: all
34266 +Section: oldlibs
34267 +Description: Development files for compiling ATM programs (dummy package)
34268 + This dummy package provides a transition from the previous atm packages.
34269 + It is provided for backwards compatibility only and may be removedafter
34270 + the upgrade has completed or when when no other package depend on it.
34271 +
34272 +Package: libatm1
34273 +Section: libs
34274 +Architecture: any
34275 +Depends: ${shlibs:Depends}
34276 +Conflicts: atm-tools (<< 2.4.1-6)
34277 +Description: shared library for ATM (Asynchronous Transfer Mode)
34278 + Shared libraries needed by ATM (Asynchronous Transfer Mode) related programs
34279 + .
34280 + Homepage: http://linux-atm.sourceforge.net/
34281 +
34282 +Package: libatm1-dev
34283 +Section: libdevel
34284 +Architecture: any
34285 +Depends: libc6-dev, libatm1
34286 +Replaces: atm-dev (<< 2.4.1-7)
34287 +Conflicts: atm-dev (<< 2.4.1-7)
34288 +Provides: libatm-dev
34289 +Description: Development files for compiling ATM programs
34290 + Header files and development libraries for compiling ATM (Asynchronous
34291 + Transfer Mode) related programs.
34292 + .
34293 + Homepage: http://linux-atm.sourceforge.net/
34294 Index: linux-atm-2.4.1/debian/atm-tools.install
34295 ===================================================================
34296 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34297 +++ linux-atm-2.4.1/debian/atm-tools.install 2007-06-04 13:23:54.516446136 +0200
34298 @@ -0,0 +1,18 @@
34299 +debian/tmp/usr/share/man/*
34300 +debian/tmp/usr/bin/*
34301 +debian/tmp/usr/sbin/atmsigd
34302 +debian/tmp/usr/sbin/atmaddr
34303 +debian/tmp/usr/sbin/esi
34304 +debian/tmp/usr/sbin/atmloop
34305 +debian/tmp/usr/sbin/atmtcp
34306 +debian/tmp/usr/sbin/enitune
34307 +debian/tmp/usr/sbin/zntune
34308 +debian/tmp/usr/sbin/atmarp sbin
34309 +debian/tmp/usr/sbin/atmarpd sbin
34310 +debian/tmp/usr/sbin/ilmid
34311 +debian/tmp/usr/sbin/zeppelin
34312 +debian/tmp/usr/sbin/les
34313 +debian/tmp/usr/sbin/bus
34314 +debian/tmp/usr/sbin/lecs
34315 +debian/tmp/usr/sbin/mpcd
34316 +debian/tmp/etc/atmsigd.conf
34317 Index: linux-atm-2.4.1/debian/atm-tools.manpages
34318 ===================================================================
34319 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34320 +++ linux-atm-2.4.1/debian/atm-tools.manpages 2007-06-04 13:23:54.516446136 +0200
34321 @@ -0,0 +1 @@
34322 +debian/atm-tools.8
34323 Index: linux-atm-2.4.1/debian/atm-tools.pod
34324 ===================================================================
34325 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34326 +++ linux-atm-2.4.1/debian/atm-tools.pod 2007-06-04 13:23:54.516446136 +0200
34327 @@ -0,0 +1,27 @@
34328 +=head1 NAME
34329 +
34330 +linux-atm - preliminary manpage
34331 +aread
34332 +awrite
34333 +enitune
34334 +ilmid
34335 +saaldump
34336 +sonetdiag
34337 +ttcp_atm
34338 +zntune
34339 +
34340 +=head1 DOCUMENTATION
34341 +
34342 +atm-tools is a package containing the basic tools that are needed for
34343 +setting up, monitoring, and tuning ATM networks. All available
34344 +documentation can be found in /usr/share/doc/atnm-tools in Debian
34345 +systems, and on the Web on: http://linux-atm.sourceforge.net.
34346 +
34347 +=head1 BUGS
34348 +
34349 +Many. Be prepared to debug.
34350 +
34351 +=head1 AUTHOR
34352 +
34353 +This manpage was written by Marc Haber for linux-atm packaging in
34354 +Debian/GNU Operating System.
34355 Index: linux-atm-2.4.1/debian/changelog
34356 ===================================================================
34357 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34358 +++ linux-atm-2.4.1/debian/changelog 2007-06-04 13:23:54.517445984 +0200
34359 @@ -0,0 +1,212 @@
34360 +linux-atm (2.4.1-17) unstable; urgency=low
34361 +
34362 + * Fix build problem with gcc 4.0 (Closes: )
34363 +
34364 + -- Peter De Schrijver (p2) <p2@mind.be> Thu, 17 Mar 2005 23:02:03 +0100
34365 +
34366 +linux-atm (2.4.1-16) unstable; urgency=low
34367 +
34368 + * Fix build problem with gcc 3.4 (Closes: #259422)
34369 +
34370 + -- Peter De Schrijver (p2) <p2@mind.be> Thu, 15 Jul 2004 14:28:10 +0200
34371 +
34372 +linux-atm (2.4.1-15) unstable; urgency=low
34373 +
34374 + * Updated descriptions (Closes: #239161)
34375 +
34376 + -- Peter De Schrijver (p2) <p2@mind.be> Sun, 4 Apr 2004 21:10:20 +0200
34377 +
34378 +linux-atm (2.4.1-14) unstable; urgency=low
34379 +
34380 + * Fix symlink for /usr/lib/libatm.so (Closes: #221011)
34381 +
34382 + -- Peter De Schrijver (p2) <p2@mind.be> Sun, 7 Dec 2003 21:53:19 +0100
34383 +
34384 +linux-atm (2.4.1-13) unstable; urgency=low
34385 +
34386 + * Previous version fixed #217259, but no changelog entry (Closes: #217259)
34387 + * Previous version fixed #216662, but no changelog entry (Closes: #216662)
34388 + * Added missing build dependency on automake1.4 (Closes: #221120, #221284)
34389 + * New Maintainer (Closes: #206982)
34390 +
34391 + -- Peter De Schrijver (p2) <p2@mind.be> Mon, 17 Nov 2003 23:03:58 +0100
34392 +
34393 +linux-atm (2.4.1-12) unstable; urgency=low
34394 +
34395 + * don't build atm-tools-br2684 by default. Thanks to ftpmaster for
34396 + not allowing the package to be in Debian.
34397 + * Since we don't build atm-tools-br2684 any more, revert back to
34398 + autotools output from 2.4.1-9
34399 + * Add README.br2684 documenting a way to build the package locally.
34400 +
34401 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 5 Nov 2003 21:31:42 +0000
34402 +
34403 +linux-atm (2.4.1-11) experimental; urgency=low
34404 +
34405 + * Build-Depend on dpatch
34406 + * dpatch br2684 header files from later libc for old libc (woody)
34407 +
34408 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 29 Oct 2003 19:05:07 +0000
34409 +
34410 +linux-atm (2.4.1-10) experimental; urgency=low
34411 +
34412 + * add br2684 to package (closes: #216663)
34413 + * autoreconf to actually build br2684
34414 + * have libatm1-dev provide libatm-dev (closes: #216662)
34415 + * move lib symlink to libatm1-dev as well (closes: #217259)
34416 +
34417 + -- Marc Haber <mh+debian-packages@zugschlus.de> Thu, 23 Oct 2003 17:55:43 +0000
34418 +
34419 +linux-atm (2.4.1-9) unstable; urgency=low
34420 +
34421 + * put libatm1-dev in libdevel (closes: #213170)
34422 + * make sure that new descriptions actually make it into the package
34423 +
34424 + -- Marc Haber <mh+debian-packages@zugschlus.de> Thu, 9 Oct 2003 17:08:10 +0000
34425 +
34426 +linux-atm (2.4.1-8) unstable; urgency=low
34427 +
34428 + * build arch-indep package as targets of binary-indep (closes: #212124)
34429 + * use dh_installdocs to install files to libatm1-dev/docs
34430 + * symlink shared lib to usr/bin (closes: #213146)
34431 + * Use better long descriptions. Thanks to Javier (closes: #209427)
34432 + Fernandez-Sanguino (closes: #209612)
34433 +
34434 + -- Marc Haber <mh+debian-packages@zugschlus.de> Sun, 28 Sep 2003 19:29:08 +0000
34435 +
34436 +linux-atm (2.4.1-7) unstable; urgency=low
34437 +
34438 + * libatm1 now conflicts with atm-tools (<< 2.4.1-6) (closes: #208170)
34439 + * armarp now writes output to stdout.
34440 + * add atm-dev as empty transitional package to help upgrades
34441 +
34442 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 2 Sep 2003 09:20:33 +0000
34443 +
34444 +linux-atm (2.4.1-6) unstable; urgency=low
34445 +
34446 + * split off shared libraries to libatm1
34447 + * rename atm-dev to libatm1-dev
34448 + * Standards-Version: 3.6.1
34449 +
34450 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 26 Aug 2003 15:46:27 +0000
34451 +
34452 +linux-atm (2.4.1-5) unstable; urgency=low
34453 +
34454 + * move *.a and *.la to usr/lib (closes: #199506).
34455 + * let atm-dev depend on atm-tools to avoid dangling /lib/libatm.so
34456 + symlink.
34457 + * Standards-Version: 3.5.6
34458 +
34459 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 30 Jul 2003 11:46:19 +0000
34460 +
34461 +linux-atm (2.4.1-4) unstable; urgency=low
34462 +
34463 + * add Build-Depends: on automake1.4
34464 +
34465 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 11 Jun 2003 16:58:21 +0000
34466 +
34467 +linux-atm (2.4.1-3) unstable; urgency=low
34468 +
34469 + * rebuilding libtool broke src/test/Makefile.in. Applied fix to
34470 + Makefile.am and re-built again.
34471 +
34472 + -- Marc Haber <mh+debian-packages@zugschlus.de> Wed, 11 Jun 2003 11:05:26 +0000
34473 +
34474 +linux-atm (2.4.1-2) unstable; urgency=low
34475 +
34476 + * rebuild configure script with new libtool (closes: #196909)
34477 +
34478 + -- Marc Haber <mh+debian-packages@zugschlus.de> Tue, 10 Jun 2003 21:01:50 +0000
34479 +
34480 +linux-atm (2.4.1-1) unstable; urgency=low
34481 +
34482 + * new upstream source
34483 + * remove atmarp and atmarpd from /usr/sbin as they are already in
34484 + /sbin (closes: #196216)
34485 + * lintian fixes
34486 +
34487 + -- Marc Haber <mh+debian-packages@zugschlus.de> Mon, 9 Jun 2003 16:03:45 +0000
34488 +
34489 +linux-atm (2.4.0-5) unstable; urgency=low
34490 +
34491 + * Fix for src/test/Makefile.in to allow building on hppa and ia64
34492 + which the fix introduced to 2.4.0-4 broke. Thanks to Goswin
34493 + Brederlow.
34494 + * Move init.d priority to that atmarpd is started before network
34495 + interfaces are started.
34496 + * Move atmarpd and libatm to /sbin and /lib to allow atmarpd to be
34497 + started before /usr is mounted.
34498 + * use dh_install instead of dh_movefiles.
34499 +
34500 + -- Marc Haber <mh+debian-packages@zugschlus.de> Sat, 24 Aug 2002 15:13:48 +0000
34501 +
34502 +linux-atm (2.4.0-4) unstable; urgency=low
34503 +
34504 + * new maintainer
34505 + * Fix for src/test/Makefile.in to allow building on sparc.
34506 + Thanks to Patrick Mauritz. (closes: #144225).
34507 + * added pseudo-manpage for manpage-less binaries.
34508 + * removed rpath by changing configure and make install paramaters
34509 +
34510 + -- Marc Haber <mh+debian-packages@zugschlus.de> Fri, 16 Aug 2002 20:39:05 +0000
34511 +
34512 +linux-atm (2.4.0-3) unstable; urgency=HIGH
34513 +
34514 + * Re-ran libtoolize.
34515 + Closes: #143522
34516 +
34517 + * Previous version Closes: #135328
34518 +
34519 + -- Russell Coker <russell@coker.com.au> Fri, 19 Apr 2002 01:55:00 +0200
34520 +
34521 +linux-atm (2.4.0-2) unstable; urgency=HIGH
34522 +
34523 + * Put a "grep -v EMAXERRNO" into the build process to deal with mipsel and
34524 + the "#ifdef __KERNEL__" it has in it's /usr/include/asm/errno.h .
34525 +
34526 + -- Russell Coker <russell@coker.com.au> Thu, 18 Apr 2002 19:56:00 +0200
34527 +
34528 +linux-atm (2.4.0-1) unstable; urgency=HIGH
34529 +
34530 + * New upstream version which changes source package name.
34531 + Closes: #138911
34532 +
34533 + -- Russell Coker <russell@coker.com.au> Mon, 18 Mar 2002 17:42:00 +0100
34534 +
34535 +atm (0.79-4) unstable; urgency=low
34536 +
34537 + * Added build-depends on flex.
34538 + Closes: #111072
34539 +
34540 + * Made the atm tools use a shared object to save space.
34541 +
34542 + * Fixed the copyright file and put all copyright details in both packages.
34543 +
34544 + * Added support for easy building with different kernel headers.
34545 + Closes: #110249
34546 +
34547 + -- Russell Coker <russell@coker.com.au> Sun, 7 Oct 2001 14:11:33 +0200
34548 +
34549 +atm (0.79-3) unstable; urgency=low
34550 +
34551 + * Created /etc/init.d/atm to start and stop atmarpd.
34552 + Closes: #110252
34553 +
34554 + * Added build-depends on bison.
34555 + Closes: #110576
34556 +
34557 + -- Russell Coker <russell@coker.com.au> Fri, 31 Aug 2001 15:21:44 +0200
34558 +
34559 +atm (0.79-2) unstable; urgency=low
34560 +
34561 + * Changed the main package name to atm-tools to indicate that it doesn't
34562 + provide ATM (gotta have the kernel support), it just has the daemons and
34563 + utilities.
34564 +
34565 + -- Russell Coker <russell@coker.com.au> Sat, 25 Aug 2001 17:55:00 +0200
34566 +
34567 +atm (0.79-1) unstable; urgency=low
34568 +
34569 + * Initial Release.
34570 +
34571 + -- Russell Coker <russell@coker.com.au> Fri, 24 Aug 2001 17:31:00 +0200
34572 Index: linux-atm-2.4.1/debian/checkout-br2684
34573 ===================================================================
34574 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34575 +++ linux-atm-2.4.1/debian/checkout-br2684 2007-06-04 13:23:54.517445984 +0200
34576 @@ -0,0 +1,25 @@
34577 +#!/bin/bash -x
34578 +
34579 +set -e
34580 +
34581 +# check out br2684 from upstream CVS. We need to jump through hoops if
34582 +# the local source package is under cvs control as well.
34583 +
34584 +CVSDIR=":pserver:anonymous:@cvs.linux-atm.sourceforge.net.:/cvsroot/linux-atm"
34585 +DIR="br2684"
34586 +TMPDIR="/tmp"
34587 +TARGETDIR="src"
34588 +
34589 +cvs -d${CVSDIR} login
34590 +
34591 +mkdir -p $TMPDIR
34592 +pushd $TMPDIR
34593 +cvs -z6 -d${CVSDIR} export -d $DIR -r V2_5_0 linux-atm/src/br2684
34594 +
34595 +popd
34596 +
34597 +mv $TMPDIR/$DIR/* $TARGETDIR/$DIR
34598 +rm -rf $TMPDIR/$DIR
34599 +
34600 +autoreconf -i -f
34601 +
34602 Index: linux-atm-2.4.1/debian/copyright.header
34603 ===================================================================
34604 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34605 +++ linux-atm-2.4.1/debian/copyright.header 2007-06-04 13:23:54.517445984 +0200
34606 @@ -0,0 +1,18 @@
34607 +This package was debianized by Russell Coker <russell@coker.com.au> on
34608 +Fri, 24 Aug 2001 16:11:12 +0200 and is now maintained by Marc Haber
34609 +<mh+debian-packages@zugschlus.de>.
34610 +
34611 +It was downloaded from http://www.sourceforge.net/projects/linux-atm/
34612 +
34613 +See also http://linux-atm.sourceforge.net/dist.php
34614 +
34615 +Upstream Authors:
34616 +Werner Almesberger EPFL ICA <Werner.Almesberger@epfl.ch>
34617 +Mitchell Blank Jr. <mitch@sfgoth.com>
34618 +Paul B Schroeder <paulsch@us.ibm.com>
34619 +
34620 +Copyright:
34621 +
34622 +GPL 2.0
34623 +
34624 +See /usr/share/common-licenses/GPL-2
34625 Index: linux-atm-2.4.1/debian/libatm1-dev.dirs
34626 ===================================================================
34627 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34628 +++ linux-atm-2.4.1/debian/libatm1-dev.dirs 2007-06-04 13:23:54.517445984 +0200
34629 @@ -0,0 +1,2 @@
34630 +usr/lib
34631 +usr/include
34632 Index: linux-atm-2.4.1/debian/libatm1-dev.docs
34633 ===================================================================
34634 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34635 +++ linux-atm-2.4.1/debian/libatm1-dev.docs 2007-06-04 13:23:54.518445832 +0200
34636 @@ -0,0 +1,2 @@
34637 +doc/README.CLP
34638 +doc/atm-linux-howto.txt
34639 Index: linux-atm-2.4.1/debian/libatm1-dev.install
34640 ===================================================================
34641 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34642 +++ linux-atm-2.4.1/debian/libatm1-dev.install 2007-06-04 13:23:54.518445832 +0200
34643 @@ -0,0 +1,2 @@
34644 +debian/tmp/usr/include/*
34645 +debian/tmp/usr/lib/*.a usr/lib
34646 Index: linux-atm-2.4.1/debian/libatm1-dev.links
34647 ===================================================================
34648 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34649 +++ linux-atm-2.4.1/debian/libatm1-dev.links 2007-06-04 13:23:54.518445832 +0200
34650 @@ -0,0 +1 @@
34651 +lib/libatm.so.1 usr/lib/libatm.so
34652 Index: linux-atm-2.4.1/debian/libatm1.dirs
34653 ===================================================================
34654 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34655 +++ linux-atm-2.4.1/debian/libatm1.dirs 2007-06-04 13:23:54.519445680 +0200
34656 @@ -0,0 +1 @@
34657 +/lib
34658 Index: linux-atm-2.4.1/debian/libatm1.install
34659 ===================================================================
34660 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
34661 +++ linux-atm-2.4.1/debian/libatm1.install 2007-06-04 13:23:54.519445680 +0200
34662 @@ -0,0 +1 @@
34663 +debian/tmp/usr/lib/libatm.so.* lib
OpenWrt SVN history