Ubuntu
cdbs package

Merge lp://qastaging/~laney/ubuntu/karmic/cdbs/bug-415898 into lp://qastaging/ubuntu/karmic/cdbs

  1. Karmic (9.10)
  2. bug-415898
  3. Merge into karmic
Proposed by Iain Lane
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~laney/ubuntu/karmic/cdbs/bug-415898
Merge into: lp://qastaging/ubuntu/karmic/cdbs
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~laney/ubuntu/karmic/cdbs/bug-415898
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+10387@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Looks good, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.in'
2--- Makefile.in 2009-08-18 14:56:29 +0000
3+++ Makefile.in 2009-08-19 12:25:10 +0000
4@@ -52,7 +52,7 @@
5 subdir = .
6 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
7 $(top_srcdir)/configure $(am__configure_deps) mkinstalldirs \
8- $(dist_man_MANS)
9+ mkinstalldirs $(dist_man_MANS)
10 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
11 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
12 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
13@@ -119,6 +119,7 @@
14 PACKAGE_NAME = @PACKAGE_NAME@
15 PACKAGE_STRING = @PACKAGE_STRING@
16 PACKAGE_TARNAME = @PACKAGE_TARNAME@
17+PACKAGE_URL = @PACKAGE_URL@
18 PACKAGE_VERSION = @PACKAGE_VERSION@
19 PATH_SEPARATOR = @PATH_SEPARATOR@
20 SET_MAKE = @SET_MAKE@
21
22=== modified file 'aclocal.m4'
23--- aclocal.m4 2009-08-18 14:56:29 +0000
24+++ aclocal.m4 2009-08-19 12:25:10 +0000
25@@ -13,8 +13,8 @@
26
27 m4_ifndef([AC_AUTOCONF_VERSION],
28 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
29-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
30-[m4_warning([this file was generated for autoconf 2.63.
31+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
32+[m4_warning([this file was generated for autoconf 2.64.
33 You have another version of autoconf. It may work, but is not guaranteed to.
34 If you have problems, you may need to regenerate the build system entirely.
35 To do so, use the procedure documented by the package, typically `autoreconf'.])])
36
37=== modified file 'configure'
38--- configure 2009-04-27 16:49:15 +0000
39+++ configure 2009-08-19 12:25:10 +0000
40@@ -1,18 +1,20 @@
41 #! /bin/sh
42 # Guess values for system-dependent variables and create Makefiles.
43-# Generated by GNU Autoconf 2.63 for cdbs something.
44+# Generated by GNU Autoconf 2.64 for cdbs something.
45 #
46 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
47-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
48+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
49+# Foundation, Inc.
50+#
51 # This configure script is free software; the Free Software Foundation
52 # gives unlimited permission to copy, distribute and modify it.
53-## --------------------- ##
54-## M4sh Initialization. ##
55-## --------------------- ##
56+## -------------------- ##
57+## M4sh Initialization. ##
58+## -------------------- ##
59
60 # Be more Bourne compatible
61 DUALCASE=1; export DUALCASE # for MKS sh
62-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
63+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
64 emulate sh
65 NULLCMD=:
66 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
67@@ -20,23 +22,15 @@
68 alias -g '${1+"$@"}'='"$@"'
69 setopt NO_GLOB_SUBST
70 else
71- case `(set -o) 2>/dev/null` in
72- *posix*) set -o posix ;;
73+ case `(set -o) 2>/dev/null` in #(
74+ *posix*) :
75+ set -o posix ;; #(
76+ *) :
77+ ;;
78 esac
79-
80 fi
81
82
83-
84-
85-# PATH needs CR
86-# Avoid depending upon Character Ranges.
87-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
88-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
89-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
90-as_cr_digits='0123456789'
91-as_cr_alnum=$as_cr_Letters$as_cr_digits
92-
93 as_nl='
94 '
95 export as_nl
96@@ -44,7 +38,13 @@
97 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
98 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
99 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
100-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
101+# Prefer a ksh shell builtin over an external printf program on Solaris,
102+# but without wasting forks for bash or zsh.
103+if test -z "$BASH_VERSION$ZSH_VERSION" \
104+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
105+ as_echo='print -r --'
106+ as_echo_n='print -rn --'
107+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
108 as_echo='printf %s\n'
109 as_echo_n='printf %s'
110 else
111@@ -55,7 +55,7 @@
112 as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
113 as_echo_n_body='eval
114 arg=$1;
115- case $arg in
116+ case $arg in #(
117 *"$as_nl"*)
118 expr "X$arg" : "X\\(.*\\)$as_nl";
119 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
120@@ -78,13 +78,6 @@
121 }
122 fi
123
124-# Support unset when possible.
125-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
126- as_unset=unset
127-else
128- as_unset=false
129-fi
130-
131
132 # IFS
133 # We need space, tab and new line, in precisely that order. Quoting is
134@@ -94,15 +87,15 @@
135 IFS=" "" $as_nl"
136
137 # Find who we are. Look in the path if we contain no directory separator.
138-case $0 in
139+case $0 in #((
140 *[\\/]* ) as_myself=$0 ;;
141 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
142 for as_dir in $PATH
143 do
144 IFS=$as_save_IFS
145 test -z "$as_dir" && as_dir=.
146- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
147-done
148+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
149+ done
150 IFS=$as_save_IFS
151
152 ;;
153@@ -114,12 +107,16 @@
154 fi
155 if test ! -f "$as_myself"; then
156 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
157- { (exit 1); exit 1; }
158+ exit 1
159 fi
160
161-# Work around bugs in pre-3.0 UWIN ksh.
162-for as_var in ENV MAIL MAILPATH
163-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
164+# Unset variables that we do not need and which cause bugs (e.g. in
165+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
166+# suppresses any "Segmentation fault" message there. '((' could
167+# trigger a bug in pdksh 5.2.14.
168+for as_var in BASH_ENV ENV MAIL MAILPATH
169+do eval test x\${$as_var+set} = xset \
170+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
171 done
172 PS1='$ '
173 PS2='> '
174@@ -131,330 +128,298 @@
175 LANGUAGE=C
176 export LANGUAGE
177
178-# Required to use basename.
179-if expr a : '\(a\)' >/dev/null 2>&1 &&
180- test "X`expr 00001 : '.*\(...\)'`" = X001; then
181- as_expr=expr
182-else
183- as_expr=false
184-fi
185-
186-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
187- as_basename=basename
188-else
189- as_basename=false
190-fi
191-
192-
193-# Name of the executable.
194-as_me=`$as_basename -- "$0" ||
195-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
196- X"$0" : 'X\(//\)$' \| \
197- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
198-$as_echo X/"$0" |
199- sed '/^.*\/\([^/][^/]*\)\/*$/{
200- s//\1/
201- q
202- }
203- /^X\/\(\/\/\)$/{
204- s//\1/
205- q
206- }
207- /^X\/\(\/\).*/{
208- s//\1/
209- q
210- }
211- s/.*/./; q'`
212-
213 # CDPATH.
214-$as_unset CDPATH
215-
216+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
217
218 if test "x$CONFIG_SHELL" = x; then
219- if (eval ":") 2>/dev/null; then
220+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
221+ emulate sh
222+ NULLCMD=:
223+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
224+ # is contrary to our usage. Disable this feature.
225+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
226+ setopt NO_GLOB_SUBST
227+else
228+ case \`(set -o) 2>/dev/null\` in #(
229+ *posix*) :
230+ set -o posix ;; #(
231+ *) :
232+ ;;
233+esac
234+fi
235+"
236+ as_required="as_fn_return () { (exit \$1); }
237+as_fn_success () { as_fn_return 0; }
238+as_fn_failure () { as_fn_return 1; }
239+as_fn_ret_success () { return 0; }
240+as_fn_ret_failure () { return 1; }
241+
242+exitcode=0
243+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
244+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
245+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
246+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
247+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
248+
249+else
250+ exitcode=1; echo positional parameters were not saved.
251+fi
252+test x\$exitcode = x0 || exit 1"
253+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
254+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
255+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
256+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
257+ if (eval "$as_required") 2>/dev/null; then :
258 as_have_required=yes
259 else
260 as_have_required=no
261 fi
262-
263- if test $as_have_required = yes && (eval ":
264-(as_func_return () {
265- (exit \$1)
266-}
267-as_func_success () {
268- as_func_return 0
269-}
270-as_func_failure () {
271- as_func_return 1
272-}
273-as_func_ret_success () {
274- return 0
275-}
276-as_func_ret_failure () {
277- return 1
278-}
279-
280-exitcode=0
281-if as_func_success; then
282- :
283-else
284- exitcode=1
285- echo as_func_success failed.
286-fi
287-
288-if as_func_failure; then
289- exitcode=1
290- echo as_func_failure succeeded.
291-fi
292-
293-if as_func_ret_success; then
294- :
295-else
296- exitcode=1
297- echo as_func_ret_success failed.
298-fi
299-
300-if as_func_ret_failure; then
301- exitcode=1
302- echo as_func_ret_failure succeeded.
303-fi
304-
305-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
306- :
307-else
308- exitcode=1
309- echo positional parameters were not saved.
310-fi
311-
312-test \$exitcode = 0) || { (exit 1); exit 1; }
313-
314-(
315- as_lineno_1=\$LINENO
316- as_lineno_2=\$LINENO
317- test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
318- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
319-") 2> /dev/null; then
320- :
321-else
322- as_candidate_shells=
323- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
324+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
325+
326+else
327+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
328+as_found=false
329 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
330 do
331 IFS=$as_save_IFS
332 test -z "$as_dir" && as_dir=.
333- case $as_dir in
334+ as_found=:
335+ case $as_dir in #(
336 /*)
337 for as_base in sh bash ksh sh5; do
338- as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
339+ # Try only shells that exist, to save several forks.
340+ as_shell=$as_dir/$as_base
341+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
342+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
343+ CONFIG_SHELL=$as_shell as_have_required=yes
344+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
345+ break 2
346+fi
347+fi
348 done;;
349 esac
350+ as_found=false
351 done
352+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
353+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
354+ CONFIG_SHELL=$SHELL as_have_required=yes
355+fi; }
356 IFS=$as_save_IFS
357
358
359- for as_shell in $as_candidate_shells $SHELL; do
360- # Try only shells that exist, to save several forks.
361- if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
362- { ("$as_shell") 2> /dev/null <<\_ASEOF
363-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
364- emulate sh
365- NULLCMD=:
366- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
367- # is contrary to our usage. Disable this feature.
368- alias -g '${1+"$@"}'='"$@"'
369- setopt NO_GLOB_SUBST
370-else
371- case `(set -o) 2>/dev/null` in
372- *posix*) set -o posix ;;
373-esac
374-
375-fi
376-
377-
378-:
379-_ASEOF
380-}; then
381- CONFIG_SHELL=$as_shell
382- as_have_required=yes
383- if { "$as_shell" 2> /dev/null <<\_ASEOF
384-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
385- emulate sh
386- NULLCMD=:
387- # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
388- # is contrary to our usage. Disable this feature.
389- alias -g '${1+"$@"}'='"$@"'
390- setopt NO_GLOB_SUBST
391-else
392- case `(set -o) 2>/dev/null` in
393- *posix*) set -o posix ;;
394-esac
395-
396-fi
397-
398-
399-:
400-(as_func_return () {
401- (exit $1)
402-}
403-as_func_success () {
404- as_func_return 0
405-}
406-as_func_failure () {
407- as_func_return 1
408-}
409-as_func_ret_success () {
410- return 0
411-}
412-as_func_ret_failure () {
413- return 1
414-}
415-
416-exitcode=0
417-if as_func_success; then
418- :
419-else
420- exitcode=1
421- echo as_func_success failed.
422-fi
423-
424-if as_func_failure; then
425- exitcode=1
426- echo as_func_failure succeeded.
427-fi
428-
429-if as_func_ret_success; then
430- :
431-else
432- exitcode=1
433- echo as_func_ret_success failed.
434-fi
435-
436-if as_func_ret_failure; then
437- exitcode=1
438- echo as_func_ret_failure succeeded.
439-fi
440-
441-if ( set x; as_func_ret_success y && test x = "$1" ); then
442- :
443-else
444- exitcode=1
445- echo positional parameters were not saved.
446-fi
447-
448-test $exitcode = 0) || { (exit 1); exit 1; }
449-
450-(
451- as_lineno_1=$LINENO
452- as_lineno_2=$LINENO
453- test "x$as_lineno_1" != "x$as_lineno_2" &&
454- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
455-
456-_ASEOF
457-}; then
458- break
459-fi
460-
461-fi
462-
463- done
464-
465- if test "x$CONFIG_SHELL" != x; then
466- for as_var in BASH_ENV ENV
467- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
468- done
469+ if test "x$CONFIG_SHELL" != x; then :
470+ # We cannot yet assume a decent shell, so we have to provide a
471+ # neutralization value for shells without unset; and this also
472+ # works around shells that cannot unset nonexistent variables.
473+ BASH_ENV=/dev/null
474+ ENV=/dev/null
475+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
476 export CONFIG_SHELL
477 exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
478 fi
479
480-
481- if test $as_have_required = no; then
482- echo This script requires a shell more modern than all the
483- echo shells that I found on your system. Please install a
484- echo modern shell, or manually run the script under such a
485- echo shell if you do have one.
486- { (exit 1); exit 1; }
487-fi
488-
489-
490-fi
491-
492-fi
493-
494-
495-
496-(eval "as_func_return () {
497- (exit \$1)
498-}
499-as_func_success () {
500- as_func_return 0
501-}
502-as_func_failure () {
503- as_func_return 1
504-}
505-as_func_ret_success () {
506- return 0
507-}
508-as_func_ret_failure () {
509- return 1
510-}
511-
512-exitcode=0
513-if as_func_success; then
514- :
515-else
516- exitcode=1
517- echo as_func_success failed.
518-fi
519-
520-if as_func_failure; then
521- exitcode=1
522- echo as_func_failure succeeded.
523-fi
524-
525-if as_func_ret_success; then
526- :
527-else
528- exitcode=1
529- echo as_func_ret_success failed.
530-fi
531-
532-if as_func_ret_failure; then
533- exitcode=1
534- echo as_func_ret_failure succeeded.
535-fi
536-
537-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
538- :
539-else
540- exitcode=1
541- echo positional parameters were not saved.
542-fi
543-
544-test \$exitcode = 0") || {
545- echo No shell found that supports shell functions.
546- echo Please tell bug-autoconf@gnu.org about your system,
547- echo including any error possibly output before this message.
548- echo This can help us improve future autoconf versions.
549- echo Configuration will now proceed without shell functions.
550-}
551-
552-
553-
554- as_lineno_1=$LINENO
555- as_lineno_2=$LINENO
556- test "x$as_lineno_1" != "x$as_lineno_2" &&
557- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
558-
559- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
560- # uniformly replaced by the line number. The first 'sed' inserts a
561- # line-number line after each line using $LINENO; the second 'sed'
562- # does the real work. The second script uses 'N' to pair each
563- # line-number line with the line containing $LINENO, and appends
564- # trailing '-' during substitution so that $LINENO is not a special
565- # case at line end.
566- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
567- # scripts with optimization help from Paolo Bonzini. Blame Lee
568- # E. McMahon (1931-1989) for sed's syntax. :-)
569+ if test x$as_have_required = xno; then :
570+ $as_echo "$0: This script requires a shell more modern than all"
571+ $as_echo "$0: the shells that I found on your system."
572+ if test x${ZSH_VERSION+set} = xset ; then
573+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
574+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
575+ else
576+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
577+$0: including any error possibly output before this
578+$0: message. Then install a modern shell, or manually run
579+$0: the script under such a shell if you do have one."
580+ fi
581+ exit 1
582+fi
583+fi
584+fi
585+SHELL=${CONFIG_SHELL-/bin/sh}
586+export SHELL
587+# Unset more variables known to interfere with behavior of common tools.
588+CLICOLOR_FORCE= GREP_OPTIONS=
589+unset CLICOLOR_FORCE GREP_OPTIONS
590+
591+## --------------------- ##
592+## M4sh Shell Functions. ##
593+## --------------------- ##
594+# as_fn_unset VAR
595+# ---------------
596+# Portably unset VAR.
597+as_fn_unset ()
598+{
599+ { eval $1=; unset $1;}
600+}
601+as_unset=as_fn_unset
602+
603+# as_fn_set_status STATUS
604+# -----------------------
605+# Set $? to STATUS, without forking.
606+as_fn_set_status ()
607+{
608+ return $1
609+} # as_fn_set_status
610+
611+# as_fn_exit STATUS
612+# -----------------
613+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
614+as_fn_exit ()
615+{
616+ set +e
617+ as_fn_set_status $1
618+ exit $1
619+} # as_fn_exit
620+
621+# as_fn_mkdir_p
622+# -------------
623+# Create "$as_dir" as a directory, including parents if necessary.
624+as_fn_mkdir_p ()
625+{
626+
627+ case $as_dir in #(
628+ -*) as_dir=./$as_dir;;
629+ esac
630+ test -d "$as_dir" || eval $as_mkdir_p || {
631+ as_dirs=
632+ while :; do
633+ case $as_dir in #(
634+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
635+ *) as_qdir=$as_dir;;
636+ esac
637+ as_dirs="'$as_qdir' $as_dirs"
638+ as_dir=`$as_dirname -- "$as_dir" ||
639+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
640+ X"$as_dir" : 'X\(//\)[^/]' \| \
641+ X"$as_dir" : 'X\(//\)$' \| \
642+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
643+$as_echo X"$as_dir" |
644+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
645+ s//\1/
646+ q
647+ }
648+ /^X\(\/\/\)[^/].*/{
649+ s//\1/
650+ q
651+ }
652+ /^X\(\/\/\)$/{
653+ s//\1/
654+ q
655+ }
656+ /^X\(\/\).*/{
657+ s//\1/
658+ q
659+ }
660+ s/.*/./; q'`
661+ test -d "$as_dir" && break
662+ done
663+ test -z "$as_dirs" || eval "mkdir $as_dirs"
664+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
665+
666+
667+} # as_fn_mkdir_p
668+# as_fn_append VAR VALUE
669+# ----------------------
670+# Append the text in VALUE to the end of the definition contained in VAR. Take
671+# advantage of any shell optimizations that allow amortized linear growth over
672+# repeated appends, instead of the typical quadratic growth present in naive
673+# implementations.
674+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
675+ eval 'as_fn_append ()
676+ {
677+ eval $1+=\$2
678+ }'
679+else
680+ as_fn_append ()
681+ {
682+ eval $1=\$$1\$2
683+ }
684+fi # as_fn_append
685+
686+# as_fn_arith ARG...
687+# ------------------
688+# Perform arithmetic evaluation on the ARGs, and store the result in the
689+# global $as_val. Take advantage of shells that can avoid forks. The arguments
690+# must be portable across $(()) and expr.
691+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
692+ eval 'as_fn_arith ()
693+ {
694+ as_val=$(( $* ))
695+ }'
696+else
697+ as_fn_arith ()
698+ {
699+ as_val=`expr "$@" || test $? -eq 1`
700+ }
701+fi # as_fn_arith
702+
703+
704+# as_fn_error ERROR [LINENO LOG_FD]
705+# ---------------------------------
706+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
707+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
708+# script with status $?, using 1 if that was 0.
709+as_fn_error ()
710+{
711+ as_status=$?; test $as_status -eq 0 && as_status=1
712+ if test "$3"; then
713+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
714+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
715+ fi
716+ $as_echo "$as_me: error: $1" >&2
717+ as_fn_exit $as_status
718+} # as_fn_error
719+
720+if expr a : '\(a\)' >/dev/null 2>&1 &&
721+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
722+ as_expr=expr
723+else
724+ as_expr=false
725+fi
726+
727+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
728+ as_basename=basename
729+else
730+ as_basename=false
731+fi
732+
733+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
734+ as_dirname=dirname
735+else
736+ as_dirname=false
737+fi
738+
739+as_me=`$as_basename -- "$0" ||
740+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
741+ X"$0" : 'X\(//\)$' \| \
742+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
743+$as_echo X/"$0" |
744+ sed '/^.*\/\([^/][^/]*\)\/*$/{
745+ s//\1/
746+ q
747+ }
748+ /^X\/\(\/\/\)$/{
749+ s//\1/
750+ q
751+ }
752+ /^X\/\(\/\).*/{
753+ s//\1/
754+ q
755+ }
756+ s/.*/./; q'`
757+
758+# Avoid depending upon Character Ranges.
759+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
760+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
761+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
762+as_cr_digits='0123456789'
763+as_cr_alnum=$as_cr_Letters$as_cr_digits
764+
765+
766+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
767+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
768+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
769+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
770+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
771 sed -n '
772 p
773 /[$]LINENO/=
774@@ -471,8 +436,7 @@
775 s/-\n.*//
776 ' >$as_me.lineno &&
777 chmod +x "$as_me.lineno" ||
778- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
779- { (exit 1); exit 1; }; }
780+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
781
782 # Don't try to exec as it changes $[0], causing all sort of problems
783 # (the dirname of $[0] is not the place where we might find the
784@@ -482,29 +446,18 @@
785 exit
786 }
787
788-
789-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
790- as_dirname=dirname
791-else
792- as_dirname=false
793-fi
794-
795 ECHO_C= ECHO_N= ECHO_T=
796-case `echo -n x` in
797+case `echo -n x` in #(((((
798 -n*)
799- case `echo 'x\c'` in
800+ case `echo 'xy\c'` in
801 *c*) ECHO_T=' ';; # ECHO_T is single tab character.
802- *) ECHO_C='\c';;
803+ xy) ECHO_C='\c';;
804+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
805+ ECHO_T=' ';;
806 esac;;
807 *)
808 ECHO_N='-n';;
809 esac
810-if expr a : '\(a\)' >/dev/null 2>&1 &&
811- test "X`expr 00001 : '.*\(...\)'`" = X001; then
812- as_expr=expr
813-else
814- as_expr=false
815-fi
816
817 rm -f conf$$ conf$$.exe conf$$.file
818 if test -d conf$$.dir; then
819@@ -534,7 +487,7 @@
820 rmdir conf$$.dir 2>/dev/null
821
822 if mkdir -p . 2>/dev/null; then
823- as_mkdir_p=:
824+ as_mkdir_p='mkdir -p "$as_dir"'
825 else
826 test -d ./-p && rmdir ./-p
827 as_mkdir_p=false
828@@ -553,10 +506,10 @@
829 if test -d "$1"; then
830 test -d "$1/.";
831 else
832- case $1 in
833+ case $1 in #(
834 -*)set "./$1";;
835 esac;
836- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
837+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
838 ???[sx]*):;;*)false;;esac;fi
839 '\'' sh
840 '
841@@ -570,7 +523,6 @@
842 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
843
844
845-
846 exec 7<&0 </dev/null 6>&1
847
848 # Name of the host.
849@@ -589,7 +541,6 @@
850 subdirs=
851 MFLAGS=
852 MAKEFLAGS=
853-SHELL=${CONFIG_SHELL-/bin/sh}
854
855 # Identity of this package.
856 PACKAGE_NAME='cdbs'
857@@ -597,6 +548,7 @@
858 PACKAGE_VERSION='something'
859 PACKAGE_STRING='cdbs something'
860 PACKAGE_BUGREPORT=''
861+PACKAGE_URL=''
862
863 ac_unique_file="1/rules/buildcore.mk.in"
864 ac_subst_vars='LTLIBOBJS
865@@ -657,6 +609,7 @@
866 program_transform_name
867 prefix
868 exec_prefix
869+PACKAGE_URL
870 PACKAGE_BUGREPORT
871 PACKAGE_STRING
872 PACKAGE_VERSION
873@@ -780,8 +733,7 @@
874 ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
875 # Reject names that are not valid shell variable names.
876 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
877- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
878- { (exit 1); exit 1; }; }
879+ as_fn_error "invalid feature name: $ac_useropt"
880 ac_useropt_orig=$ac_useropt
881 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
882 case $ac_user_opts in
883@@ -807,8 +759,7 @@
884 ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
885 # Reject names that are not valid shell variable names.
886 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
887- { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
888- { (exit 1); exit 1; }; }
889+ as_fn_error "invalid feature name: $ac_useropt"
890 ac_useropt_orig=$ac_useropt
891 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
892 case $ac_user_opts in
893@@ -1012,8 +963,7 @@
894 ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
895 # Reject names that are not valid shell variable names.
896 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
897- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
898- { (exit 1); exit 1; }; }
899+ as_fn_error "invalid package name: $ac_useropt"
900 ac_useropt_orig=$ac_useropt
901 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
902 case $ac_user_opts in
903@@ -1029,8 +979,7 @@
904 ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
905 # Reject names that are not valid shell variable names.
906 expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
907- { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
908- { (exit 1); exit 1; }; }
909+ as_fn_error "invalid package name: $ac_useropt"
910 ac_useropt_orig=$ac_useropt
911 ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
912 case $ac_user_opts in
913@@ -1060,17 +1009,17 @@
914 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
915 x_libraries=$ac_optarg ;;
916
917- -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
918-Try \`$0 --help' for more information." >&2
919- { (exit 1); exit 1; }; }
920+ -*) as_fn_error "unrecognized option: \`$ac_option'
921+Try \`$0 --help' for more information."
922 ;;
923
924 *=*)
925 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
926 # Reject names that are not valid shell variable names.
927- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
928- { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
929- { (exit 1); exit 1; }; }
930+ case $ac_envvar in #(
931+ '' | [0-9]* | *[!_$as_cr_alnum]* )
932+ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
933+ esac
934 eval $ac_envvar=\$ac_optarg
935 export $ac_envvar ;;
936
937@@ -1087,15 +1036,13 @@
938
939 if test -n "$ac_prev"; then
940 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
941- { $as_echo "$as_me: error: missing argument to $ac_option" >&2
942- { (exit 1); exit 1; }; }
943+ as_fn_error "missing argument to $ac_option"
944 fi
945
946 if test -n "$ac_unrecognized_opts"; then
947 case $enable_option_checking in
948 no) ;;
949- fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
950- { (exit 1); exit 1; }; } ;;
951+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
952 *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
953 esac
954 fi
955@@ -1118,8 +1065,7 @@
956 [\\/$]* | ?:[\\/]* ) continue;;
957 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
958 esac
959- { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
960- { (exit 1); exit 1; }; }
961+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
962 done
963
964 # There might be people who depend on the old broken behavior: `$host'
965@@ -1149,11 +1095,9 @@
966 ac_pwd=`pwd` && test -n "$ac_pwd" &&
967 ac_ls_di=`ls -di .` &&
968 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
969- { $as_echo "$as_me: error: working directory cannot be determined" >&2
970- { (exit 1); exit 1; }; }
971+ as_fn_error "working directory cannot be determined"
972 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
973- { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
974- { (exit 1); exit 1; }; }
975+ as_fn_error "pwd does not report name of working directory"
976
977
978 # Find the source files, if location was not specified.
979@@ -1192,13 +1136,11 @@
980 fi
981 if test ! -r "$srcdir/$ac_unique_file"; then
982 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
983- { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
984- { (exit 1); exit 1; }; }
985+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
986 fi
987 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
988 ac_abs_confdir=`(
989- cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
990- { (exit 1); exit 1; }; }
991+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
992 pwd)`
993 # When building in place, set srcdir=.
994 if test "$ac_abs_confdir" = "$ac_pwd"; then
995@@ -1301,6 +1243,7 @@
996 --enable-maintainer-mode enable make rules and dependencies not useful
997 (and sometimes confusing) to the casual installer
998
999+Report bugs to the package provider.
1000 _ACEOF
1001 ac_status=$?
1002 fi
1003@@ -1364,21 +1307,24 @@
1004 if $ac_init_version; then
1005 cat <<\_ACEOF
1006 cdbs configure something
1007-generated by GNU Autoconf 2.63
1008+generated by GNU Autoconf 2.64
1009
1010-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
1011-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
1012+Copyright (C) 2009 Free Software Foundation, Inc.
1013 This configure script is free software; the Free Software Foundation
1014 gives unlimited permission to copy, distribute and modify it.
1015 _ACEOF
1016 exit
1017 fi
1018+
1019+## ------------------------ ##
1020+## Autoconf initialization. ##
1021+## ------------------------ ##
1022 cat >config.log <<_ACEOF
1023 This file contains any messages produced by compilers while
1024 running configure, to aid debugging if configure makes a mistake.
1025
1026 It was created by cdbs $as_me something, which was
1027-generated by GNU Autoconf 2.63. Invocation command line was
1028+generated by GNU Autoconf 2.64. Invocation command line was
1029
1030 $ $0 $@
1031
1032@@ -1414,8 +1360,8 @@
1033 do
1034 IFS=$as_save_IFS
1035 test -z "$as_dir" && as_dir=.
1036- $as_echo "PATH: $as_dir"
1037-done
1038+ $as_echo "PATH: $as_dir"
1039+ done
1040 IFS=$as_save_IFS
1041
1042 } >&5
1043@@ -1452,9 +1398,9 @@
1044 ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
1045 esac
1046 case $ac_pass in
1047- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
1048+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
1049 2)
1050- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
1051+ as_fn_append ac_configure_args1 " '$ac_arg'"
1052 if test $ac_must_keep_next = true; then
1053 ac_must_keep_next=false # Got value, back to normal.
1054 else
1055@@ -1470,13 +1416,13 @@
1056 -* ) ac_must_keep_next=true ;;
1057 esac
1058 fi
1059- ac_configure_args="$ac_configure_args '$ac_arg'"
1060+ as_fn_append ac_configure_args " '$ac_arg'"
1061 ;;
1062 esac
1063 done
1064 done
1065-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
1066-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
1067+{ ac_configure_args0=; unset ac_configure_args0;}
1068+{ ac_configure_args1=; unset ac_configure_args1;}
1069
1070 # When interrupted or exit'd, cleanup temporary files, and complete
1071 # config.log. We remove comments because anyway the quotes in there
1072@@ -1501,13 +1447,13 @@
1073 case $ac_val in #(
1074 *${as_nl}*)
1075 case $ac_var in #(
1076- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
1077+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
1078 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
1079 esac
1080 case $ac_var in #(
1081 _ | IFS | as_nl) ;; #(
1082 BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
1083- *) $as_unset $ac_var ;;
1084+ *) { eval $ac_var=; unset $ac_var;} ;;
1085 esac ;;
1086 esac
1087 done
1088@@ -1579,39 +1525,41 @@
1089 exit $exit_status
1090 ' 0
1091 for ac_signal in 1 2 13 15; do
1092- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
1093+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
1094 done
1095 ac_signal=0
1096
1097 # confdefs.h avoids OS command line length limits that DEFS can exceed.
1098 rm -f -r conftest* confdefs.h
1099
1100+$as_echo "/* confdefs.h */" > confdefs.h
1101+
1102 # Predefined preprocessor variables.
1103
1104 cat >>confdefs.h <<_ACEOF
1105 #define PACKAGE_NAME "$PACKAGE_NAME"
1106 _ACEOF
1107
1108-
1109 cat >>confdefs.h <<_ACEOF
1110 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
1111 _ACEOF
1112
1113-
1114 cat >>confdefs.h <<_ACEOF
1115 #define PACKAGE_VERSION "$PACKAGE_VERSION"
1116 _ACEOF
1117
1118-
1119 cat >>confdefs.h <<_ACEOF
1120 #define PACKAGE_STRING "$PACKAGE_STRING"
1121 _ACEOF
1122
1123-
1124 cat >>confdefs.h <<_ACEOF
1125 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
1126 _ACEOF
1127
1128+cat >>confdefs.h <<_ACEOF
1129+#define PACKAGE_URL "$PACKAGE_URL"
1130+_ACEOF
1131+
1132
1133 # Let the site file select an alternate cache file if it wants to.
1134 # Prefer an explicitly selected file to automatically selected ones.
1135@@ -1630,7 +1578,7 @@
1136 do
1137 test "x$ac_site_file" = xNONE && continue
1138 if test -r "$ac_site_file"; then
1139- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
1140+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
1141 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
1142 sed 's/^/| /' "$ac_site_file" >&5
1143 . "$ac_site_file"
1144@@ -1641,7 +1589,7 @@
1145 # Some versions of bash will fail to source /dev/null (special
1146 # files actually), so we avoid doing that.
1147 if test -f "$cache_file"; then
1148- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
1149+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
1150 $as_echo "$as_me: loading cache $cache_file" >&6;}
1151 case $cache_file in
1152 [\\/]* | ?:[\\/]* ) . "$cache_file";;
1153@@ -1649,7 +1597,7 @@
1154 esac
1155 fi
1156 else
1157- { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
1158+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
1159 $as_echo "$as_me: creating cache $cache_file" >&6;}
1160 >$cache_file
1161 fi
1162@@ -1664,11 +1612,11 @@
1163 eval ac_new_val=\$ac_env_${ac_var}_value
1164 case $ac_old_set,$ac_new_set in
1165 set,)
1166- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1167+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
1168 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
1169 ac_cache_corrupted=: ;;
1170 ,set)
1171- { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
1172+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
1173 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
1174 ac_cache_corrupted=: ;;
1175 ,);;
1176@@ -1678,17 +1626,17 @@
1177 ac_old_val_w=`echo x $ac_old_val`
1178 ac_new_val_w=`echo x $ac_new_val`
1179 if test "$ac_old_val_w" != "$ac_new_val_w"; then
1180- { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1181+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
1182 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1183 ac_cache_corrupted=:
1184 else
1185- { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1186+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1187 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
1188 eval $ac_var=\$ac_old_val
1189 fi
1190- { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
1191+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
1192 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
1193- { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
1194+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
1195 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
1196 fi;;
1197 esac
1198@@ -1700,43 +1648,20 @@
1199 esac
1200 case " $ac_configure_args " in
1201 *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
1202- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
1203+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
1204 esac
1205 fi
1206 done
1207 if $ac_cache_corrupted; then
1208- { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1209+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
1210 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1211- { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1212+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
1213 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1214- { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1215-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1216- { (exit 1); exit 1; }; }
1217+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
1218 fi
1219-
1220-
1221-
1222-
1223-
1224-
1225-
1226-
1227-
1228-
1229-
1230-
1231-
1232-
1233-
1234-
1235-
1236-
1237-
1238-
1239-
1240-
1241-
1242-
1243+## -------------------- ##
1244+## Main body of script. ##
1245+## -------------------- ##
1246
1247 ac_ext=c
1248 ac_cpp='$CPP $CPPFLAGS'
1249@@ -1750,24 +1675,16 @@
1250
1251 ac_aux_dir=
1252 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
1253- if test -f "$ac_dir/install-sh"; then
1254- ac_aux_dir=$ac_dir
1255- ac_install_sh="$ac_aux_dir/install-sh -c"
1256- break
1257- elif test -f "$ac_dir/install.sh"; then
1258- ac_aux_dir=$ac_dir
1259- ac_install_sh="$ac_aux_dir/install.sh -c"
1260- break
1261- elif test -f "$ac_dir/shtool"; then
1262- ac_aux_dir=$ac_dir
1263- ac_install_sh="$ac_aux_dir/shtool install -c"
1264- break
1265- fi
1266+ for ac_t in install-sh install.sh shtool; do
1267+ if test -f "$ac_dir/$ac_t"; then
1268+ ac_aux_dir=$ac_dir
1269+ ac_install_sh="$ac_aux_dir/$ac_t -c"
1270+ break 2
1271+ fi
1272+ done
1273 done
1274 if test -z "$ac_aux_dir"; then
1275- { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
1276-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
1277- { (exit 1); exit 1; }; }
1278+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
1279 fi
1280
1281 # These three variables are undocumented and unsupported,
1282@@ -1793,10 +1710,10 @@
1283 # OS/2's system install, which has a completely different semantic
1284 # ./install, which can be erroneously created by make from ./install.sh.
1285 # Reject install programs that cannot install multiple files.
1286-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
1287+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
1288 $as_echo_n "checking for a BSD-compatible install... " >&6; }
1289 if test -z "$INSTALL"; then
1290-if test "${ac_cv_path_install+set}" = set; then
1291+if test "${ac_cv_path_install+set}" = set; then :
1292 $as_echo_n "(cached) " >&6
1293 else
1294 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1295@@ -1804,11 +1721,11 @@
1296 do
1297 IFS=$as_save_IFS
1298 test -z "$as_dir" && as_dir=.
1299- # Account for people who put trailing slashes in PATH elements.
1300-case $as_dir/ in
1301- ./ | .// | /cC/* | \
1302+ # Account for people who put trailing slashes in PATH elements.
1303+case $as_dir/ in #((
1304+ ./ | .// | /[cC]/* | \
1305 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
1306- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
1307+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
1308 /usr/ucb/* ) ;;
1309 *)
1310 # OSF1 and SCO ODT 3.0 have their own names for install.
1311@@ -1845,7 +1762,7 @@
1312 ;;
1313 esac
1314
1315-done
1316+ done
1317 IFS=$as_save_IFS
1318
1319 rm -rf conftest.one conftest.two conftest.dir
1320@@ -1861,7 +1778,7 @@
1321 INSTALL=$ac_install_sh
1322 fi
1323 fi
1324-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
1325+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
1326 $as_echo "$INSTALL" >&6; }
1327
1328 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
1329@@ -1872,7 +1789,7 @@
1330
1331 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1332
1333-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
1334+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
1335 $as_echo_n "checking whether build environment is sane... " >&6; }
1336 # Just in case
1337 sleep 1
1338@@ -1896,11 +1813,8 @@
1339 # if, for instance, CONFIG_SHELL is bash and it inherits a
1340 # broken ls alias from the environment. This has actually
1341 # happened. Such a system could not be considered "sane".
1342- { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
1343-alias in your environment" >&5
1344-$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
1345-alias in your environment" >&2;}
1346- { (exit 1); exit 1; }; }
1347+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
1348+alias in your environment" "$LINENO" 5
1349 fi
1350
1351 test "$2" = conftest.file
1352@@ -1909,13 +1823,10 @@
1353 # Ok.
1354 :
1355 else
1356- { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
1357-Check your system clock" >&5
1358-$as_echo "$as_me: error: newly created file is older than distributed files!
1359-Check your system clock" >&2;}
1360- { (exit 1); exit 1; }; }
1361+ as_fn_error "newly created file is older than distributed files!
1362+Check your system clock" "$LINENO" 5
1363 fi
1364-{ $as_echo "$as_me:$LINENO: result: yes" >&5
1365+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1366 $as_echo "yes" >&6; }
1367 test "$program_prefix" != NONE &&
1368 program_transform_name="s&^&$program_prefix&;$program_transform_name"
1369@@ -1936,14 +1847,14 @@
1370 am_missing_run="$MISSING --run "
1371 else
1372 am_missing_run=
1373- { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
1374+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
1375 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1376 fi
1377
1378-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
1379+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
1380 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
1381 if test -z "$MKDIR_P"; then
1382- if test "${ac_cv_path_mkdir+set}" = set; then
1383+ if test "${ac_cv_path_mkdir+set}" = set; then :
1384 $as_echo_n "(cached) " >&6
1385 else
1386 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1387@@ -1951,7 +1862,7 @@
1388 do
1389 IFS=$as_save_IFS
1390 test -z "$as_dir" && as_dir=.
1391- for ac_prog in mkdir gmkdir; do
1392+ for ac_prog in mkdir gmkdir; do
1393 for ac_exec_ext in '' $ac_executable_extensions; do
1394 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
1395 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
1396@@ -1963,7 +1874,7 @@
1397 esac
1398 done
1399 done
1400-done
1401+ done
1402 IFS=$as_save_IFS
1403
1404 fi
1405@@ -1979,7 +1890,7 @@
1406 MKDIR_P="$ac_install_sh -d"
1407 fi
1408 fi
1409-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
1410+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
1411 $as_echo "$MKDIR_P" >&6; }
1412
1413 mkdir_p="$MKDIR_P"
1414@@ -1992,9 +1903,9 @@
1415 do
1416 # Extract the first word of "$ac_prog", so it can be a program name with args.
1417 set dummy $ac_prog; ac_word=$2
1418-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1419+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1420 $as_echo_n "checking for $ac_word... " >&6; }
1421-if test "${ac_cv_prog_AWK+set}" = set; then
1422+if test "${ac_cv_prog_AWK+set}" = set; then :
1423 $as_echo_n "(cached) " >&6
1424 else
1425 if test -n "$AWK"; then
1426@@ -2005,24 +1916,24 @@
1427 do
1428 IFS=$as_save_IFS
1429 test -z "$as_dir" && as_dir=.
1430- for ac_exec_ext in '' $ac_executable_extensions; do
1431+ for ac_exec_ext in '' $ac_executable_extensions; do
1432 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1433 ac_cv_prog_AWK="$ac_prog"
1434- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1435+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1436 break 2
1437 fi
1438 done
1439-done
1440+ done
1441 IFS=$as_save_IFS
1442
1443 fi
1444 fi
1445 AWK=$ac_cv_prog_AWK
1446 if test -n "$AWK"; then
1447- { $as_echo "$as_me:$LINENO: result: $AWK" >&5
1448+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
1449 $as_echo "$AWK" >&6; }
1450 else
1451- { $as_echo "$as_me:$LINENO: result: no" >&5
1452+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1453 $as_echo "no" >&6; }
1454 fi
1455
1456@@ -2030,11 +1941,11 @@
1457 test -n "$AWK" && break
1458 done
1459
1460-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
1461+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
1462 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
1463 set x ${MAKE-make}
1464 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
1465-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
1466+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
1467 $as_echo_n "(cached) " >&6
1468 else
1469 cat >conftest.make <<\_ACEOF
1470@@ -2052,11 +1963,11 @@
1471 rm -f conftest.make
1472 fi
1473 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
1474- { $as_echo "$as_me:$LINENO: result: yes" >&5
1475+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1476 $as_echo "yes" >&6; }
1477 SET_MAKE=
1478 else
1479- { $as_echo "$as_me:$LINENO: result: no" >&5
1480+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1481 $as_echo "no" >&6; }
1482 SET_MAKE="MAKE=${MAKE-make}"
1483 fi
1484@@ -2076,9 +1987,7 @@
1485 am__isrc=' -I$(srcdir)'
1486 # test to see if srcdir already configured
1487 if test -f $srcdir/config.status; then
1488- { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
1489-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
1490- { (exit 1); exit 1; }; }
1491+ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
1492 fi
1493 fi
1494
1495@@ -2132,9 +2041,9 @@
1496 if test -n "$ac_tool_prefix"; then
1497 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
1498 set dummy ${ac_tool_prefix}strip; ac_word=$2
1499-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1500+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1501 $as_echo_n "checking for $ac_word... " >&6; }
1502-if test "${ac_cv_prog_STRIP+set}" = set; then
1503+if test "${ac_cv_prog_STRIP+set}" = set; then :
1504 $as_echo_n "(cached) " >&6
1505 else
1506 if test -n "$STRIP"; then
1507@@ -2145,24 +2054,24 @@
1508 do
1509 IFS=$as_save_IFS
1510 test -z "$as_dir" && as_dir=.
1511- for ac_exec_ext in '' $ac_executable_extensions; do
1512+ for ac_exec_ext in '' $ac_executable_extensions; do
1513 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1514 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
1515- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1516+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1517 break 2
1518 fi
1519 done
1520-done
1521+ done
1522 IFS=$as_save_IFS
1523
1524 fi
1525 fi
1526 STRIP=$ac_cv_prog_STRIP
1527 if test -n "$STRIP"; then
1528- { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
1529+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
1530 $as_echo "$STRIP" >&6; }
1531 else
1532- { $as_echo "$as_me:$LINENO: result: no" >&5
1533+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1534 $as_echo "no" >&6; }
1535 fi
1536
1537@@ -2172,9 +2081,9 @@
1538 ac_ct_STRIP=$STRIP
1539 # Extract the first word of "strip", so it can be a program name with args.
1540 set dummy strip; ac_word=$2
1541-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1542+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1543 $as_echo_n "checking for $ac_word... " >&6; }
1544-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
1545+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
1546 $as_echo_n "(cached) " >&6
1547 else
1548 if test -n "$ac_ct_STRIP"; then
1549@@ -2185,24 +2094,24 @@
1550 do
1551 IFS=$as_save_IFS
1552 test -z "$as_dir" && as_dir=.
1553- for ac_exec_ext in '' $ac_executable_extensions; do
1554+ for ac_exec_ext in '' $ac_executable_extensions; do
1555 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1556 ac_cv_prog_ac_ct_STRIP="strip"
1557- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1558+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1559 break 2
1560 fi
1561 done
1562-done
1563+ done
1564 IFS=$as_save_IFS
1565
1566 fi
1567 fi
1568 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
1569 if test -n "$ac_ct_STRIP"; then
1570- { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
1571+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
1572 $as_echo "$ac_ct_STRIP" >&6; }
1573 else
1574- { $as_echo "$as_me:$LINENO: result: no" >&5
1575+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1576 $as_echo "no" >&6; }
1577 fi
1578
1579@@ -2211,7 +2120,7 @@
1580 else
1581 case $cross_compiling:$ac_tool_warned in
1582 yes:)
1583-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1584+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
1585 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1586 ac_tool_warned=yes ;;
1587 esac
1588@@ -2236,16 +2145,16 @@
1589
1590
1591
1592-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
1593+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
1594 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
1595 # Check whether --enable-maintainer-mode was given.
1596-if test "${enable_maintainer_mode+set}" = set; then
1597+if test "${enable_maintainer_mode+set}" = set; then :
1598 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
1599 else
1600 USE_MAINTAINER_MODE=no
1601 fi
1602
1603- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
1604+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
1605 $as_echo "$USE_MAINTAINER_MODE" >&6; }
1606 if test $USE_MAINTAINER_MODE = yes; then
1607 MAINTAINER_MODE_TRUE=
1608@@ -2287,13 +2196,13 @@
1609 case $ac_val in #(
1610 *${as_nl}*)
1611 case $ac_var in #(
1612- *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
1613+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
1614 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
1615 esac
1616 case $ac_var in #(
1617 _ | IFS | as_nl) ;; #(
1618 BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
1619- *) $as_unset $ac_var ;;
1620+ *) { eval $ac_var=; unset $ac_var;} ;;
1621 esac ;;
1622 esac
1623 done
1624@@ -2301,8 +2210,8 @@
1625 (set) 2>&1 |
1626 case $as_nl`(ac_space=' '; set) 2>&1` in #(
1627 *${as_nl}ac_space=\ *)
1628- # `set' does not quote correctly, so add quotes (double-quote
1629- # substitution turns \\\\ into \\, and sed turns \\ into \).
1630+ # `set' does not quote correctly, so add quotes: double-quote
1631+ # substitution turns \\\\ into \\, and sed turns \\ into \.
1632 sed -n \
1633 "s/'/'\\\\''/g;
1634 s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
1635@@ -2325,11 +2234,11 @@
1636 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
1637 if test -w "$cache_file"; then
1638 test "x$cache_file" != "x/dev/null" &&
1639- { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
1640+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
1641 $as_echo "$as_me: updating cache $cache_file" >&6;}
1642 cat confcache >$cache_file
1643 else
1644- { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
1645+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
1646 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
1647 fi
1648 fi
1649@@ -2385,8 +2294,8 @@
1650 ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
1651 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
1652 # will be set to the directory where LIBOBJS objects are built.
1653- ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
1654- ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
1655+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
1656+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
1657 done
1658 LIBOBJS=$ac_libobjs
1659
1660@@ -2394,20 +2303,18 @@
1661
1662
1663 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
1664- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
1665-Usually this means the macro was only invoked conditionally." >&5
1666-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
1667-Usually this means the macro was only invoked conditionally." >&2;}
1668- { (exit 1); exit 1; }; }
1669+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
1670+Usually this means the macro was only invoked conditionally." "$LINENO" 5
1671 fi
1672
1673 : ${CONFIG_STATUS=./config.status}
1674 ac_write_fail=0
1675 ac_clean_files_save=$ac_clean_files
1676 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
1677-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
1678+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
1679 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
1680-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1681+as_write_fail=0
1682+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
1683 #! $SHELL
1684 # Generated by $as_me.
1685 # Run this file to recreate the current configuration.
1686@@ -2417,17 +2324,18 @@
1687 debug=false
1688 ac_cs_recheck=false
1689 ac_cs_silent=false
1690+
1691 SHELL=\${CONFIG_SHELL-$SHELL}
1692-_ACEOF
1693-
1694-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1695-## --------------------- ##
1696-## M4sh Initialization. ##
1697-## --------------------- ##
1698+export SHELL
1699+_ASEOF
1700+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
1701+## -------------------- ##
1702+## M4sh Initialization. ##
1703+## -------------------- ##
1704
1705 # Be more Bourne compatible
1706 DUALCASE=1; export DUALCASE # for MKS sh
1707-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
1708+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
1709 emulate sh
1710 NULLCMD=:
1711 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
1712@@ -2435,23 +2343,15 @@
1713 alias -g '${1+"$@"}'='"$@"'
1714 setopt NO_GLOB_SUBST
1715 else
1716- case `(set -o) 2>/dev/null` in
1717- *posix*) set -o posix ;;
1718+ case `(set -o) 2>/dev/null` in #(
1719+ *posix*) :
1720+ set -o posix ;; #(
1721+ *) :
1722+ ;;
1723 esac
1724-
1725 fi
1726
1727
1728-
1729-
1730-# PATH needs CR
1731-# Avoid depending upon Character Ranges.
1732-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
1733-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
1734-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
1735-as_cr_digits='0123456789'
1736-as_cr_alnum=$as_cr_Letters$as_cr_digits
1737-
1738 as_nl='
1739 '
1740 export as_nl
1741@@ -2459,7 +2359,13 @@
1742 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
1743 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
1744 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
1745-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
1746+# Prefer a ksh shell builtin over an external printf program on Solaris,
1747+# but without wasting forks for bash or zsh.
1748+if test -z "$BASH_VERSION$ZSH_VERSION" \
1749+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
1750+ as_echo='print -r --'
1751+ as_echo_n='print -rn --'
1752+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
1753 as_echo='printf %s\n'
1754 as_echo_n='printf %s'
1755 else
1756@@ -2470,7 +2376,7 @@
1757 as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
1758 as_echo_n_body='eval
1759 arg=$1;
1760- case $arg in
1761+ case $arg in #(
1762 *"$as_nl"*)
1763 expr "X$arg" : "X\\(.*\\)$as_nl";
1764 arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
1765@@ -2493,13 +2399,6 @@
1766 }
1767 fi
1768
1769-# Support unset when possible.
1770-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
1771- as_unset=unset
1772-else
1773- as_unset=false
1774-fi
1775-
1776
1777 # IFS
1778 # We need space, tab and new line, in precisely that order. Quoting is
1779@@ -2509,15 +2408,15 @@
1780 IFS=" "" $as_nl"
1781
1782 # Find who we are. Look in the path if we contain no directory separator.
1783-case $0 in
1784+case $0 in #((
1785 *[\\/]* ) as_myself=$0 ;;
1786 *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1787 for as_dir in $PATH
1788 do
1789 IFS=$as_save_IFS
1790 test -z "$as_dir" && as_dir=.
1791- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
1792-done
1793+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
1794+ done
1795 IFS=$as_save_IFS
1796
1797 ;;
1798@@ -2529,12 +2428,16 @@
1799 fi
1800 if test ! -f "$as_myself"; then
1801 $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
1802- { (exit 1); exit 1; }
1803+ exit 1
1804 fi
1805
1806-# Work around bugs in pre-3.0 UWIN ksh.
1807-for as_var in ENV MAIL MAILPATH
1808-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
1809+# Unset variables that we do not need and which cause bugs (e.g. in
1810+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
1811+# suppresses any "Segmentation fault" message there. '((' could
1812+# trigger a bug in pdksh 5.2.14.
1813+for as_var in BASH_ENV ENV MAIL MAILPATH
1814+do eval test x\${$as_var+set} = xset \
1815+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
1816 done
1817 PS1='$ '
1818 PS2='> '
1819@@ -2546,7 +2449,89 @@
1820 LANGUAGE=C
1821 export LANGUAGE
1822
1823-# Required to use basename.
1824+# CDPATH.
1825+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
1826+
1827+
1828+# as_fn_error ERROR [LINENO LOG_FD]
1829+# ---------------------------------
1830+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
1831+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
1832+# script with status $?, using 1 if that was 0.
1833+as_fn_error ()
1834+{
1835+ as_status=$?; test $as_status -eq 0 && as_status=1
1836+ if test "$3"; then
1837+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
1838+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
1839+ fi
1840+ $as_echo "$as_me: error: $1" >&2
1841+ as_fn_exit $as_status
1842+} # as_fn_error
1843+
1844+
1845+# as_fn_set_status STATUS
1846+# -----------------------
1847+# Set $? to STATUS, without forking.
1848+as_fn_set_status ()
1849+{
1850+ return $1
1851+} # as_fn_set_status
1852+
1853+# as_fn_exit STATUS
1854+# -----------------
1855+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
1856+as_fn_exit ()
1857+{
1858+ set +e
1859+ as_fn_set_status $1
1860+ exit $1
1861+} # as_fn_exit
1862+
1863+# as_fn_unset VAR
1864+# ---------------
1865+# Portably unset VAR.
1866+as_fn_unset ()
1867+{
1868+ { eval $1=; unset $1;}
1869+}
1870+as_unset=as_fn_unset
1871+# as_fn_append VAR VALUE
1872+# ----------------------
1873+# Append the text in VALUE to the end of the definition contained in VAR. Take
1874+# advantage of any shell optimizations that allow amortized linear growth over
1875+# repeated appends, instead of the typical quadratic growth present in naive
1876+# implementations.
1877+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
1878+ eval 'as_fn_append ()
1879+ {
1880+ eval $1+=\$2
1881+ }'
1882+else
1883+ as_fn_append ()
1884+ {
1885+ eval $1=\$$1\$2
1886+ }
1887+fi # as_fn_append
1888+
1889+# as_fn_arith ARG...
1890+# ------------------
1891+# Perform arithmetic evaluation on the ARGs, and store the result in the
1892+# global $as_val. Take advantage of shells that can avoid forks. The arguments
1893+# must be portable across $(()) and expr.
1894+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
1895+ eval 'as_fn_arith ()
1896+ {
1897+ as_val=$(( $* ))
1898+ }'
1899+else
1900+ as_fn_arith ()
1901+ {
1902+ as_val=`expr "$@" || test $? -eq 1`
1903+ }
1904+fi # as_fn_arith
1905+
1906+
1907 if expr a : '\(a\)' >/dev/null 2>&1 &&
1908 test "X`expr 00001 : '.*\(...\)'`" = X001; then
1909 as_expr=expr
1910@@ -2560,8 +2545,12 @@
1911 as_basename=false
1912 fi
1913
1914+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
1915+ as_dirname=dirname
1916+else
1917+ as_dirname=false
1918+fi
1919
1920-# Name of the executable.
1921 as_me=`$as_basename -- "$0" ||
1922 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
1923 X"$0" : 'X\(//\)$' \| \
1924@@ -2581,76 +2570,25 @@
1925 }
1926 s/.*/./; q'`
1927
1928-# CDPATH.
1929-$as_unset CDPATH
1930-
1931-
1932-
1933- as_lineno_1=$LINENO
1934- as_lineno_2=$LINENO
1935- test "x$as_lineno_1" != "x$as_lineno_2" &&
1936- test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
1937-
1938- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
1939- # uniformly replaced by the line number. The first 'sed' inserts a
1940- # line-number line after each line using $LINENO; the second 'sed'
1941- # does the real work. The second script uses 'N' to pair each
1942- # line-number line with the line containing $LINENO, and appends
1943- # trailing '-' during substitution so that $LINENO is not a special
1944- # case at line end.
1945- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
1946- # scripts with optimization help from Paolo Bonzini. Blame Lee
1947- # E. McMahon (1931-1989) for sed's syntax. :-)
1948- sed -n '
1949- p
1950- /[$]LINENO/=
1951- ' <$as_myself |
1952- sed '
1953- s/[$]LINENO.*/&-/
1954- t lineno
1955- b
1956- :lineno
1957- N
1958- :loop
1959- s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
1960- t loop
1961- s/-\n.*//
1962- ' >$as_me.lineno &&
1963- chmod +x "$as_me.lineno" ||
1964- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
1965- { (exit 1); exit 1; }; }
1966-
1967- # Don't try to exec as it changes $[0], causing all sort of problems
1968- # (the dirname of $[0] is not the place where we might find the
1969- # original and so on. Autoconf is especially sensitive to this).
1970- . "./$as_me.lineno"
1971- # Exit status is that of the last command.
1972- exit
1973-}
1974-
1975-
1976-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
1977- as_dirname=dirname
1978-else
1979- as_dirname=false
1980-fi
1981+# Avoid depending upon Character Ranges.
1982+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
1983+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
1984+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
1985+as_cr_digits='0123456789'
1986+as_cr_alnum=$as_cr_Letters$as_cr_digits
1987
1988 ECHO_C= ECHO_N= ECHO_T=
1989-case `echo -n x` in
1990+case `echo -n x` in #(((((
1991 -n*)
1992- case `echo 'x\c'` in
1993+ case `echo 'xy\c'` in
1994 *c*) ECHO_T=' ';; # ECHO_T is single tab character.
1995- *) ECHO_C='\c';;
1996+ xy) ECHO_C='\c';;
1997+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
1998+ ECHO_T=' ';;
1999 esac;;
2000 *)
2001 ECHO_N='-n';;
2002 esac
2003-if expr a : '\(a\)' >/dev/null 2>&1 &&
2004- test "X`expr 00001 : '.*\(...\)'`" = X001; then
2005- as_expr=expr
2006-else
2007- as_expr=false
2008-fi
2009
2010 rm -f conf$$ conf$$.exe conf$$.file
2011 if test -d conf$$.dir; then
2012@@ -2679,8 +2617,56 @@
2013 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
2014 rmdir conf$$.dir 2>/dev/null
2015
2016+
2017+# as_fn_mkdir_p
2018+# -------------
2019+# Create "$as_dir" as a directory, including parents if necessary.
2020+as_fn_mkdir_p ()
2021+{
2022+
2023+ case $as_dir in #(
2024+ -*) as_dir=./$as_dir;;
2025+ esac
2026+ test -d "$as_dir" || eval $as_mkdir_p || {
2027+ as_dirs=
2028+ while :; do
2029+ case $as_dir in #(
2030+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
2031+ *) as_qdir=$as_dir;;
2032+ esac
2033+ as_dirs="'$as_qdir' $as_dirs"
2034+ as_dir=`$as_dirname -- "$as_dir" ||
2035+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2036+ X"$as_dir" : 'X\(//\)[^/]' \| \
2037+ X"$as_dir" : 'X\(//\)$' \| \
2038+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
2039+$as_echo X"$as_dir" |
2040+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
2041+ s//\1/
2042+ q
2043+ }
2044+ /^X\(\/\/\)[^/].*/{
2045+ s//\1/
2046+ q
2047+ }
2048+ /^X\(\/\/\)$/{
2049+ s//\1/
2050+ q
2051+ }
2052+ /^X\(\/\).*/{
2053+ s//\1/
2054+ q
2055+ }
2056+ s/.*/./; q'`
2057+ test -d "$as_dir" && break
2058+ done
2059+ test -z "$as_dirs" || eval "mkdir $as_dirs"
2060+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
2061+
2062+
2063+} # as_fn_mkdir_p
2064 if mkdir -p . 2>/dev/null; then
2065- as_mkdir_p=:
2066+ as_mkdir_p='mkdir -p "$as_dir"'
2067 else
2068 test -d ./-p && rmdir ./-p
2069 as_mkdir_p=false
2070@@ -2699,10 +2685,10 @@
2071 if test -d "$1"; then
2072 test -d "$1/.";
2073 else
2074- case $1 in
2075+ case $1 in #(
2076 -*)set "./$1";;
2077 esac;
2078- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
2079+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
2080 ???[sx]*):;;*)false;;esac;fi
2081 '\'' sh
2082 '
2083@@ -2717,13 +2703,19 @@
2084
2085
2086 exec 6>&1
2087+## ----------------------------------- ##
2088+## Main body of $CONFIG_STATUS script. ##
2089+## ----------------------------------- ##
2090+_ASEOF
2091+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
2092
2093-# Save the log message, to keep $[0] and so on meaningful, and to
2094+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2095+# Save the log message, to keep $0 and so on meaningful, and to
2096 # report actual input values of CONFIG_FILES etc. instead of their
2097 # values after options handling.
2098 ac_log="
2099 This file was extended by cdbs $as_me something, which was
2100-generated by GNU Autoconf 2.63. Invocation command line was
2101+generated by GNU Autoconf 2.64. Invocation command line was
2102
2103 CONFIG_FILES = $CONFIG_FILES
2104 CONFIG_HEADERS = $CONFIG_HEADERS
2105@@ -2750,10 +2742,11 @@
2106
2107 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2108 ac_cs_usage="\
2109-\`$as_me' instantiates files from templates according to the
2110-current configuration.
2111+\`$as_me' instantiates files and other configuration actions
2112+from templates according to the current configuration. Unless the files
2113+and actions are specified as TAGs, all are instantiated by default.
2114
2115-Usage: $0 [OPTION]... [FILE]...
2116+Usage: $0 [OPTION]... [TAG]...
2117
2118 -h, --help print this help, then exit
2119 -V, --version print version number and configuration settings, then exit
2120@@ -2767,16 +2760,16 @@
2121 Configuration files:
2122 $config_files
2123
2124-Report bugs to <bug-autoconf@gnu.org>."
2125+Report bugs to the package provider."
2126
2127 _ACEOF
2128 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2129 ac_cs_version="\\
2130 cdbs config.status something
2131-configured by $0, generated by GNU Autoconf 2.63,
2132+configured by $0, generated by GNU Autoconf 2.64,
2133 with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
2134
2135-Copyright (C) 2008 Free Software Foundation, Inc.
2136+Copyright (C) 2009 Free Software Foundation, Inc.
2137 This config.status script is free software; the Free Software Foundation
2138 gives unlimited permission to copy, distribute and modify it."
2139
2140@@ -2819,7 +2812,7 @@
2141 case $ac_optarg in
2142 *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
2143 esac
2144- CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
2145+ as_fn_append CONFIG_FILES " '$ac_optarg'"
2146 ac_need_defaults=false;;
2147 --he | --h | --help | --hel | -h )
2148 $as_echo "$ac_cs_usage"; exit ;;
2149@@ -2828,11 +2821,10 @@
2150 ac_cs_silent=: ;;
2151
2152 # This is an error.
2153- -*) { $as_echo "$as_me: error: unrecognized option: $1
2154-Try \`$0 --help' for more information." >&2
2155- { (exit 1); exit 1; }; } ;;
2156+ -*) as_fn_error "unrecognized option: \`$1'
2157+Try \`$0 --help' for more information." ;;
2158
2159- *) ac_config_targets="$ac_config_targets $1"
2160+ *) as_fn_append ac_config_targets " $1"
2161 ac_need_defaults=false ;;
2162
2163 esac
2164@@ -2881,9 +2873,7 @@
2165 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
2166 "test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
2167
2168- *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
2169-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
2170- { (exit 1); exit 1; }; };;
2171+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
2172 esac
2173 done
2174
2175@@ -2908,7 +2898,7 @@
2176 trap 'exit_status=$?
2177 { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
2178 ' 0
2179- trap '{ (exit 1); exit 1; }' 1 2 13 15
2180+ trap 'as_fn_exit 1' 1 2 13 15
2181 }
2182 # Create a (secure) tmp directory for tmp files.
2183
2184@@ -2919,11 +2909,7 @@
2185 {
2186 tmp=./conf$$-$RANDOM
2187 (umask 077 && mkdir "$tmp")
2188-} ||
2189-{
2190- $as_echo "$as_me: cannot create a temporary directory in ." >&2
2191- { (exit 1); exit 1; }
2192-}
2193+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
2194
2195 # Set up the scripts for CONFIG_FILES section.
2196 # No need to generate them if there are no CONFIG_FILES.
2197@@ -2931,10 +2917,16 @@
2198 if test -n "$CONFIG_FILES"; then
2199
2200
2201-ac_cr='
2202'
2203+ac_cr=`echo X | tr X '\015'`
2204+# On cygwin, bash can eat \r inside `` if the user requested igncr.
2205+# But we know of no other shell where ac_cr would be empty at this
2206+# point, so we can use a bashism as a fallback.
2207+if test "x$ac_cr" = x; then
2208+ eval ac_cr=\$\'\\r\'
2209+fi
2210 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
2211 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
2212- ac_cs_awk_cr='\\r'
2213+ ac_cs_awk_cr='\r'
2214 else
2215 ac_cs_awk_cr=$ac_cr
2216 fi
2217@@ -2948,24 +2940,18 @@
2218 echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
2219 echo "_ACEOF"
2220 } >conf$$subs.sh ||
2221- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2222-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
2223- { (exit 1); exit 1; }; }
2224+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
2225 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
2226 ac_delim='%!_!# '
2227 for ac_last_try in false false false false false :; do
2228 . ./conf$$subs.sh ||
2229- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2230-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
2231- { (exit 1); exit 1; }; }
2232+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
2233
2234 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
2235 if test $ac_delim_n = $ac_delim_num; then
2236 break
2237 elif $ac_last_try; then
2238- { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
2239-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
2240- { (exit 1); exit 1; }; }
2241+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
2242 else
2243 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
2244 fi
2245@@ -3054,9 +3040,7 @@
2246 else
2247 cat
2248 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
2249- || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
2250-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
2251- { (exit 1); exit 1; }; }
2252+ || as_fn_error "could not setup config files machinery" "$LINENO" 5
2253 _ACEOF
2254
2255 # VPATH may cause trouble with some makes, so we remove $(srcdir),
2256@@ -3087,9 +3071,7 @@
2257 esac
2258 case $ac_mode$ac_tag in
2259 :[FHL]*:*);;
2260- :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
2261-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
2262- { (exit 1); exit 1; }; };;
2263+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
2264 :[FH]-) ac_tag=-:-;;
2265 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
2266 esac
2267@@ -3117,12 +3099,10 @@
2268 [\\/$]*) false;;
2269 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
2270 esac ||
2271- { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
2272-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
2273- { (exit 1); exit 1; }; };;
2274+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
2275 esac
2276 case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
2277- ac_file_inputs="$ac_file_inputs '$ac_f'"
2278+ as_fn_append ac_file_inputs " '$ac_f'"
2279 done
2280
2281 # Let's still pretend it is `configure' which instantiates (i.e., don't
2282@@ -3133,7 +3113,7 @@
2283 `' by configure.'
2284 if test x"$ac_file" != x-; then
2285 configure_input="$ac_file. $configure_input"
2286- { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
2287+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
2288 $as_echo "$as_me: creating $ac_file" >&6;}
2289 fi
2290 # Neutralize special characters interpreted by sed in replacement strings.
2291@@ -3146,9 +3126,7 @@
2292
2293 case $ac_tag in
2294 *:-:* | *:-) cat >"$tmp/stdin" \
2295- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
2296-$as_echo "$as_me: error: could not create $ac_file" >&2;}
2297- { (exit 1); exit 1; }; } ;;
2298+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
2299 esac
2300 ;;
2301 esac
2302@@ -3176,47 +3154,7 @@
2303 q
2304 }
2305 s/.*/./; q'`
2306- { as_dir="$ac_dir"
2307- case $as_dir in #(
2308- -*) as_dir=./$as_dir;;
2309- esac
2310- test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
2311- as_dirs=
2312- while :; do
2313- case $as_dir in #(
2314- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
2315- *) as_qdir=$as_dir;;
2316- esac
2317- as_dirs="'$as_qdir' $as_dirs"
2318- as_dir=`$as_dirname -- "$as_dir" ||
2319-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2320- X"$as_dir" : 'X\(//\)[^/]' \| \
2321- X"$as_dir" : 'X\(//\)$' \| \
2322- X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
2323-$as_echo X"$as_dir" |
2324- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
2325- s//\1/
2326- q
2327- }
2328- /^X\(\/\/\)[^/].*/{
2329- s//\1/
2330- q
2331- }
2332- /^X\(\/\/\)$/{
2333- s//\1/
2334- q
2335- }
2336- /^X\(\/\).*/{
2337- s//\1/
2338- q
2339- }
2340- s/.*/./; q'`
2341- test -d "$as_dir" && break
2342- done
2343- test -z "$as_dirs" || eval "mkdir $as_dirs"
2344- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
2345-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
2346- { (exit 1); exit 1; }; }; }
2347+ as_dir="$ac_dir"; as_fn_mkdir_p
2348 ac_builddir=.
2349
2350 case "$ac_dir" in
2351@@ -3273,7 +3211,6 @@
2352 # If the template does not know about datarootdir, expand it.
2353 # FIXME: This hack should be removed a few years after 2.60.
2354 ac_datarootdir_hack=; ac_datarootdir_seen=
2355-
2356 ac_sed_dataroot='
2357 /datarootdir/ {
2358 p
2359@@ -3283,12 +3220,11 @@
2360 /@docdir@/p
2361 /@infodir@/p
2362 /@localedir@/p
2363-/@mandir@/p
2364-'
2365+/@mandir@/p'
2366 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
2367 *datarootdir*) ac_datarootdir_seen=yes;;
2368 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
2369- { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
2370+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
2371 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
2372 _ACEOF
2373 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2374@@ -3298,7 +3234,7 @@
2375 s&@infodir@&$infodir&g
2376 s&@localedir@&$localedir&g
2377 s&@mandir@&$mandir&g
2378- s&\\\${datarootdir}&$datarootdir&g' ;;
2379+ s&\\\${datarootdir}&$datarootdir&g' ;;
2380 esac
2381 _ACEOF
2382
2383@@ -3327,14 +3263,12 @@
2384 $ac_datarootdir_hack
2385 "
2386 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
2387- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
2388-$as_echo "$as_me: error: could not create $ac_file" >&2;}
2389- { (exit 1); exit 1; }; }
2390+ || as_fn_error "could not create $ac_file" "$LINENO" 5
2391
2392 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
2393 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
2394 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
2395- { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
2396+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
2397 which seems to be undefined. Please make sure it is defined." >&5
2398 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
2399 which seems to be undefined. Please make sure it is defined." >&2;}
2400@@ -3344,9 +3278,7 @@
2401 -) cat "$tmp/out" && rm -f "$tmp/out";;
2402 *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
2403 esac \
2404- || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
2405-$as_echo "$as_me: error: could not create $ac_file" >&2;}
2406- { (exit 1); exit 1; }; }
2407+ || as_fn_error "could not create $ac_file" "$LINENO" 5
2408 ;;
2409
2410
2411@@ -3356,15 +3288,12 @@
2412 done # for ac_tag
2413
2414
2415-{ (exit 0); exit 0; }
2416+as_fn_exit 0
2417 _ACEOF
2418-chmod +x $CONFIG_STATUS
2419 ac_clean_files=$ac_clean_files_save
2420
2421 test $ac_write_fail = 0 ||
2422- { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
2423-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
2424- { (exit 1); exit 1; }; }
2425+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
2426
2427
2428 # configure is writing to config.log, and then calls config.status.
2429@@ -3385,10 +3314,10 @@
2430 exec 5>>config.log
2431 # Use ||, not &&, to avoid exiting from the if with $? = 1, which
2432 # would make configure fail if this is the last instruction.
2433- $ac_cs_success || { (exit 1); exit 1; }
2434+ $ac_cs_success || as_fn_exit $?
2435 fi
2436 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
2437- { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
2438+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
2439 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
2440 fi
2441
2442
2443=== modified file 'debian/changelog'
2444--- debian/changelog 2009-08-18 14:56:29 +0000
2445+++ debian/changelog 2009-08-19 13:03:55 +0000
2446@@ -1,3 +1,11 @@
2447+cdbs (0.4.59ubuntu2) karmic; urgency=low
2448+
2449+ * debian/control: Drop Kaffe build-dep as it is not in main (LP: #415898)
2450+ * debian/control: Disable ant-1 test; this was inactive prior to 0.4.57 and
2451+ now causes build failures due to Kaffe being dropped
2452+
2453+ -- Iain Lane <laney@ubuntu.com> Wed, 19 Aug 2009 13:08:44 +0100
2454+
2455 cdbs (0.4.59ubuntu1) karmic; urgency=low
2456
2457 * Merge from debian unstable (LP: #414791), remaining changes:
2458
2459=== modified file 'debian/control'
2460--- debian/control 2009-08-18 14:56:29 +0000
2461+++ debian/control 2009-08-19 12:14:28 +0000
2462@@ -3,7 +3,7 @@
2463 Priority: optional
2464 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
2465 XSBC-Original-Maintainer: CDBS Hackers <build-common-hackers@lists.alioth.debian.org>
2466-Build-Depends-Indep: debhelper (>= 5), graphviz, realpath, fakeroot, python-dev, python-all-dev, python-central, python-support, libxml2-utils, xsltproc, docbook-xml, docbook-xsl, dblatex, ant, kaffe, sharutils, gs-common, texlive-extra-utils, lzma
2467+Build-Depends-Indep: debhelper (>= 5), graphviz, realpath, fakeroot, python-dev, python-all-dev, python-central, python-support, libxml2-utils, xsltproc, docbook-xml, docbook-xsl, dblatex, ant, sharutils, gs-common, texlive-extra-utils, lzma
2468 Uploaders: Jonas Smedegaard <dr@jones.dk>, Marc Dequènes (Duck) <Duck@DuckCorp.org>, Peter Eisentraut <petere@debian.org>
2469 Standards-Version: 3.7.3
2470 Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/cdbs/ubuntu
2471
2472=== modified file 'install-sh'
2473--- install-sh 2005-04-20 07:59:51 +0000
2474+++ install-sh 2009-08-19 12:25:10 +0000
2475@@ -1,7 +1,7 @@
2476 #!/bin/sh
2477 # install - install a program, script, or datafile
2478
2479-scriptversion=2005-02-02.21
2480+scriptversion=2006-12-25.00
2481
2482 # This originates from X11R5 (mit/util/scripts/install.sh), which was
2483 # later released in X11R6 (xc/config/util/install.sh) with the
2484@@ -39,38 +39,68 @@
2485 # when there is no Makefile.
2486 #
2487 # This script is compatible with the BSD install script, but was written
2488-# from scratch. It can only install one file at a time, a restriction
2489-# shared with many OS's install programs.
2490+# from scratch.
2491+
2492+nl='
2493+'
2494+IFS=" "" $nl"
2495
2496 # set DOITPROG to echo to test this script
2497
2498 # Don't use :- since 4.3BSD and earlier shells don't like it.
2499-doit="${DOITPROG-}"
2500-
2501-# put in absolute paths if you don't have them in your path; or use env. vars.
2502-
2503-mvprog="${MVPROG-mv}"
2504-cpprog="${CPPROG-cp}"
2505-chmodprog="${CHMODPROG-chmod}"
2506-chownprog="${CHOWNPROG-chown}"
2507-chgrpprog="${CHGRPPROG-chgrp}"
2508-stripprog="${STRIPPROG-strip}"
2509-rmprog="${RMPROG-rm}"
2510-mkdirprog="${MKDIRPROG-mkdir}"
2511-
2512-chmodcmd="$chmodprog 0755"
2513+doit=${DOITPROG-}
2514+if test -z "$doit"; then
2515+ doit_exec=exec
2516+else
2517+ doit_exec=$doit
2518+fi
2519+
2520+# Put in absolute file names if you don't have them in your path;
2521+# or use environment vars.
2522+
2523+chgrpprog=${CHGRPPROG-chgrp}
2524+chmodprog=${CHMODPROG-chmod}
2525+chownprog=${CHOWNPROG-chown}
2526+cmpprog=${CMPPROG-cmp}
2527+cpprog=${CPPROG-cp}
2528+mkdirprog=${MKDIRPROG-mkdir}
2529+mvprog=${MVPROG-mv}
2530+rmprog=${RMPROG-rm}
2531+stripprog=${STRIPPROG-strip}
2532+
2533+posix_glob='?'
2534+initialize_posix_glob='
2535+ test "$posix_glob" != "?" || {
2536+ if (set -f) 2>/dev/null; then
2537+ posix_glob=
2538+ else
2539+ posix_glob=:
2540+ fi
2541+ }
2542+'
2543+
2544+posix_mkdir=
2545+
2546+# Desired mode of installed file.
2547+mode=0755
2548+
2549+chgrpcmd=
2550+chmodcmd=$chmodprog
2551 chowncmd=
2552-chgrpcmd=
2553+mvcmd=$mvprog
2554+rmcmd="$rmprog -f"
2555 stripcmd=
2556-rmcmd="$rmprog -f"
2557-mvcmd="$mvprog"
2558+
2559 src=
2560 dst=
2561 dir_arg=
2562-dstarg=
2563+dst_arg=
2564+
2565+copy_on_change=false
2566 no_target_directory=
2567
2568-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
2569+usage="\
2570+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
2571 or: $0 [OPTION]... SRCFILES... DIRECTORY
2572 or: $0 [OPTION]... -t DIRECTORY SRCFILES...
2573 or: $0 [OPTION]... -d DIRECTORIES...
2574@@ -80,81 +110,86 @@
2575 In the 4th, create DIRECTORIES.
2576
2577 Options:
2578--c (ignored)
2579--d create directories instead of installing files.
2580--g GROUP $chgrpprog installed files to GROUP.
2581--m MODE $chmodprog installed files to MODE.
2582--o USER $chownprog installed files to USER.
2583--s $stripprog installed files.
2584--t DIRECTORY install into DIRECTORY.
2585--T report an error if DSTFILE is a directory.
2586---help display this help and exit.
2587---version display version info and exit.
2588+ --help display this help and exit.
2589+ --version display version info and exit.
2590+
2591+ -c (ignored)
2592+ -C install only if different (preserve the last data modification time)
2593+ -d create directories instead of installing files.
2594+ -g GROUP $chgrpprog installed files to GROUP.
2595+ -m MODE $chmodprog installed files to MODE.
2596+ -o USER $chownprog installed files to USER.
2597+ -s $stripprog installed files.
2598+ -t DIRECTORY install into DIRECTORY.
2599+ -T report an error if DSTFILE is a directory.
2600
2601 Environment variables override the default commands:
2602- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
2603+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
2604+ RMPROG STRIPPROG
2605 "
2606
2607-while test -n "$1"; do
2608+while test $# -ne 0; do
2609 case $1 in
2610- -c) shift
2611- continue;;
2612-
2613- -d) dir_arg=true
2614- shift
2615- continue;;
2616+ -c) ;;
2617+
2618+ -C) copy_on_change=true;;
2619+
2620+ -d) dir_arg=true;;
2621
2622 -g) chgrpcmd="$chgrpprog $2"
2623- shift
2624- shift
2625- continue;;
2626+ shift;;
2627
2628 --help) echo "$usage"; exit $?;;
2629
2630- -m) chmodcmd="$chmodprog $2"
2631- shift
2632- shift
2633- continue;;
2634+ -m) mode=$2
2635+ case $mode in
2636+ *' '* | *' '* | *'
2637+'* | *'*'* | *'?'* | *'['*)
2638+ echo "$0: invalid mode: $mode" >&2
2639+ exit 1;;
2640+ esac
2641+ shift;;
2642
2643 -o) chowncmd="$chownprog $2"
2644- shift
2645- shift
2646- continue;;
2647-
2648- -s) stripcmd=$stripprog
2649- shift
2650- continue;;
2651-
2652- -t) dstarg=$2
2653- shift
2654- shift
2655- continue;;
2656-
2657- -T) no_target_directory=true
2658- shift
2659- continue;;
2660+ shift;;
2661+
2662+ -s) stripcmd=$stripprog;;
2663+
2664+ -t) dst_arg=$2
2665+ shift;;
2666+
2667+ -T) no_target_directory=true;;
2668
2669 --version) echo "$0 $scriptversion"; exit $?;;
2670
2671- *) # When -d is used, all remaining arguments are directories to create.
2672- # When -t is used, the destination is already specified.
2673- test -n "$dir_arg$dstarg" && break
2674- # Otherwise, the last argument is the destination. Remove it from $@.
2675- for arg
2676- do
2677- if test -n "$dstarg"; then
2678- # $@ is not empty: it contains at least $arg.
2679- set fnord "$@" "$dstarg"
2680- shift # fnord
2681- fi
2682- shift # arg
2683- dstarg=$arg
2684- done
2685+ --) shift
2686 break;;
2687+
2688+ -*) echo "$0: invalid option: $1" >&2
2689+ exit 1;;
2690+
2691+ *) break;;
2692 esac
2693+ shift
2694 done
2695
2696-if test -z "$1"; then
2697+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
2698+ # When -d is used, all remaining arguments are directories to create.
2699+ # When -t is used, the destination is already specified.
2700+ # Otherwise, the last argument is the destination. Remove it from $@.
2701+ for arg
2702+ do
2703+ if test -n "$dst_arg"; then
2704+ # $@ is not empty: it contains at least $arg.
2705+ set fnord "$@" "$dst_arg"
2706+ shift # fnord
2707+ fi
2708+ shift # arg
2709+ dst_arg=$arg
2710+ done
2711+fi
2712+
2713+if test $# -eq 0; then
2714 if test -z "$dir_arg"; then
2715 echo "$0: no input file specified." >&2
2716 exit 1
2717@@ -164,24 +199,47 @@
2718 exit 0
2719 fi
2720
2721+if test -z "$dir_arg"; then
2722+ trap '(exit $?); exit' 1 2 13 15
2723+
2724+ # Set umask so as not to create temps with too-generous modes.
2725+ # However, 'strip' requires both read and write access to temps.
2726+ case $mode in
2727+ # Optimize common cases.
2728+ *644) cp_umask=133;;
2729+ *755) cp_umask=22;;
2730+
2731+ *[0-7])
2732+ if test -z "$stripcmd"; then
2733+ u_plus_rw=
2734+ else
2735+ u_plus_rw='% 200'
2736+ fi
2737+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
2738+ *)
2739+ if test -z "$stripcmd"; then
2740+ u_plus_rw=
2741+ else
2742+ u_plus_rw=,u+rw
2743+ fi
2744+ cp_umask=$mode$u_plus_rw;;
2745+ esac
2746+fi
2747+
2748 for src
2749 do
2750 # Protect names starting with `-'.
2751 case $src in
2752- -*) src=./$src ;;
2753+ -*) src=./$src;;
2754 esac
2755
2756 if test -n "$dir_arg"; then
2757 dst=$src
2758- src=
2759+ dstdir=$dst
2760+ test -d "$dstdir"
2761+ dstdir_status=$?
2762+ else
2763
2764- if test -d "$dst"; then
2765- mkdircmd=:
2766- chmodcmd=
2767- else
2768- mkdircmd=$mkdirprog
2769- fi
2770- else
2771 # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
2772 # might cause directories to be created, which would be especially bad
2773 # if $src (and thus $dsttmp) contains '*'.
2774@@ -190,71 +248,199 @@
2775 exit 1
2776 fi
2777
2778- if test -z "$dstarg"; then
2779+ if test -z "$dst_arg"; then
2780 echo "$0: no destination specified." >&2
2781 exit 1
2782 fi
2783
2784- dst=$dstarg
2785+ dst=$dst_arg
2786 # Protect names starting with `-'.
2787 case $dst in
2788- -*) dst=./$dst ;;
2789+ -*) dst=./$dst;;
2790 esac
2791
2792 # If destination is a directory, append the input filename; won't work
2793 # if double slashes aren't ignored.
2794 if test -d "$dst"; then
2795 if test -n "$no_target_directory"; then
2796- echo "$0: $dstarg: Is a directory" >&2
2797+ echo "$0: $dst_arg: Is a directory" >&2
2798 exit 1
2799 fi
2800- dst=$dst/`basename "$src"`
2801+ dstdir=$dst
2802+ dst=$dstdir/`basename "$src"`
2803+ dstdir_status=0
2804+ else
2805+ # Prefer dirname, but fall back on a substitute if dirname fails.
2806+ dstdir=`
2807+ (dirname "$dst") 2>/dev/null ||
2808+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
2809+ X"$dst" : 'X\(//\)[^/]' \| \
2810+ X"$dst" : 'X\(//\)$' \| \
2811+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
2812+ echo X"$dst" |
2813+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
2814+ s//\1/
2815+ q
2816+ }
2817+ /^X\(\/\/\)[^/].*/{
2818+ s//\1/
2819+ q
2820+ }
2821+ /^X\(\/\/\)$/{
2822+ s//\1/
2823+ q
2824+ }
2825+ /^X\(\/\).*/{
2826+ s//\1/
2827+ q
2828+ }
2829+ s/.*/./; q'
2830+ `
2831+
2832+ test -d "$dstdir"
2833+ dstdir_status=$?
2834 fi
2835 fi
2836
2837- # This sed command emulates the dirname command.
2838- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
2839-
2840- # Make sure that the destination directory exists.
2841-
2842- # Skip lots of stat calls in the usual case.
2843- if test ! -d "$dstdir"; then
2844- defaultIFS='
2845- '
2846- IFS="${IFS-$defaultIFS}"
2847-
2848- oIFS=$IFS
2849- # Some sh's can't handle IFS=/ for some reason.
2850- IFS='%'
2851- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
2852- shift
2853- IFS=$oIFS
2854-
2855- pathcomp=
2856-
2857- while test $# -ne 0 ; do
2858- pathcomp=$pathcomp$1
2859+ obsolete_mkdir_used=false
2860+
2861+ if test $dstdir_status != 0; then
2862+ case $posix_mkdir in
2863+ '')
2864+ # Create intermediate dirs using mode 755 as modified by the umask.
2865+ # This is like FreeBSD 'install' as of 1997-10-28.
2866+ umask=`umask`
2867+ case $stripcmd.$umask in
2868+ # Optimize common cases.
2869+ *[2367][2367]) mkdir_umask=$umask;;
2870+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
2871+
2872+ *[0-7])
2873+ mkdir_umask=`expr $umask + 22 \
2874+ - $umask % 100 % 40 + $umask % 20 \
2875+ - $umask % 10 % 4 + $umask % 2
2876+ `;;
2877+ *) mkdir_umask=$umask,go-w;;
2878+ esac
2879+
2880+ # With -d, create the new directory with the user-specified mode.
2881+ # Otherwise, rely on $mkdir_umask.
2882+ if test -n "$dir_arg"; then
2883+ mkdir_mode=-m$mode
2884+ else
2885+ mkdir_mode=
2886+ fi
2887+
2888+ posix_mkdir=false
2889+ case $umask in
2890+ *[123567][0-7][0-7])
2891+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
2892+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
2893+ ;;
2894+ *)
2895+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
2896+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
2897+
2898+ if (umask $mkdir_umask &&
2899+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
2900+ then
2901+ if test -z "$dir_arg" || {
2902+ # Check for POSIX incompatibilities with -m.
2903+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
2904+ # other-writeable bit of parent directory when it shouldn't.
2905+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
2906+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
2907+ case $ls_ld_tmpdir in
2908+ d????-?r-*) different_mode=700;;
2909+ d????-?--*) different_mode=755;;
2910+ *) false;;
2911+ esac &&
2912+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
2913+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
2914+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
2915+ }
2916+ }
2917+ then posix_mkdir=:
2918+ fi
2919+ rmdir "$tmpdir/d" "$tmpdir"
2920+ else
2921+ # Remove any dirs left behind by ancient mkdir implementations.
2922+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
2923+ fi
2924+ trap '' 0;;
2925+ esac;;
2926+ esac
2927+
2928+ if
2929+ $posix_mkdir && (
2930+ umask $mkdir_umask &&
2931+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
2932+ )
2933+ then :
2934+ else
2935+
2936+ # The umask is ridiculous, or mkdir does not conform to POSIX,
2937+ # or it failed possibly due to a race condition. Create the
2938+ # directory the slow way, step by step, checking for races as we go.
2939+
2940+ case $dstdir in
2941+ /*) prefix='/';;
2942+ -*) prefix='./';;
2943+ *) prefix='';;
2944+ esac
2945+
2946+ eval "$initialize_posix_glob"
2947+
2948+ oIFS=$IFS
2949+ IFS=/
2950+ $posix_glob set -f
2951+ set fnord $dstdir
2952 shift
2953- if test ! -d "$pathcomp"; then
2954- $mkdirprog "$pathcomp"
2955- # mkdir can fail with a `File exist' error in case several
2956- # install-sh are creating the directory concurrently. This
2957- # is OK.
2958- test -d "$pathcomp" || exit
2959+ $posix_glob set +f
2960+ IFS=$oIFS
2961+
2962+ prefixes=
2963+
2964+ for d
2965+ do
2966+ test -z "$d" && continue
2967+
2968+ prefix=$prefix$d
2969+ if test -d "$prefix"; then
2970+ prefixes=
2971+ else
2972+ if $posix_mkdir; then
2973+ (umask=$mkdir_umask &&
2974+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
2975+ # Don't fail if two instances are running concurrently.
2976+ test -d "$prefix" || exit 1
2977+ else
2978+ case $prefix in
2979+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
2980+ *) qprefix=$prefix;;
2981+ esac
2982+ prefixes="$prefixes '$qprefix'"
2983+ fi
2984+ fi
2985+ prefix=$prefix/
2986+ done
2987+
2988+ if test -n "$prefixes"; then
2989+ # Don't fail if two instances are running concurrently.
2990+ (umask $mkdir_umask &&
2991+ eval "\$doit_exec \$mkdirprog $prefixes") ||
2992+ test -d "$dstdir" || exit 1
2993+ obsolete_mkdir_used=true
2994 fi
2995- pathcomp=$pathcomp/
2996- done
2997+ fi
2998 fi
2999
3000 if test -n "$dir_arg"; then
3001- $doit $mkdircmd "$dst" \
3002- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
3003- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
3004- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
3005- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
3006-
3007+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
3008+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
3009+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
3010+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
3011 else
3012- dstfile=`basename "$dst"`
3013
3014 # Make a couple of temp file names in the proper directory.
3015 dsttmp=$dstdir/_inst.$$_
3016@@ -262,10 +448,9 @@
3017
3018 # Trap to clean up those temp files at exit.
3019 trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
3020- trap '(exit $?); exit' 1 2 13 15
3021
3022 # Copy the file name to the temp name.
3023- $doit $cpprog "$src" "$dsttmp" &&
3024+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
3025
3026 # and set any options; do chmod last to preserve setuid bits.
3027 #
3028@@ -273,48 +458,59 @@
3029 # ignore errors from any of these, just make sure not to ignore
3030 # errors from the above "$doit $cpprog $src $dsttmp" command.
3031 #
3032- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
3033- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
3034- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
3035- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
3036-
3037- # Now rename the file to the real destination.
3038- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
3039- || {
3040- # The rename failed, perhaps because mv can't rename something else
3041- # to itself, or perhaps because mv is so ancient that it does not
3042- # support -f.
3043-
3044- # Now remove or move aside any old file at destination location.
3045- # We try this two ways since rm can't unlink itself on some
3046- # systems and the destination file might be busy for other
3047- # reasons. In this case, the final cleanup might fail but the new
3048- # file should still install successfully.
3049- {
3050- if test -f "$dstdir/$dstfile"; then
3051- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
3052- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
3053- || {
3054- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
3055- (exit 1); exit 1
3056- }
3057- else
3058- :
3059- fi
3060- } &&
3061-
3062- # Now rename the file to the real destination.
3063- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
3064- }
3065- }
3066- fi || { (exit 1); exit 1; }
3067+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
3068+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
3069+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
3070+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
3071+
3072+ # If -C, don't bother to copy if it wouldn't change the file.
3073+ if $copy_on_change &&
3074+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
3075+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
3076+
3077+ eval "$initialize_posix_glob" &&
3078+ $posix_glob set -f &&
3079+ set X $old && old=:$2:$4:$5:$6 &&
3080+ set X $new && new=:$2:$4:$5:$6 &&
3081+ $posix_glob set +f &&
3082+
3083+ test "$old" = "$new" &&
3084+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
3085+ then
3086+ rm -f "$dsttmp"
3087+ else
3088+ # Rename the file to the real destination.
3089+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
3090+
3091+ # The rename failed, perhaps because mv can't rename something else
3092+ # to itself, or perhaps because mv is so ancient that it does not
3093+ # support -f.
3094+ {
3095+ # Now remove or move aside any old file at destination location.
3096+ # We try this two ways since rm can't unlink itself on some
3097+ # systems and the destination file might be busy for other
3098+ # reasons. In this case, the final cleanup might fail but the new
3099+ # file should still install successfully.
3100+ {
3101+ test ! -f "$dst" ||
3102+ $doit $rmcmd -f "$dst" 2>/dev/null ||
3103+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
3104+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
3105+ } ||
3106+ { echo "$0: cannot unlink or rename $dst" >&2
3107+ (exit 1); exit 1
3108+ }
3109+ } &&
3110+
3111+ # Now rename the file to the real destination.
3112+ $doit $mvcmd "$dsttmp" "$dst"
3113+ }
3114+ fi || exit 1
3115+
3116+ trap '' 0
3117+ fi
3118 done
3119
3120-# The final little trick to "correctly" pass the exit status to the exit trap.
3121-{
3122- (exit 0); exit 0
3123-}
3124-
3125 # Local variables:
3126 # eval: (add-hook 'write-file-hooks 'time-stamp)
3127 # time-stamp-start: "scriptversion="
3128
3129=== modified file 'missing'
3130--- missing 2005-04-20 07:59:51 +0000
3131+++ missing 2009-08-19 12:25:10 +0000
3132@@ -1,9 +1,9 @@
3133 #! /bin/sh
3134 # Common stub for a few missing GNU programs while installing.
3135
3136-scriptversion=2005-02-08.22
3137+scriptversion=2006-05-10.23
3138
3139-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
3140+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
3141 # Free Software Foundation, Inc.
3142 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
3143
3144@@ -19,8 +19,8 @@
3145
3146 # You should have received a copy of the GNU General Public License
3147 # along with this program; if not, write to the Free Software
3148-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
3149-# 02111-1307, USA.
3150+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
3151+# 02110-1301, USA.
3152
3153 # As a special exception to the GNU General Public License, if you
3154 # distribute this file as part of a program that contains a
3155@@ -33,6 +33,8 @@
3156 fi
3157
3158 run=:
3159+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
3160+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
3161
3162 # In the cases where this matters, `missing' is being run in the
3163 # srcdir already.
3164@@ -44,7 +46,7 @@
3165
3166 msg="missing on your system"
3167
3168-case "$1" in
3169+case $1 in
3170 --run)
3171 # Try to run requested program, and just exit if it succeeds.
3172 run=
3173@@ -77,6 +79,7 @@
3174 aclocal touch file \`aclocal.m4'
3175 autoconf touch file \`configure'
3176 autoheader touch file \`config.h.in'
3177+ autom4te touch the output file, or create a stub one
3178 automake touch all \`Makefile.in' files
3179 bison create \`y.tab.[ch]', if possible, from existing .[ch]
3180 flex create \`lex.yy.c', if possible, from existing .c
3181@@ -106,7 +109,7 @@
3182 # Now exit if we have it, but it failed. Also exit now if we
3183 # don't have it and --version was passed (most likely to detect
3184 # the program).
3185-case "$1" in
3186+case $1 in
3187 lex|yacc)
3188 # Not GNU programs, they don't have --version.
3189 ;;
3190@@ -135,7 +138,7 @@
3191
3192 # If it does not exist, or fails to run (possibly an outdated version),
3193 # try to emulate it.
3194-case "$1" in
3195+case $1 in
3196 aclocal*)
3197 echo 1>&2 "\
3198 WARNING: \`$1' is $msg. You should only need it if
3199@@ -164,7 +167,7 @@
3200 test -z "$files" && files="config.h"
3201 touch_files=
3202 for f in $files; do
3203- case "$f" in
3204+ case $f in
3205 *:*) touch_files="$touch_files "`echo "$f" |
3206 sed -e 's/^[^:]*://' -e 's/:.*//'`;;
3207 *) touch_files="$touch_files $f.in";;
3208@@ -192,8 +195,8 @@
3209 You can get \`$1' as part of \`Autoconf' from any GNU
3210 archive site."
3211
3212- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
3213- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
3214+ file=`echo "$*" | sed -n "$sed_output"`
3215+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
3216 if test -f "$file"; then
3217 touch $file
3218 else
3219@@ -214,25 +217,25 @@
3220 in order for those modifications to take effect. You can get
3221 \`Bison' from any GNU archive site."
3222 rm -f y.tab.c y.tab.h
3223- if [ $# -ne 1 ]; then
3224+ if test $# -ne 1; then
3225 eval LASTARG="\${$#}"
3226- case "$LASTARG" in
3227+ case $LASTARG in
3228 *.y)
3229 SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
3230- if [ -f "$SRCFILE" ]; then
3231+ if test -f "$SRCFILE"; then
3232 cp "$SRCFILE" y.tab.c
3233 fi
3234 SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
3235- if [ -f "$SRCFILE" ]; then
3236+ if test -f "$SRCFILE"; then
3237 cp "$SRCFILE" y.tab.h
3238 fi
3239 ;;
3240 esac
3241 fi
3242- if [ ! -f y.tab.h ]; then
3243+ if test ! -f y.tab.h; then
3244 echo >y.tab.h
3245 fi
3246- if [ ! -f y.tab.c ]; then
3247+ if test ! -f y.tab.c; then
3248 echo 'main() { return 0; }' >y.tab.c
3249 fi
3250 ;;
3251@@ -244,18 +247,18 @@
3252 in order for those modifications to take effect. You can get
3253 \`Flex' from any GNU archive site."
3254 rm -f lex.yy.c
3255- if [ $# -ne 1 ]; then
3256+ if test $# -ne 1; then
3257 eval LASTARG="\${$#}"
3258- case "$LASTARG" in
3259+ case $LASTARG in
3260 *.l)
3261 SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
3262- if [ -f "$SRCFILE" ]; then
3263+ if test -f "$SRCFILE"; then
3264 cp "$SRCFILE" lex.yy.c
3265 fi
3266 ;;
3267 esac
3268 fi
3269- if [ ! -f lex.yy.c ]; then
3270+ if test ! -f lex.yy.c; then
3271 echo 'main() { return 0; }' >lex.yy.c
3272 fi
3273 ;;
3274@@ -267,11 +270,9 @@
3275 \`Help2man' package in order for those modifications to take
3276 effect. You can get \`Help2man' from any GNU archive site."
3277
3278- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
3279- if test -z "$file"; then
3280- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
3281- fi
3282- if [ -f "$file" ]; then
3283+ file=`echo "$*" | sed -n "$sed_output"`
3284+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
3285+ if test -f "$file"; then
3286 touch $file
3287 else
3288 test -z "$file" || exec >$file
3289@@ -289,14 +290,23 @@
3290 DU, IRIX). You might want to install the \`Texinfo' package or
3291 the \`GNU make' package. Grab either from any GNU archive site."
3292 # The file to touch is that specified with -o ...
3293- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
3294+ file=`echo "$*" | sed -n "$sed_output"`
3295+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
3296 if test -z "$file"; then
3297 # ... or it is the one specified with @setfilename ...
3298 infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
3299- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
3300+ file=`sed -n '
3301+ /^@setfilename/{
3302+ s/.* \([^ ]*\) *$/\1/
3303+ p
3304+ q
3305+ }' $infile`
3306 # ... or it is derived from the source name (dir/f.texi becomes f.info)
3307 test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
3308 fi
3309+ # If the file does not exist, the user really needs makeinfo;
3310+ # let's fail without touching anything.
3311+ test -f $file || exit 1
3312 touch $file
3313 ;;
3314
3315@@ -314,13 +324,13 @@
3316 fi
3317 firstarg="$1"
3318 if shift; then
3319- case "$firstarg" in
3320+ case $firstarg in
3321 *o*)
3322 firstarg=`echo "$firstarg" | sed s/o//`
3323 tar "$firstarg" "$@" && exit 0
3324 ;;
3325 esac
3326- case "$firstarg" in
3327+ case $firstarg in
3328 *h*)
3329 firstarg=`echo "$firstarg" | sed s/h//`
3330 tar "$firstarg" "$@" && exit 0
3331
3332=== modified file 'mkinstalldirs'
3333--- mkinstalldirs 2005-04-20 07:59:51 +0000
3334+++ mkinstalldirs 2009-08-19 12:25:10 +0000
3335@@ -1,7 +1,7 @@
3336 #! /bin/sh
3337 # mkinstalldirs --- make directory hierarchy
3338
3339-scriptversion=2005-02-02.21
3340+scriptversion=2006-05-11.19
3341
3342 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
3343 # Created: 1993-05-16
3344@@ -11,8 +11,11 @@
3345 # bugs to <bug-automake@gnu.org> or send patches to
3346 # <automake-patches@gnu.org>.
3347
3348+nl='
3349+'
3350+IFS=" "" $nl"
3351 errstatus=0
3352-dirmode=""
3353+dirmode=
3354
3355 usage="\
3356 Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
3357@@ -103,13 +106,21 @@
3358
3359 for file
3360 do
3361- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
3362+ case $file in
3363+ /*) pathcomp=/ ;;
3364+ *) pathcomp= ;;
3365+ esac
3366+ oIFS=$IFS
3367+ IFS=/
3368+ set fnord $file
3369 shift
3370+ IFS=$oIFS
3371
3372- pathcomp=
3373 for d
3374 do
3375- pathcomp="$pathcomp$d"
3376+ test "x$d" = x && continue
3377+
3378+ pathcomp=$pathcomp$d
3379 case $pathcomp in
3380 -*) pathcomp=./$pathcomp ;;
3381 esac
3382@@ -124,7 +135,7 @@
3383 else
3384 if test ! -z "$dirmode"; then
3385 echo "chmod $dirmode $pathcomp"
3386- lasterr=""
3387+ lasterr=
3388 chmod "$dirmode" "$pathcomp" || lasterr=$?
3389
3390 if test ! -z "$lasterr"; then
3391@@ -134,7 +145,7 @@
3392 fi
3393 fi
3394
3395- pathcomp="$pathcomp/"
3396+ pathcomp=$pathcomp/
3397 done
3398 done
3399
3400
3401=== modified file 'test/Makefile.am'
3402--- test/Makefile.am 2009-08-18 14:56:29 +0000
3403+++ test/Makefile.am 2009-08-19 12:14:28 +0000
3404@@ -47,8 +47,7 @@
3405 distutils-5.sh \
3406 distutils-6.sh \
3407 distutils-7.sh \
3408- distutils-8.sh \
3409- ant-1.sh
3410+ distutils-8.sh
3411
3412 TARBALLS = tarballs/autotools-test-0.1.tar.gz \
3413 tarballs/distutils-test-0.1.tar.gz
3414
3415=== modified file 'test/Makefile.in'
3416--- test/Makefile.in 2009-08-18 14:56:29 +0000
3417+++ test/Makefile.in 2009-08-19 12:25:10 +0000
3418@@ -67,6 +67,7 @@
3419 PACKAGE_NAME = @PACKAGE_NAME@
3420 PACKAGE_STRING = @PACKAGE_STRING@
3421 PACKAGE_TARNAME = @PACKAGE_TARNAME@
3422+PACKAGE_URL = @PACKAGE_URL@
3423 PACKAGE_VERSION = @PACKAGE_VERSION@
3424 PATH_SEPARATOR = @PATH_SEPARATOR@
3425 SET_MAKE = @SET_MAKE@
3426@@ -141,8 +142,7 @@
3427 distutils-5.sh \
3428 distutils-6.sh \
3429 distutils-7.sh \
3430- distutils-8.sh \
3431- ant-1.sh
3432+ distutils-8.sh
3433
3434 TARBALLS = tarballs/autotools-test-0.1.tar.gz \
3435 tarballs/distutils-test-0.1.tar.gz

Subscribers

People subscribed via source and target branches

to all changes: