1 --- maemo-launcher-0.31/Makefile.in
2 +++ maemo-launcher-0.31/Makefile.in
4 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
5 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
8 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
10 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
11 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
12 $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL TODO \
13 - config/config.guess config/config.sub config/depcomp \
14 - config/install-sh config/missing
15 + config/depcomp config/install-sh config/missing
16 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
17 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
18 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
21 sysconfdir = @sysconfdir@
22 target_alias = @target_alias@
23 +top_build_prefix = @top_build_prefix@
24 top_builddir = @top_builddir@
25 top_srcdir = @top_srcdir@
26 @BUILD_CLIENT_TRUE@CLIENT = client
28 unique=`for i in $$list; do \
29 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
31 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
32 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
33 END { if (nonempty) { for (i in files) print i; }; }'`; \
36 --- maemo-launcher-0.31/configure
37 +++ maemo-launcher-0.31/configure
40 # From configure.ac Revision.
41 # Guess values for system-dependent variables and create Makefiles.
42 -# Generated by GNU Autoconf 2.61 for maemo-launcher 0.31.
43 +# Generated by GNU Autoconf 2.63 for maemo-launcher 0.31.
45 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
46 -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
47 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
48 # This configure script is free software; the Free Software Foundation
49 # gives unlimited permission to copy, distribute and modify it.
50 ## --------------------- ##
52 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
55 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
56 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
57 # is contrary to our usage. Disable this feature.
58 alias -g '${1+"$@"}'='"$@"'
61 as_cr_digits='0123456789'
62 as_cr_alnum=$as_cr_Letters$as_cr_digits
64 -# The user is always right.
65 -if test "${PATH_SEPARATOR+set}" != set; then
66 - echo "#! /bin/sh" >conf$$.sh
67 - echo "exit 0" >>conf$$.sh
69 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
74 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
75 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
76 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
77 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
78 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
79 + as_echo='printf %s\n'
80 + as_echo_n='printf %s'
82 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
83 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
84 + as_echo_n='/usr/ucb/echo -n'
87 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
88 + as_echo_n_body='eval
92 + expr "X$arg" : "X\\(.*\\)$as_nl";
93 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
95 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
97 + export as_echo_n_body
98 + as_echo_n='sh -c $as_echo_n_body as_echo'
101 + export as_echo_body
102 + as_echo='sh -c $as_echo_body as_echo'
105 +# The user is always right.
106 +if test "${PATH_SEPARATOR+set}" != set; then
108 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
109 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
114 # Support unset when possible.
116 # there to prevent editors from complaining about space-tab.
117 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
118 # splitting by setting IFS to empty value.)
123 # Find who we are. Look in the path if we contain no directory separator.
127 if test ! -f "$as_myself"; then
128 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
129 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
130 { (exit 1); exit 1; }
133 @@ -101,17 +127,10 @@
138 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
139 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
140 - LC_TELEPHONE LC_TIME
142 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
143 - eval $as_var=C; export $as_var
145 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
153 # Required to use basename.
154 if expr a : '\(a\)' >/dev/null 2>&1 &&
156 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
157 X"$0" : 'X\(//\)$' \| \
158 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
161 sed '/^.*\/\([^/][^/]*\)\/*$/{
168 - if test $as_have_required = yes && (eval ":
169 + if test $as_have_required = yes && (eval ":
174 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
177 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
178 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
179 # is contrary to our usage. Disable this feature.
180 alias -g '${1+"$@"}'='"$@"'
183 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
186 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
187 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
188 # is contrary to our usage. Disable this feature.
189 alias -g '${1+"$@"}'='"$@"'
191 @@ -342,10 +361,10 @@
193 if test "x$CONFIG_SHELL" != x; then
194 for as_var in BASH_ENV ENV
195 - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
197 - export CONFIG_SHELL
198 - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
199 + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
201 + export CONFIG_SHELL
202 + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
208 test \$exitcode = 0") || {
209 echo No shell found that supports shell functions.
210 - echo Please tell autoconf@gnu.org about your system,
211 - echo including any error possibly output before this
213 + echo Please tell bug-autoconf@gnu.org about your system,
214 + echo including any error possibly output before this message.
215 + echo This can help us improve future autoconf versions.
216 + echo Configuration will now proceed without shell functions.
223 chmod +x "$as_me.lineno" ||
224 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
225 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
226 { (exit 1); exit 1; }; }
228 # Don't try to exec as it changes $[0], causing all sort of problems
234 if expr a : '\(a\)' >/dev/null 2>&1 &&
235 test "X`expr 00001 : '.*\(...\)'`" = X001; then
237 @@ -493,19 +512,22 @@
238 rm -f conf$$.dir/conf$$.file
242 + mkdir conf$$.dir 2>/dev/null
245 -if ln -s conf$$.file conf$$ 2>/dev/null; then
247 - # ... but there are two gotchas:
248 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
249 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
250 - # In both cases, we have to default to `cp -p'.
251 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
252 +if (echo >conf$$.file) 2>/dev/null; then
253 + if ln -s conf$$.file conf$$ 2>/dev/null; then
255 + # ... but there are two gotchas:
256 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
257 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
258 + # In both cases, we have to default to `cp -p'.
259 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
261 + elif ln conf$$.file conf$$ 2>/dev/null; then
265 -elif ln conf$$.file conf$$ 2>/dev/null; then
271 @@ -530,10 +552,10 @@
274 if test -d "$1"; then
282 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
283 ???[sx]*):;;*)false;;esac;fi
284 @@ -578,103 +600,112 @@
287 ac_unique_file="launcher/launcher.c"
288 -ac_subst_vars='SHELL
297 -program_transform_name
339 -INSTALL_STRIP_PROGRAM
347 -MAINTAINER_MODE_TRUE
348 -MAINTAINER_MODE_FALSE
382 +ac_subst_vars='LTLIBOBJS
418 +MAINTAINER_MODE_FALSE
419 +MAINTAINER_MODE_TRUE
428 +INSTALL_STRIP_PROGRAM
470 +program_transform_name
482 +enable_option_checking
483 +enable_maintainer_mode
484 +enable_dependency_tracking
485 +enable_hildon_booster
489 ac_precious_vars='build_alias
493 # Initialize some variables set by options.
495 ac_init_version=false
496 +ac_unrecognized_opts=
497 +ac_unrecognized_sep=
498 # The variables have the same names as the options, with
499 # dashes changed to underlines.
501 @@ -794,13 +827,21 @@
502 datarootdir=$ac_optarg ;;
504 -disable-* | --disable-*)
505 - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
506 + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
507 # Reject names that are not valid shell variable names.
508 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
509 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
510 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
511 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
512 { (exit 1); exit 1; }; }
513 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
514 - eval enable_$ac_feature=no ;;
515 + ac_useropt_orig=$ac_useropt
516 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
517 + case $ac_user_opts in
519 +"enable_$ac_useropt"
521 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
522 + ac_unrecognized_sep=', ';;
524 + eval enable_$ac_useropt=no ;;
526 -docdir | --docdir | --docdi | --doc | --do)
528 @@ -813,13 +854,21 @@
531 -enable-* | --enable-*)
532 - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
533 + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
534 # Reject names that are not valid shell variable names.
535 - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
536 - { echo "$as_me: error: invalid feature name: $ac_feature" >&2
537 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
538 + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
539 { (exit 1); exit 1; }; }
540 - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
541 - eval enable_$ac_feature=\$ac_optarg ;;
542 + ac_useropt_orig=$ac_useropt
543 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
544 + case $ac_user_opts in
546 +"enable_$ac_useropt"
548 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
549 + ac_unrecognized_sep=', ';;
551 + eval enable_$ac_useropt=\$ac_optarg ;;
553 -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
554 | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
555 @@ -1010,22 +1059,38 @@
559 - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
560 + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
561 # Reject names that are not valid shell variable names.
562 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
563 - { echo "$as_me: error: invalid package name: $ac_package" >&2
564 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
565 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
566 { (exit 1); exit 1; }; }
567 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
568 - eval with_$ac_package=\$ac_optarg ;;
569 + ac_useropt_orig=$ac_useropt
570 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
571 + case $ac_user_opts in
575 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
576 + ac_unrecognized_sep=', ';;
578 + eval with_$ac_useropt=\$ac_optarg ;;
580 -without-* | --without-*)
581 - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
582 + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
583 # Reject names that are not valid shell variable names.
584 - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
585 - { echo "$as_me: error: invalid package name: $ac_package" >&2
586 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
587 + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
588 { (exit 1); exit 1; }; }
589 - ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
590 - eval with_$ac_package=no ;;
591 + ac_useropt_orig=$ac_useropt
592 + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
593 + case $ac_user_opts in
597 + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
598 + ac_unrecognized_sep=', ';;
600 + eval with_$ac_useropt=no ;;
603 # Obsolete; use --with-x.
604 @@ -1045,7 +1110,7 @@
605 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
606 x_libraries=$ac_optarg ;;
608 - -*) { echo "$as_me: error: unrecognized option: $ac_option
609 + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
610 Try \`$0 --help' for more information." >&2
611 { (exit 1); exit 1; }; }
613 @@ -1054,16 +1119,16 @@
614 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
615 # Reject names that are not valid shell variable names.
616 expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
617 - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
618 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
619 { (exit 1); exit 1; }; }
620 eval $ac_envvar=\$ac_optarg
624 # FIXME: should be removed in autoconf 3.0.
625 - echo "$as_me: WARNING: you should use --build, --host, --target" >&2
626 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
627 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
628 - echo "$as_me: WARNING: invalid host type: $ac_option" >&2
629 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
630 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
633 @@ -1072,22 +1137,38 @@
635 if test -n "$ac_prev"; then
636 ac_option=--`echo $ac_prev | sed 's/_/-/g'`
637 - { echo "$as_me: error: missing argument to $ac_option" >&2
638 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2
639 { (exit 1); exit 1; }; }
642 -# Be sure to have absolute directory names.
643 +if test -n "$ac_unrecognized_opts"; then
644 + case $enable_option_checking in
646 + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
647 + { (exit 1); exit 1; }; } ;;
648 + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
652 +# Check all directory arguments for consistency.
653 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
654 datadir sysconfdir sharedstatedir localstatedir includedir \
655 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
656 libdir localedir mandir
658 eval ac_val=\$$ac_var
659 + # Remove trailing slashes.
662 + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
663 + eval $ac_var=\$ac_val;;
665 + # Be sure to have absolute directory names.
667 [\\/$]* | ?:[\\/]* ) continue;;
668 NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
670 - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
671 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
672 { (exit 1); exit 1; }; }
675 @@ -1102,7 +1183,7 @@
676 if test "x$host_alias" != x; then
677 if test "x$build_alias" = x; then
678 cross_compiling=maybe
679 - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
680 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
681 If a cross compiler is detected then cross compile mode will be used." >&2
682 elif test "x$build_alias" != "x$host_alias"; then
684 @@ -1118,10 +1199,10 @@
685 ac_pwd=`pwd` && test -n "$ac_pwd" &&
686 ac_ls_di=`ls -di .` &&
687 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
688 - { echo "$as_me: error: Working directory cannot be determined" >&2
689 + { $as_echo "$as_me: error: working directory cannot be determined" >&2
690 { (exit 1); exit 1; }; }
691 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
692 - { echo "$as_me: error: pwd does not report name of working directory" >&2
693 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
694 { (exit 1); exit 1; }; }
697 @@ -1129,12 +1210,12 @@
698 if test -z "$srcdir"; then
699 ac_srcdir_defaulted=yes
700 # Try the directory containing this script, then the parent directory.
701 - ac_confdir=`$as_dirname -- "$0" ||
702 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
703 - X"$0" : 'X\(//\)[^/]' \| \
704 - X"$0" : 'X\(//\)$' \| \
705 - X"$0" : 'X\(/\)' \| . 2>/dev/null ||
707 + ac_confdir=`$as_dirname -- "$as_myself" ||
708 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
709 + X"$as_myself" : 'X\(//\)[^/]' \| \
710 + X"$as_myself" : 'X\(//\)$' \| \
711 + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
712 +$as_echo X"$as_myself" |
713 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
716 @@ -1161,12 +1242,12 @@
718 if test ! -r "$srcdir/$ac_unique_file"; then
719 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
720 - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
721 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
722 { (exit 1); exit 1; }; }
724 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
726 - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
727 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
728 { (exit 1); exit 1; }; }
730 # When building in place, set srcdir=.
731 @@ -1215,9 +1296,9 @@
733 Installation directories:
734 --prefix=PREFIX install architecture-independent files in PREFIX
735 - [$ac_default_prefix]
736 + [$ac_default_prefix]
737 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
741 By default, \`make install' will install all the files in
742 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
743 @@ -1227,25 +1308,25 @@
744 For better control, use the options below.
746 Fine tuning of the installation directories:
747 - --bindir=DIR user executables [EPREFIX/bin]
748 - --sbindir=DIR system admin executables [EPREFIX/sbin]
749 - --libexecdir=DIR program executables [EPREFIX/libexec]
750 - --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
751 - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
752 - --localstatedir=DIR modifiable single-machine data [PREFIX/var]
753 - --libdir=DIR object code libraries [EPREFIX/lib]
754 - --includedir=DIR C header files [PREFIX/include]
755 - --oldincludedir=DIR C header files for non-gcc [/usr/include]
756 - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
757 - --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
758 - --infodir=DIR info documentation [DATAROOTDIR/info]
759 - --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
760 - --mandir=DIR man documentation [DATAROOTDIR/man]
761 - --docdir=DIR documentation root [DATAROOTDIR/doc/maemo-launcher]
762 - --htmldir=DIR html documentation [DOCDIR]
763 - --dvidir=DIR dvi documentation [DOCDIR]
764 - --pdfdir=DIR pdf documentation [DOCDIR]
765 - --psdir=DIR ps documentation [DOCDIR]
766 + --bindir=DIR user executables [EPREFIX/bin]
767 + --sbindir=DIR system admin executables [EPREFIX/sbin]
768 + --libexecdir=DIR program executables [EPREFIX/libexec]
769 + --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
770 + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
771 + --localstatedir=DIR modifiable single-machine data [PREFIX/var]
772 + --libdir=DIR object code libraries [EPREFIX/lib]
773 + --includedir=DIR C header files [PREFIX/include]
774 + --oldincludedir=DIR C header files for non-gcc [/usr/include]
775 + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
776 + --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
777 + --infodir=DIR info documentation [DATAROOTDIR/info]
778 + --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
779 + --mandir=DIR man documentation [DATAROOTDIR/man]
780 + --docdir=DIR documentation root [DATAROOTDIR/doc/maemo-launcher]
781 + --htmldir=DIR html documentation [DOCDIR]
782 + --dvidir=DIR dvi documentation [DOCDIR]
783 + --pdfdir=DIR pdf documentation [DOCDIR]
784 + --psdir=DIR ps documentation [DOCDIR]
788 @@ -1264,6 +1345,7 @@
792 + --disable-option-checking ignore unrecognized --enable/--with options
793 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
794 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
795 --enable-maintainer-mode enable make rules and dependencies not useful
796 @@ -1304,15 +1386,17 @@
797 if test "$ac_init_help" = "recursive"; then
798 # If there are subdirs, report their specific --help.
799 for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
800 - test -d "$ac_dir" || continue
801 + test -d "$ac_dir" ||
802 + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
807 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
809 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
810 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
811 # A ".." for each directory in $ac_dir_suffix.
812 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
813 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
814 case $ac_top_builddir_sub in
815 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
816 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
817 @@ -1348,7 +1432,7 @@
819 $SHELL "$ac_srcdir/configure" --help=recursive
821 - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
822 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
824 cd "$ac_pwd" || { ac_status=$?; break; }
826 @@ -1358,10 +1442,10 @@
827 if $ac_init_version; then
829 maemo-launcher configure 0.31
830 -generated by GNU Autoconf 2.61
831 +generated by GNU Autoconf 2.63
833 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
834 -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
835 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
836 This configure script is free software; the Free Software Foundation
837 gives unlimited permission to copy, distribute and modify it.
839 @@ -1372,7 +1456,7 @@
840 running configure, to aid debugging if configure makes a mistake.
842 It was created by maemo-launcher $as_me 0.31, which was
843 -generated by GNU Autoconf 2.61. Invocation command line was
844 +generated by GNU Autoconf 2.63. Invocation command line was
848 @@ -1408,7 +1492,7 @@
851 test -z "$as_dir" && as_dir=.
852 - echo "PATH: $as_dir"
853 + $as_echo "PATH: $as_dir"
857 @@ -1443,7 +1527,7 @@
858 | -silent | --silent | --silen | --sile | --sil)
861 - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
862 + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
865 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
866 @@ -1495,11 +1579,12 @@
870 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
871 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
872 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
873 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
876 _ | IFS | as_nl) ;; #(
877 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
878 *) $as_unset $ac_var ;;
881 @@ -1529,9 +1614,9 @@
883 eval ac_val=\$$ac_var
885 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
886 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
888 - echo "$ac_var='\''$ac_val'\''"
889 + $as_echo "$ac_var='\''$ac_val'\''"
893 @@ -1546,9 +1631,9 @@
895 eval ac_val=\$$ac_var
897 - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
898 + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
900 - echo "$ac_var='\''$ac_val'\''"
901 + $as_echo "$ac_var='\''$ac_val'\''"
905 @@ -1564,8 +1649,8 @@
908 test "$ac_signal" != 0 &&
909 - echo "$as_me: caught signal $ac_signal"
910 - echo "$as_me: exit $exit_status"
911 + $as_echo "$as_me: caught signal $ac_signal"
912 + $as_echo "$as_me: exit $exit_status"
914 rm -f core *.core core.conftest.* &&
915 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
916 @@ -1607,21 +1692,24 @@
919 # Let the site file select an alternate cache file if it wants to.
920 -# Prefer explicitly selected file to automatically selected ones.
921 +# Prefer an explicitly selected file to automatically selected ones.
924 if test -n "$CONFIG_SITE"; then
925 - set x "$CONFIG_SITE"
926 + ac_site_file1=$CONFIG_SITE
927 elif test "x$prefix" != xNONE; then
928 - set x "$prefix/share/config.site" "$prefix/etc/config.site"
929 + ac_site_file1=$prefix/share/config.site
930 + ac_site_file2=$prefix/etc/config.site
932 - set x "$ac_default_prefix/share/config.site" \
933 - "$ac_default_prefix/etc/config.site"
934 + ac_site_file1=$ac_default_prefix/share/config.site
935 + ac_site_file2=$ac_default_prefix/etc/config.site
939 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
941 + test "x$ac_site_file" = xNONE && continue
942 if test -r "$ac_site_file"; then
943 - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
944 -echo "$as_me: loading site script $ac_site_file" >&6;}
945 + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
946 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
947 sed 's/^/| /' "$ac_site_file" >&5
950 @@ -1631,16 +1719,16 @@
951 # Some versions of bash will fail to source /dev/null (special
952 # files actually), so we avoid doing that.
953 if test -f "$cache_file"; then
954 - { echo "$as_me:$LINENO: loading cache $cache_file" >&5
955 -echo "$as_me: loading cache $cache_file" >&6;}
956 + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
957 +$as_echo "$as_me: loading cache $cache_file" >&6;}
959 [\\/]* | ?:[\\/]* ) . "$cache_file";;
960 *) . "./$cache_file";;
964 - { echo "$as_me:$LINENO: creating cache $cache_file" >&5
965 -echo "$as_me: creating cache $cache_file" >&6;}
966 + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
967 +$as_echo "$as_me: creating cache $cache_file" >&6;}
971 @@ -1654,29 +1742,38 @@
972 eval ac_new_val=\$ac_env_${ac_var}_value
973 case $ac_old_set,$ac_new_set in
975 - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
976 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
977 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
978 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
979 ac_cache_corrupted=: ;;
981 - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
982 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
983 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
984 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
985 ac_cache_corrupted=: ;;
988 if test "x$ac_old_val" != "x$ac_new_val"; then
989 - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
990 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
991 - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
992 -echo "$as_me: former value: $ac_old_val" >&2;}
993 - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
994 -echo "$as_me: current value: $ac_new_val" >&2;}
995 - ac_cache_corrupted=:
996 + # differences in whitespace do not lead to failure.
997 + ac_old_val_w=`echo x $ac_old_val`
998 + ac_new_val_w=`echo x $ac_new_val`
999 + if test "$ac_old_val_w" != "$ac_new_val_w"; then
1000 + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1001 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
1002 + ac_cache_corrupted=:
1004 + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
1005 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
1006 + eval $ac_var=\$ac_old_val
1008 + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
1009 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
1010 + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
1011 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
1014 # Pass precious variables to config.status.
1015 if test "$ac_new_set" = set; then
1017 - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1018 + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
1019 *) ac_arg=$ac_var=$ac_new_val ;;
1021 case " $ac_configure_args " in
1022 @@ -1686,10 +1783,12 @@
1025 if $ac_cache_corrupted; then
1026 - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1027 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1028 - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1029 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1030 + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1031 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1032 + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
1033 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
1034 + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
1035 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
1036 { (exit 1); exit 1; }; }
1039 @@ -1744,8 +1843,8 @@
1042 if test -z "$ac_aux_dir"; then
1043 - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
1044 -echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
1045 + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
1046 +$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
1047 { (exit 1); exit 1; }; }
1050 @@ -1776,11 +1875,12 @@
1051 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
1052 # OS/2's system install, which has a completely different semantic
1053 # ./install, which can be erroneously created by make from ./install.sh.
1054 -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
1055 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
1056 +# Reject install programs that cannot install multiple files.
1057 +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
1058 +$as_echo_n "checking for a BSD-compatible install... " >&6; }
1059 if test -z "$INSTALL"; then
1060 if test "${ac_cv_path_install+set}" = set; then
1061 - echo $ECHO_N "(cached) $ECHO_C" >&6
1062 + $as_echo_n "(cached) " >&6
1064 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1066 @@ -1809,17 +1909,29 @@
1067 # program-specific install script used by HP pwplus--don't use.
1070 - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
1072 + rm -rf conftest.one conftest.two conftest.dir
1073 + echo one > conftest.one
1074 + echo two > conftest.two
1075 + mkdir conftest.dir
1076 + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
1077 + test -s conftest.one && test -s conftest.two &&
1078 + test -s conftest.dir/conftest.one &&
1079 + test -s conftest.dir/conftest.two
1081 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
1094 +rm -rf conftest.one conftest.two conftest.dir
1097 if test "${ac_cv_path_install+set}" = set; then
1098 @@ -1832,8 +1944,8 @@
1099 INSTALL=$ac_install_sh
1102 -{ echo "$as_me:$LINENO: result: $INSTALL" >&5
1103 -echo "${ECHO_T}$INSTALL" >&6; }
1104 +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
1105 +$as_echo "$INSTALL" >&6; }
1107 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
1108 # It thinks the first close brace ends the variable substitution.
1109 @@ -1843,8 +1955,8 @@
1111 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
1113 -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5
1114 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; }
1115 +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
1116 +$as_echo_n "checking whether build environment is sane... " >&6; }
1119 echo timestamp > conftest.file
1120 @@ -1867,9 +1979,9 @@
1121 # if, for instance, CONFIG_SHELL is bash and it inherits a
1122 # broken ls alias from the environment. This has actually
1123 # happened. Such a system could not be considered "sane".
1124 - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
1125 + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
1126 alias in your environment" >&5
1127 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
1128 +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
1129 alias in your environment" >&2;}
1130 { (exit 1); exit 1; }; }
1132 @@ -1880,26 +1992,23 @@
1136 - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
1137 + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
1138 Check your system clock" >&5
1139 -echo "$as_me: error: newly created file is older than distributed files!
1140 +$as_echo "$as_me: error: newly created file is older than distributed files!
1141 Check your system clock" >&2;}
1142 { (exit 1); exit 1; }; }
1144 -{ echo "$as_me:$LINENO: result: yes" >&5
1145 -echo "${ECHO_T}yes" >&6; }
1146 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
1147 +$as_echo "yes" >&6; }
1148 test "$program_prefix" != NONE &&
1149 program_transform_name="s&^&$program_prefix&;$program_transform_name"
1150 # Use a double $ so make ignores it.
1151 test "$program_suffix" != NONE &&
1152 program_transform_name="s&\$&$program_suffix&;$program_transform_name"
1153 -# Double any \ or $. echo might interpret backslashes.
1154 +# Double any \ or $.
1155 # By default was `s,x,x', remove it if useless.
1156 -cat <<\_ACEOF >conftest.sed
1157 -s/[\\$]/&&/g;s/;s,x,x,$//
1159 -program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
1161 +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
1162 +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
1164 # expand $ac_aux_dir to an absolute path
1165 am_aux_dir=`cd $ac_aux_dir && pwd`
1166 @@ -1910,15 +2019,15 @@
1167 am_missing_run="$MISSING --run "
1170 - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
1171 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1172 + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
1173 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
1176 -{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
1177 -echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
1178 +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
1179 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
1180 if test -z "$MKDIR_P"; then
1181 if test "${ac_cv_path_mkdir+set}" = set; then
1182 - echo $ECHO_N "(cached) $ECHO_C" >&6
1183 + $as_echo_n "(cached) " >&6
1185 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1186 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
1187 @@ -1953,8 +2062,8 @@
1188 MKDIR_P="$ac_install_sh -d"
1191 -{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
1192 -echo "${ECHO_T}$MKDIR_P" >&6; }
1193 +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
1194 +$as_echo "$MKDIR_P" >&6; }
1198 @@ -1966,10 +2075,10 @@
1200 # Extract the first word of "$ac_prog", so it can be a program name with args.
1201 set dummy $ac_prog; ac_word=$2
1202 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1203 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1204 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1205 +$as_echo_n "checking for $ac_word... " >&6; }
1206 if test "${ac_cv_prog_AWK+set}" = set; then
1207 - echo $ECHO_N "(cached) $ECHO_C" >&6
1208 + $as_echo_n "(cached) " >&6
1210 if test -n "$AWK"; then
1211 ac_cv_prog_AWK="$AWK" # Let the user override the test.
1212 @@ -1982,7 +2091,7 @@
1213 for ac_exec_ext in '' $ac_executable_extensions; do
1214 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1215 ac_cv_prog_AWK="$ac_prog"
1216 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1217 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1221 @@ -1993,22 +2102,23 @@
1224 if test -n "$AWK"; then
1225 - { echo "$as_me:$LINENO: result: $AWK" >&5
1226 -echo "${ECHO_T}$AWK" >&6; }
1227 + { $as_echo "$as_me:$LINENO: result: $AWK" >&5
1228 +$as_echo "$AWK" >&6; }
1230 - { echo "$as_me:$LINENO: result: no" >&5
1231 -echo "${ECHO_T}no" >&6; }
1232 + { $as_echo "$as_me:$LINENO: result: no" >&5
1233 +$as_echo "no" >&6; }
1237 test -n "$AWK" && break
1240 -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
1241 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
1242 -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
1243 +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
1244 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
1246 +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
1247 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
1248 - echo $ECHO_N "(cached) $ECHO_C" >&6
1249 + $as_echo_n "(cached) " >&6
1251 cat >conftest.make <<\_ACEOF
1253 @@ -2025,12 +2135,12 @@
1256 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
1257 - { echo "$as_me:$LINENO: result: yes" >&5
1258 -echo "${ECHO_T}yes" >&6; }
1259 + { $as_echo "$as_me:$LINENO: result: yes" >&5
1260 +$as_echo "yes" >&6; }
1263 - { echo "$as_me:$LINENO: result: no" >&5
1264 -echo "${ECHO_T}no" >&6; }
1265 + { $as_echo "$as_me:$LINENO: result: no" >&5
1266 +$as_echo "no" >&6; }
1267 SET_MAKE="MAKE=${MAKE-make}"
1270 @@ -2049,8 +2159,8 @@
1271 am__isrc=' -I$(srcdir)'
1272 # test to see if srcdir already configured
1273 if test -f $srcdir/config.status; then
1274 - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
1275 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
1276 + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
1277 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
1278 { (exit 1); exit 1; }; }
1281 @@ -2105,10 +2215,10 @@
1282 if test -n "$ac_tool_prefix"; then
1283 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
1284 set dummy ${ac_tool_prefix}strip; ac_word=$2
1285 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1286 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1287 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1288 +$as_echo_n "checking for $ac_word... " >&6; }
1289 if test "${ac_cv_prog_STRIP+set}" = set; then
1290 - echo $ECHO_N "(cached) $ECHO_C" >&6
1291 + $as_echo_n "(cached) " >&6
1293 if test -n "$STRIP"; then
1294 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
1295 @@ -2121,7 +2231,7 @@
1296 for ac_exec_ext in '' $ac_executable_extensions; do
1297 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1298 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
1299 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1300 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1304 @@ -2132,11 +2242,11 @@
1306 STRIP=$ac_cv_prog_STRIP
1307 if test -n "$STRIP"; then
1308 - { echo "$as_me:$LINENO: result: $STRIP" >&5
1309 -echo "${ECHO_T}$STRIP" >&6; }
1310 + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
1311 +$as_echo "$STRIP" >&6; }
1313 - { echo "$as_me:$LINENO: result: no" >&5
1314 -echo "${ECHO_T}no" >&6; }
1315 + { $as_echo "$as_me:$LINENO: result: no" >&5
1316 +$as_echo "no" >&6; }
1320 @@ -2145,10 +2255,10 @@
1322 # Extract the first word of "strip", so it can be a program name with args.
1323 set dummy strip; ac_word=$2
1324 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1325 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1326 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1327 +$as_echo_n "checking for $ac_word... " >&6; }
1328 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
1329 - echo $ECHO_N "(cached) $ECHO_C" >&6
1330 + $as_echo_n "(cached) " >&6
1332 if test -n "$ac_ct_STRIP"; then
1333 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
1334 @@ -2161,7 +2271,7 @@
1335 for ac_exec_ext in '' $ac_executable_extensions; do
1336 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1337 ac_cv_prog_ac_ct_STRIP="strip"
1338 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1339 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1343 @@ -2172,11 +2282,11 @@
1345 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
1346 if test -n "$ac_ct_STRIP"; then
1347 - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
1348 -echo "${ECHO_T}$ac_ct_STRIP" >&6; }
1349 + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
1350 +$as_echo "$ac_ct_STRIP" >&6; }
1352 - { echo "$as_me:$LINENO: result: no" >&5
1353 -echo "${ECHO_T}no" >&6; }
1354 + { $as_echo "$as_me:$LINENO: result: no" >&5
1355 +$as_echo "no" >&6; }
1358 if test "x$ac_ct_STRIP" = x; then
1359 @@ -2184,12 +2294,8 @@
1361 case $cross_compiling:$ac_tool_warned in
1363 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1364 -whose name does not start with the host triplet. If you think this
1365 -configuration is useful to you, please write to autoconf@gnu.org." >&5
1366 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1367 -whose name does not start with the host triplet. If you think this
1368 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1369 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1370 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1371 ac_tool_warned=yes ;;
1374 @@ -2213,8 +2319,8 @@
1378 -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
1379 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
1380 +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
1381 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
1382 # Check whether --enable-maintainer-mode was given.
1383 if test "${enable_maintainer_mode+set}" = set; then
1384 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
1385 @@ -2222,8 +2328,8 @@
1386 USE_MAINTAINER_MODE=no
1389 - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
1390 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
1391 + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
1392 +$as_echo "$USE_MAINTAINER_MODE" >&6; }
1393 if test $USE_MAINTAINER_MODE = yes; then
1394 MAINTAINER_MODE_TRUE=
1395 MAINTAINER_MODE_FALSE='#'
1396 @@ -2244,10 +2350,10 @@
1397 if test -n "$ac_tool_prefix"; then
1398 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
1399 set dummy ${ac_tool_prefix}gcc; ac_word=$2
1400 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1401 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1402 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1403 +$as_echo_n "checking for $ac_word... " >&6; }
1404 if test "${ac_cv_prog_CC+set}" = set; then
1405 - echo $ECHO_N "(cached) $ECHO_C" >&6
1406 + $as_echo_n "(cached) " >&6
1408 if test -n "$CC"; then
1409 ac_cv_prog_CC="$CC" # Let the user override the test.
1410 @@ -2260,7 +2366,7 @@
1411 for ac_exec_ext in '' $ac_executable_extensions; do
1412 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1413 ac_cv_prog_CC="${ac_tool_prefix}gcc"
1414 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1415 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1419 @@ -2271,11 +2377,11 @@
1422 if test -n "$CC"; then
1423 - { echo "$as_me:$LINENO: result: $CC" >&5
1424 -echo "${ECHO_T}$CC" >&6; }
1425 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1426 +$as_echo "$CC" >&6; }
1428 - { echo "$as_me:$LINENO: result: no" >&5
1429 -echo "${ECHO_T}no" >&6; }
1430 + { $as_echo "$as_me:$LINENO: result: no" >&5
1431 +$as_echo "no" >&6; }
1435 @@ -2284,10 +2390,10 @@
1437 # Extract the first word of "gcc", so it can be a program name with args.
1438 set dummy gcc; ac_word=$2
1439 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1440 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1441 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1442 +$as_echo_n "checking for $ac_word... " >&6; }
1443 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1444 - echo $ECHO_N "(cached) $ECHO_C" >&6
1445 + $as_echo_n "(cached) " >&6
1447 if test -n "$ac_ct_CC"; then
1448 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1449 @@ -2300,7 +2406,7 @@
1450 for ac_exec_ext in '' $ac_executable_extensions; do
1451 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1452 ac_cv_prog_ac_ct_CC="gcc"
1453 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1454 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1458 @@ -2311,11 +2417,11 @@
1460 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1461 if test -n "$ac_ct_CC"; then
1462 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1463 -echo "${ECHO_T}$ac_ct_CC" >&6; }
1464 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1465 +$as_echo "$ac_ct_CC" >&6; }
1467 - { echo "$as_me:$LINENO: result: no" >&5
1468 -echo "${ECHO_T}no" >&6; }
1469 + { $as_echo "$as_me:$LINENO: result: no" >&5
1470 +$as_echo "no" >&6; }
1473 if test "x$ac_ct_CC" = x; then
1474 @@ -2323,12 +2429,8 @@
1476 case $cross_compiling:$ac_tool_warned in
1478 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1479 -whose name does not start with the host triplet. If you think this
1480 -configuration is useful to you, please write to autoconf@gnu.org." >&5
1481 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1482 -whose name does not start with the host triplet. If you think this
1483 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1484 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1485 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1486 ac_tool_warned=yes ;;
1489 @@ -2341,10 +2443,10 @@
1490 if test -n "$ac_tool_prefix"; then
1491 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
1492 set dummy ${ac_tool_prefix}cc; ac_word=$2
1493 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1494 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1495 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1496 +$as_echo_n "checking for $ac_word... " >&6; }
1497 if test "${ac_cv_prog_CC+set}" = set; then
1498 - echo $ECHO_N "(cached) $ECHO_C" >&6
1499 + $as_echo_n "(cached) " >&6
1501 if test -n "$CC"; then
1502 ac_cv_prog_CC="$CC" # Let the user override the test.
1503 @@ -2357,7 +2459,7 @@
1504 for ac_exec_ext in '' $ac_executable_extensions; do
1505 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1506 ac_cv_prog_CC="${ac_tool_prefix}cc"
1507 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1508 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1512 @@ -2368,11 +2470,11 @@
1515 if test -n "$CC"; then
1516 - { echo "$as_me:$LINENO: result: $CC" >&5
1517 -echo "${ECHO_T}$CC" >&6; }
1518 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1519 +$as_echo "$CC" >&6; }
1521 - { echo "$as_me:$LINENO: result: no" >&5
1522 -echo "${ECHO_T}no" >&6; }
1523 + { $as_echo "$as_me:$LINENO: result: no" >&5
1524 +$as_echo "no" >&6; }
1528 @@ -2381,10 +2483,10 @@
1529 if test -z "$CC"; then
1530 # Extract the first word of "cc", so it can be a program name with args.
1531 set dummy cc; ac_word=$2
1532 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1533 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1534 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1535 +$as_echo_n "checking for $ac_word... " >&6; }
1536 if test "${ac_cv_prog_CC+set}" = set; then
1537 - echo $ECHO_N "(cached) $ECHO_C" >&6
1538 + $as_echo_n "(cached) " >&6
1540 if test -n "$CC"; then
1541 ac_cv_prog_CC="$CC" # Let the user override the test.
1542 @@ -2402,7 +2504,7 @@
1546 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1547 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1551 @@ -2425,11 +2527,11 @@
1554 if test -n "$CC"; then
1555 - { echo "$as_me:$LINENO: result: $CC" >&5
1556 -echo "${ECHO_T}$CC" >&6; }
1557 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1558 +$as_echo "$CC" >&6; }
1560 - { echo "$as_me:$LINENO: result: no" >&5
1561 -echo "${ECHO_T}no" >&6; }
1562 + { $as_echo "$as_me:$LINENO: result: no" >&5
1563 +$as_echo "no" >&6; }
1567 @@ -2440,10 +2542,10 @@
1569 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
1570 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
1571 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1572 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1573 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1574 +$as_echo_n "checking for $ac_word... " >&6; }
1575 if test "${ac_cv_prog_CC+set}" = set; then
1576 - echo $ECHO_N "(cached) $ECHO_C" >&6
1577 + $as_echo_n "(cached) " >&6
1579 if test -n "$CC"; then
1580 ac_cv_prog_CC="$CC" # Let the user override the test.
1581 @@ -2456,7 +2558,7 @@
1582 for ac_exec_ext in '' $ac_executable_extensions; do
1583 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1584 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
1585 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1586 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1590 @@ -2467,11 +2569,11 @@
1593 if test -n "$CC"; then
1594 - { echo "$as_me:$LINENO: result: $CC" >&5
1595 -echo "${ECHO_T}$CC" >&6; }
1596 + { $as_echo "$as_me:$LINENO: result: $CC" >&5
1597 +$as_echo "$CC" >&6; }
1599 - { echo "$as_me:$LINENO: result: no" >&5
1600 -echo "${ECHO_T}no" >&6; }
1601 + { $as_echo "$as_me:$LINENO: result: no" >&5
1602 +$as_echo "no" >&6; }
1606 @@ -2484,10 +2586,10 @@
1608 # Extract the first word of "$ac_prog", so it can be a program name with args.
1609 set dummy $ac_prog; ac_word=$2
1610 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1611 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1612 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
1613 +$as_echo_n "checking for $ac_word... " >&6; }
1614 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
1615 - echo $ECHO_N "(cached) $ECHO_C" >&6
1616 + $as_echo_n "(cached) " >&6
1618 if test -n "$ac_ct_CC"; then
1619 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
1620 @@ -2500,7 +2602,7 @@
1621 for ac_exec_ext in '' $ac_executable_extensions; do
1622 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1623 ac_cv_prog_ac_ct_CC="$ac_prog"
1624 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1625 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1629 @@ -2511,11 +2613,11 @@
1631 ac_ct_CC=$ac_cv_prog_ac_ct_CC
1632 if test -n "$ac_ct_CC"; then
1633 - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1634 -echo "${ECHO_T}$ac_ct_CC" >&6; }
1635 + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
1636 +$as_echo "$ac_ct_CC" >&6; }
1638 - { echo "$as_me:$LINENO: result: no" >&5
1639 -echo "${ECHO_T}no" >&6; }
1640 + { $as_echo "$as_me:$LINENO: result: no" >&5
1641 +$as_echo "no" >&6; }
1645 @@ -2527,12 +2629,8 @@
1647 case $cross_compiling:$ac_tool_warned in
1649 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
1650 -whose name does not start with the host triplet. If you think this
1651 -configuration is useful to you, please write to autoconf@gnu.org." >&5
1652 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
1653 -whose name does not start with the host triplet. If you think this
1654 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
1655 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
1656 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
1657 ac_tool_warned=yes ;;
1660 @@ -2542,44 +2640,50 @@
1664 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1665 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1666 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1667 +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
1668 See \`config.log' for more details." >&5
1669 -echo "$as_me: error: no acceptable C compiler found in \$PATH
1670 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
1671 See \`config.log' for more details." >&2;}
1672 - { (exit 1); exit 1; }; }
1673 + { (exit 1); exit 1; }; }; }
1675 # Provide some information about the compiler.
1676 -echo "$as_me:$LINENO: checking for C compiler version" >&5
1677 -ac_compiler=`set X $ac_compile; echo $2`
1678 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
1681 { (ac_try="$ac_compiler --version >&5"
1683 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1684 *) ac_try_echo=$ac_try;;
1686 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1687 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1688 +$as_echo "$ac_try_echo") >&5
1689 (eval "$ac_compiler --version >&5") 2>&5
1691 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1692 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1693 (exit $ac_status); }
1694 { (ac_try="$ac_compiler -v >&5"
1696 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1697 *) ac_try_echo=$ac_try;;
1699 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1700 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1701 +$as_echo "$ac_try_echo") >&5
1702 (eval "$ac_compiler -v >&5") 2>&5
1704 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1705 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1706 (exit $ac_status); }
1707 { (ac_try="$ac_compiler -V >&5"
1709 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1710 *) ac_try_echo=$ac_try;;
1712 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1713 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1714 +$as_echo "$ac_try_echo") >&5
1715 (eval "$ac_compiler -V >&5") 2>&5
1717 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1718 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1719 (exit $ac_status); }
1721 cat >conftest.$ac_ext <<_ACEOF
1722 @@ -2598,27 +2702,22 @@
1725 ac_clean_files_save=$ac_clean_files
1726 -ac_clean_files="$ac_clean_files a.out a.exe b.out"
1727 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
1728 # Try to create an executable without -o first, disregard a.out.
1729 # It will help us diagnose broken compilers, and finding out an intuition
1731 -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1732 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
1733 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1735 -# List of possible output files, starting from the most likely.
1736 -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
1737 -# only as a last resort. b.out is created by i960 compilers.
1738 -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
1740 -# The IRIX 6 linker writes into existing files which may not be
1741 -# executable, retaining their permissions. Remove them first so a
1742 -# subsequent execution test works.
1743 +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
1744 +$as_echo_n "checking for C compiler default output file name... " >&6; }
1745 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
1747 +# The possible output files:
1748 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
1751 for ac_file in $ac_files
1754 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
1755 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
1756 * ) ac_rmfiles="$ac_rmfiles $ac_file";;
1759 @@ -2629,10 +2728,11 @@
1760 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1761 *) ac_try_echo=$ac_try;;
1763 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1764 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1765 +$as_echo "$ac_try_echo") >&5
1766 (eval "$ac_link_default") 2>&5
1768 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1769 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1770 (exit $ac_status); }; then
1771 # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
1772 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
1773 @@ -2643,7 +2743,7 @@
1775 test -f "$ac_file" || continue
1777 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
1778 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
1781 # We found the default executable, but exeext='' is most
1782 @@ -2670,25 +2770,27 @@
1786 -{ echo "$as_me:$LINENO: result: $ac_file" >&5
1787 -echo "${ECHO_T}$ac_file" >&6; }
1788 +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
1789 +$as_echo "$ac_file" >&6; }
1790 if test -z "$ac_file"; then
1791 - echo "$as_me: failed program was:" >&5
1792 + $as_echo "$as_me: failed program was:" >&5
1793 sed 's/^/| /' conftest.$ac_ext >&5
1795 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
1796 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1797 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1798 +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
1799 See \`config.log' for more details." >&5
1800 -echo "$as_me: error: C compiler cannot create executables
1801 +$as_echo "$as_me: error: C compiler cannot create executables
1802 See \`config.log' for more details." >&2;}
1803 - { (exit 77); exit 77; }; }
1804 + { (exit 77); exit 77; }; }; }
1807 ac_exeext=$ac_cv_exeext
1809 # Check that the compiler produces executables we can run. If not, either
1810 # the compiler is broken, or we cross compile.
1811 -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1812 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
1813 +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
1814 +$as_echo_n "checking whether the C compiler works... " >&6; }
1815 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
1816 # If not cross compiling, check that we can run a simple program.
1817 if test "$cross_compiling" != yes; then
1818 @@ -2697,49 +2799,53 @@
1819 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1820 *) ac_try_echo=$ac_try;;
1822 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1823 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1824 +$as_echo "$ac_try_echo") >&5
1825 (eval "$ac_try") 2>&5
1827 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1828 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1829 (exit $ac_status); }; }; then
1832 if test "$cross_compiling" = maybe; then
1835 - { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
1836 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1837 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1838 +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
1839 If you meant to cross compile, use \`--host'.
1840 See \`config.log' for more details." >&5
1841 -echo "$as_me: error: cannot run C compiled programs.
1842 +$as_echo "$as_me: error: cannot run C compiled programs.
1843 If you meant to cross compile, use \`--host'.
1844 See \`config.log' for more details." >&2;}
1845 - { (exit 1); exit 1; }; }
1846 + { (exit 1); exit 1; }; }; }
1850 -{ echo "$as_me:$LINENO: result: yes" >&5
1851 -echo "${ECHO_T}yes" >&6; }
1852 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
1853 +$as_echo "yes" >&6; }
1855 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
1856 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
1857 ac_clean_files=$ac_clean_files_save
1858 # Check that the compiler produces executables we can run. If not, either
1859 # the compiler is broken, or we cross compile.
1860 -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
1861 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
1862 -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
1863 -echo "${ECHO_T}$cross_compiling" >&6; }
1864 +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
1865 +$as_echo_n "checking whether we are cross compiling... " >&6; }
1866 +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
1867 +$as_echo "$cross_compiling" >&6; }
1869 -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
1870 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
1871 +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
1872 +$as_echo_n "checking for suffix of executables... " >&6; }
1873 if { (ac_try="$ac_link"
1875 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1876 *) ac_try_echo=$ac_try;;
1878 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1879 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1880 +$as_echo "$ac_try_echo") >&5
1881 (eval "$ac_link") 2>&5
1883 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1884 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1885 (exit $ac_status); }; then
1886 # If both `conftest.exe' and `conftest' are `present' (well, observable)
1887 # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
1888 @@ -2748,31 +2854,33 @@
1889 for ac_file in conftest.exe conftest conftest.*; do
1890 test -f "$ac_file" || continue
1892 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
1893 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
1894 *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
1900 - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
1901 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1902 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1903 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
1904 See \`config.log' for more details." >&5
1905 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
1906 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
1907 See \`config.log' for more details." >&2;}
1908 - { (exit 1); exit 1; }; }
1909 + { (exit 1); exit 1; }; }; }
1912 rm -f conftest$ac_cv_exeext
1913 -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
1914 -echo "${ECHO_T}$ac_cv_exeext" >&6; }
1915 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
1916 +$as_echo "$ac_cv_exeext" >&6; }
1918 rm -f conftest.$ac_ext
1919 EXEEXT=$ac_cv_exeext
1921 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
1922 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
1923 +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
1924 +$as_echo_n "checking for suffix of object files... " >&6; }
1925 if test "${ac_cv_objext+set}" = set; then
1926 - echo $ECHO_N "(cached) $ECHO_C" >&6
1927 + $as_echo_n "(cached) " >&6
1929 cat >conftest.$ac_ext <<_ACEOF
1931 @@ -2795,40 +2903,43 @@
1932 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1933 *) ac_try_echo=$ac_try;;
1935 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1936 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1937 +$as_echo "$ac_try_echo") >&5
1938 (eval "$ac_compile") 2>&5
1940 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
1941 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
1942 (exit $ac_status); }; then
1943 for ac_file in conftest.o conftest.obj conftest.*; do
1944 test -f "$ac_file" || continue;
1946 - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
1947 + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
1948 *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
1953 - echo "$as_me: failed program was:" >&5
1954 + $as_echo "$as_me: failed program was:" >&5
1955 sed 's/^/| /' conftest.$ac_ext >&5
1957 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
1958 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
1959 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
1960 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
1961 See \`config.log' for more details." >&5
1962 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
1963 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
1964 See \`config.log' for more details." >&2;}
1965 - { (exit 1); exit 1; }; }
1966 + { (exit 1); exit 1; }; }; }
1969 rm -f conftest.$ac_cv_objext conftest.$ac_ext
1971 -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
1972 -echo "${ECHO_T}$ac_cv_objext" >&6; }
1973 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
1974 +$as_echo "$ac_cv_objext" >&6; }
1975 OBJEXT=$ac_cv_objext
1977 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1978 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
1979 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
1980 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
1981 if test "${ac_cv_c_compiler_gnu+set}" = set; then
1982 - echo $ECHO_N "(cached) $ECHO_C" >&6
1983 + $as_echo_n "(cached) " >&6
1985 cat >conftest.$ac_ext <<_ACEOF
1987 @@ -2854,20 +2965,21 @@
1988 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
1989 *) ac_try_echo=$ac_try;;
1991 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
1992 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
1993 +$as_echo "$ac_try_echo") >&5
1994 (eval "$ac_compile") 2>conftest.er1
1996 grep -v '^ *+' conftest.er1 >conftest.err
1998 cat conftest.err >&5
1999 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2000 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2001 (exit $ac_status); } && {
2002 test -z "$ac_c_werror_flag" ||
2003 test ! -s conftest.err
2004 } && test -s conftest.$ac_objext; then
2007 - echo "$as_me: failed program was:" >&5
2008 + $as_echo "$as_me: failed program was:" >&5
2009 sed 's/^/| /' conftest.$ac_ext >&5
2012 @@ -2877,15 +2989,19 @@
2013 ac_cv_c_compiler_gnu=$ac_compiler_gnu
2016 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2017 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
2018 -GCC=`test $ac_compiler_gnu = yes && echo yes`
2019 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
2020 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
2021 +if test $ac_compiler_gnu = yes; then
2026 ac_test_CFLAGS=${CFLAGS+set}
2027 ac_save_CFLAGS=$CFLAGS
2028 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2029 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
2030 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
2031 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
2032 if test "${ac_cv_prog_cc_g+set}" = set; then
2033 - echo $ECHO_N "(cached) $ECHO_C" >&6
2034 + $as_echo_n "(cached) " >&6
2036 ac_save_c_werror_flag=$ac_c_werror_flag
2037 ac_c_werror_flag=yes
2038 @@ -2912,20 +3028,21 @@
2039 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2040 *) ac_try_echo=$ac_try;;
2042 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2043 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2044 +$as_echo "$ac_try_echo") >&5
2045 (eval "$ac_compile") 2>conftest.er1
2047 grep -v '^ *+' conftest.er1 >conftest.err
2049 cat conftest.err >&5
2050 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2051 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2052 (exit $ac_status); } && {
2053 test -z "$ac_c_werror_flag" ||
2054 test ! -s conftest.err
2055 } && test -s conftest.$ac_objext; then
2058 - echo "$as_me: failed program was:" >&5
2059 + $as_echo "$as_me: failed program was:" >&5
2060 sed 's/^/| /' conftest.$ac_ext >&5
2063 @@ -2950,20 +3067,21 @@
2064 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2065 *) ac_try_echo=$ac_try;;
2067 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2068 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2069 +$as_echo "$ac_try_echo") >&5
2070 (eval "$ac_compile") 2>conftest.er1
2072 grep -v '^ *+' conftest.er1 >conftest.err
2074 cat conftest.err >&5
2075 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2076 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2077 (exit $ac_status); } && {
2078 test -z "$ac_c_werror_flag" ||
2079 test ! -s conftest.err
2080 } && test -s conftest.$ac_objext; then
2083 - echo "$as_me: failed program was:" >&5
2084 + $as_echo "$as_me: failed program was:" >&5
2085 sed 's/^/| /' conftest.$ac_ext >&5
2087 ac_c_werror_flag=$ac_save_c_werror_flag
2088 @@ -2989,20 +3107,21 @@
2089 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2090 *) ac_try_echo=$ac_try;;
2092 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2093 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2094 +$as_echo "$ac_try_echo") >&5
2095 (eval "$ac_compile") 2>conftest.er1
2097 grep -v '^ *+' conftest.er1 >conftest.err
2099 cat conftest.err >&5
2100 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2101 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2102 (exit $ac_status); } && {
2103 test -z "$ac_c_werror_flag" ||
2104 test ! -s conftest.err
2105 } && test -s conftest.$ac_objext; then
2108 - echo "$as_me: failed program was:" >&5
2109 + $as_echo "$as_me: failed program was:" >&5
2110 sed 's/^/| /' conftest.$ac_ext >&5
2113 @@ -3017,8 +3136,8 @@
2114 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2115 ac_c_werror_flag=$ac_save_c_werror_flag
2117 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2118 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
2119 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
2120 +$as_echo "$ac_cv_prog_cc_g" >&6; }
2121 if test "$ac_test_CFLAGS" = set; then
2122 CFLAGS=$ac_save_CFLAGS
2123 elif test $ac_cv_prog_cc_g = yes; then
2124 @@ -3034,10 +3153,10 @@
2128 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
2129 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
2130 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
2131 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
2132 if test "${ac_cv_prog_cc_c89+set}" = set; then
2133 - echo $ECHO_N "(cached) $ECHO_C" >&6
2134 + $as_echo_n "(cached) " >&6
2136 ac_cv_prog_cc_c89=no
2138 @@ -3108,20 +3227,21 @@
2139 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2140 *) ac_try_echo=$ac_try;;
2142 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2143 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2144 +$as_echo "$ac_try_echo") >&5
2145 (eval "$ac_compile") 2>conftest.er1
2147 grep -v '^ *+' conftest.er1 >conftest.err
2149 cat conftest.err >&5
2150 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2151 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2152 (exit $ac_status); } && {
2153 test -z "$ac_c_werror_flag" ||
2154 test ! -s conftest.err
2155 } && test -s conftest.$ac_objext; then
2156 ac_cv_prog_cc_c89=$ac_arg
2158 - echo "$as_me: failed program was:" >&5
2159 + $as_echo "$as_me: failed program was:" >&5
2160 sed 's/^/| /' conftest.$ac_ext >&5
2163 @@ -3137,15 +3257,15 @@
2165 case "x$ac_cv_prog_cc_c89" in
2167 - { echo "$as_me:$LINENO: result: none needed" >&5
2168 -echo "${ECHO_T}none needed" >&6; } ;;
2169 + { $as_echo "$as_me:$LINENO: result: none needed" >&5
2170 +$as_echo "none needed" >&6; } ;;
2172 - { echo "$as_me:$LINENO: result: unsupported" >&5
2173 -echo "${ECHO_T}unsupported" >&6; } ;;
2174 + { $as_echo "$as_me:$LINENO: result: unsupported" >&5
2175 +$as_echo "unsupported" >&6; } ;;
2177 CC="$CC $ac_cv_prog_cc_c89"
2178 - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
2179 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
2180 + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
2181 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
2185 @@ -3166,8 +3286,8 @@
2188 # If we don't find an include directive, just comment out the code.
2189 -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
2190 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
2191 +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
2192 +$as_echo_n "checking for style of include used by $am_make... " >&6; }
2196 @@ -3194,8 +3314,8 @@
2200 -{ echo "$as_me:$LINENO: result: $_am_result" >&5
2201 -echo "${ECHO_T}$_am_result" >&6; }
2202 +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
2203 +$as_echo "$_am_result" >&6; }
2204 rm -f confinc confmf
2206 # Check whether --enable-dependency-tracking was given.
2207 @@ -3219,10 +3339,10 @@
2209 depcc="$CC" am_compiler_list=
2211 -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
2212 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
2213 +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
2214 +$as_echo_n "checking dependency style of $depcc... " >&6; }
2215 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
2216 - echo $ECHO_N "(cached) $ECHO_C" >&6
2217 + $as_echo_n "(cached) " >&6
2219 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
2220 # We make a subdir and do the tests there. Otherwise we can end up
2221 @@ -3310,8 +3430,8 @@
2225 -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
2226 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
2227 +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
2228 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
2229 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
2232 @@ -3330,15 +3450,15 @@
2233 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
2234 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2235 ac_compiler_gnu=$ac_cv_c_compiler_gnu
2236 -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
2237 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
2238 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
2239 +$as_echo_n "checking how to run the C preprocessor... " >&6; }
2240 # On Suns, sometimes $CPP names a directory.
2241 if test -n "$CPP" && test -d "$CPP"; then
2244 if test -z "$CPP"; then
2245 if test "${ac_cv_prog_CPP+set}" = set; then
2246 - echo $ECHO_N "(cached) $ECHO_C" >&6
2247 + $as_echo_n "(cached) " >&6
2249 # Double quotes because CPP needs to be expanded
2250 for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
2251 @@ -3370,20 +3490,21 @@
2252 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2253 *) ac_try_echo=$ac_try;;
2255 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2256 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2257 +$as_echo "$ac_try_echo") >&5
2258 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2260 grep -v '^ *+' conftest.er1 >conftest.err
2262 cat conftest.err >&5
2263 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2264 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2265 (exit $ac_status); } >/dev/null && {
2266 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2267 test ! -s conftest.err
2271 - echo "$as_me: failed program was:" >&5
2272 + $as_echo "$as_me: failed program was:" >&5
2273 sed 's/^/| /' conftest.$ac_ext >&5
2275 # Broken: fails on valid input.
2276 @@ -3407,13 +3528,14 @@
2277 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2278 *) ac_try_echo=$ac_try;;
2280 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2281 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2282 +$as_echo "$ac_try_echo") >&5
2283 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2285 grep -v '^ *+' conftest.er1 >conftest.err
2287 cat conftest.err >&5
2288 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2289 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2290 (exit $ac_status); } >/dev/null && {
2291 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2292 test ! -s conftest.err
2293 @@ -3421,7 +3543,7 @@
2294 # Broken: success on invalid input.
2297 - echo "$as_me: failed program was:" >&5
2298 + $as_echo "$as_me: failed program was:" >&5
2299 sed 's/^/| /' conftest.$ac_ext >&5
2301 # Passes both tests.
2302 @@ -3446,8 +3568,8 @@
2306 -{ echo "$as_me:$LINENO: result: $CPP" >&5
2307 -echo "${ECHO_T}$CPP" >&6; }
2308 +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
2309 +$as_echo "$CPP" >&6; }
2311 for ac_c_preproc_warn_flag in '' yes
2313 @@ -3475,20 +3597,21 @@
2314 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2315 *) ac_try_echo=$ac_try;;
2317 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2318 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2319 +$as_echo "$ac_try_echo") >&5
2320 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2322 grep -v '^ *+' conftest.er1 >conftest.err
2324 cat conftest.err >&5
2325 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2326 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2327 (exit $ac_status); } >/dev/null && {
2328 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2329 test ! -s conftest.err
2333 - echo "$as_me: failed program was:" >&5
2334 + $as_echo "$as_me: failed program was:" >&5
2335 sed 's/^/| /' conftest.$ac_ext >&5
2337 # Broken: fails on valid input.
2338 @@ -3512,13 +3635,14 @@
2339 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2340 *) ac_try_echo=$ac_try;;
2342 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2343 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2344 +$as_echo "$ac_try_echo") >&5
2345 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
2347 grep -v '^ *+' conftest.er1 >conftest.err
2349 cat conftest.err >&5
2350 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2351 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2352 (exit $ac_status); } >/dev/null && {
2353 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
2354 test ! -s conftest.err
2355 @@ -3526,7 +3650,7 @@
2356 # Broken: success on invalid input.
2359 - echo "$as_me: failed program was:" >&5
2360 + $as_echo "$as_me: failed program was:" >&5
2361 sed 's/^/| /' conftest.$ac_ext >&5
2363 # Passes both tests.
2364 @@ -3542,11 +3666,13 @@
2365 if $ac_preproc_ok; then
2368 - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
2369 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2370 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2371 +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
2372 See \`config.log' for more details." >&5
2373 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
2374 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
2375 See \`config.log' for more details." >&2;}
2376 - { (exit 1); exit 1; }; }
2377 + { (exit 1); exit 1; }; }; }
2381 @@ -3555,22 +3681,23 @@
2382 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
2383 ac_compiler_gnu=$ac_cv_c_compiler_gnu
2385 -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
2386 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
2387 +{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
2388 +$as_echo_n "checking whether ln -s works... " >&6; }
2390 if test "$LN_S" = "ln -s"; then
2391 - { echo "$as_me:$LINENO: result: yes" >&5
2392 -echo "${ECHO_T}yes" >&6; }
2393 + { $as_echo "$as_me:$LINENO: result: yes" >&5
2394 +$as_echo "yes" >&6; }
2396 - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
2397 -echo "${ECHO_T}no, using $LN_S" >&6; }
2398 + { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
2399 +$as_echo "no, using $LN_S" >&6; }
2402 -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2403 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
2404 -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2405 +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2406 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2408 +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2409 if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
2410 - echo $ECHO_N "(cached) $ECHO_C" >&6
2411 + $as_echo_n "(cached) " >&6
2413 cat >conftest.make <<\_ACEOF
2415 @@ -3587,20 +3714,20 @@
2418 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
2419 - { echo "$as_me:$LINENO: result: yes" >&5
2420 -echo "${ECHO_T}yes" >&6; }
2421 + { $as_echo "$as_me:$LINENO: result: yes" >&5
2422 +$as_echo "yes" >&6; }
2425 - { echo "$as_me:$LINENO: result: no" >&5
2426 -echo "${ECHO_T}no" >&6; }
2427 + { $as_echo "$as_me:$LINENO: result: no" >&5
2428 +$as_echo "no" >&6; }
2429 SET_MAKE="MAKE=${MAKE-make}"
2433 -{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
2434 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
2435 +{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
2436 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
2437 if test "${ac_cv_c_const+set}" = set; then
2438 - echo $ECHO_N "(cached) $ECHO_C" >&6
2439 + $as_echo_n "(cached) " >&6
2441 cat >conftest.$ac_ext <<_ACEOF
2443 @@ -3672,20 +3799,21 @@
2444 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2445 *) ac_try_echo=$ac_try;;
2447 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2448 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2449 +$as_echo "$ac_try_echo") >&5
2450 (eval "$ac_compile") 2>conftest.er1
2452 grep -v '^ *+' conftest.er1 >conftest.err
2454 cat conftest.err >&5
2455 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2456 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2457 (exit $ac_status); } && {
2458 test -z "$ac_c_werror_flag" ||
2459 test ! -s conftest.err
2460 } && test -s conftest.$ac_objext; then
2463 - echo "$as_me: failed program was:" >&5
2464 + $as_echo "$as_me: failed program was:" >&5
2465 sed 's/^/| /' conftest.$ac_ext >&5
2468 @@ -3693,54 +3821,49 @@
2470 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2472 -{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
2473 -echo "${ECHO_T}$ac_cv_c_const" >&6; }
2474 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
2475 +$as_echo "$ac_cv_c_const" >&6; }
2476 if test $ac_cv_c_const = no; then
2478 cat >>confdefs.h <<\_ACEOF
2487 -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
2488 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
2489 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
2490 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
2491 if test "${ac_cv_path_GREP+set}" = set; then
2492 - echo $ECHO_N "(cached) $ECHO_C" >&6
2494 - # Extract the first word of "grep ggrep" to use in msg output
2495 -if test -z "$GREP"; then
2496 -set dummy grep ggrep; ac_prog_name=$2
2497 -if test "${ac_cv_path_GREP+set}" = set; then
2498 - echo $ECHO_N "(cached) $ECHO_C" >&6
2499 + $as_echo_n "(cached) " >&6
2501 + if test -z "$GREP"; then
2502 ac_path_GREP_found=false
2503 -# Loop through the user's path and test for each of PROGNAME-LIST
2504 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2505 + # Loop through the user's path and test for each of PROGNAME-LIST
2506 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2507 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
2510 test -z "$as_dir" && as_dir=.
2511 for ac_prog in grep ggrep; do
2512 - for ac_exec_ext in '' $ac_executable_extensions; do
2513 - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
2514 - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
2515 - # Check for GNU ac_path_GREP and select it if it is found.
2516 + for ac_exec_ext in '' $ac_executable_extensions; do
2517 + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
2518 + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
2519 +# Check for GNU ac_path_GREP and select it if it is found.
2520 # Check for GNU $ac_path_GREP
2521 case `"$ac_path_GREP" --version 2>&1` in
2523 ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
2526 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
2527 + $as_echo_n 0123456789 >"conftest.in"
2530 cat "conftest.in" "conftest.in" >"conftest.tmp"
2531 mv "conftest.tmp" "conftest.in"
2532 cp "conftest.in" "conftest.nl"
2533 - echo 'GREP' >> "conftest.nl"
2534 + $as_echo 'GREP' >> "conftest.nl"
2535 "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
2536 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
2537 ac_count=`expr $ac_count + 1`
2538 @@ -3755,74 +3878,60 @@
2539 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
2543 - $ac_path_GREP_found && break 3
2544 + $ac_path_GREP_found && break 3
2555 -GREP="$ac_cv_path_GREP"
2556 -if test -z "$GREP"; then
2557 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
2558 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
2559 + if test -z "$ac_cv_path_GREP"; then
2560 + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
2561 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
2562 { (exit 1); exit 1; }; }
2567 ac_cv_path_GREP=$GREP
2572 -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
2573 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
2574 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
2575 +$as_echo "$ac_cv_path_GREP" >&6; }
2576 GREP="$ac_cv_path_GREP"
2579 -{ echo "$as_me:$LINENO: checking for egrep" >&5
2580 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
2581 +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
2582 +$as_echo_n "checking for egrep... " >&6; }
2583 if test "${ac_cv_path_EGREP+set}" = set; then
2584 - echo $ECHO_N "(cached) $ECHO_C" >&6
2585 + $as_echo_n "(cached) " >&6
2587 if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
2588 then ac_cv_path_EGREP="$GREP -E"
2590 - # Extract the first word of "egrep" to use in msg output
2591 -if test -z "$EGREP"; then
2592 -set dummy egrep; ac_prog_name=$2
2593 -if test "${ac_cv_path_EGREP+set}" = set; then
2594 - echo $ECHO_N "(cached) $ECHO_C" >&6
2596 + if test -z "$EGREP"; then
2597 ac_path_EGREP_found=false
2598 -# Loop through the user's path and test for each of PROGNAME-LIST
2599 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2600 + # Loop through the user's path and test for each of PROGNAME-LIST
2601 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2602 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
2605 test -z "$as_dir" && as_dir=.
2606 for ac_prog in egrep; do
2607 - for ac_exec_ext in '' $ac_executable_extensions; do
2608 - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
2609 - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
2610 - # Check for GNU ac_path_EGREP and select it if it is found.
2611 + for ac_exec_ext in '' $ac_executable_extensions; do
2612 + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
2613 + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
2614 +# Check for GNU ac_path_EGREP and select it if it is found.
2615 # Check for GNU $ac_path_EGREP
2616 case `"$ac_path_EGREP" --version 2>&1` in
2618 ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
2621 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
2622 + $as_echo_n 0123456789 >"conftest.in"
2625 cat "conftest.in" "conftest.in" >"conftest.tmp"
2626 mv "conftest.tmp" "conftest.in"
2627 cp "conftest.in" "conftest.nl"
2628 - echo 'EGREP' >> "conftest.nl"
2629 + $as_echo 'EGREP' >> "conftest.nl"
2630 "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
2631 diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
2632 ac_count=`expr $ac_count + 1`
2633 @@ -3837,40 +3946,31 @@
2634 rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
2638 - $ac_path_EGREP_found && break 3
2639 + $ac_path_EGREP_found && break 3
2650 -EGREP="$ac_cv_path_EGREP"
2651 -if test -z "$EGREP"; then
2652 - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
2653 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
2654 + if test -z "$ac_cv_path_EGREP"; then
2655 + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
2656 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
2657 { (exit 1); exit 1; }; }
2662 ac_cv_path_EGREP=$EGREP
2668 -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
2669 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
2670 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
2671 +$as_echo "$ac_cv_path_EGREP" >&6; }
2672 EGREP="$ac_cv_path_EGREP"
2675 -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
2676 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
2677 +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
2678 +$as_echo_n "checking for ANSI C header files... " >&6; }
2679 if test "${ac_cv_header_stdc+set}" = set; then
2680 - echo $ECHO_N "(cached) $ECHO_C" >&6
2681 + $as_echo_n "(cached) " >&6
2683 cat >conftest.$ac_ext <<_ACEOF
2685 @@ -3897,20 +3997,21 @@
2686 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2687 *) ac_try_echo=$ac_try;;
2689 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2690 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2691 +$as_echo "$ac_try_echo") >&5
2692 (eval "$ac_compile") 2>conftest.er1
2694 grep -v '^ *+' conftest.er1 >conftest.err
2696 cat conftest.err >&5
2697 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2698 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2699 (exit $ac_status); } && {
2700 test -z "$ac_c_werror_flag" ||
2701 test ! -s conftest.err
2702 } && test -s conftest.$ac_objext; then
2703 ac_cv_header_stdc=yes
2705 - echo "$as_me: failed program was:" >&5
2706 + $as_echo "$as_me: failed program was:" >&5
2707 sed 's/^/| /' conftest.$ac_ext >&5
2709 ac_cv_header_stdc=no
2710 @@ -4002,37 +4103,40 @@
2711 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2712 *) ac_try_echo=$ac_try;;
2714 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2715 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2716 +$as_echo "$ac_try_echo") >&5
2717 (eval "$ac_link") 2>&5
2719 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2720 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2721 (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
2722 { (case "(($ac_try" in
2723 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2724 *) ac_try_echo=$ac_try;;
2726 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2727 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2728 +$as_echo "$ac_try_echo") >&5
2729 (eval "$ac_try") 2>&5
2731 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2732 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2733 (exit $ac_status); }; }; then
2736 - echo "$as_me: program exited with status $ac_status" >&5
2737 -echo "$as_me: failed program was:" >&5
2738 + $as_echo "$as_me: program exited with status $ac_status" >&5
2739 +$as_echo "$as_me: failed program was:" >&5
2740 sed 's/^/| /' conftest.$ac_ext >&5
2743 ac_cv_header_stdc=no
2745 +rm -rf conftest.dSYM
2746 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
2752 -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
2753 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
2754 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
2755 +$as_echo "$ac_cv_header_stdc" >&6; }
2756 if test $ac_cv_header_stdc = yes; then
2758 cat >>confdefs.h <<\_ACEOF
2759 @@ -4042,8 +4146,8 @@
2763 -{ echo "$as_me:$LINENO: checking for prctl with PR_SET_NAME support" >&5
2764 -echo $ECHO_N "checking for prctl with PR_SET_NAME support... $ECHO_C" >&6; }
2765 +{ $as_echo "$as_me:$LINENO: checking for prctl with PR_SET_NAME support" >&5
2766 +$as_echo_n "checking for prctl with PR_SET_NAME support... " >&6; }
2767 cat >conftest.$ac_ext <<_ACEOF
2769 #include <sys/prctl.h>
2770 @@ -4061,18 +4165,21 @@
2771 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
2772 *) ac_try_echo=$ac_try;;
2774 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
2775 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
2776 +$as_echo "$ac_try_echo") >&5
2777 (eval "$ac_link") 2>conftest.er1
2779 grep -v '^ *+' conftest.er1 >conftest.err
2781 cat conftest.err >&5
2782 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2783 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2784 (exit $ac_status); } && {
2785 test -z "$ac_c_werror_flag" ||
2786 test ! -s conftest.err
2787 - } && test -s conftest$ac_exeext &&
2788 - $as_test_x conftest$ac_exeext; then
2789 + } && test -s conftest$ac_exeext && {
2790 + test "$cross_compiling" = yes ||
2791 + $as_test_x conftest$ac_exeext
2794 cat >>confdefs.h <<\_ACEOF
2795 #define HAVE_PRCTL_SET_NAME 1
2796 @@ -4080,16 +4187,17 @@
2800 - echo "$as_me: failed program was:" >&5
2801 + $as_echo "$as_me: failed program was:" >&5
2802 sed 's/^/| /' conftest.$ac_ext >&5
2807 +rm -rf conftest.dSYM
2808 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
2809 conftest$ac_exeext conftest.$ac_ext
2810 -{ echo "$as_me:$LINENO: result: $prctl" >&5
2811 -echo "${ECHO_T}$prctl" >&6; }
2812 +{ $as_echo "$as_me:$LINENO: result: $prctl" >&5
2813 +$as_echo "$prctl" >&6; }
2816 # Launcher dependencies
2817 @@ -4103,10 +4211,10 @@
2818 if test -n "$ac_tool_prefix"; then
2819 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
2820 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
2821 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2822 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2823 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2824 +$as_echo_n "checking for $ac_word... " >&6; }
2825 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
2826 - echo $ECHO_N "(cached) $ECHO_C" >&6
2827 + $as_echo_n "(cached) " >&6
2831 @@ -4121,7 +4229,7 @@
2832 for ac_exec_ext in '' $ac_executable_extensions; do
2833 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2834 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
2835 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2836 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2840 @@ -4133,11 +4241,11 @@
2842 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
2843 if test -n "$PKG_CONFIG"; then
2844 - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
2845 -echo "${ECHO_T}$PKG_CONFIG" >&6; }
2846 + { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
2847 +$as_echo "$PKG_CONFIG" >&6; }
2849 - { echo "$as_me:$LINENO: result: no" >&5
2850 -echo "${ECHO_T}no" >&6; }
2851 + { $as_echo "$as_me:$LINENO: result: no" >&5
2852 +$as_echo "no" >&6; }
2856 @@ -4146,10 +4254,10 @@
2857 ac_pt_PKG_CONFIG=$PKG_CONFIG
2858 # Extract the first word of "pkg-config", so it can be a program name with args.
2859 set dummy pkg-config; ac_word=$2
2860 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
2861 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
2862 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
2863 +$as_echo_n "checking for $ac_word... " >&6; }
2864 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
2865 - echo $ECHO_N "(cached) $ECHO_C" >&6
2866 + $as_echo_n "(cached) " >&6
2868 case $ac_pt_PKG_CONFIG in
2870 @@ -4164,7 +4272,7 @@
2871 for ac_exec_ext in '' $ac_executable_extensions; do
2872 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2873 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
2874 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2875 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
2879 @@ -4176,11 +4284,11 @@
2881 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
2882 if test -n "$ac_pt_PKG_CONFIG"; then
2883 - { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
2884 -echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
2885 + { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
2886 +$as_echo "$ac_pt_PKG_CONFIG" >&6; }
2888 - { echo "$as_me:$LINENO: result: no" >&5
2889 -echo "${ECHO_T}no" >&6; }
2890 + { $as_echo "$as_me:$LINENO: result: no" >&5
2891 +$as_echo "no" >&6; }
2894 if test "x$ac_pt_PKG_CONFIG" = x; then
2895 @@ -4188,12 +4296,8 @@
2897 case $cross_compiling:$ac_tool_warned in
2899 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
2900 -whose name does not start with the host triplet. If you think this
2901 -configuration is useful to you, please write to autoconf@gnu.org." >&5
2902 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
2903 -whose name does not start with the host triplet. If you think this
2904 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
2905 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
2906 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2907 ac_tool_warned=yes ;;
2909 PKG_CONFIG=$ac_pt_PKG_CONFIG
2910 @@ -4205,36 +4309,36 @@
2912 if test -n "$PKG_CONFIG"; then
2913 _pkg_min_version=0.9.0
2914 - { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
2915 -echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
2916 + { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
2917 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
2918 if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
2919 - { echo "$as_me:$LINENO: result: yes" >&5
2920 -echo "${ECHO_T}yes" >&6; }
2921 + { $as_echo "$as_me:$LINENO: result: yes" >&5
2922 +$as_echo "yes" >&6; }
2924 - { echo "$as_me:$LINENO: result: no" >&5
2925 -echo "${ECHO_T}no" >&6; }
2926 + { $as_echo "$as_me:$LINENO: result: no" >&5
2927 +$as_echo "no" >&6; }
2934 -{ echo "$as_me:$LINENO: checking for DBUS" >&5
2935 -echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }
2936 +{ $as_echo "$as_me:$LINENO: checking for DBUS" >&5
2937 +$as_echo_n "checking for DBUS... " >&6; }
2939 if test -n "$PKG_CONFIG"; then
2940 if test -n "$DBUS_CFLAGS"; then
2941 pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
2943 if test -n "$PKG_CONFIG" && \
2944 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
2945 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
2948 ($PKG_CONFIG --exists --print-errors "
2952 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2953 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2954 (exit $ac_status); }; then
2955 pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "
2957 @@ -4251,14 +4355,14 @@
2958 pkg_cv_DBUS_LIBS="$DBUS_LIBS"
2960 if test -n "$PKG_CONFIG" && \
2961 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
2962 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
2965 ($PKG_CONFIG --exists --print-errors "
2969 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
2970 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
2971 (exit $ac_status); }; then
2972 pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "
2974 @@ -4292,7 +4396,7 @@
2975 # Put the nasty error message in config.log where it belongs
2976 echo "$DBUS_PKG_ERRORS" >&5
2978 - { { echo "$as_me:$LINENO: error: Package requirements (
2979 + { { $as_echo "$as_me:$LINENO: error: Package requirements (
2983 @@ -4305,7 +4409,7 @@
2984 and DBUS_LIBS to avoid the need to call pkg-config.
2985 See the pkg-config man page for more details.
2987 -echo "$as_me: error: Package requirements (
2988 +$as_echo "$as_me: error: Package requirements (
2992 @@ -4320,7 +4424,9 @@
2994 { (exit 1); exit 1; }; }
2995 elif test $pkg_failed = untried; then
2996 - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
2997 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
2998 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
2999 +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
3000 is in your PATH or set the PKG_CONFIG environment variable to the full
3003 @@ -4330,7 +4436,7 @@
3005 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3006 See \`config.log' for more details." >&5
3007 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
3008 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
3009 is in your PATH or set the PKG_CONFIG environment variable to the full
3012 @@ -4340,12 +4446,12 @@
3014 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3015 See \`config.log' for more details." >&2;}
3016 - { (exit 1); exit 1; }; }
3017 + { (exit 1); exit 1; }; }; }
3019 DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
3020 DBUS_LIBS=$pkg_cv_DBUS_LIBS
3021 - { echo "$as_me:$LINENO: result: yes" >&5
3022 -echo "${ECHO_T}yes" >&6; }
3023 + { $as_echo "$as_me:$LINENO: result: yes" >&5
3024 +$as_echo "yes" >&6; }
3028 @@ -4358,8 +4464,8 @@
3029 enableval=$enable_hildon_booster; case "${enableval}" in
3030 (yes) hildon_booster=true ;;
3031 (no) hildon_booster=false ;;
3032 - (*) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-hildon-booster" >&5
3033 -echo "$as_me: error: bad value ${enableval} for --enable-hildon-booster" >&2;}
3034 + (*) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-hildon-booster" >&5
3035 +$as_echo "$as_me: error: bad value ${enableval} for --enable-hildon-booster" >&2;}
3036 { (exit 1); exit 1; }; } ;;
3039 @@ -4376,7 +4482,7 @@
3040 HILDON_DEPENDS="$GTK_DEPENDS
3041 gnome-vfs-2.0 >= 2.8.0
3048 @@ -4394,22 +4500,22 @@
3052 -{ echo "$as_me:$LINENO: checking for BOOSTER_GTK" >&5
3053 -echo $ECHO_N "checking for BOOSTER_GTK... $ECHO_C" >&6; }
3054 +{ $as_echo "$as_me:$LINENO: checking for BOOSTER_GTK" >&5
3055 +$as_echo_n "checking for BOOSTER_GTK... " >&6; }
3057 if test -n "$PKG_CONFIG"; then
3058 if test -n "$BOOSTER_GTK_CFLAGS"; then
3059 pkg_cv_BOOSTER_GTK_CFLAGS="$BOOSTER_GTK_CFLAGS"
3061 if test -n "$PKG_CONFIG" && \
3062 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
3063 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
3064 \$BOOSTER_GTK_DEPENDS
3066 ($PKG_CONFIG --exists --print-errors "
3067 $BOOSTER_GTK_DEPENDS
3070 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3071 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3072 (exit $ac_status); }; then
3073 pkg_cv_BOOSTER_GTK_CFLAGS=`$PKG_CONFIG --cflags "
3074 $BOOSTER_GTK_DEPENDS
3075 @@ -4426,14 +4532,14 @@
3076 pkg_cv_BOOSTER_GTK_LIBS="$BOOSTER_GTK_LIBS"
3078 if test -n "$PKG_CONFIG" && \
3079 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
3080 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
3081 \$BOOSTER_GTK_DEPENDS
3083 ($PKG_CONFIG --exists --print-errors "
3084 $BOOSTER_GTK_DEPENDS
3087 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3088 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3089 (exit $ac_status); }; then
3090 pkg_cv_BOOSTER_GTK_LIBS=`$PKG_CONFIG --libs "
3091 $BOOSTER_GTK_DEPENDS
3092 @@ -4467,7 +4573,7 @@
3093 # Put the nasty error message in config.log where it belongs
3094 echo "$BOOSTER_GTK_PKG_ERRORS" >&5
3096 - { { echo "$as_me:$LINENO: error: Package requirements (
3097 + { { $as_echo "$as_me:$LINENO: error: Package requirements (
3098 $BOOSTER_GTK_DEPENDS
3101 @@ -4480,7 +4586,7 @@
3102 and BOOSTER_GTK_LIBS to avoid the need to call pkg-config.
3103 See the pkg-config man page for more details.
3105 -echo "$as_me: error: Package requirements (
3106 +$as_echo "$as_me: error: Package requirements (
3107 $BOOSTER_GTK_DEPENDS
3110 @@ -4495,7 +4601,9 @@
3112 { (exit 1); exit 1; }; }
3113 elif test $pkg_failed = untried; then
3114 - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
3115 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3116 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3117 +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
3118 is in your PATH or set the PKG_CONFIG environment variable to the full
3121 @@ -4505,7 +4613,7 @@
3123 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3124 See \`config.log' for more details." >&5
3125 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
3126 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
3127 is in your PATH or set the PKG_CONFIG environment variable to the full
3130 @@ -4515,12 +4623,12 @@
3132 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3133 See \`config.log' for more details." >&2;}
3134 - { (exit 1); exit 1; }; }
3135 + { (exit 1); exit 1; }; }; }
3137 BOOSTER_GTK_CFLAGS=$pkg_cv_BOOSTER_GTK_CFLAGS
3138 BOOSTER_GTK_LIBS=$pkg_cv_BOOSTER_GTK_LIBS
3139 - { echo "$as_me:$LINENO: result: yes" >&5
3140 -echo "${ECHO_T}yes" >&6; }
3141 + { $as_echo "$as_me:$LINENO: result: yes" >&5
3142 +$as_echo "yes" >&6; }
3146 @@ -4536,8 +4644,8 @@
3147 enableval=$enable_pie; case "${enableval}" in
3150 - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-pie" >&5
3151 -echo "$as_me: error: bad value ${enableval} for --enable-pie" >&2;}
3152 + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-pie" >&5
3153 +$as_echo "$as_me: error: bad value ${enableval} for --enable-pie" >&2;}
3154 { (exit 1); exit 1; }; } ;;
3157 @@ -4558,8 +4666,8 @@
3158 enableval=$enable_client; case "${enableval}" in
3161 - *) { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-client" >&5
3162 -echo "$as_me: error: bad value ${enableval} for --enable-client" >&2;}
3163 + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-client" >&5
3164 +$as_echo "$as_me: error: bad value ${enableval} for --enable-client" >&2;}
3165 { (exit 1); exit 1; }; } ;;
3168 @@ -4580,15 +4688,15 @@
3172 -{ echo "$as_me:$LINENO: checking for CLIENT" >&5
3173 -echo $ECHO_N "checking for CLIENT... $ECHO_C" >&6; }
3174 +{ $as_echo "$as_me:$LINENO: checking for CLIENT" >&5
3175 +$as_echo_n "checking for CLIENT... " >&6; }
3177 if test -n "$PKG_CONFIG"; then
3178 if test -n "$CLIENT_CFLAGS"; then
3179 pkg_cv_CLIENT_CFLAGS="$CLIENT_CFLAGS"
3181 if test -n "$PKG_CONFIG" && \
3182 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
3183 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
3187 @@ -4597,7 +4705,7 @@
3191 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3192 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3193 (exit $ac_status); }; then
3194 pkg_cv_CLIENT_CFLAGS=`$PKG_CONFIG --cflags "
3196 @@ -4615,7 +4723,7 @@
3197 pkg_cv_CLIENT_LIBS="$CLIENT_LIBS"
3199 if test -n "$PKG_CONFIG" && \
3200 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
3201 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"
3205 @@ -4624,7 +4732,7 @@
3209 - echo "$as_me:$LINENO: \$? = $ac_status" >&5
3210 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
3211 (exit $ac_status); }; then
3212 pkg_cv_CLIENT_LIBS=`$PKG_CONFIG --libs "
3214 @@ -4661,7 +4769,7 @@
3215 # Put the nasty error message in config.log where it belongs
3216 echo "$CLIENT_PKG_ERRORS" >&5
3218 - { { echo "$as_me:$LINENO: error: Package requirements (
3219 + { { $as_echo "$as_me:$LINENO: error: Package requirements (
3223 @@ -4675,7 +4783,7 @@
3224 and CLIENT_LIBS to avoid the need to call pkg-config.
3225 See the pkg-config man page for more details.
3227 -echo "$as_me: error: Package requirements (
3228 +$as_echo "$as_me: error: Package requirements (
3232 @@ -4691,7 +4799,9 @@
3234 { (exit 1); exit 1; }; }
3235 elif test $pkg_failed = untried; then
3236 - { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
3237 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
3238 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
3239 +{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
3240 is in your PATH or set the PKG_CONFIG environment variable to the full
3243 @@ -4701,7 +4811,7 @@
3245 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3246 See \`config.log' for more details." >&5
3247 -echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
3248 +$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
3249 is in your PATH or set the PKG_CONFIG environment variable to the full
3252 @@ -4711,12 +4821,12 @@
3254 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3255 See \`config.log' for more details." >&2;}
3256 - { (exit 1); exit 1; }; }
3257 + { (exit 1); exit 1; }; }; }
3259 CLIENT_CFLAGS=$pkg_cv_CLIENT_CFLAGS
3260 CLIENT_LIBS=$pkg_cv_CLIENT_LIBS
3261 - { echo "$as_me:$LINENO: result: yes" >&5
3262 -echo "${ECHO_T}yes" >&6; }
3263 + { $as_echo "$as_me:$LINENO: result: yes" >&5
3264 +$as_echo "yes" >&6; }
3268 @@ -4751,11 +4861,12 @@
3272 - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
3273 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
3274 + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
3275 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
3278 _ | IFS | as_nl) ;; #(
3279 + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
3280 *) $as_unset $ac_var ;;
3283 @@ -4788,12 +4899,12 @@
3284 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
3285 if test -w "$cache_file"; then
3286 test "x$cache_file" != "x/dev/null" &&
3287 - { echo "$as_me:$LINENO: updating cache $cache_file" >&5
3288 -echo "$as_me: updating cache $cache_file" >&6;}
3289 + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
3290 +$as_echo "$as_me: updating cache $cache_file" >&6;}
3291 cat confcache >$cache_file
3293 - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
3294 -echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3295 + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
3296 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
3300 @@ -4809,7 +4920,7 @@
3301 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
3302 # 1. Remove the extension, and $U if already installed.
3303 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
3304 - ac_i=`echo "$ac_i" | sed "$ac_script"`
3305 + ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
3306 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
3307 # will be set to the directory where LIBOBJS objects are built.
3308 ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
3309 @@ -4821,47 +4932,48 @@
3312 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
3313 - { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
3314 + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
3315 Usually this means the macro was only invoked conditionally." >&5
3316 -echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
3317 +$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
3318 Usually this means the macro was only invoked conditionally." >&2;}
3319 { (exit 1); exit 1; }; }
3321 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
3322 - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
3323 + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
3324 Usually this means the macro was only invoked conditionally." >&5
3325 -echo "$as_me: error: conditional \"AMDEP\" was never defined.
3326 +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
3327 Usually this means the macro was only invoked conditionally." >&2;}
3328 { (exit 1); exit 1; }; }
3330 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
3331 - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
3332 + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
3333 Usually this means the macro was only invoked conditionally." >&5
3334 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
3335 +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
3336 Usually this means the macro was only invoked conditionally." >&2;}
3337 { (exit 1); exit 1; }; }
3339 if test -z "${USE_PIE_TRUE}" && test -z "${USE_PIE_FALSE}"; then
3340 - { { echo "$as_me:$LINENO: error: conditional \"USE_PIE\" was never defined.
3341 + { { $as_echo "$as_me:$LINENO: error: conditional \"USE_PIE\" was never defined.
3342 Usually this means the macro was only invoked conditionally." >&5
3343 -echo "$as_me: error: conditional \"USE_PIE\" was never defined.
3344 +$as_echo "$as_me: error: conditional \"USE_PIE\" was never defined.
3345 Usually this means the macro was only invoked conditionally." >&2;}
3346 { (exit 1); exit 1; }; }
3348 if test -z "${BUILD_CLIENT_TRUE}" && test -z "${BUILD_CLIENT_FALSE}"; then
3349 - { { echo "$as_me:$LINENO: error: conditional \"BUILD_CLIENT\" was never defined.
3350 + { { $as_echo "$as_me:$LINENO: error: conditional \"BUILD_CLIENT\" was never defined.
3351 Usually this means the macro was only invoked conditionally." >&5
3352 -echo "$as_me: error: conditional \"BUILD_CLIENT\" was never defined.
3353 +$as_echo "$as_me: error: conditional \"BUILD_CLIENT\" was never defined.
3354 Usually this means the macro was only invoked conditionally." >&2;}
3355 { (exit 1); exit 1; }; }
3358 : ${CONFIG_STATUS=./config.status}
3360 ac_clean_files_save=$ac_clean_files
3361 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
3362 -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
3363 -echo "$as_me: creating $CONFIG_STATUS" >&6;}
3364 -cat >$CONFIG_STATUS <<_ACEOF
3365 +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
3366 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
3367 +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3369 # Generated by $as_me.
3370 # Run this file to recreate the current configuration.
3371 @@ -4874,7 +4986,7 @@
3372 SHELL=\${CONFIG_SHELL-$SHELL}
3375 -cat >>$CONFIG_STATUS <<\_ACEOF
3376 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3377 ## --------------------- ##
3378 ## M4sh Initialization. ##
3379 ## --------------------- ##
3380 @@ -4884,7 +4996,7 @@
3381 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
3384 - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
3385 + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
3386 # is contrary to our usage. Disable this feature.
3387 alias -g '${1+"$@"}'='"$@"'
3388 setopt NO_GLOB_SUBST
3389 @@ -4906,17 +5018,45 @@
3390 as_cr_digits='0123456789'
3391 as_cr_alnum=$as_cr_Letters$as_cr_digits
3393 -# The user is always right.
3394 -if test "${PATH_SEPARATOR+set}" != set; then
3395 - echo "#! /bin/sh" >conf$$.sh
3396 - echo "exit 0" >>conf$$.sh
3397 - chmod +x conf$$.sh
3398 - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
3399 - PATH_SEPARATOR=';'
3403 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
3404 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
3405 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
3406 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
3407 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
3408 + as_echo='printf %s\n'
3409 + as_echo_n='printf %s'
3411 + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
3412 + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
3413 + as_echo_n='/usr/ucb/echo -n'
3416 + as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
3417 + as_echo_n_body='eval
3421 + expr "X$arg" : "X\\(.*\\)$as_nl";
3422 + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
3424 + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
3426 + export as_echo_n_body
3427 + as_echo_n='sh -c $as_echo_n_body as_echo'
3430 + export as_echo_body
3431 + as_echo='sh -c $as_echo_body as_echo'
3434 +# The user is always right.
3435 +if test "${PATH_SEPARATOR+set}" != set; then
3437 + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
3438 + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
3439 + PATH_SEPARATOR=';'
3443 # Support unset when possible.
3444 @@ -4932,8 +5072,6 @@
3445 # there to prevent editors from complaining about space-tab.
3446 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
3447 # splitting by setting IFS to empty value.)
3452 # Find who we are. Look in the path if we contain no directory separator.
3453 @@ -4956,7 +5094,7 @@
3456 if test ! -f "$as_myself"; then
3457 - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
3458 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
3459 { (exit 1); exit 1; }
3462 @@ -4969,17 +5107,10 @@
3467 - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
3468 - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
3469 - LC_TELEPHONE LC_TIME
3471 - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
3472 - eval $as_var=C; export $as_var
3474 - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
3482 # Required to use basename.
3483 if expr a : '\(a\)' >/dev/null 2>&1 &&
3484 @@ -5001,7 +5132,7 @@
3485 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
3486 X"$0" : 'X\(//\)$' \| \
3487 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
3490 sed '/^.*\/\([^/][^/]*\)\/*$/{
3493 @@ -5052,7 +5183,7 @@
3496 chmod +x "$as_me.lineno" ||
3497 - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3498 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
3499 { (exit 1); exit 1; }; }
3501 # Don't try to exec as it changes $[0], causing all sort of problems
3502 @@ -5080,7 +5211,6 @@
3507 if expr a : '\(a\)' >/dev/null 2>&1 &&
3508 test "X`expr 00001 : '.*\(...\)'`" = X001; then
3510 @@ -5093,19 +5223,22 @@
3511 rm -f conf$$.dir/conf$$.file
3515 + mkdir conf$$.dir 2>/dev/null
3518 -if ln -s conf$$.file conf$$ 2>/dev/null; then
3520 - # ... but there are two gotchas:
3521 - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3522 - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3523 - # In both cases, we have to default to `cp -p'.
3524 - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3525 +if (echo >conf$$.file) 2>/dev/null; then
3526 + if ln -s conf$$.file conf$$ 2>/dev/null; then
3528 + # ... but there are two gotchas:
3529 + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
3530 + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
3531 + # In both cases, we have to default to `cp -p'.
3532 + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
3534 + elif ln conf$$.file conf$$ 2>/dev/null; then
3538 -elif ln conf$$.file conf$$ 2>/dev/null; then
3544 @@ -5130,10 +5263,10 @@
3547 if test -d "$1"; then
3555 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
3556 ???[sx]*):;;*)false;;esac;fi
3557 @@ -5156,7 +5289,7 @@
3558 # values after options handling.
3560 This file was extended by maemo-launcher $as_me 0.31, which was
3561 -generated by GNU Autoconf 2.61. Invocation command line was
3562 +generated by GNU Autoconf 2.63. Invocation command line was
3564 CONFIG_FILES = $CONFIG_FILES
3565 CONFIG_HEADERS = $CONFIG_HEADERS
3566 @@ -5169,7 +5302,16 @@
3570 -cat >>$CONFIG_STATUS <<_ACEOF
3571 +case $ac_config_files in *"
3572 +"*) set x $ac_config_files; shift; ac_config_files=$*;;
3575 +case $ac_config_headers in *"
3576 +"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
3580 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3581 # Files that config.status was made for.
3582 config_files="$ac_config_files"
3583 config_headers="$ac_config_headers"
3584 @@ -5177,22 +5319,23 @@
3588 -cat >>$CONFIG_STATUS <<\_ACEOF
3589 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3591 \`$as_me' instantiates files from templates according to the
3592 current configuration.
3594 -Usage: $0 [OPTIONS] [FILE]...
3595 +Usage: $0 [OPTION]... [FILE]...
3597 -h, --help print this help, then exit
3598 -V, --version print version number and configuration settings, then exit
3599 - -q, --quiet do not print progress messages
3600 + -q, --quiet, --silent
3601 + do not print progress messages
3602 -d, --debug don't remove temporary files
3603 --recheck update $as_me by reconfiguring in the same conditions
3604 - --file=FILE[:TEMPLATE]
3605 - instantiate the configuration file FILE
3606 - --header=FILE[:TEMPLATE]
3607 - instantiate the configuration header FILE
3608 + --file=FILE[:TEMPLATE]
3609 + instantiate the configuration file FILE
3610 + --header=FILE[:TEMPLATE]
3611 + instantiate the configuration header FILE
3613 Configuration files:
3615 @@ -5206,13 +5349,13 @@
3616 Report bugs to <bug-autoconf@gnu.org>."
3619 -cat >>$CONFIG_STATUS <<_ACEOF
3620 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3622 maemo-launcher config.status 0.31
3623 -configured by $0, generated by GNU Autoconf 2.61,
3624 - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
3625 +configured by $0, generated by GNU Autoconf 2.63,
3626 + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
3628 -Copyright (C) 2006 Free Software Foundation, Inc.
3629 +Copyright (C) 2008 Free Software Foundation, Inc.
3630 This config.status script is free software; the Free Software Foundation
3631 gives unlimited permission to copy, distribute and modify it."
3633 @@ -5220,11 +5363,12 @@
3638 +test -n "\$AWK" || AWK=awk
3641 -cat >>$CONFIG_STATUS <<\_ACEOF
3642 -# If no file are specified by the user, then we need to provide default
3643 -# value. By we need to know if files were specified by the user.
3644 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3645 +# The default lists apply if the user does not specify any file.
3649 @@ -5246,30 +5390,36 @@
3650 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
3652 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
3653 - echo "$ac_cs_version"; exit ;;
3654 + $as_echo "$ac_cs_version"; exit ;;
3655 --debug | --debu | --deb | --de | --d | -d )
3657 --file | --fil | --fi | --f )
3659 - CONFIG_FILES="$CONFIG_FILES $ac_optarg"
3660 + case $ac_optarg in
3661 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
3663 + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
3664 ac_need_defaults=false;;
3665 --header | --heade | --head | --hea )
3667 - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
3668 + case $ac_optarg in
3669 + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
3671 + CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
3672 ac_need_defaults=false;;
3674 # Conflict between --help and --header
3675 - { echo "$as_me: error: ambiguous option: $1
3676 + { $as_echo "$as_me: error: ambiguous option: $1
3677 Try \`$0 --help' for more information." >&2
3678 { (exit 1); exit 1; }; };;
3679 --help | --hel | -h )
3680 - echo "$ac_cs_usage"; exit ;;
3681 + $as_echo "$ac_cs_usage"; exit ;;
3682 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
3683 | -silent | --silent | --silen | --sile | --sil | --si | --s)
3687 - -*) { echo "$as_me: error: unrecognized option: $1
3688 + -*) { $as_echo "$as_me: error: unrecognized option: $1
3689 Try \`$0 --help' for more information." >&2
3690 { (exit 1); exit 1; }; } ;;
3692 @@ -5288,27 +5438,29 @@
3696 -cat >>$CONFIG_STATUS <<_ACEOF
3697 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3698 if \$ac_cs_recheck; then
3699 - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
3700 - CONFIG_SHELL=$SHELL
3701 + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
3703 + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
3704 + CONFIG_SHELL='$SHELL'
3706 - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
3711 -cat >>$CONFIG_STATUS <<\_ACEOF
3712 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3716 sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
3717 ## Running $as_me. ##
3720 + $as_echo "$ac_log"
3724 -cat >>$CONFIG_STATUS <<_ACEOF
3725 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3729 @@ -5316,7 +5468,7 @@
3733 -cat >>$CONFIG_STATUS <<\_ACEOF
3734 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
3736 # Handling of arguments.
3737 for ac_config_target in $ac_config_targets
3738 @@ -5333,8 +5485,8 @@
3739 "launcher/maemo-launcher.1") CONFIG_FILES="$CONFIG_FILES launcher/maemo-launcher.1:launcher/launcher.1.in" ;;
3740 "client/Makefile") CONFIG_FILES="$CONFIG_FILES client/Makefile" ;;
3742 - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
3743 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
3744 + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
3745 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
3746 { (exit 1); exit 1; }; };;
3749 @@ -5375,159 +5527,144 @@
3750 (umask 077 && mkdir "$tmp")
3753 - echo "$me: cannot create a temporary directory in ." >&2
3754 + $as_echo "$as_me: cannot create a temporary directory in ." >&2
3755 { (exit 1); exit 1; }
3759 -# Set up the sed scripts for CONFIG_FILES section.
3762 -# No need to generate the scripts if there are no CONFIG_FILES.
3763 -# This happens for instance when ./config.status config.h
3764 +# Set up the scripts for CONFIG_FILES section.
3765 +# No need to generate them if there are no CONFIG_FILES.
3766 +# This happens for instance with `./config.status config.h'.
3767 if test -n "$CONFIG_FILES"; then
3772 +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
3773 +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
3774 + ac_cs_awk_cr='\\r'
3776 + ac_cs_awk_cr=$ac_cr
3779 +echo 'BEGIN {' >"$tmp/subs1.awk" &&
3784 + echo "cat >conf$$subs.awk <<_ACEOF" &&
3785 + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
3787 +} >conf$$subs.sh ||
3788 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3789 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3790 + { (exit 1); exit 1; }; }
3791 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
3793 for ac_last_try in false false false false false :; do
3794 - cat >conf$$subs.sed <<_ACEOF
3795 -SHELL!$SHELL$ac_delim
3796 -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
3797 -PACKAGE_NAME!$PACKAGE_NAME$ac_delim
3798 -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
3799 -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
3800 -PACKAGE_STRING!$PACKAGE_STRING$ac_delim
3801 -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
3802 -exec_prefix!$exec_prefix$ac_delim
3803 -prefix!$prefix$ac_delim
3804 -program_transform_name!$program_transform_name$ac_delim
3805 -bindir!$bindir$ac_delim
3806 -sbindir!$sbindir$ac_delim
3807 -libexecdir!$libexecdir$ac_delim
3808 -datarootdir!$datarootdir$ac_delim
3809 -datadir!$datadir$ac_delim
3810 -sysconfdir!$sysconfdir$ac_delim
3811 -sharedstatedir!$sharedstatedir$ac_delim
3812 -localstatedir!$localstatedir$ac_delim
3813 -includedir!$includedir$ac_delim
3814 -oldincludedir!$oldincludedir$ac_delim
3815 -docdir!$docdir$ac_delim
3816 -infodir!$infodir$ac_delim
3817 -htmldir!$htmldir$ac_delim
3818 -dvidir!$dvidir$ac_delim
3819 -pdfdir!$pdfdir$ac_delim
3820 -psdir!$psdir$ac_delim
3821 -libdir!$libdir$ac_delim
3822 -localedir!$localedir$ac_delim
3823 -mandir!$mandir$ac_delim
3824 -DEFS!$DEFS$ac_delim
3825 -ECHO_C!$ECHO_C$ac_delim
3826 -ECHO_N!$ECHO_N$ac_delim
3827 -ECHO_T!$ECHO_T$ac_delim
3828 -LIBS!$LIBS$ac_delim
3829 -build_alias!$build_alias$ac_delim
3830 -host_alias!$host_alias$ac_delim
3831 -target_alias!$target_alias$ac_delim
3832 -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
3833 -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
3834 -INSTALL_DATA!$INSTALL_DATA$ac_delim
3835 -am__isrc!$am__isrc$ac_delim
3836 -CYGPATH_W!$CYGPATH_W$ac_delim
3837 -PACKAGE!$PACKAGE$ac_delim
3838 -VERSION!$VERSION$ac_delim
3839 -ACLOCAL!$ACLOCAL$ac_delim
3840 -AUTOCONF!$AUTOCONF$ac_delim
3841 -AUTOMAKE!$AUTOMAKE$ac_delim
3842 -AUTOHEADER!$AUTOHEADER$ac_delim
3843 -MAKEINFO!$MAKEINFO$ac_delim
3844 -install_sh!$install_sh$ac_delim
3845 -STRIP!$STRIP$ac_delim
3846 -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
3847 -mkdir_p!$mkdir_p$ac_delim
3849 -SET_MAKE!$SET_MAKE$ac_delim
3850 -am__leading_dot!$am__leading_dot$ac_delim
3851 -AMTAR!$AMTAR$ac_delim
3852 -am__tar!$am__tar$ac_delim
3853 -am__untar!$am__untar$ac_delim
3854 -MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
3855 -MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
3856 -MAINT!$MAINT$ac_delim
3858 -CFLAGS!$CFLAGS$ac_delim
3859 -LDFLAGS!$LDFLAGS$ac_delim
3860 -CPPFLAGS!$CPPFLAGS$ac_delim
3861 -ac_ct_CC!$ac_ct_CC$ac_delim
3862 -EXEEXT!$EXEEXT$ac_delim
3863 -OBJEXT!$OBJEXT$ac_delim
3864 -DEPDIR!$DEPDIR$ac_delim
3865 -am__include!$am__include$ac_delim
3866 -am__quote!$am__quote$ac_delim
3867 -AMDEP_TRUE!$AMDEP_TRUE$ac_delim
3868 -AMDEP_FALSE!$AMDEP_FALSE$ac_delim
3869 -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
3870 -CCDEPMODE!$CCDEPMODE$ac_delim
3871 -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
3872 -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
3874 -LN_S!$LN_S$ac_delim
3875 -GREP!$GREP$ac_delim
3876 -EGREP!$EGREP$ac_delim
3877 -PKG_CONFIG!$PKG_CONFIG$ac_delim
3878 -DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
3879 -DBUS_LIBS!$DBUS_LIBS$ac_delim
3880 -BOOSTER_GTK_CFLAGS!$BOOSTER_GTK_CFLAGS$ac_delim
3881 -BOOSTER_GTK_LIBS!$BOOSTER_GTK_LIBS$ac_delim
3883 -USE_PIE_TRUE!$USE_PIE_TRUE$ac_delim
3884 -USE_PIE_FALSE!$USE_PIE_FALSE$ac_delim
3885 -BUILD_CLIENT_TRUE!$BUILD_CLIENT_TRUE$ac_delim
3886 -BUILD_CLIENT_FALSE!$BUILD_CLIENT_FALSE$ac_delim
3887 -CLIENT_CFLAGS!$CLIENT_CFLAGS$ac_delim
3888 -CLIENT_LIBS!$CLIENT_LIBS$ac_delim
3889 -LIBOBJS!$LIBOBJS$ac_delim
3890 -LTLIBOBJS!$LTLIBOBJS$ac_delim
3892 + . ./conf$$subs.sh ||
3893 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3894 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3895 + { (exit 1); exit 1; }; }
3897 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 96; then
3898 + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
3899 + if test $ac_delim_n = $ac_delim_num; then
3901 elif $ac_last_try; then
3902 - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3903 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3904 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
3905 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
3906 { (exit 1); exit 1; }; }
3908 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
3911 +rm -f conf$$subs.sh
3913 -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
3914 -if test -n "$ac_eof"; then
3915 - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
3916 - ac_eof=`expr $ac_eof + 1`
3918 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3919 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
3923 +s/^/S["/; s/!.*/"]=/
3933 +s/\(.\{148\}\).*/\1/
3935 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
3940 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
3947 +s/\(.\{148\}\).*/\1/
3949 +s/["\\]/\\&/g; s/^/"/; s/$/"/
3953 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/
3958 +' <conf$$subs.awk | sed '
3963 +' >>$CONFIG_STATUS || ac_write_fail=1
3964 +rm -f conf$$subs.awk
3965 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
3967 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
3968 + for (key in S) S_is_set[key] = 1
3971 -cat >>$CONFIG_STATUS <<_ACEOF
3972 -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
3973 -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
3977 + nfields = split(line, field, "@")
3979 + len = length(field[1])
3980 + for (i = 2; i < nfields; i++) {
3982 + keylen = length(key)
3983 + if (S_is_set[key]) {
3985 + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
3986 + len += length(value) + length(field[++i])
3998 -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
3999 -s/^/s,@/; s/!/@,|#_!!_#|/
4002 -s/'"$ac_delim"'$/,g/; t
4004 -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
4005 -' >>$CONFIG_STATUS <conf$$subs.sed
4006 -rm -f conf$$subs.sed
4007 -cat >>$CONFIG_STATUS <<_ACEOF
4009 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
4010 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
4011 + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
4014 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
4015 + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
4016 +$as_echo "$as_me: error: could not setup config files machinery" >&2;}
4017 + { (exit 1); exit 1; }; }
4021 # VPATH may cause trouble with some makes, so we remove $(srcdir),
4022 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
4023 # trailing colons and then remove the whole line if VPATH becomes empty
4024 @@ -5543,19 +5680,133 @@
4028 -cat >>$CONFIG_STATUS <<\_ACEOF
4029 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
4030 fi # test -n "$CONFIG_FILES"
4032 +# Set up the scripts for CONFIG_HEADERS section.
4033 +# No need to generate them if there are no CONFIG_HEADERS.
4034 +# This happens for instance with `./config.status Makefile'.
4035 +if test -n "$CONFIG_HEADERS"; then
4036 +cat >"$tmp/defines.awk" <<\_ACAWK ||
4040 +# Transform confdefs.h into an awk script `defines.awk', embedded as
4041 +# here-document in config.status, that substitutes the proper values into
4042 +# config.h.in to produce config.h.
4044 -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
4045 +# Create a delimiter string that does not exist in confdefs.h, to ease
4046 +# handling of long lines.
4048 +for ac_last_try in false false :; do
4049 + ac_t=`sed -n "/$ac_delim/p" confdefs.h`
4050 + if test -z "$ac_t"; then
4052 + elif $ac_last_try; then
4053 + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
4054 +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
4055 + { (exit 1); exit 1; }; }
4057 + ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
4061 +# For the awk script, D is an array of macro values keyed by name,
4062 +# likewise P contains macro parameters if any. Preserve backslash
4063 +# newline sequences.
4065 +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
4067 +s/.\{148\}/&'"$ac_delim"'/g
4070 +s/^[ ]*#[ ]*define[ ][ ]*/ /
4077 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
4079 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p
4083 +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\
4084 +D["\1"]=" \3\\\\\\n"\\/p
4086 +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
4091 +s/.\{148\}/&'"$ac_delim"'/g
4096 +s/["\\]/\\&/g; s/^/"/; s/$/"/p
4099 +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
4101 +' <confdefs.h | sed '
4102 +s/'"$ac_delim"'/"\\\
4103 +"/g' >>$CONFIG_STATUS || ac_write_fail=1
4105 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
4106 + for (key in D) D_is_set[key] = 1
4109 +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
4111 + split(line, arg, " ")
4112 + if (arg[1] == "#") {
4116 + defundef = substr(arg[1], 2)
4119 + split(mac1, mac2, "(") #)
4121 + prefix = substr(line, 1, index(line, defundef) - 1)
4122 + if (D_is_set[macro]) {
4123 + # Preserve the white space surrounding the "#".
4124 + print prefix "define", macro P[macro] D[macro]
4127 + # Replace #undef with comments. This is necessary, for example,
4128 + # in the case of _POSIX_SOURCE, which is predefined and required
4129 + # on some systems where configure will not decide to define it.
4130 + if (defundef == "undef") {
4131 + print "/*", prefix defundef, macro, "*/"
4139 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
4140 + { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
4141 +$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
4142 + { (exit 1); exit 1; }; }
4143 +fi # test -n "$CONFIG_HEADERS"
4146 +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
4151 :[FHLC]) ac_mode=$ac_tag; continue;;
4153 case $ac_mode$ac_tag in
4155 - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
4156 -echo "$as_me: error: Invalid tag $ac_tag." >&2;}
4157 + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
4158 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
4159 { (exit 1); exit 1; }; };;
4160 :[FH]-) ac_tag=-:-;;
4161 :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
4162 @@ -5584,26 +5835,38 @@
4164 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
4166 - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
4167 -echo "$as_me: error: cannot find input file: $ac_f" >&2;}
4168 + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
4169 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
4170 { (exit 1); exit 1; }; };;
4172 - ac_file_inputs="$ac_file_inputs $ac_f"
4173 + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
4174 + ac_file_inputs="$ac_file_inputs '$ac_f'"
4177 # Let's still pretend it is `configure' which instantiates (i.e., don't
4178 # use $as_me), people would be surprised to read:
4179 # /* config.h. Generated by config.status. */
4180 - configure_input="Generated from "`IFS=:
4181 - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
4182 + configure_input='Generated from '`
4183 + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
4185 if test x"$ac_file" != x-; then
4186 configure_input="$ac_file. $configure_input"
4187 - { echo "$as_me:$LINENO: creating $ac_file" >&5
4188 -echo "$as_me: creating $ac_file" >&6;}
4189 + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
4190 +$as_echo "$as_me: creating $ac_file" >&6;}
4192 + # Neutralize special characters interpreted by sed in replacement strings.
4193 + case $configure_input in #(
4194 + *\&* | *\|* | *\\* )
4195 + ac_sed_conf_input=`$as_echo "$configure_input" |
4196 + sed 's/[\\\\&|]/\\\\&/g'`;; #(
4197 + *) ac_sed_conf_input=$configure_input;;
4201 - *:-:* | *:-) cat >"$tmp/stdin";;
4202 + *:-:* | *:-) cat >"$tmp/stdin" \
4203 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
4204 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
4205 + { (exit 1); exit 1; }; } ;;
4209 @@ -5613,7 +5876,7 @@
4210 X"$ac_file" : 'X\(//\)[^/]' \| \
4211 X"$ac_file" : 'X\(//\)$' \| \
4212 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
4214 +$as_echo X"$ac_file" |
4215 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
4218 @@ -5639,7 +5902,7 @@
4222 - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
4223 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
4224 *) as_qdir=$as_dir;;
4226 as_dirs="'$as_qdir' $as_dirs"
4227 @@ -5648,7 +5911,7 @@
4228 X"$as_dir" : 'X\(//\)[^/]' \| \
4229 X"$as_dir" : 'X\(//\)$' \| \
4230 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
4232 +$as_echo X"$as_dir" |
4233 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
4236 @@ -5669,17 +5932,17 @@
4237 test -d "$as_dir" && break
4239 test -z "$as_dirs" || eval "mkdir $as_dirs"
4240 - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
4241 -echo "$as_me: error: cannot create directory $as_dir" >&2;}
4242 + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
4243 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
4244 { (exit 1); exit 1; }; }; }
4248 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
4250 - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
4251 + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
4252 # A ".." for each directory in $ac_dir_suffix.
4253 - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
4254 + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
4255 case $ac_top_builddir_sub in
4256 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
4257 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
4258 @@ -5724,12 +5987,13 @@
4262 -cat >>$CONFIG_STATUS <<\_ACEOF
4263 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
4264 # If the template does not know about datarootdir, expand it.
4265 # FIXME: This hack should be removed a few years after 2.60.
4266 ac_datarootdir_hack=; ac_datarootdir_seen=
4268 -case `sed -n '/datarootdir/ {
4274 @@ -5738,13 +6002,14 @@
4278 -' $ac_file_inputs` in
4280 +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
4281 *datarootdir*) ac_datarootdir_seen=yes;;
4282 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
4283 - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
4284 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
4285 + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
4286 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
4288 -cat >>$CONFIG_STATUS <<_ACEOF
4289 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
4290 ac_datarootdir_hack='
4291 s&@datadir@&$datadir&g
4292 s&@docdir@&$docdir&g
4293 @@ -5758,15 +6023,16 @@
4294 # Neutralize VPATH when `$srcdir' = `.'.
4295 # Shell code in configure.ac might set extrasub.
4296 # FIXME: do we really want to maintain this feature?
4297 -cat >>$CONFIG_STATUS <<_ACEOF
4299 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
4300 +ac_sed_extra="$ac_vpsub
4303 -cat >>$CONFIG_STATUS <<\_ACEOF
4304 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
4306 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
4307 -s&@configure_input@&$configure_input&;t t
4308 +s|@configure_input@|$ac_sed_conf_input|;t t
4309 s&@top_builddir@&$ac_top_builddir_sub&;t t
4310 +s&@top_build_prefix@&$ac_top_build_prefix&;t t
4311 s&@srcdir@&$ac_srcdir&;t t
4312 s&@abs_srcdir@&$ac_abs_srcdir&;t t
4313 s&@top_srcdir@&$ac_top_srcdir&;t t
4314 @@ -5777,121 +6043,60 @@
4315 s&@INSTALL@&$ac_INSTALL&;t t
4316 s&@MKDIR_P@&$ac_MKDIR_P&;t t
4317 $ac_datarootdir_hack
4318 -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed 's/|#_!!_#|//g' >$tmp/out
4320 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
4321 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
4322 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
4323 + { (exit 1); exit 1; }; }
4325 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
4326 { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
4327 { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
4328 - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
4329 + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
4330 which seems to be undefined. Please make sure it is defined." >&5
4331 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
4332 +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
4333 which seems to be undefined. Please make sure it is defined." >&2;}
4337 - -) cat "$tmp/out"; rm -f "$tmp/out";;
4338 - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
4340 + -) cat "$tmp/out" && rm -f "$tmp/out";;
4341 + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
4343 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
4344 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
4345 + { (exit 1); exit 1; }; }
4353 -# Transform confdefs.h into a sed script `conftest.defines', that
4354 -# substitutes the proper values into config.h.in to produce config.h.
4355 -rm -f conftest.defines conftest.tail
4356 -# First, append a space to every undef/define line, to ease matching.
4357 -echo 's/$/ /' >conftest.defines
4358 -# Then, protect against being on the right side of a sed subst, or in
4359 -# an unquoted here document, in config.status. If some macros were
4360 -# called several times there might be several #defines for the same
4361 -# symbol, which is useless. But do not sort them, since the last
4362 -# AC_DEFINE must be honored.
4363 -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
4364 -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
4365 -# NAME is the cpp macro being defined, VALUE is the value it is being given.
4366 -# PARAMS is the parameter list in the macro definition--in most cases, it's
4367 -# just an empty string.
4368 -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
4369 -ac_dB='\\)[ (].*,\\1define\\2'
4377 - s/^[ ]*#[ ]*define[ ][ ]*//
4382 - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
4383 - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
4384 - ' >>conftest.defines
4386 -# Remove the space that was appended to ease matching.
4387 -# Then replace #undef with comments. This is necessary, for
4388 -# example, in the case of _POSIX_SOURCE, which is predefined and required
4389 -# on some systems where configure will not decide to define it.
4390 -# (The regexp can be short, since the line contains either #define or #undef.)
4392 -s,^[ #]*u.*,/* & */,' >>conftest.defines
4394 -# Break up conftest.defines:
4395 -ac_max_sed_lines=50
4397 -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
4398 -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
4399 -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
4401 -ac_in='$ac_file_inputs'
4402 -ac_out='"$tmp/out1"'
4403 -ac_nxt='"$tmp/out2"'
4407 - # Write a here document:
4408 - cat >>$CONFIG_STATUS <<_ACEOF
4409 - # First, check the format of the line:
4410 - cat >"\$tmp/defines.sed" <<\\CEOF
4411 -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
4412 -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
4416 - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
4418 - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
4419 - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
4420 - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
4421 - grep . conftest.tail >/dev/null || break
4422 - rm -f conftest.defines
4423 - mv conftest.tail conftest.defines
4425 -rm -f conftest.defines conftest.tail
4427 -echo "ac_result=$ac_in" >>$CONFIG_STATUS
4428 -cat >>$CONFIG_STATUS <<\_ACEOF
4429 if test x"$ac_file" != x-; then
4430 - echo "/* $configure_input */" >"$tmp/config.h"
4431 - cat "$ac_result" >>"$tmp/config.h"
4432 - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
4433 - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
4434 -echo "$as_me: $ac_file is unchanged" >&6;}
4436 + $as_echo "/* $configure_input */" \
4437 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
4438 + } >"$tmp/config.h" \
4439 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
4440 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
4441 + { (exit 1); exit 1; }; }
4442 + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
4443 + { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
4444 +$as_echo "$as_me: $ac_file is unchanged" >&6;}
4447 - mv "$tmp/config.h" $ac_file
4449 + mv "$tmp/config.h" "$ac_file" \
4450 + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
4451 +$as_echo "$as_me: error: could not create $ac_file" >&2;}
4452 + { (exit 1); exit 1; }; }
4455 - echo "/* $configure_input */"
4457 + $as_echo "/* $configure_input */" \
4458 + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
4459 + || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
4460 +$as_echo "$as_me: error: could not create -" >&2;}
4461 + { (exit 1); exit 1; }; }
4463 - rm -f "$tmp/out12"
4464 -# Compute $ac_file's index in $config_headers.
4466 +# Compute "$ac_file"'s index in $config_headers.
4469 for _am_header in $config_headers :; do
4471 @@ -5906,7 +6111,7 @@
4472 X"$_am_arg" : 'X\(//\)[^/]' \| \
4473 X"$_am_arg" : 'X\(//\)$' \| \
4474 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
4476 +$as_echo X"$_am_arg" |
4477 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
4480 @@ -5926,14 +6131,23 @@
4481 s/.*/./; q'`/stamp-h$_am_stamp_count
4484 - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
4485 -echo "$as_me: executing $ac_file commands" >&6;}
4486 + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
4487 +$as_echo "$as_me: executing $ac_file commands" >&6;}
4492 case $ac_file$ac_mode in
4493 - "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
4494 + "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
4495 +# are listed without --file. Let's play safe and only enable the eval
4496 +# if we detect the quoting.
4497 +case $CONFIG_FILES in
4498 +*\'*) eval set x "$CONFIG_FILES" ;;
4499 +*) set x $CONFIG_FILES ;;
4504 # Strip MF so we end up with the name of the file.
4505 mf=`echo "$mf" | sed -e 's/:.*$//'`
4506 # Check whether this is an Automake generated Makefile or not.
4507 @@ -5949,7 +6163,7 @@
4508 X"$mf" : 'X\(//\)[^/]' \| \
4509 X"$mf" : 'X\(//\)$' \| \
4510 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
4513 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
4516 @@ -5993,7 +6207,7 @@
4517 X"$file" : 'X\(//\)[^/]' \| \
4518 X"$file" : 'X\(//\)$' \| \
4519 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
4521 +$as_echo X"$file" |
4522 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
4525 @@ -6019,7 +6233,7 @@
4529 - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
4530 + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
4531 *) as_qdir=$as_dir;;
4533 as_dirs="'$as_qdir' $as_dirs"
4534 @@ -6028,7 +6242,7 @@
4535 X"$as_dir" : 'X\(//\)[^/]' \| \
4536 X"$as_dir" : 'X\(//\)$' \| \
4537 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
4539 +$as_echo X"$as_dir" |
4540 sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
4543 @@ -6049,8 +6263,8 @@
4544 test -d "$as_dir" && break
4546 test -z "$as_dirs" || eval "mkdir $as_dirs"
4547 - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
4548 -echo "$as_me: error: cannot create directory $as_dir" >&2;}
4549 + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
4550 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
4551 { (exit 1); exit 1; }; }; }
4552 # echo "creating $dirpart/$file"
4553 echo '# dummy' > "$dirpart/$file"
4554 @@ -6067,6 +6281,11 @@
4555 chmod +x $CONFIG_STATUS
4556 ac_clean_files=$ac_clean_files_save
4558 +test $ac_write_fail = 0 ||
4559 + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
4560 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
4561 + { (exit 1); exit 1; }; }
4564 # configure is writing to config.log, and then calls config.status.
4565 # config.status does its own redirection, appending to config.log.
4566 @@ -6088,4 +6307,8 @@
4567 # would make configure fail if this is the last instruction.
4568 $ac_cs_success || { (exit 1); exit 1; }
4570 +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
4571 + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
4572 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
4575 --- maemo-launcher-0.31/aclocal.m4
4576 +++ maemo-launcher-0.31/aclocal.m4
4578 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
4579 +# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
4581 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4582 # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4585 m4_ifndef([AC_AUTOCONF_VERSION],
4586 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
4587 -m4_if(AC_AUTOCONF_VERSION, [2.61],,
4588 -[m4_warning([this file was generated for autoconf 2.61.
4589 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
4590 +[m4_warning([this file was generated for autoconf 2.63.
4591 You have another version of autoconf. It may work, but is not guaranteed to.
4592 If you have problems, you may need to regenerate the build system entirely.
4593 To do so, use the procedure documented by the package, typically `autoreconf'.])])
4596 ])# PKG_CHECK_MODULES
4598 -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
4599 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4601 # This file is free software; the Free Software Foundation
4602 # gives unlimited permission to copy and/or distribute it,
4604 [am__api_version='1.10'
4605 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
4606 dnl require some minimum version. Point them to the right macro.
4607 -m4_if([$1], [1.10.1], [],
4608 +m4_if([$1], [1.10.2], [],
4609 [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
4612 @@ -206,12 +206,12 @@
4613 # AM_SET_CURRENT_AUTOMAKE_VERSION
4614 # -------------------------------
4615 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
4616 -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
4617 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
4618 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
4619 -[AM_AUTOMAKE_VERSION([1.10.1])dnl
4620 +[AM_AUTOMAKE_VERSION([1.10.2])dnl
4621 m4_ifndef([AC_AUTOCONF_VERSION],
4622 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
4623 -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
4624 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
4626 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
4628 @@ -461,19 +461,28 @@
4630 # Generate code to set up dependency tracking. -*- Autoconf -*-
4632 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
4633 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
4634 # Free Software Foundation, Inc.
4636 # This file is free software; the Free Software Foundation
4637 # gives unlimited permission to copy and/or distribute it,
4638 # with or without modifications, as long as this notice is preserved.
4643 # _AM_OUTPUT_DEPENDENCY_COMMANDS
4644 # ------------------------------
4645 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
4646 -[for mf in $CONFIG_FILES; do
4647 +[# Autoconf 2.62 quotes --file arguments for eval, but not when files
4648 +# are listed without --file. Let's play safe and only enable the eval
4649 +# if we detect the quoting.
4650 +case $CONFIG_FILES in
4651 +*\'*) eval set x "$CONFIG_FILES" ;;
4652 +*) set x $CONFIG_FILES ;;
4657 # Strip MF so we end up with the name of the file.
4658 mf=`echo "$mf" | sed -e 's/:.*$//'`
4659 # Check whether this is an Automake generated Makefile or not.
4660 @@ -834,13 +843,13 @@
4662 # Helper functions for option handling. -*- Autoconf -*-
4664 -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
4665 +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
4667 # This file is free software; the Free Software Foundation
4668 # gives unlimited permission to copy and/or distribute it,
4669 # with or without modifications, as long as this notice is preserved.
4674 # _AM_MANGLE_OPTION(NAME)
4675 # -----------------------
4677 # ----------------------------------
4678 # OPTIONS is a space-separated list of Automake options.
4679 AC_DEFUN([_AM_SET_OPTIONS],
4680 -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
4681 +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
4683 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
4684 # -------------------------------------------
4685 --- maemo-launcher-0.31/configure.ac
4686 +++ maemo-launcher-0.31/configure.ac
4688 HILDON_DEPENDS="$GTK_DEPENDS
4689 gnome-vfs-2.0 >= 2.8.0
4696 --- maemo-launcher-0.31/client/Makefile.in
4697 +++ maemo-launcher-0.31/client/Makefile.in
4699 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
4700 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
4703 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4706 sysconfdir = @sysconfdir@
4707 target_alias = @target_alias@
4708 +top_build_prefix = @top_build_prefix@
4709 top_builddir = @top_builddir@
4710 top_srcdir = @top_srcdir@
4713 @for dep in $?; do \
4714 case '$(am__configure_deps)' in \
4716 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
4718 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
4719 + && { if test -f $@; then exit 0; else break; fi; }; \
4724 unique=`for i in $$list; do \
4725 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
4727 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
4728 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
4729 END { if (nonempty) { for (i in files) print i; }; }'`; \
4732 --- maemo-launcher-0.31/debian/rules
4733 +++ maemo-launcher-0.31/debian/rules
4740 +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
4741 +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
4743 +POD2MAN := pod2man -c maemo-launcher
4747 +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
4753 +ifneq (,$(findstring nohildon,$(DEB_BUILD_OPTIONS)))
4756 + opt_hildon := --enable-hildon-booster
4759 +# Nasty thing due to having the upstream and debian stuff merged.
4760 +configure: configure.ac
4761 + autoreconf -f -i -Wall
4762 + rm -rf autom4te.cache
4764 +config.status: configure
4767 + CFLAGS="$(CFLAGS)" ./configure \
4768 + --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
4770 + --mandir=\$${prefix}/share/man \
4773 +build: config.status
4778 + $(POD2MAN) $(CURDIR)/debian/dh_maemolauncher > \
4779 + $(CURDIR)/debian/dh_maemolauncher.1
4786 + [ ! -f Makefile ] || $(MAKE) distclean
4796 + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
4798 + cp $(CURDIR)/debian/dh_maemolauncher \
4799 + $(CURDIR)/debian/tmp/usr/bin
4800 + chmod 755 $(CURDIR)/debian/tmp/usr/bin/dh_maemolauncher
4801 + cp $(CURDIR)/debian/dh_maemolauncher.1 \
4802 + $(CURDIR)/debian/tmp/usr/share/man/man1/
4804 +binary-indep: build install
4807 + dh_installchangelogs -i ChangeLog
4809 + dh_install -i --sourcedir=$(CURDIR)/debian/tmp
4818 +binary-arch: build install
4821 + dh_installchangelogs -a ChangeLog
4823 + dh_installexamples -a
4824 + dh_install -a --sourcedir=$(CURDIR)/debian/tmp
4825 +# dh_installlogrotate
4826 +# dh_installinit -a --no-start -- start 45 2 3 4 . stop 45 0 1 5 6 .
4829 + dh_strip --dbg-package=maemo-launcher
4832 + chmod u+s $(CURDIR)/debian/maemo-launcher/usr/lib/maemo-launcher/defender
4840 +binary: binary-indep binary-arch
4842 +.PHONY: build clean binary-indep binary-arch binary install
4844 --- maemo-launcher-0.31/debian/compat
4845 +++ maemo-launcher-0.31/debian/compat
4848 --- maemo-launcher-0.31/debian/control
4849 +++ maemo-launcher-0.31/debian/control
4851 +Source: maemo-launcher
4854 +Maintainer: Guillem Jover <guillem.jover@nokia.com>
4855 +Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev (>= 2.6.4-1),
4856 + libfontconfig1-dev, libpango1.0-dev, libdbus-1-dev (>= 0.60-1),
4857 + gtkhtml3.14-dev, clinkc-dev, libosso-dev, libosso-gnomevfs2-dev (>= 2.8.0-1),
4858 + libhildonmime-dev, libhildonhelp-dev, libhildonfm2-dev, libhildondesktop-dev,
4859 + libhildon1-dev, autoconf
4860 +Standards-Version: 3.7.2
4862 +Package: maemo-launcher
4864 +Depends: ${shlibs:Depends}, hildon-initscripts
4865 +Description: Maemo Launcher for GTK applications
4866 + Maemo Launcher for any gtk+ application. Tries to reduce startup time by
4867 + pre-initializing the state of some libraries and then dynamically loading
4870 +Package: maemo-launcher-dbg
4873 +Depends: maemo-launcher (= ${Source-Version})
4874 +Description: Maemo Launcher for GTK applications - debugging symbols
4875 + Maemo Launcher for any gtk+ application. Tries to reduce startup time by
4876 + pre-initializing the state of some libraries and then dynamically loading
4879 + This package provides the debugging symbols for maemo-launcher.
4881 --- maemo-launcher-0.31/debian/maemo-launcher.postinst
4882 +++ maemo-launcher-0.31/debian/maemo-launcher.postinst
4888 +# Reload the launcher binary from disk while preserving the current state
4889 +# on upgrade (except when installing or upgrading from an old version).
4890 +if [ "$1" = configure ] && [ -x "/etc/init.d/maemo-launcher" ]; then
4891 + if dpkg --compare-versions "$2" lt-nl 0.27-1; then
4897 + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
4898 + invoke-rc.d maemo-launcher $action || exit $?
4900 + /etc/init.d/maemo-launcher $action || exit $?
4908 --- maemo-launcher-0.31/debian/copyright
4909 +++ maemo-launcher-0.31/debian/copyright
4911 +This package was debianized by Guillem Jover <guillem.jover@nokia.com>
4912 +Fri, 13 May 2005 15:37:00 +0300.
4914 +It was downloaded from <http://www.maemo.org/>.
4918 + Copyright © 2005, 2006, 2007, 2008 Nokia Corporation
4922 + Michael Natterer <mitch@imendio.com>
4923 + Guillem Jover <guillem.jover@nokia.com>
4927 + This package is free software; you can redistribute it and/or modify
4928 + it under the terms of the GNU General Public License as published by
4929 + the Free Software Foundation; version 2 of the License.
4931 + This package is distributed in the hope that it will be useful,
4932 + but WITHOUT ANY WARRANTY; without even the implied warranty of
4933 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4934 + GNU General Public License for more details.
4936 + You should have received a copy of the GNU General Public License
4937 + along with this package; if not, write to the Free Software
4938 + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
4940 +On Debian systems, the complete text of the GNU General
4941 +Public License can be found in `/usr/share/common-licenses/GPL'.
4943 --- maemo-launcher-0.31/debian/maemo-launcher.install
4944 +++ maemo-launcher-0.31/debian/maemo-launcher.install
4947 +usr/lib/maemo-launcher
4948 +usr/share/man/man1/maemo-*
4949 --- maemo-launcher-0.31/debian/changelog
4950 +++ maemo-launcher-0.31/debian/changelog
4952 +maemo-launcher (0.31-2mer6) jaunty; urgency=low
4954 + * Depend on gtkhtml3.14-dev instead
4956 + -- Carsten V. Munk <cvm@cs.au.dk> Sun, 24 May 2009 10:33:06 +0000
4958 +maemo-launcher (0.31-2mer5) jaunty; urgency=low
4960 + * Seperate out maemo-launcher-dev.
4962 + -- Carsten V. Munk <cvm@cs.au.dk> Sat, 09 May 2009 15:40:43 +0000
4964 +maemo-launcher (0.31-2mer4) jaunty; urgency=low
4966 + * Do not install a init.d script.
4968 + -- Carsten V. Munk <cvm@cs.au.dk> Fri, 03 Apr 2009 20:52:18 +0000
4970 +maemo-launcher (0.31-2mer2) jaunty; urgency=low
4972 + * Changed pcflags for maemo-launcher so we don't have to do -pie all the time.
4974 + -- Carsten V. Munk <cvm@cs.au.dk> Sat, 06 Dec 2008 20:42:45 +0000
4976 +maemo-launcher (0.31-2mer1) jaunty; urgency=low
4978 + * Add autoconf build-dep, correct gtkhtml reference
4980 + -- Carsten V. Munk <cvm@cs.au.dk> Sun, 30 Nov 2008 10:01:45 +0000
4982 +maemo-launcher (0.31-2) unstable; urgency=low
4984 + * Sources af-defines.sh at the beginning to avoid it unconditionally
4985 + overriding the USER variable (among others). (Fixes: NB#86855)
4987 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 10 Jul 2008 19:29:18 +0300
4989 +maemo-launcher (0.31-1) unstable; urgency=low
4991 + * Export USER, LOGNAME, SHELL and HOME to maemo-launcher. (Fixes: MM#1131)
4992 + * Add comment in the init.d script about the wrongess of the current
4994 + * Let's take quality seriously by disabling the application crash
4995 + notifications. (Fixes: NB#86711)
4996 + * Disable self core dumping on maemo-invoker just before enabling signal
4997 + forwarding. (Fixes: NB#86713)
4999 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 03 Jul 2008 18:00:08 +0300
5001 +maemo-launcher (0.30-1) unstable; urgency=low
5003 + * New Upstream Release.
5004 + - README: Typo fix and additional information for symbol versioning.
5005 + Thanks to Eero Tamminen <eero.tamminen@nokia.com>.
5006 + * Replace libosso-help-dev with libhildonhelp-dev in Build-Depends.
5009 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 29 May 2008 18:33:55 +0300
5011 +maemo-launcher (0.29-1) unstable; urgency=low
5013 + * New Upstream Release.
5014 + - Destroy and store state only for valid childs. (Fixes: NB#85166)
5016 + -- Guillem Jover <guillem.jover@nokia.com> Mon, 05 May 2008 16:56:36 +0300
5018 +maemo-launcher (0.28-1) unstable; urgency=low
5020 + * New Upstream Release.
5021 + - Fix memory leaks for comm_msg from the upgrade in-place support.
5024 + -- Guillem Jover <guillem.jover@nokia.com> Sun, 27 Apr 2008 23:04:41 +0300
5026 +maemo-launcher (0.27-1) unstable; urgency=low
5028 + * New Upstream Release.
5029 + - Port client to Hildon 1.x.
5030 + - Use compile options determined from configure to build the client.
5031 + - Use exit(3) instead of _exit(2) so that things like atexit(3) work.
5033 + - Support upgrading the launcher via in-memory hot-swap while preserving
5034 + the state. (Fixes: NB#82624)
5035 + - Document changes needed for make based build systems and mention the
5036 + possible usage of version scripts. (Fixes: NB#72805)
5037 + * Update copyright year in debian/copyright.
5039 + -- Guillem Jover <guillem.jover@nokia.com> Wed, 16 Apr 2008 00:52:25 +0300
5041 +maemo-launcher (0.26-1) unstable; urgency=low
5043 + * New Upstream Release.
5044 + - Fix memory leak when failing to allocate the childs structure.
5046 + -- Guillem Jover <guillem.jover@nokia.com> Wed, 03 Oct 2007 22:12:20 +0300
5048 +maemo-launcher (0.25-1) unstable; urgency=low
5050 + * New Upstream Release.
5051 + - Do not link against libstdc++ anymore. (Fixes: NB#69684)
5053 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 25 Sep 2007 20:04:09 +0300
5055 +maemo-launcher (0.24-1) unstable; urgency=low
5057 + * New Upstream Release.
5058 + - Do not call dbus_shutdown as libdbus is too eager to abort.
5060 + * Place maemo-launcher-dev on the libdevel Section.
5062 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 30 Aug 2007 21:20:12 +0300
5064 +maemo-launcher (0.23-1) unstable; urgency=low
5066 + * New Upstream Release.
5067 + - Do not close D-Bus shared connections on the child sending the
5068 + ApplicationDied signal. (Fixes: NB#65588)
5069 + - Update documentation on how to integrate the launcher support into
5071 + - Add support for nolauncher on DEB_BUILD_OPTIONS to dh_maemolauncher.
5073 + -- Guillem Jover <guillem.jover@nokia.com> Wed, 15 Aug 2007 20:36:19 +0300
5075 +maemo-launcher (0.22-1) unstable; urgency=low
5077 + * New Upstream Release.
5078 + - Update gtk booster module to support gtk+ 2.10. (Fixes: NM#952)
5079 + Thanks to Johannes Schmid <johannes.schmid@openismus.com> for the
5081 + - Use memmove over overlapping memory in maemo-summoner. (Fixes: NB#49872)
5082 + - Support path resolution from maemo-summoner and maemo-invoker.
5083 + (Fixes: NM#1741, NB#55873)
5084 + - Strip '.launch' from invoked or summoned programs. (Fixes: NB#52432)
5085 + - Correctly set argv contents for summoned programs.
5086 + (Fixes: NB#52434, NB#52435)
5087 + - Add an pkgconfig file for launcherized applications. (Fixes: NB#52992)
5088 + - Load the program binary after having adjusted the process priority and
5089 + oom_adj value. (Fixes: NB#59173)
5090 + * Remove Build-Depends on libxft-dev.
5091 + * Add new package maemo-launcher-dev and include the header file
5092 + for the boosters and the pkgconfig file. (Fixes: NM#1027)
5093 + * Remove clinkc-av-dev, hildon-base-lib-dev and hildon-status-bar-lib-dev
5095 + * Update Build-Depends to the new counterparts:
5096 + - Replace hildon-libs-dev with libhildon1-dev.
5097 + - Replace hildon-fm-dev with libhildonfm2-dev.
5098 + - Replace libossomime-dev with libhildonmime-dev.
5099 + - Replace libhildonmenu-dev with libhildondesktop-dev.
5100 + * Add a dh_maemolauncher to automate launcherizing packages.
5101 + - Add a Build-Depends on debhelper to maemo-launcher-dev.
5102 + - Generate and install the manpage from the perl script.
5103 + * Do not ignore errors from "make distclean".
5105 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 02 Aug 2007 01:47:36 +0300
5107 +maemo-launcher (0.21-1) unstable; urgency=low
5109 + * New Upstream Release.
5110 + - Link against libstdc++, clinkc and clinkcav (add build dependencies
5111 + on clinkc-dev and clinkc-av-dev). (Fixes: NB#47726)
5112 + - Initialize Xft by calling its constructors (add a build dependency
5113 + on libxft-dev). (Fixes: NB#17937)
5114 + - Check for asprintf errors. (Fixes: NB#45396)
5115 + * Fix chmod instance following upstream maemo-defender to defender rename.
5117 + -- Guillem Jover <guillem.jover@nokia.com> Wed, 29 Nov 2006 00:00:32 +0200
5119 +maemo-launcher (0.20-1) unstable; urgency=low
5121 + * New Upstream Release.
5122 + - Unprotect non-essential user processes from the OOM killer.
5124 + * Make the hildon enabled booster link against even more libraries, so
5125 + that we can "preload" and share them across the childs. Added to
5126 + Build-Depends gtkhtml-dev, libosso-dev, libossomime-dev, libosso-help-dev,
5127 + hildon-fm-dev, libhildonmenu-dev hildon-status-bar-lib-dev and
5128 + hildon-base-lib-dev. (Fixes: NB#17937)
5130 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 14 Nov 2006 15:50:46 +0200
5132 +maemo-launcher (0.19-1) unstable; urgency=low
5134 + * New Upstream Release.
5135 + * Add a maemo-launcher-dbg package. (Closes: #41746@Nokia)
5137 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 10 Oct 2006 16:52:43 +0300
5139 +maemo-launcher (0.18-1) unstable; urgency=low
5141 + * New Upstream Release.
5142 + - Create a new session id for the childs. (Closes: #28627@Nokia)
5143 + - Use new --booster option and select the gtk module.
5144 + - Use the renamed --enable-hildon-booster instead of --extra-libs in
5146 + - Remove the now not required LD_BIND_NOW environment variable from
5147 + the init script (as it's implemented using the boosters).
5148 + (Closes: #28055@Nokia)
5149 + - Add new maemo-summoner, to load directly .launch applications.
5150 + (Closes: #38580@Nokia)
5151 + * Add support in DEB_BUILD_OPTIONS with nohildong to not enable the
5152 + hildon enhancment to the gtk booster
5153 + * Enable again sending the application died signal.
5155 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 28 Sep 2006 03:39:07 +0300
5157 +maemo-launcher (0.17-1) unstable; urgency=low
5159 + * New Upstream Release.
5160 + - Do not send the application died signal by default, because some
5161 + people believe that by not showing applications crashing, that
5162 + will fix their bugs... (Closes: #32915@Nokia)
5164 + -- Guillem Jover <guillem.jover@nokia.com> Mon, 19 Jun 2006 12:29:20 +0300
5166 +maemo-launcher (0.16-1) unstable; urgency=low
5168 + * New Upstream Release.
5169 + - Ignore SIGPIPE in the launcher, so that it does not die miserably.
5170 + (Closes: #32718@Nokia)
5172 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 15 Jun 2006 17:18:42 +0300
5174 +maemo-launcher (0.15-1) unstable; urgency=low
5176 + * New Upstream Release.
5177 + - Relicense to GPL version 2 only.
5178 + - Change copyright holder to "Nokia Corporation".
5179 + * Enable yet again LD_BIND_NOW=1 on startup. (Closes: #28055@Nokia)
5181 + -- Guillem Jover <guillem.jover@nokia.com> Fri, 9 Jun 2006 15:24:06 +0300
5183 +maemo-launcher (0.14-2) unstable; urgency=low
5185 + * Disable for now LD_BIND_NOW=1 in the init script due to it "breaking"
5186 + the browser plugins...
5188 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 23 May 2006 17:26:44 +0300
5190 +maemo-launcher (0.14-1) unstable; urgency=low
5192 + * New Upstream Release.
5193 + - Force all relocations to be resolved at startup time, but not for the
5194 + childs. (Closes: #28055@Nokia)
5195 + - Protect the childs that have negative priority from the OOM killer by
5196 + setting the adjust value to -17. (Closes: #29529@Nokia)
5197 + * Bump Standards-Version to 3.7.2 (no changes needed).
5199 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 18 May 2006 21:13:52 +0300
5201 +maemo-launcher (0.13-1) unstable; urgency=low
5203 + * New Upstream Release.
5204 + - Fork when sending the dbus signal, due to libdbus being unable to
5205 + cleanup and reopen connections. Which fixes:
5206 + - Applications not running on first boot. (Closes: #26599@Nokia)
5207 + - DBus autoactivation after crashed application. (Closes: #27158@Nokia)
5209 + -- Guillem Jover <guillem.jover@nokia.com> Fri, 21 Apr 2006 22:57:42 +0300
5211 +maemo-launcher (0.12-1) unstable; urgency=low
5213 + * New Upstream Release.
5214 + * Do not source the .defs files anymore from the init script.
5215 + * Only set PATH when not in Scratchbox in the init script.
5216 + (Closes: #25123@Nokia)
5218 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 11 Apr 2006 00:09:27 +0300
5220 +maemo-launcher (0.11-1) unstable; urgency=low
5222 + * New Upstream Release.
5223 + * Do not use ndm, yet.
5224 + * Remove Build-Dependency on deprecated hildon-lgpl-dev.
5225 + * Add Build-Dependency on libdbus-1-dev (>= 0.60-1).
5226 + * Check for DAEMON instead of LAUNCHER in init.d.
5228 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 4 Apr 2006 22:38:50 +0300
5230 +maemo-launcher (0.10.1-1) unstable; urgency=low
5232 + * New Upstream Release.
5233 + * Link init scripts into /etc/ndm/session.d, not with update-rc.d.
5234 + Thanks to Daniel Stone <daniel.stone@nokia.com>.
5237 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 14 Mar 2006 15:49:04 +0200
5239 +maemo-launcher (0.10-1) unstable; urgency=low
5241 + * New Upstream Release.
5242 + * Autoconfiscate if needed or if outdated.
5243 + * Update upstream copyright years.
5244 + * Add libfontconfig1-dev and libpango1.0-dev to Build-Depends.
5245 + * Load the applications using RTLD_GLOBAL. (Closes: #22725@Nokia)
5247 + -- Guillem Jover <guillem.jover@nokia.com> Mon, 13 Feb 2006 13:53:08 +0200
5249 +maemo-launcher (0.9-1) unstable; urgency=low
5251 + * New Upstream Release.
5252 + - Restore the process priority to 0 for the launched processes.
5253 + (Closes: #21337@Nokia)
5254 + - Fix possible heap overflow by untrusted invoker programs.
5256 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 17 Nov 2005 22:38:02 +0200
5258 +maemo-launcher (0.8-1) unstable; urgency=low
5260 + * New Upstream Release.
5261 + * Do not update config.*, assume upstream has the latest ones.
5263 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 25 Oct 2005 14:36:15 +0300
5265 +maemo-launcher (0.7-1) unstable; urgency=low
5267 + * New Upstream Release.
5268 + - Do not leave ghost processes after launching applications.
5269 + (Closes: #20215@Nokia)
5271 + -- Guillem Jover <guillem.jover@nokia.com> Fri, 7 Oct 2005 18:05:49 +0300
5273 +maemo-launcher (0.6-1) unstable; urgency=low
5275 + * New Upstream Release.
5277 + -- Guillem Jover <guillem.jover@nokia.com> Wed, 28 Sep 2005 21:44:18 +0300
5279 +maemo-launcher (0.5-1) unstable; urgency=low
5281 + * New Upstream Release.
5282 + - With hildon-control-panel-personalisation 0.1.15-2.1 honours theme
5283 + changes on newly launched applications. (Closes: #16356@Nokia)
5284 + Thanks to Tommi Komulainen <tommi.komulainen@nokia.com>.
5285 + - Restore signal handlers just before launching the child. Thus fixing
5286 + osso-chess not being able to restart/continue. (Closes: #18716@Nokia)
5287 + - Log child exit status. (Closes: #17530@Nokia)
5288 + - Increase the invoker timeout to 6, otherwise osso-chess fails to start
5289 + on the first run. (Closes: #16026@Nokia, #18104@Nokia, #18634@Nokia)
5290 + - Thus fixing the chess related bugs. (Closes: #18849@Nokia)
5291 + * Do not start in the acting dead runlevel. (Closes: #18010@Nokia)
5292 + * Handle gracefully starting running in scratchbox and don't try to run
5294 + Thanks to Tommi Komulainen <tommi.komulainen@nokia.com>.
5295 + * Make sure the launcher is not an OOM candidate by increasing the process
5296 + priority. (Closes: #19073@Nokia)
5297 + * Do not be quiet inside scratchbox. (Closes: #19147@Nokia)
5298 + * Remove autotools-dev from Build-Depends, as upstream sources have more up
5299 + to date vesion of config.* files.
5300 + * Update FSF's address.
5302 + -- Guillem Jover <guillem.jover@nokia.com> Wed, 14 Sep 2005 13:13:32 +0300
5304 +maemo-launcher (0.4-1) unstable; urgency=low
5306 + * New Upstream Release.
5307 + * Minor cosmetic fixes.
5309 + -- Guillem Jover <guillem.jover@nokia.com> Mon, 25 Jul 2005 23:24:38 +0300
5311 +maemo-launcher (0.3-2) unstable; urgency=low
5313 + * Do not start the daemon using run-standalone.sh, source the needed
5314 + files ourselves, so now start-stop-daemon can find if it is running
5316 + * Add autotools-dev to Build-Depends to get config.guess and config.sub.
5318 + -- Guillem Jover <guillem.jover@nokia.com> Fri, 22 Jul 2005 21:55:55 +0300
5320 +maemo-launcher (0.3-1) unstable; urgency=low
5322 + * New Upstream Release.
5323 + * Only change uid to 'user' when needed. (Closes: #15503@Nokia)
5325 + -- Guillem Jover <guillem.jover@nokia.com> Mon, 11 Jul 2005 21:32:44 +0300
5327 +maemo-launcher (0.2-1) unstable; urgency=low
5329 + * New Upstream Release.
5331 + -- Guillem Jover <guillem.jover@nokia.com> Wed, 6 Jul 2005 23:49:22 +0300
5333 +maemo-launcher (0.1.0-2) unstable; urgency=low
5335 + * Change section from gnome to embedded.
5336 + * Bump Standards-Version to 3.6.2 (no changes needed).
5337 + * Workaround the fact that HOME is not defined anymore.
5339 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 21 Jun 2005 21:40:05 +0300
5341 +maemo-launcher (0.1.0-1) unstable; urgency=low
5343 + * New Upstream Release.
5344 + - License under the GPL.
5345 + * Update copyright file accordingly.
5346 + * Remove unused variable dependency misc:Depends.
5347 + * Enable dh_installman (at least for the check phase).
5348 + * Correct mandir location.
5350 + -- Guillem Jover <guillem.jover@nokia.com> Fri, 17 Jun 2005 16:21:49 +0300
5352 +maemo-launcher (0.0.10-1) unstable; urgency=low
5354 + * New Upstream Release.
5355 + * Rename package to maemo-launcher.
5356 + * Match program names with new upstream changes.
5358 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 16 Jun 2005 23:05:57 +0300
5360 +gtk-launcher (0.0.9-3) unstable; urgency=low
5362 + * Depend on hildon-initscripts.
5363 + * Do not fail if config.* are not present.
5365 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 14 Jun 2005 22:00:05 +0300
5367 +gtk-launcher (0.0.9-2) unstable; urgency=low
5369 + * Install the init script with sequence code 45.
5371 + -- Guillem Jover <guillem.jover@nokia.com> Thu, 9 Jun 2005 15:18:12 +0300
5373 +gtk-launcher (0.0.9-1) unstable; urgency=low
5375 + * New Upstream Release.
5377 + -- Guillem Jover <guillem.jover@noia.com> Wed, 8 Jun 2005 17:43:25 +0300
5379 +gtk-launcher (0.0.8-2) unstable; urgency=low
5381 + * Specify the real binary when stoppig so start-stop-daemon can find it.
5383 + -- Guillem Jover <guillem.jover@nokia.com> Tue, 17 May 2005 18:03:17 +0300
5385 +gtk-launcher (0.0.8-1) unstable; urgency=low
5387 + * Initial Release.
5389 + -- Guillem Jover <guillem.jover@nokia.com> Fri, 13 May 2005 15:36:26 +0300
5391 --- maemo-launcher-0.31/debian/init.d
5392 +++ maemo-launcher-0.31/debian/init.d
5401 +NAME=maemo-launcher
5402 +DESC="Maemo Launcher"
5403 +DAEMON=/usr/bin/$NAME
5404 +# XXX: Because we take quality seriously let's disable the application crash
5405 +# notification (you might want to add '--send-app-died' back...)
5406 +DAEMON_BASE_OPTS="--daemon --booster gtk"
5407 +PIDFILE=/tmp/$NAME.pid
5409 +test -x $DAEMON || exit 0
5411 +# Those files set needed environment variables for the Maemo applications
5412 +# FIXME: but this should not be needed either, and should be inherited from
5413 +# the session instead.
5415 +# OSSO AF Init definitions
5416 +DEFSDIR=/etc/osso-af-init/
5418 +if [ -e $DEFSDIR/af-defines.sh ]
5420 + . $DEFSDIR/af-defines.sh
5422 + echo "$DEFSDIR/af-defines.sh not found!"
5426 +# When inside scratchbox we are not really root nor do we have 'user' user
5427 +if [ -f /targets/links/scratchbox.config ]; then
5428 + DAEMON_OPTS="$DAEMON_BASE_OPTS"
5430 + # FIXME: this is wrong wrong wrong, and should not be hardcoded, this script
5431 + # belongs in the session level instead.
5432 + PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
5434 + export LOGNAME=$USER
5435 + PWENTRY=`getent passwd $USER`
5436 + export HOME=`echo $PWENTRY | cut -d: -f6`
5437 + export SHELL=`echo $PWENTRY | cut -d: -f7`
5438 + if [ `id -u` = 0 ]; then
5439 + CHUID="--chuid $USER"
5440 + # Make sure the launcher is not an OOM candidate
5441 + NICE="--nicelevel -1"
5443 + DAEMON_OPTS="$DAEMON_BASE_OPTS --quiet"
5448 + echo -n "Starting $DESC: $NAME"
5449 + start-stop-daemon --start --quiet --pidfile $PIDFILE $CHUID $NICE \
5450 + --exec $DAEMON -- $DAEMON_OPTS || echo -n " start failed"
5454 + echo -n "Stopping $DESC: $NAME"
5455 + start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON \
5456 + || echo -n " not running"
5464 + reload|force-reload)
5465 + echo -n "Reloading $DESC: $NAME"
5466 + start-stop-daemon --stop --signal USR1 --quiet --pidfile $PIDFILE \
5467 + --exec $DAEMON || echo -n " not running"
5471 + N=/etc/init.d/$NAME
5472 + echo "Usage: $N {start|stop|restart|force-reload}" >&2
5481 --- maemo-launcher-0.31/debian/maemo-launcher.prerm
5482 +++ maemo-launcher-0.31/debian/maemo-launcher.prerm
5488 +if [ -x "/etc/init.d/maemo-launcher" ] && [ "$1" = remove ]; then
5489 + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
5490 + invoke-rc.d maemo-launcher stop || exit $?
5492 + /etc/init.d/maemo-launcher stop || exit $?
5500 --- maemo-launcher-0.31/debian/dh_maemolauncher.1
5501 +++ maemo-launcher-0.31/debian/dh_maemolauncher.1
5503 +.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
5505 +.\" Standard preamble:
5506 +.\" ========================================================================
5507 +.de Sp \" Vertical space (when we can't use .PP)
5511 +.de Vb \" Begin verbatim text
5516 +.de Ve \" End verbatim text
5520 +.\" Set up some character translations and predefined strings. \*(-- will
5521 +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
5522 +.\" double quote, and \*(R" will give a right double quote. \*(C+ will
5523 +.\" give a nicer C++. Capital omega is used to do unbreakable dashes and
5524 +.\" therefore won't be available. \*(C` and \*(C' expand to `' in nroff,
5525 +.\" nothing in troff, for use with C<>.
5527 +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
5531 +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
5532 +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch
5545 +.\" Escape single quotes in literal strings from groff's Unicode transform.
5546 +.ie \n(.g .ds Aq \(aq
5549 +.\" If the F register is turned on, we'll generate index entries on stderr for
5550 +.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
5551 +.\" entries marked with X<> in POD. Of course, you'll have to process the
5552 +.\" output yourself in some meaningful fashion.
5555 +. tm Index:\\$1\t\\n%\t"\\$2"
5565 +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
5566 +.\" Fear. Run. Save yourself. No user-serviceable parts.
5567 +. \" fudge factors for nroff and troff
5576 +. ds #H ((1u-(\\\\n(.fu%2u))*.13m)
5582 +. \" simple accents for nroff and troff
5592 +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
5593 +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
5594 +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
5595 +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
5596 +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
5597 +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
5599 +. \" troff and (daisy-wheel) nroff accents
5600 +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
5601 +.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
5602 +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
5603 +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
5604 +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
5605 +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
5606 +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
5607 +.ds ae a\h'-(\w'a'u*4/10)'e
5608 +.ds Ae A\h'-(\w'A'u*4/10)'E
5609 +. \" corrections for vroff
5610 +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
5611 +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
5612 +. \" for low resolution devices (crt and lpr)
5613 +.if \n(.H>23 .if \n(.V>19 \
5618 +. ds d- d\h'-1'\(ga
5619 +. ds D- D\h'-1'\(hy
5625 +.rm #[ #] #H #V #F C
5626 +.\" ========================================================================
5628 +.IX Title "DH_MAEMOLAUNCHER 1"
5629 +.TH DH_MAEMOLAUNCHER 1 "2009-04-03" "perl v5.10.0" "maemo-launcher"
5630 +.\" For nroff, turn off justification. Always turn off hyphenation; it makes
5631 +.\" way too many mistakes in technical documents.
5635 +dh_maemolauncher \- prepare a package to use maemo\-launcher
5637 +.IX Header "SYNOPSIS"
5638 +\&\fBdh_maemolauncher\fR [\fIdebhelper\ options\fR] [\fIshared\ object\ ...\fR]
5640 +.IX Header "DESCRIPTION"
5641 +dh_maemolauncher is a debhelper program that is responsible for adding
5642 +the ${launcher:Depends} into the substvars file and creating the proper
5643 +symlinks for launcherizable programs.
5645 +Any shared object specified as parameteres will be prepared to be used
5646 +by maemo-launcher into the first package dh_maemolauncher is told to act
5647 +on. By default, this is the first binary package in debian/control, but
5648 +if you use \-p, \-i or \-a flags, it will be the first package specified by
5651 +Files named debian/package.launcher (or debian/launcher source packages
5652 +produging a single binary) can list other shared objects to be prepared.
5654 +.IX Header "OPTIONS"
5655 +.IP "\fIshared object ...\fR" 4
5656 +.IX Item "shared object ..."
5657 +Prepare these shared objects to be used by the launcher. Namely, renaming
5658 +them to use the proper extension, and symlink the original name to
5662 +If the \s-1DEB_BUILD_OPTIONS\s0 environment variable contains \*(L"nolauncher\*(R", no
5663 +binary will be prepared to support maemo-launcher.
5665 +.IX Header "EXAMPLES"
5667 +\& dh_maemolauncher usr/bin/foo
5670 +.IX Header "SEE ALSO"
5671 +\&\fIdebhelper\fR\|(7)
5673 +This program is a part of maemo-launcher but is made to work with debhelper.
5675 +.IX Header "AUTHOR"
5676 +Guillem Jover <guillem.jover@nokia.com>
5677 --- maemo-launcher-0.31/debian/dh_maemolauncher
5678 +++ maemo-launcher-0.31/debian/dh_maemolauncher
5684 +dh_maemolauncher - prepare a package to use maemo-launcher
5690 +use Debian::Debhelper::Dh_Lib;
5694 +B<dh_maemolauncher> [S<I<debhelper options>>] [S<I<shared object ...>>]
5698 +dh_maemolauncher is a debhelper program that is responsible for adding
5699 +the ${launcher:Depends} into the substvars file and creating the proper
5700 +symlinks for launcherizable programs.
5702 +Any shared object specified as parameteres will be prepared to be used
5703 +by maemo-launcher into the first package dh_maemolauncher is told to act
5704 +on. By default, this is the first binary package in debian/control, but
5705 +if you use -p, -i or -a flags, it will be the first package specified by
5708 +Files named debian/package.launcher (or debian/launcher source packages
5709 +produging a single binary) can list other shared objects to be prepared.
5715 +=item I<shared object ...>
5717 +Prepare these shared objects to be used by the launcher. Namely, renaming
5718 +them to use the proper extension, and symlink the original name to
5725 +If the DEB_BUILD_OPTIONS environment variable contains "nolauncher", no
5726 +binary will be prepared to support maemo-launcher.
5730 + dh_maemolauncher usr/bin/foo
5736 +if (defined $ENV{DEB_BUILD_OPTIONS} &&
5737 + $ENV{DEB_BUILD_OPTIONS} =~ /nolauncher/) {
5741 +foreach my $package (@{$dh{DOPACKAGES}}) {
5742 + my $tmp = tmpdir($package);
5743 + my $launcher_file = pkgfile($package, "launcher");
5746 + addsubstvar($package, "launcher:Depends", "maemo-launcher");
5748 + if ($launcher_file) {
5749 + @binaries = filearray($launcher_file, ".");
5752 + if (($package eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
5753 + push @binaries, @ARGV;
5756 + foreach my $so (@binaries) {
5757 + doit("mv", "-f", "$tmp/$so", "$tmp/$so.launch");
5758 + doit("ln", "-s", "/usr/bin/maemo-invoker", "$tmp/$so");
5766 +This program is a part of maemo-launcher but is made to work with debhelper.
5770 +Guillem Jover <guillem.jover@nokia.com>
5773 --- maemo-launcher-0.31/debian/maemo-launcher-dev.install
5774 +++ maemo-launcher-0.31/debian/maemo-launcher-dev.install
5779 +usr/share/man/man1/dh_*
5780 --- maemo-launcher-0.31/launcher/Makefile.in
5781 +++ maemo-launcher-0.31/launcher/Makefile.in
5783 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
5784 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
5787 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5790 sysconfdir = @sysconfdir@
5791 target_alias = @target_alias@
5792 +top_build_prefix = @top_build_prefix@
5793 top_builddir = @top_builddir@
5794 top_srcdir = @top_srcdir@
5795 helperdir = $(libdir)/maemo-launcher
5797 @for dep in $?; do \
5798 case '$(am__configure_deps)' in \
5800 - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
5802 + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
5803 + && { if test -f $@; then exit 0; else break; fi; }; \
5810 for i in $$list; do \
5811 - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
5812 - else file=$$i; fi; \
5813 + if test -f $$i; then file=$$i; \
5814 + else file=$(srcdir)/$$i; fi; \
5815 ext=`echo $$i | sed -e 's/^.*\\.//'`; \
5819 unique=`for i in $$list; do \
5820 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
5822 - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
5823 + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
5824 END { if (nonempty) { for (i in files) print i; }; }'`; \
5828 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
5830 check-TESTS: $(TESTS)
5831 - @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
5832 + @failed=0; all=0; xfail=0; xpass=0; skip=0; \
5833 srcdir=$(srcdir); export srcdir; \
5834 list=' $(TESTS) '; \
5835 if test -n "$$list"; then \
5837 if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
5838 all=`expr $$all + 1`; \
5839 case " $(XFAIL_TESTS) " in \
5840 - *$$ws$$tst$$ws*) \
5841 + *[\ \ ]$$tst[\ \ ]*) \
5842 xpass=`expr $$xpass + 1`; \
5843 failed=`expr $$failed + 1`; \
5844 echo "XPASS: $$tst"; \
5845 @@ -1004,7 +1005,7 @@
5846 elif test $$? -ne 77; then \
5847 all=`expr $$all + 1`; \
5848 case " $(XFAIL_TESTS) " in \
5849 - *$$ws$$tst$$ws*) \
5850 + *[\ \ ]$$tst[\ \ ]*) \
5851 xfail=`expr $$xfail + 1`; \
5852 echo "XFAIL: $$tst"; \
5854 @@ -1018,23 +1019,36 @@
5855 echo "SKIP: $$tst"; \
5858 + if test "$$all" -eq 1; then \
5865 if test "$$failed" -eq 0; then \
5866 if test "$$xfail" -eq 0; then \
5867 - banner="All $$all tests passed"; \
5868 + banner="$$All$$all $$tests passed"; \
5870 - banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
5871 + if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
5872 + banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
5875 if test "$$xpass" -eq 0; then \
5876 - banner="$$failed of $$all tests failed"; \
5877 + banner="$$failed of $$all $$tests failed"; \
5879 - banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
5880 + if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
5881 + banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
5884 dashes="$$banner"; \
5886 if test "$$skip" -ne 0; then \
5887 - skipped="($$skip tests were not run)"; \
5888 + if test "$$skip" -eq 1; then \
5889 + skipped="($$skip test was not run)"; \
5891 + skipped="($$skip tests were not run)"; \
5893 test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
5894 dashes="$$skipped"; \
5896 --- maemo-launcher-0.31/launcher/launcher.pc.in
5897 +++ maemo-launcher-0.31/launcher/launcher.pc.in
5899 Name: maemo-launcher-app
5900 Description: maemo-launcher application startup accelerator
5902 -Libs: -shared @PIC@ -export-dynamic
5903 -Cflags: -shared @PIC@
5904 +Libs: -pie @PIC@ -export-dynamic