diff --git a/INSTALL b/INSTALL
index 23e5f25d0e5f85798dcfb368ecb2f04f59777f61..d3c5b40a94091285c27361905f591af64c1f7b21 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@ debugging `configure').
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,6 +67,9 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
@@ -78,7 +81,7 @@ details on some of the pertinent environment variables.
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +90,15 @@ Compiling For Multiple Architectures
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
@@ -190,12 +191,12 @@ them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
diff --git a/libs/dbus-c++/autom4te.cache/output.1 b/libs/dbus-c++/autom4te.cache/output.1
index 1b760b8ee5840002f1f9c9b359d59afa1d8caf46..99ee5f8afa68b6d7afc9a2f9e9d6a60934443936 100644
--- a/libs/dbus-c++/autom4te.cache/output.1
+++ b/libs/dbus-c++/autom4te.cache/output.1
@@ -808,6 +808,7 @@ target_alias
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
+am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -1972,7 +1973,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version="1.9"
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2155,38 +2157,53 @@ else
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
else
- mkdir_p='$(install_sh) -d'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
fi
fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
for ac_prog in gawk mawk nawk awk
do
@@ -2269,12 +2286,16 @@ else
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2317,7 +2338,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2421,7 +2442,7 @@ else
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -3534,9 +3555,7 @@ if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -3546,7 +3565,6 @@ fi
-
depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3614,6 +3632,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3643,9 +3662,7 @@ fi
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -4087,6 +4104,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4116,9 +4134,7 @@ fi
echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
@@ -20216,9 +20232,7 @@ echo "${ECHO_T}yes" >&6; }
fi
-
-
-if test 1 = 1; then
+ if test 1 = 1; then
ENABLE_GLIB_TRUE=
ENABLE_GLIB_FALSE='#'
else
@@ -20287,9 +20301,7 @@ fi
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -20299,9 +20311,7 @@ fi
elif test $pkg_failed = untried; then
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -20315,9 +20325,7 @@ else
gtkmm_LIBS=$pkg_cv_gtkmm_LIBS
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-
-
-if test 1 = 1; then
+ if test 1 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -20329,9 +20337,7 @@ fi
else
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
ENABLE_GLIB_TRUE=
ENABLE_GLIB_FALSE='#'
else
@@ -20339,9 +20345,7 @@ else
ENABLE_GLIB_FALSE=
fi
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -20878,9 +20882,7 @@ echo "$as_me: error: Building Doxygen docs explicitly required, but Doxygen not
echo "${ECHO_T}yes" >&6; }
fi
-
-
-if test "$enable_doxygen_docs" = "yes"; then
+ if test "$enable_doxygen_docs" = "yes"; then
DBUS_DOXYGEN_DOCS_ENABLED_TRUE=
DBUS_DOXYGEN_DOCS_ENABLED_FALSE='#'
else
@@ -20891,9 +20893,7 @@ fi
# For the tools/, we need libdbus-c++ for the "build" architecture as well
-
-
-if test "$cross_compiling" = "yes"; then
+ if test "$cross_compiling" = "yes"; then
CROSS_COMPILING_TRUE=
CROSS_COMPILING_FALSE='#'
else
@@ -21448,6 +21448,7 @@ gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -21668,6 +21669,7 @@ target_alias!$target_alias$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -21724,7 +21726,6 @@ LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -21766,6 +21767,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+DSYMUTIL!$DSYMUTIL$ac_delim
NMEDIT!$NMEDIT$ac_delim
CPP!$CPP$ac_delim
CXXCPP!$CXXCPP$ac_delim
@@ -21796,7 +21798,7 @@ LIB@&t@OBJS!$LIB@&t@OBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -22023,6 +22025,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -22076,6 +22083,7 @@ s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
@@ -22191,21 +22199,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -22240,8 +22249,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff --git a/libs/dbus-c++/autom4te.cache/requests b/libs/dbus-c++/autom4te.cache/requests
index cd5607edcc6b6ab192eb31a7c179e3cd2fb423b1..71373a82f6513e609d6b78564710929280100b78 100644
--- a/libs/dbus-c++/autom4te.cache/requests
+++ b/libs/dbus-c++/autom4te.cache/requests
@@ -210,6 +210,160 @@
'm4_include' => 1,
'AC_SUBST_TRACE' => 1
}
+ ], 'Autom4te::Request' ),
+ bless( [
+ '2',
+ 1,
+ [
+ '/usr/share/autoconf'
+ ],
+ [
+ '/usr/share/autoconf/autoconf/autoconf.m4f',
+ '/usr/share/aclocal/libtool.m4',
+ '/usr/share/aclocal/pkg.m4',
+ '/usr/share/aclocal-1.10/amversion.m4',
+ '/usr/share/aclocal-1.10/auxdir.m4',
+ '/usr/share/aclocal-1.10/cond.m4',
+ '/usr/share/aclocal-1.10/depend.m4',
+ '/usr/share/aclocal-1.10/depout.m4',
+ '/usr/share/aclocal-1.10/header.m4',
+ '/usr/share/aclocal-1.10/init.m4',
+ '/usr/share/aclocal-1.10/install-sh.m4',
+ '/usr/share/aclocal-1.10/lead-dot.m4',
+ '/usr/share/aclocal-1.10/make.m4',
+ '/usr/share/aclocal-1.10/missing.m4',
+ '/usr/share/aclocal-1.10/mkdirp.m4',
+ '/usr/share/aclocal-1.10/options.m4',
+ '/usr/share/aclocal-1.10/runlog.m4',
+ '/usr/share/aclocal-1.10/sanity.m4',
+ '/usr/share/aclocal-1.10/strip.m4',
+ '/usr/share/aclocal-1.10/substnot.m4',
+ '/usr/share/aclocal-1.10/tar.m4',
+ 'configure.ac'
+ ],
+ {
+ '_LT_AC_TAGCONFIG' => 1,
+ 'AM_ENABLE_STATIC' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_LIBTOOL_COMPILER_OPTION' => 1,
+ 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+ '_LT_AC_SHELL_INIT' => 1,
+ 'AC_DISABLE_SHARED' => 1,
+ 'AC_DEFUN' => 1,
+ '_LT_COMPILER_BOILERPLATE' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
+ 'AC_LIBTOOL_WIN32_DLL' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
+ 'AM_PROG_MKDIR_P' => 1,
+ 'AC_PROG_LD_RELOAD_FLAG' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AM_MISSING_HAS_RUN' => 1,
+ 'AM_MISSING_PROG' => 1,
+ 'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+ '_LT_AC_LANG_C_CONFIG' => 1,
+ 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+ 'AM_PROG_INSTALL_STRIP' => 1,
+ '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+ '_m4_warn' => 1,
+ 'AC_LIBTOOL_OBJDIR' => 1,
+ 'AM_SANITY_CHECK' => 1,
+ 'AC_LIBTOOL_LINKER_OPTION' => 1,
+ 'PKG_CHECK_EXISTS' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+ 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+ 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
+ 'LT_AC_PROG_RC' => 1,
+ 'AC_LIBTOOL_CXX' => 1,
+ '_AM_PROG_TAR' => 1,
+ 'AC_LIBTOOL_GCJ' => 1,
+ 'LT_AC_PROG_GCJ' => 1,
+ 'AM_DEP_TRACK' => 1,
+ '_LT_AC_PROG_CXXCPP' => 1,
+ 'AM_DISABLE_STATIC' => 1,
+ '_AC_PROG_LIBTOOL' => 1,
+ 'AM_CONFIG_HEADER' => 1,
+ '_LT_AC_LANG_F77' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
+ '_AM_IF_OPTION' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
+ 'AC_PATH_TOOL_PREFIX' => 1,
+ 'AC_LIBTOOL_F77' => 1,
+ '_AM_AUTOCONF_VERSION' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AM_DISABLE_SHARED' => 1,
+ 'AM_SET_LEADING_DOT' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
+ '_LT_AC_LANG_CXX' => 1,
+ '_AM_DEPENDENCIES' => 1,
+ '_LT_AC_FILE_LTDLL_C' => 1,
+ 'AM_PROG_LD' => 1,
+ 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+ '_LT_AC_SYS_COMPILER' => 1,
+ 'AM_PROG_NM' => 1,
+ 'PKG_CHECK_MODULES' => 1,
+ 'AU_DEFUN' => 1,
+ 'AC_PROG_NM' => 1,
+ 'AC_LIBTOOL_DLOPEN' => 1,
+ 'AC_LIBLTDL_CONVENIENCE' => 1,
+ 'AC_PROG_LD' => 1,
+ 'AC_ENABLE_FAST_INSTALL' => 1,
+ 'AC_PROG_LD_GNU' => 1,
+ 'AC_DEPLIBS_CHECK_METHOD' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+ '_AM_SET_OPTION' => 1,
+ '_LT_LINKER_BOILERPLATE' => 1,
+ 'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_DISABLE_STATIC' => 1,
+ 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AC_DEFUN_ONCE' => 1,
+ '_LT_AC_LOCK' => 1,
+ '_LT_AC_LANG_RC_CONFIG' => 1,
+ '_LT_AC_LANG_GCJ' => 1,
+ 'AC_LIBTOOL_RC' => 1,
+ '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
+ 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ '_LT_AC_SYS_LIBPATH_AIX' => 1,
+ 'include' => 1,
+ 'LT_AC_PROG_SED' => 1,
+ 'AM_ENABLE_SHARED' => 1,
+ 'AM_AUX_DIR_EXPAND' => 1,
+ '_LT_AC_LANG_GCJ_CONFIG' => 1,
+ 'AC_ENABLE_SHARED' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ '_LT_AC_LANG_F77_CONFIG' => 1,
+ '_AM_SET_OPTIONS' => 1,
+ 'AM_RUN_LOG' => 1,
+ '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AC_LIBTOOL_PICMODE' => 1,
+ '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+ 'AC_ENABLE_STATIC' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ 'AC_CHECK_LIBM' => 1,
+ '_LT_AC_TAGVAR' => 1,
+ 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+ '_AM_MANGLE_OPTION' => 1,
+ 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ 'AM_SET_DEPDIR' => 1,
+ '_LT_CC_BASENAME' => 1,
+ 'AM_PROG_INSTALL_SH' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'm4_include' => 1,
+ 'AC_PROG_EGREP' => 1,
+ 'AC_PATH_MAGIC' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AM_MAKE_INCLUDE' => 1
+ }
], 'Autom4te::Request' )
);
diff --git a/libs/dbus-c++/autom4te.cache/traces.1 b/libs/dbus-c++/autom4te.cache/traces.1
index 0056a31cb5e0e2d02984ac4fb9d6108c17de9fb5..5cdcf836744d79486f0d59bc76b60715b765c3af 100644
--- a/libs/dbus-c++/autom4te.cache/traces.1
+++ b/libs/dbus-c++/autom4te.cache/traces.1
@@ -141,7 +141,7 @@ m4trace:configure.ac:4: -1- AC_SUBST_TRACE([target_alias])
m4trace:configure.ac:4: -1- m4_pattern_allow([^target_alias$])
m4trace:configure.ac:6: -1- AM_INIT_AUTOMAKE([libdbus-c++], [0.5.0])
m4trace:configure.ac:6: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:6: -1- AM_AUTOMAKE_VERSION([1.9.6])
+m4trace:configure.ac:6: -1- AM_AUTOMAKE_VERSION([1.10.1])
m4trace:configure.ac:6: -1- AC_REQUIRE_AUX_FILE([install-sh])
m4trace:configure.ac:6: -1- AC_SUBST([INSTALL_PROGRAM])
m4trace:configure.ac:6: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
@@ -152,6 +152,10 @@ m4trace:configure.ac:6: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
m4trace:configure.ac:6: -1- AC_SUBST([INSTALL_DATA])
m4trace:configure.ac:6: -1- AC_SUBST_TRACE([INSTALL_DATA])
m4trace:configure.ac:6: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:6: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
+m4trace:configure.ac:6: -1- AC_SUBST_TRACE([am__isrc])
+m4trace:configure.ac:6: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.ac:6: -1- _AM_SUBST_NOTMAKE([am__isrc])
m4trace:configure.ac:6: -1- AC_SUBST([CYGPATH_W])
m4trace:configure.ac:6: -1- AC_SUBST_TRACE([CYGPATH_W])
m4trace:configure.ac:6: -1- m4_pattern_allow([^CYGPATH_W$])
@@ -169,6 +173,7 @@ m4trace:configure.ac:6: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
m4trace:configure.ac:6: -1- m4_pattern_allow([^VERSION$])
m4trace:configure.ac:6: -1- AH_OUTPUT([VERSION], [/* Version number of package */
#undef VERSION])
+m4trace:configure.ac:6: -1- AC_REQUIRE_AUX_FILE([missing])
m4trace:configure.ac:6: -1- AC_SUBST([ACLOCAL])
m4trace:configure.ac:6: -1- AC_SUBST_TRACE([ACLOCAL])
m4trace:configure.ac:6: -1- m4_pattern_allow([^ACLOCAL$])
@@ -193,7 +198,8 @@ m4trace:configure.ac:6: -1- m4_pattern_allow([^STRIP$])
m4trace:configure.ac:6: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
m4trace:configure.ac:6: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
m4trace:configure.ac:6: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:6: -1- AC_SUBST([mkdir_p])
+m4trace:configure.ac:6: -1- AC_REQUIRE_AUX_FILE([install-sh])
+m4trace:configure.ac:6: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
m4trace:configure.ac:6: -1- AC_SUBST_TRACE([mkdir_p])
m4trace:configure.ac:6: -1- m4_pattern_allow([^mkdir_p$])
m4trace:configure.ac:6: -1- AC_SUBST([AWK])
@@ -215,7 +221,7 @@ m4trace:configure.ac:6: -1- AC_SUBST([am__untar])
m4trace:configure.ac:6: -1- AC_SUBST_TRACE([am__untar])
m4trace:configure.ac:6: -1- m4_pattern_allow([^am__untar$])
m4trace:configure.ac:7: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
-You should run autoupdate.], [aclocal.m4:7163: AM_CONFIG_HEADER is expanded from...
+You should run autoupdate.], [aclocal.m4:7193: AM_CONFIG_HEADER is expanded from...
configure.ac:7: the top level])
m4trace:configure.ac:7: -1- AC_CONFIG_HEADERS([include/dbus-c++/config.h])
m4trace:configure.ac:9: -1- AC_CANONICAL_HOST
@@ -304,9 +310,12 @@ m4trace:configure.ac:41: -1- m4_pattern_allow([^AMDEP_TRUE$])
m4trace:configure.ac:41: -1- AC_SUBST([AMDEP_FALSE])
m4trace:configure.ac:41: -1- AC_SUBST_TRACE([AMDEP_FALSE])
m4trace:configure.ac:41: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:41: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:41: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
m4trace:configure.ac:41: -1- AC_SUBST([AMDEPBACKSLASH])
m4trace:configure.ac:41: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
m4trace:configure.ac:41: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:41: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
m4trace:configure.ac:41: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
m4trace:configure.ac:41: -1- AC_SUBST_TRACE([CCDEPMODE])
m4trace:configure.ac:41: -1- m4_pattern_allow([^CCDEPMODE$])
@@ -319,6 +328,8 @@ m4trace:configure.ac:41: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
m4trace:configure.ac:41: -1- AC_SUBST([am__fastdepCC_FALSE])
m4trace:configure.ac:41: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
m4trace:configure.ac:41: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:41: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:41: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
m4trace:configure.ac:42: -1- AC_SUBST([CXX])
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([CXX])
m4trace:configure.ac:42: -1- m4_pattern_allow([^CXX$])
@@ -352,6 +363,8 @@ m4trace:configure.ac:42: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
m4trace:configure.ac:42: -1- AC_SUBST([am__fastdepCXX_FALSE])
m4trace:configure.ac:42: -1- AC_SUBST_TRACE([am__fastdepCXX_FALSE])
m4trace:configure.ac:42: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
m4trace:configure.ac:45: -1- AC_SUBST([CXX_FOR_BUILD])
m4trace:configure.ac:45: -1- AC_SUBST_TRACE([CXX_FOR_BUILD])
m4trace:configure.ac:45: -1- m4_pattern_allow([^CXX_FOR_BUILD$])
@@ -359,38 +372,38 @@ m4trace:configure.ac:47: -1- AC_PROG_LIBTOOL
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from...
-aclocal.m4:2049: AC_ENABLE_SHARED is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:2057: AC_ENABLE_SHARED is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from...
-aclocal.m4:2088: AC_ENABLE_STATIC is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:2096: AC_ENABLE_STATIC is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from...
-aclocal.m4:2127: AC_ENABLE_FAST_INSTALL is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:2135: AC_ENABLE_FAST_INSTALL is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from...
-aclocal.m4:2268: AC_PROG_LD is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:2276: AC_PROG_LD is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- AC_SUBST([SED])
m4trace:configure.ac:47: -1- AC_SUBST_TRACE([SED])
@@ -431,32 +444,32 @@ m4trace:configure.ac:47: -1- m4_pattern_allow([^NMEDIT$])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
../../lib/autoconf/general.m4:1364: AC_ARG_ENABLE is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:2414: AC_TRY_LINK is expanded from...
../../lib/m4sugar/m4sh.m4:516: AS_IF is expanded from...
../../lib/autoconf/general.m4:1898: AC_CACHE_VAL is expanded from...
../../lib/autoconf/general.m4:1911: AC_CACHE_CHECK is expanded from...
-aclocal.m4:557: _LT_AC_LOCK is expanded from...
-aclocal.m4:1177: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
-aclocal.m4:2801: _LT_AC_LANG_C_CONFIG is expanded from...
-aclocal.m4:2800: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:565: _LT_AC_LOCK is expanded from...
+aclocal.m4:1185: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
+aclocal.m4:2809: _LT_AC_LANG_C_CONFIG is expanded from...
+aclocal.m4:2808: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H])
@@ -495,23 +508,23 @@ m4trace:configure.ac:47: -1- _LT_AC_TAGCONFIG
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:209: AC_HELP_STRING is expanded from...
../../lib/autoconf/general.m4:1382: AC_ARG_WITH is expanded from...
-aclocal.m4:1926: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:1934: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
-m4trace:configure.ac:47: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:1926: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+m4trace:configure.ac:47: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:1934: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
-m4trace:configure.ac:47: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:1926: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+m4trace:configure.ac:47: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:1934: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- AC_SUBST([CXXCPP])
m4trace:configure.ac:47: -1- AC_SUBST_TRACE([CXXCPP])
@@ -542,43 +555,43 @@ m4trace:configure.ac:47: -1- AC_SUBST_TRACE([ac_ct_F77])
m4trace:configure.ac:47: -1- m4_pattern_allow([^ac_ct_F77$])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from...
-aclocal.m4:4187: _LT_AC_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:4186: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:1926: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:4195: _LT_AC_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:4194: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:1934: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from...
-aclocal.m4:4187: _LT_AC_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:4186: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:1926: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:4195: _LT_AC_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:4194: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:1934: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/lang.m4:167: AC_LANG_SAVE is expanded from...
-aclocal.m4:4243: _LT_AC_LANG_RC_CONFIG is expanded from...
-aclocal.m4:4242: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
-aclocal.m4:1926: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:4251: _LT_AC_LANG_RC_CONFIG is expanded from...
+aclocal.m4:4250: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
+aclocal.m4:1934: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
You should run autoupdate.], [../../lib/autoconf/lang.m4:176: AC_LANG_RESTORE is expanded from...
-aclocal.m4:4243: _LT_AC_LANG_RC_CONFIG is expanded from...
-aclocal.m4:4242: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
-aclocal.m4:1926: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:86: AC_LIBTOOL_SETUP is expanded from...
-aclocal.m4:66: _AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:31: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6558: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:4251: _LT_AC_LANG_RC_CONFIG is expanded from...
+aclocal.m4:4250: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
+aclocal.m4:1934: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:94: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:74: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:39: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6566: AM_PROG_LIBTOOL is expanded from...
configure.ac:47: the top level])
m4trace:configure.ac:47: -1- AC_SUBST([LIBTOOL])
m4trace:configure.ac:47: -1- AC_SUBST_TRACE([LIBTOOL])
@@ -638,6 +651,8 @@ m4trace:configure.ac:96: -1- m4_pattern_allow([^ENABLE_GLIB_TRUE$])
m4trace:configure.ac:96: -1- AC_SUBST([ENABLE_GLIB_FALSE])
m4trace:configure.ac:96: -1- AC_SUBST_TRACE([ENABLE_GLIB_FALSE])
m4trace:configure.ac:96: -1- m4_pattern_allow([^ENABLE_GLIB_FALSE$])
+m4trace:configure.ac:96: -1- _AM_SUBST_NOTMAKE([ENABLE_GLIB_TRUE])
+m4trace:configure.ac:96: -1- _AM_SUBST_NOTMAKE([ENABLE_GLIB_FALSE])
m4trace:configure.ac:98: -2- AM_CONDITIONAL([HAVE_GTKMM], [test 1 = 1])
m4trace:configure.ac:98: -2- AC_SUBST([HAVE_GTKMM_TRUE])
m4trace:configure.ac:98: -2- AC_SUBST_TRACE([HAVE_GTKMM_TRUE])
@@ -645,6 +660,8 @@ m4trace:configure.ac:98: -2- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
m4trace:configure.ac:98: -2- AC_SUBST([HAVE_GTKMM_FALSE])
m4trace:configure.ac:98: -2- AC_SUBST_TRACE([HAVE_GTKMM_FALSE])
m4trace:configure.ac:98: -2- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
+m4trace:configure.ac:98: -2- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
+m4trace:configure.ac:98: -2- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
m4trace:configure.ac:99: -2- AM_CONDITIONAL([HAVE_GTKMM], [test 0 = 1])
m4trace:configure.ac:99: -2- AC_SUBST([HAVE_GTKMM_TRUE])
m4trace:configure.ac:99: -2- AC_SUBST_TRACE([HAVE_GTKMM_TRUE])
@@ -652,6 +669,8 @@ m4trace:configure.ac:99: -2- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
m4trace:configure.ac:99: -2- AC_SUBST([HAVE_GTKMM_FALSE])
m4trace:configure.ac:99: -2- AC_SUBST_TRACE([HAVE_GTKMM_FALSE])
m4trace:configure.ac:99: -2- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
+m4trace:configure.ac:99: -2- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
+m4trace:configure.ac:99: -2- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
m4trace:configure.ac:97: -1- AC_SUBST([gtkmm_CFLAGS])
m4trace:configure.ac:97: -1- AC_SUBST_TRACE([gtkmm_CFLAGS])
m4trace:configure.ac:97: -1- m4_pattern_allow([^gtkmm_CFLAGS$])
@@ -671,6 +690,8 @@ m4trace:configure.ac:104: -1- m4_pattern_allow([^ENABLE_GLIB_TRUE$])
m4trace:configure.ac:104: -1- AC_SUBST([ENABLE_GLIB_FALSE])
m4trace:configure.ac:104: -1- AC_SUBST_TRACE([ENABLE_GLIB_FALSE])
m4trace:configure.ac:104: -1- m4_pattern_allow([^ENABLE_GLIB_FALSE$])
+m4trace:configure.ac:104: -1- _AM_SUBST_NOTMAKE([ENABLE_GLIB_TRUE])
+m4trace:configure.ac:104: -1- _AM_SUBST_NOTMAKE([ENABLE_GLIB_FALSE])
m4trace:configure.ac:105: -1- AM_CONDITIONAL([HAVE_GTKMM], [test 0 = 1])
m4trace:configure.ac:105: -1- AC_SUBST([HAVE_GTKMM_TRUE])
m4trace:configure.ac:105: -1- AC_SUBST_TRACE([HAVE_GTKMM_TRUE])
@@ -678,6 +699,8 @@ m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
m4trace:configure.ac:105: -1- AC_SUBST([HAVE_GTKMM_FALSE])
m4trace:configure.ac:105: -1- AC_SUBST_TRACE([HAVE_GTKMM_FALSE])
m4trace:configure.ac:105: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
+m4trace:configure.ac:105: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
+m4trace:configure.ac:105: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
m4trace:configure.ac:108: -1- AH_OUTPUT([HAVE_EXPAT_H], [/* Define to 1 if you have the <expat.h> header file. */
#undef HAVE_EXPAT_H])
m4trace:configure.ac:120: -1- AC_SUBST([xml_CFLAGS])
@@ -698,6 +721,8 @@ m4trace:configure.ac:164: -1- m4_pattern_allow([^DBUS_DOXYGEN_DOCS_ENABLED_TRUE$
m4trace:configure.ac:164: -1- AC_SUBST([DBUS_DOXYGEN_DOCS_ENABLED_FALSE])
m4trace:configure.ac:164: -1- AC_SUBST_TRACE([DBUS_DOXYGEN_DOCS_ENABLED_FALSE])
m4trace:configure.ac:164: -1- m4_pattern_allow([^DBUS_DOXYGEN_DOCS_ENABLED_FALSE$])
+m4trace:configure.ac:164: -1- _AM_SUBST_NOTMAKE([DBUS_DOXYGEN_DOCS_ENABLED_TRUE])
+m4trace:configure.ac:164: -1- _AM_SUBST_NOTMAKE([DBUS_DOXYGEN_DOCS_ENABLED_FALSE])
m4trace:configure.ac:168: -1- AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = "yes"])
m4trace:configure.ac:168: -1- AC_SUBST([CROSS_COMPILING_TRUE])
m4trace:configure.ac:168: -1- AC_SUBST_TRACE([CROSS_COMPILING_TRUE])
@@ -705,6 +730,8 @@ m4trace:configure.ac:168: -1- m4_pattern_allow([^CROSS_COMPILING_TRUE$])
m4trace:configure.ac:168: -1- AC_SUBST([CROSS_COMPILING_FALSE])
m4trace:configure.ac:168: -1- AC_SUBST_TRACE([CROSS_COMPILING_FALSE])
m4trace:configure.ac:168: -1- m4_pattern_allow([^CROSS_COMPILING_FALSE$])
+m4trace:configure.ac:168: -1- _AM_SUBST_NOTMAKE([CROSS_COMPILING_TRUE])
+m4trace:configure.ac:168: -1- _AM_SUBST_NOTMAKE([CROSS_COMPILING_FALSE])
m4trace:configure.ac:176: -1- AC_SUBST([BUILD_LIBDBUS_CXX_DIR])
m4trace:configure.ac:176: -1- AC_SUBST_TRACE([BUILD_LIBDBUS_CXX_DIR])
m4trace:configure.ac:176: -1- m4_pattern_allow([^BUILD_LIBDBUS_CXX_DIR$])
@@ -740,3 +767,4 @@ m4trace:configure.ac:181: -1- AC_SUBST_TRACE([builddir])
m4trace:configure.ac:181: -1- AC_SUBST_TRACE([abs_builddir])
m4trace:configure.ac:181: -1- AC_SUBST_TRACE([abs_top_builddir])
m4trace:configure.ac:181: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:181: -1- AC_SUBST_TRACE([MKDIR_P])
diff --git a/libs/dbus-c++/config.log b/libs/dbus-c++/config.log
index d03a4b1f05a738f5bd4aca70c9cb44ee5704977f..cc4bf5412d27a74de71fc78cae46f2df4c8c87bf 100644
--- a/libs/dbus-c++/config.log
+++ b/libs/dbus-c++/config.log
@@ -4,13 +4,13 @@ running configure, to aid debugging if configure makes a mistake.
It was created by libdbus-c++ configure 0.5.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
- $ ./configure --prefix=/usr --enable-debug
+ $ ./configure --prefix=/usr
## --------- ##
## Platform. ##
## --------- ##
-hostname = sulfur
+hostname = yun
uname -m = i686
uname -r = 2.6.24-19-generic
uname -s = Linux
@@ -34,136 +34,139 @@ PATH: /usr/bin
PATH: /sbin
PATH: /bin
PATH: /usr/games
-PATH: /usr/local/share/OpenSceneGraph/bin
## ----------- ##
## Core tests. ##
## ----------- ##
-configure:2020: checking for a BSD-compatible install
-configure:2076: result: /usr/bin/install -c
-configure:2087: checking whether build environment is sane
-configure:2130: result: yes
-configure:2195: checking for gawk
-configure:2211: found /usr/bin/gawk
-configure:2222: result: gawk
-configure:2233: checking whether make sets $(MAKE)
-configure:2254: result: yes
-configure:2447: checking build system type
-configure:2465: result: i686-pc-linux-gnu
-configure:2487: checking host system type
-configure:2502: result: i686-pc-linux-gnu
-configure:2614: checking for gcc
-configure:2630: found /usr/bin/gcc
-configure:2641: result: gcc
-configure:2879: checking for C compiler version
-configure:2886: gcc --version >&5
+configure:2022: checking for a BSD-compatible install
+configure:2078: result: /usr/bin/install -c
+configure:2089: checking whether build environment is sane
+configure:2132: result: yes
+configure:2160: checking for a thread-safe mkdir -p
+configure:2199: result: /bin/mkdir -p
+configure:2212: checking for gawk
+configure:2242: result: no
+configure:2212: checking for mawk
+configure:2228: found /usr/bin/mawk
+configure:2239: result: mawk
+configure:2250: checking whether make sets $(MAKE)
+configure:2271: result: yes
+configure:2468: checking build system type
+configure:2486: result: i686-pc-linux-gnu
+configure:2508: checking host system type
+configure:2523: result: i686-pc-linux-gnu
+configure:2635: checking for gcc
+configure:2651: found /usr/bin/gcc
+configure:2662: result: gcc
+configure:2900: checking for C compiler version
+configure:2907: gcc --version >&5
gcc (GCC) 4.2.3 (Ubuntu 4.2.3-2ubuntu7)
Copyright (C) 2007 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-configure:2889: $? = 0
-configure:2896: gcc -v >&5
+configure:2910: $? = 0
+configure:2917: gcc -v >&5
Using built-in specs.
Target: i486-linux-gnu
Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.2 --program-suffix=-4.2 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
Thread model: posix
gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu7)
-configure:2899: $? = 0
-configure:2906: gcc -V >&5
+configure:2920: $? = 0
+configure:2927: gcc -V >&5
gcc: '-V' option must have argument
-configure:2909: $? = 1
-configure:2932: checking for C compiler default output file name
-configure:2959: gcc conftest.c >&5
-configure:2962: $? = 0
-configure:3000: result: a.out
-configure:3017: checking whether the C compiler works
-configure:3027: ./a.out
-configure:3030: $? = 0
-configure:3047: result: yes
-configure:3054: checking whether we are cross compiling
-configure:3056: result: no
-configure:3059: checking for suffix of executables
-configure:3066: gcc -o conftest conftest.c >&5
-configure:3069: $? = 0
-configure:3093: result:
-configure:3099: checking for suffix of object files
-configure:3125: gcc -c conftest.c >&5
-configure:3128: $? = 0
-configure:3151: result: o
-configure:3155: checking whether we are using the GNU C compiler
-configure:3184: gcc -c conftest.c >&5
-configure:3190: $? = 0
-configure:3207: result: yes
-configure:3212: checking whether gcc accepts -g
-configure:3242: gcc -c -g conftest.c >&5
-configure:3248: $? = 0
-configure:3347: result: yes
-configure:3364: checking for gcc option to accept ISO C89
-configure:3438: gcc -c -g -O2 conftest.c >&5
-configure:3444: $? = 0
-configure:3467: result: none needed
-configure:3496: checking for style of include used by make
-configure:3524: result: GNU
-configure:3552: checking dependency style of gcc
-configure:3642: result: gcc3
-configure:3717: checking for g++
-configure:3733: found /usr/bin/g++
-configure:3744: result: g++
-configure:3775: checking for C++ compiler version
-configure:3782: g++ --version >&5
+configure:2930: $? = 1
+configure:2953: checking for C compiler default output file name
+configure:2980: gcc conftest.c >&5
+configure:2983: $? = 0
+configure:3021: result: a.out
+configure:3038: checking whether the C compiler works
+configure:3048: ./a.out
+configure:3051: $? = 0
+configure:3068: result: yes
+configure:3075: checking whether we are cross compiling
+configure:3077: result: no
+configure:3080: checking for suffix of executables
+configure:3087: gcc -o conftest conftest.c >&5
+configure:3090: $? = 0
+configure:3114: result:
+configure:3120: checking for suffix of object files
+configure:3146: gcc -c conftest.c >&5
+configure:3149: $? = 0
+configure:3172: result: o
+configure:3176: checking whether we are using the GNU C compiler
+configure:3205: gcc -c conftest.c >&5
+configure:3211: $? = 0
+configure:3228: result: yes
+configure:3233: checking whether gcc accepts -g
+configure:3263: gcc -c -g conftest.c >&5
+configure:3269: $? = 0
+configure:3368: result: yes
+configure:3385: checking for gcc option to accept ISO C89
+configure:3459: gcc -c -g -O2 conftest.c >&5
+configure:3465: $? = 0
+configure:3488: result: none needed
+configure:3517: checking for style of include used by make
+configure:3545: result: GNU
+configure:3570: checking dependency style of gcc
+configure:3661: result: gcc3
+configure:3734: checking for g++
+configure:3750: found /usr/bin/g++
+configure:3761: result: g++
+configure:3792: checking for C++ compiler version
+configure:3799: g++ --version >&5
g++ (GCC) 4.2.3 (Ubuntu 4.2.3-2ubuntu7)
Copyright (C) 2007 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-configure:3785: $? = 0
-configure:3792: g++ -v >&5
+configure:3802: $? = 0
+configure:3809: g++ -v >&5
Using built-in specs.
Target: i486-linux-gnu
Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.2 --program-suffix=-4.2 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu
Thread model: posix
gcc version 4.2.3 (Ubuntu 4.2.3-2ubuntu7)
-configure:3795: $? = 0
-configure:3802: g++ -V >&5
+configure:3812: $? = 0
+configure:3819: g++ -V >&5
g++: '-V' option must have argument
-configure:3805: $? = 1
-configure:3808: checking whether we are using the GNU C++ compiler
-configure:3837: g++ -c conftest.cpp >&5
-configure:3843: $? = 0
-configure:3860: result: yes
-configure:3865: checking whether g++ accepts -g
-configure:3895: g++ -c -g conftest.cpp >&5
-configure:3901: $? = 0
-configure:4000: result: yes
-configure:4025: checking dependency style of g++
-configure:4115: result: gcc3
-configure:4208: checking for a sed that does not truncate output
-configure:4264: result: /bin/sed
-configure:4267: checking for grep that handles long lines and -e
-configure:4341: result: /bin/grep
-configure:4346: checking for egrep
-configure:4424: result: /bin/grep -E
-configure:4440: checking for ld used by gcc
-configure:4507: result: /usr/bin/ld
-configure:4516: checking if the linker (/usr/bin/ld) is GNU ld
-configure:4531: result: yes
-configure:4536: checking for /usr/bin/ld option to reload object files
-configure:4543: result: -r
-configure:4561: checking for BSD-compatible nm
-configure:4610: result: /usr/bin/nm -B
-configure:4614: checking whether ln -s works
-configure:4618: result: yes
-configure:4625: checking how to recognize dependent libraries
-configure:4811: result: pass_all
-configure:5057: checking how to run the C preprocessor
-configure:5097: gcc -E conftest.c
-configure:5103: $? = 0
-configure:5134: gcc -E conftest.c
+configure:3822: $? = 1
+configure:3825: checking whether we are using the GNU C++ compiler
+configure:3854: g++ -c conftest.cpp >&5
+configure:3860: $? = 0
+configure:3877: result: yes
+configure:3882: checking whether g++ accepts -g
+configure:3912: g++ -c -g conftest.cpp >&5
+configure:3918: $? = 0
+configure:4017: result: yes
+configure:4042: checking dependency style of g++
+configure:4133: result: gcc3
+configure:4224: checking for a sed that does not truncate output
+configure:4280: result: /bin/sed
+configure:4283: checking for grep that handles long lines and -e
+configure:4357: result: /bin/grep
+configure:4362: checking for egrep
+configure:4440: result: /bin/grep -E
+configure:4456: checking for ld used by gcc
+configure:4523: result: /usr/bin/ld
+configure:4532: checking if the linker (/usr/bin/ld) is GNU ld
+configure:4547: result: yes
+configure:4552: checking for /usr/bin/ld option to reload object files
+configure:4559: result: -r
+configure:4577: checking for BSD-compatible nm
+configure:4626: result: /usr/bin/nm -B
+configure:4630: checking whether ln -s works
+configure:4634: result: yes
+configure:4641: checking how to recognize dependent libraries
+configure:4827: result: pass_all
+configure:5073: checking how to run the C preprocessor
+configure:5113: gcc -E conftest.c
+configure:5119: $? = 0
+configure:5150: gcc -E conftest.c
conftest.c:10:28: error: ac_nonexistent.h: No such file or directory
-configure:5140: $? = 1
+configure:5156: $? = 1
configure: failed program was:
| /* confdefs.h. */
| #define PACKAGE_NAME "libdbus-c++"
@@ -175,12 +178,12 @@ configure: failed program was:
| #define VERSION "0.5.0"
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:5173: result: gcc -E
-configure:5202: gcc -E conftest.c
-configure:5208: $? = 0
-configure:5239: gcc -E conftest.c
+configure:5189: result: gcc -E
+configure:5218: gcc -E conftest.c
+configure:5224: $? = 0
+configure:5255: gcc -E conftest.c
conftest.c:10:28: error: ac_nonexistent.h: No such file or directory
-configure:5245: $? = 1
+configure:5261: $? = 1
configure: failed program was:
| /* confdefs.h. */
| #define PACKAGE_NAME "libdbus-c++"
@@ -192,66 +195,66 @@ configure: failed program was:
| #define VERSION "0.5.0"
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:5283: checking for ANSI C header files
-configure:5313: gcc -c -g -O2 conftest.c >&5
-configure:5319: $? = 0
-configure:5418: gcc -o conftest -g -O2 conftest.c >&5
-configure:5421: $? = 0
-configure:5427: ./conftest
-configure:5430: $? = 0
-configure:5447: result: yes
-configure:5471: checking for sys/types.h
-configure:5492: gcc -c -g -O2 conftest.c >&5
-configure:5498: $? = 0
-configure:5514: result: yes
-configure:5471: checking for sys/stat.h
-configure:5492: gcc -c -g -O2 conftest.c >&5
-configure:5498: $? = 0
-configure:5514: result: yes
-configure:5471: checking for stdlib.h
-configure:5492: gcc -c -g -O2 conftest.c >&5
-configure:5498: $? = 0
-configure:5514: result: yes
-configure:5471: checking for string.h
-configure:5492: gcc -c -g -O2 conftest.c >&5
-configure:5498: $? = 0
-configure:5514: result: yes
-configure:5471: checking for memory.h
-configure:5492: gcc -c -g -O2 conftest.c >&5
-configure:5498: $? = 0
-configure:5514: result: yes
-configure:5471: checking for strings.h
-configure:5492: gcc -c -g -O2 conftest.c >&5
-configure:5498: $? = 0
-configure:5514: result: yes
-configure:5471: checking for inttypes.h
-configure:5492: gcc -c -g -O2 conftest.c >&5
-configure:5498: $? = 0
-configure:5514: result: yes
-configure:5471: checking for stdint.h
-configure:5492: gcc -c -g -O2 conftest.c >&5
-configure:5498: $? = 0
-configure:5514: result: yes
-configure:5471: checking for unistd.h
-configure:5492: gcc -c -g -O2 conftest.c >&5
-configure:5498: $? = 0
-configure:5514: result: yes
-configure:5541: checking dlfcn.h usability
-configure:5558: gcc -c -g -O2 conftest.c >&5
-configure:5564: $? = 0
-configure:5578: result: yes
-configure:5582: checking dlfcn.h presence
-configure:5597: gcc -E conftest.c
-configure:5603: $? = 0
-configure:5617: result: yes
-configure:5650: checking for dlfcn.h
-configure:5658: result: yes
-configure:5681: checking how to run the C++ preprocessor
-configure:5717: g++ -E conftest.cpp
-configure:5723: $? = 0
-configure:5754: g++ -E conftest.cpp
+configure:5299: checking for ANSI C header files
+configure:5329: gcc -c -g -O2 conftest.c >&5
+configure:5335: $? = 0
+configure:5434: gcc -o conftest -g -O2 conftest.c >&5
+configure:5437: $? = 0
+configure:5443: ./conftest
+configure:5446: $? = 0
+configure:5463: result: yes
+configure:5487: checking for sys/types.h
+configure:5508: gcc -c -g -O2 conftest.c >&5
+configure:5514: $? = 0
+configure:5530: result: yes
+configure:5487: checking for sys/stat.h
+configure:5508: gcc -c -g -O2 conftest.c >&5
+configure:5514: $? = 0
+configure:5530: result: yes
+configure:5487: checking for stdlib.h
+configure:5508: gcc -c -g -O2 conftest.c >&5
+configure:5514: $? = 0
+configure:5530: result: yes
+configure:5487: checking for string.h
+configure:5508: gcc -c -g -O2 conftest.c >&5
+configure:5514: $? = 0
+configure:5530: result: yes
+configure:5487: checking for memory.h
+configure:5508: gcc -c -g -O2 conftest.c >&5
+configure:5514: $? = 0
+configure:5530: result: yes
+configure:5487: checking for strings.h
+configure:5508: gcc -c -g -O2 conftest.c >&5
+configure:5514: $? = 0
+configure:5530: result: yes
+configure:5487: checking for inttypes.h
+configure:5508: gcc -c -g -O2 conftest.c >&5
+configure:5514: $? = 0
+configure:5530: result: yes
+configure:5487: checking for stdint.h
+configure:5508: gcc -c -g -O2 conftest.c >&5
+configure:5514: $? = 0
+configure:5530: result: yes
+configure:5487: checking for unistd.h
+configure:5508: gcc -c -g -O2 conftest.c >&5
+configure:5514: $? = 0
+configure:5530: result: yes
+configure:5557: checking dlfcn.h usability
+configure:5574: gcc -c -g -O2 conftest.c >&5
+configure:5580: $? = 0
+configure:5594: result: yes
+configure:5598: checking dlfcn.h presence
+configure:5613: gcc -E conftest.c
+configure:5619: $? = 0
+configure:5633: result: yes
+configure:5666: checking for dlfcn.h
+configure:5674: result: yes
+configure:5697: checking how to run the C++ preprocessor
+configure:5733: g++ -E conftest.cpp
+configure:5739: $? = 0
+configure:5770: g++ -E conftest.cpp
conftest.cpp:21:28: error: ac_nonexistent.h: No such file or directory
-configure:5760: $? = 1
+configure:5776: $? = 1
configure: failed program was:
| /* confdefs.h. */
| #define PACKAGE_NAME "libdbus-c++"
@@ -274,12 +277,12 @@ configure: failed program was:
| #define HAVE_DLFCN_H 1
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:5793: result: g++ -E
-configure:5822: g++ -E conftest.cpp
-configure:5828: $? = 0
-configure:5859: g++ -E conftest.cpp
+configure:5809: result: g++ -E
+configure:5838: g++ -E conftest.cpp
+configure:5844: $? = 0
+configure:5875: g++ -E conftest.cpp
conftest.cpp:21:28: error: ac_nonexistent.h: No such file or directory
-configure:5865: $? = 1
+configure:5881: $? = 1
configure: failed program was:
| /* confdefs.h. */
| #define PACKAGE_NAME "libdbus-c++"
@@ -302,70 +305,70 @@ configure: failed program was:
| #define HAVE_DLFCN_H 1
| /* end confdefs.h. */
| #include <ac_nonexistent.h>
-configure:5957: checking for g77
-configure:5987: result: no
-configure:5957: checking for xlf
-configure:5987: result: no
-configure:5957: checking for f77
-configure:5987: result: no
-configure:5957: checking for frt
-configure:5987: result: no
-configure:5957: checking for pgf77
-configure:5987: result: no
-configure:5957: checking for cf77
-configure:5987: result: no
-configure:5957: checking for fort77
-configure:5987: result: no
-configure:5957: checking for fl32
-configure:5987: result: no
-configure:5957: checking for af77
-configure:5987: result: no
-configure:5957: checking for xlf90
-configure:5987: result: no
-configure:5957: checking for f90
-configure:5987: result: no
-configure:5957: checking for pgf90
-configure:5987: result: no
-configure:5957: checking for pghpf
-configure:5987: result: no
-configure:5957: checking for epcf90
-configure:5987: result: no
-configure:5957: checking for gfortran
-configure:5987: result: no
-configure:5957: checking for g95
-configure:5987: result: no
-configure:5957: checking for xlf95
-configure:5987: result: no
-configure:5957: checking for f95
-configure:5987: result: no
-configure:5957: checking for fort
-configure:5987: result: no
-configure:5957: checking for ifort
-configure:5987: result: no
-configure:5957: checking for ifc
-configure:5987: result: no
-configure:5957: checking for efc
-configure:5987: result: no
-configure:5957: checking for pgf95
-configure:5987: result: no
-configure:5957: checking for lf95
-configure:5987: result: no
-configure:5957: checking for ftn
-configure:5987: result: no
-configure:6014: checking for Fortran 77 compiler version
-configure:6021: --version >&5
-./configure: line 6022: --version: command not found
-configure:6024: $? = 127
-configure:6031: -v >&5
-./configure: line 6032: -v: command not found
-configure:6034: $? = 127
-configure:6041: -V >&5
-./configure: line 6042: -V: command not found
-configure:6044: $? = 127
-configure:6052: checking whether we are using the GNU Fortran 77 compiler
-configure:6071: -c conftest.F >&5
-./configure: line 6072: -c: command not found
-configure:6077: $? = 127
+configure:5973: checking for g77
+configure:6003: result: no
+configure:5973: checking for xlf
+configure:6003: result: no
+configure:5973: checking for f77
+configure:6003: result: no
+configure:5973: checking for frt
+configure:6003: result: no
+configure:5973: checking for pgf77
+configure:6003: result: no
+configure:5973: checking for cf77
+configure:6003: result: no
+configure:5973: checking for fort77
+configure:6003: result: no
+configure:5973: checking for fl32
+configure:6003: result: no
+configure:5973: checking for af77
+configure:6003: result: no
+configure:5973: checking for xlf90
+configure:6003: result: no
+configure:5973: checking for f90
+configure:6003: result: no
+configure:5973: checking for pgf90
+configure:6003: result: no
+configure:5973: checking for pghpf
+configure:6003: result: no
+configure:5973: checking for epcf90
+configure:6003: result: no
+configure:5973: checking for gfortran
+configure:6003: result: no
+configure:5973: checking for g95
+configure:6003: result: no
+configure:5973: checking for xlf95
+configure:6003: result: no
+configure:5973: checking for f95
+configure:6003: result: no
+configure:5973: checking for fort
+configure:6003: result: no
+configure:5973: checking for ifort
+configure:6003: result: no
+configure:5973: checking for ifc
+configure:6003: result: no
+configure:5973: checking for efc
+configure:6003: result: no
+configure:5973: checking for pgf95
+configure:6003: result: no
+configure:5973: checking for lf95
+configure:6003: result: no
+configure:5973: checking for ftn
+configure:6003: result: no
+configure:6030: checking for Fortran 77 compiler version
+configure:6037: --version >&5
+./configure: line 6038: --version: command not found
+configure:6040: $? = 127
+configure:6047: -v >&5
+./configure: line 6048: -v: command not found
+configure:6050: $? = 127
+configure:6057: -V >&5
+./configure: line 6058: -V: command not found
+configure:6060: $? = 127
+configure:6068: checking whether we are using the GNU Fortran 77 compiler
+configure:6087: -c conftest.F >&5
+./configure: line 6088: -c: command not found
+configure:6093: $? = 127
configure: failed program was:
| program main
| #ifndef __GNUC__
@@ -373,153 +376,153 @@ configure: failed program was:
| #endif
|
| end
-configure:6094: result: no
-configure:6100: checking whether accepts -g
-configure:6117: -c -g conftest.f >&5
-./configure: line 6118: -c: command not found
-configure:6123: $? = 127
+configure:6110: result: no
+configure:6116: checking whether accepts -g
+configure:6133: -c -g conftest.f >&5
+./configure: line 6134: -c: command not found
+configure:6139: $? = 127
configure: failed program was:
| program main
|
| end
-configure:6139: result: no
-configure:6168: checking the maximum length of command line arguments
-configure:6280: result: 98304
-configure:6292: checking command to parse /usr/bin/nm -B output from gcc object
-configure:6397: g++ -c -g -O2 conftest.cpp >&5
-configure:6400: $? = 0
-configure:6404: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
-configure:6407: $? = 0
-configure:6459: g++ -o conftest -g -O2 conftest.cpp conftstm.o >&5
-configure:6462: $? = 0
-configure:6500: result: ok
-configure:6504: checking for objdir
-configure:6519: result: .libs
-configure:6611: checking for ar
-configure:6627: found /usr/bin/ar
-configure:6638: result: ar
-configure:6707: checking for ranlib
-configure:6723: found /usr/bin/ranlib
-configure:6734: result: ranlib
-configure:6803: checking for strip
-configure:6819: found /usr/bin/strip
-configure:6830: result: strip
-configure:7428: checking if gcc supports -fno-rtti -fno-exceptions
-configure:7446: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5
+configure:6155: result: no
+configure:6184: checking the maximum length of command line arguments
+configure:6296: result: 98304
+configure:6308: checking command to parse /usr/bin/nm -B output from gcc object
+configure:6413: g++ -c -g -O2 conftest.cpp >&5
+configure:6416: $? = 0
+configure:6420: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p' \> conftest.nm
+configure:6423: $? = 0
+configure:6475: g++ -o conftest -g -O2 conftest.cpp conftstm.o >&5
+configure:6478: $? = 0
+configure:6516: result: ok
+configure:6520: checking for objdir
+configure:6535: result: .libs
+configure:6627: checking for ar
+configure:6643: found /usr/bin/ar
+configure:6654: result: ar
+configure:6723: checking for ranlib
+configure:6739: found /usr/bin/ranlib
+configure:6750: result: ranlib
+configure:6819: checking for strip
+configure:6835: found /usr/bin/strip
+configure:6846: result: strip
+configure:7444: checking if gcc supports -fno-rtti -fno-exceptions
+configure:7462: gcc -c -g -O2 -fno-rtti -fno-exceptions conftest.c >&5
cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
-configure:7450: $? = 0
-configure:7463: result: no
-configure:7478: checking for gcc option to produce PIC
-configure:7710: result: -fPIC
-configure:7718: checking if gcc PIC flag -fPIC works
-configure:7736: gcc -c -g -O2 -fPIC -DPIC conftest.c >&5
-configure:7740: $? = 0
-configure:7753: result: yes
-configure:7781: checking if gcc static flag -static works
-configure:7809: result: yes
-configure:7819: checking if gcc supports -c -o file.o
-configure:7840: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5
-configure:7844: $? = 0
-configure:7866: result: yes
-configure:7892: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
-configure:8873: result: yes
-configure:8894: checking whether -lc should be explicitly linked in
-configure:8899: gcc -c -g -O2 conftest.c >&5
-configure:8902: $? = 0
-configure:8917: gcc -shared conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep -lc \>/dev/null 2\>\&1
-configure:8920: $? = 0
-configure:8932: result: no
-configure:8940: checking dynamic linker characteristics
-configure:9554: result: GNU/Linux ld.so
-configure:9578: checking how to hardcode library paths into programs
-configure:9603: result: immediate
-configure:9617: checking whether stripping libraries is possible
-configure:9622: result: yes
-configure:10424: checking if libtool supports shared libraries
-configure:10426: result: yes
-configure:10429: checking whether to build shared libraries
-configure:10450: result: yes
-configure:10453: checking whether to build static libraries
-configure:10457: result: yes
-configure:10551: creating libtool
-configure:11144: checking for ld used by g++
-configure:11211: result: /usr/bin/ld
-configure:11220: checking if the linker (/usr/bin/ld) is GNU ld
-configure:11235: result: yes
-configure:11286: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:12232: result: yes
-configure:12249: g++ -c -g -O2 conftest.cpp >&5
-configure:12252: $? = 0
-configure:12408: checking for g++ option to produce PIC
-configure:12692: result: -fPIC
-configure:12700: checking if g++ PIC flag -fPIC works
-configure:12718: g++ -c -g -O2 -fPIC -DPIC conftest.cpp >&5
-configure:12722: $? = 0
-configure:12735: result: yes
-configure:12763: checking if g++ static flag -static works
-configure:12791: result: yes
-configure:12801: checking if g++ supports -c -o file.o
-configure:12822: g++ -c -g -O2 -o out/conftest2.o conftest.cpp >&5
-configure:12826: $? = 0
-configure:12848: result: yes
-configure:12874: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:12903: result: yes
-configure:12970: checking dynamic linker characteristics
-configure:13532: result: GNU/Linux ld.so
-configure:13556: checking how to hardcode library paths into programs
-configure:13581: result: immediate
-configure:19878: checking for pkg-config
-configure:19896: found /usr/bin/pkg-config
-configure:19908: result: /usr/bin/pkg-config
-configure:19937: checking pkg-config is at least version 0.9.0
-configure:19940: result: yes
-configure:19951: checking whether g++ supports symbol visibility
-configure:19957: result: yes
-configure:19977: checking for dbus
-configure:19985: $PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION"
-configure:19988: $? = 0
-configure:20003: $PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION"
-configure:20006: $? = 0
-configure:20052: result: yes
-configure:20061: $PKG_CONFIG --exists --print-errors "dbus-1 < $DBUS_API_STABLE_VERSION"
+configure:7466: $? = 0
+configure:7479: result: no
+configure:7494: checking for gcc option to produce PIC
+configure:7726: result: -fPIC
+configure:7734: checking if gcc PIC flag -fPIC works
+configure:7752: gcc -c -g -O2 -fPIC -DPIC conftest.c >&5
+configure:7756: $? = 0
+configure:7769: result: yes
+configure:7797: checking if gcc static flag -static works
+configure:7825: result: yes
+configure:7835: checking if gcc supports -c -o file.o
+configure:7856: gcc -c -g -O2 -o out/conftest2.o conftest.c >&5
+configure:7860: $? = 0
+configure:7882: result: yes
+configure:7908: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
+configure:8889: result: yes
+configure:8910: checking whether -lc should be explicitly linked in
+configure:8915: gcc -c -g -O2 conftest.c >&5
+configure:8918: $? = 0
+configure:8933: gcc -shared conftest.o -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep -lc \>/dev/null 2\>\&1
+configure:8936: $? = 0
+configure:8948: result: no
+configure:8956: checking dynamic linker characteristics
+configure:9570: result: GNU/Linux ld.so
+configure:9594: checking how to hardcode library paths into programs
+configure:9619: result: immediate
+configure:9633: checking whether stripping libraries is possible
+configure:9638: result: yes
+configure:10440: checking if libtool supports shared libraries
+configure:10442: result: yes
+configure:10445: checking whether to build shared libraries
+configure:10466: result: yes
+configure:10469: checking whether to build static libraries
+configure:10473: result: yes
+configure:10567: creating libtool
+configure:11160: checking for ld used by g++
+configure:11227: result: /usr/bin/ld
+configure:11236: checking if the linker (/usr/bin/ld) is GNU ld
+configure:11251: result: yes
+configure:11302: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
+configure:12248: result: yes
+configure:12265: g++ -c -g -O2 conftest.cpp >&5
+configure:12268: $? = 0
+configure:12424: checking for g++ option to produce PIC
+configure:12708: result: -fPIC
+configure:12716: checking if g++ PIC flag -fPIC works
+configure:12734: g++ -c -g -O2 -fPIC -DPIC conftest.cpp >&5
+configure:12738: $? = 0
+configure:12751: result: yes
+configure:12779: checking if g++ static flag -static works
+configure:12807: result: yes
+configure:12817: checking if g++ supports -c -o file.o
+configure:12838: g++ -c -g -O2 -o out/conftest2.o conftest.cpp >&5
+configure:12842: $? = 0
+configure:12864: result: yes
+configure:12890: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
+configure:12919: result: yes
+configure:12986: checking dynamic linker characteristics
+configure:13548: result: GNU/Linux ld.so
+configure:13572: checking how to hardcode library paths into programs
+configure:13597: result: immediate
+configure:19894: checking for pkg-config
+configure:19912: found /usr/bin/pkg-config
+configure:19924: result: /usr/bin/pkg-config
+configure:19953: checking pkg-config is at least version 0.9.0
+configure:19956: result: yes
+configure:19967: checking whether g++ supports symbol visibility
+configure:19973: result: yes
+configure:19993: checking for dbus
+configure:20001: $PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION"
+configure:20004: $? = 0
+configure:20019: $PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_REQUIRED_VERSION"
+configure:20022: $? = 0
+configure:20068: result: yes
+configure:20077: $PKG_CONFIG --exists --print-errors "dbus-1 < $DBUS_API_STABLE_VERSION"
Requested 'dbus-1 < 1.0.0' but version of dbus is 1.1.20
-configure:20064: $? = 1
-configure:20076: $PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION"
-configure:20079: $? = 0
-configure:20091: $PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION"
-configure:20094: $? = 0
-configure:20355: checking for XML_ParserCreate_MM in -lexpat
-configure:20390: g++ -o conftest -fvisibility=hidden conftest.cpp -lexpat >&5
-configure:20396: $? = 0
-configure:20414: result: yes
-configure:20432: checking expat.h usability
-configure:20449: g++ -c -fvisibility=hidden conftest.cpp >&5
-configure:20455: $? = 0
-configure:20469: result: yes
-configure:20473: checking expat.h presence
-configure:20488: g++ -E conftest.cpp
-configure:20494: $? = 0
-configure:20508: result: yes
-configure:20541: checking for expat.h
-configure:20549: result: yes
-configure:20583: checking for pthread_create in -lpthread
-configure:20618: g++ -o conftest -fvisibility=hidden conftest.cpp -lpthread >&5
-configure:20624: $? = 0
-configure:20642: result: yes
-configure:20660: checking pthread.h usability
-configure:20677: g++ -c -fvisibility=hidden conftest.cpp >&5
-configure:20683: $? = 0
-configure:20697: result: yes
-configure:20701: checking pthread.h presence
-configure:20716: g++ -E conftest.cpp
-configure:20722: $? = 0
-configure:20736: result: yes
-configure:20769: checking for pthread.h
-configure:20777: result: yes
-configure:20814: checking for doxygen
-configure:20832: found /usr/bin/doxygen
-configure:20845: result: /usr/bin/doxygen
-configure:20854: checking whether to build Doxygen documentation
+configure:20080: $? = 1
+configure:20092: $PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_THREADS_INIT_DEFAULT_VERSION"
+configure:20095: $? = 0
+configure:20107: $PKG_CONFIG --exists --print-errors "dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION"
+configure:20110: $? = 0
+configure:20359: checking for XML_ParserCreate_MM in -lexpat
+configure:20394: g++ -o conftest -fvisibility=hidden conftest.cpp -lexpat >&5
+configure:20400: $? = 0
+configure:20418: result: yes
+configure:20436: checking expat.h usability
+configure:20453: g++ -c -fvisibility=hidden conftest.cpp >&5
+configure:20459: $? = 0
+configure:20473: result: yes
+configure:20477: checking expat.h presence
+configure:20492: g++ -E conftest.cpp
+configure:20498: $? = 0
+configure:20512: result: yes
+configure:20545: checking for expat.h
+configure:20553: result: yes
+configure:20587: checking for pthread_create in -lpthread
+configure:20622: g++ -o conftest -fvisibility=hidden conftest.cpp -lpthread >&5
+configure:20628: $? = 0
+configure:20646: result: yes
+configure:20664: checking pthread.h usability
+configure:20681: g++ -c -fvisibility=hidden conftest.cpp >&5
+configure:20687: $? = 0
+configure:20701: result: yes
+configure:20705: checking pthread.h presence
+configure:20720: g++ -E conftest.cpp
+configure:20726: $? = 0
+configure:20740: result: yes
+configure:20773: checking for pthread.h
+configure:20781: result: yes
+configure:20818: checking for doxygen
+configure:20836: found /usr/bin/doxygen
+configure:20849: result: /usr/bin/doxygen
+configure:20858: checking whether to build Doxygen documentation
configure:21091: creating ./config.status
## ---------------------- ##
@@ -535,25 +538,25 @@ generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_COMMANDS =
$ ./config.status
-on sulfur
+on yun
-config.status:695: creating Makefile
-config.status:695: creating src/Makefile
-config.status:695: creating tools/Makefile
-config.status:695: creating data/Makefile
-config.status:695: creating doc/Makefile
-config.status:695: creating doc/Doxyfile
-config.status:695: creating examples/Makefile
-config.status:695: creating examples/properties/Makefile
-config.status:695: creating examples/echo/Makefile
-config.status:695: creating examples/hal/Makefile
-config.status:695: creating examples/glib/Makefile
-config.status:695: creating dbus-c++-1.pc
-config.status:695: creating dbus-c++-1-uninstalled.pc
-config.status:695: creating libdbus-c++.spec
-config.status:695: creating include/dbus-c++/config.h
-config.status:921: include/dbus-c++/config.h is unchanged
-config.status:967: executing depfiles commands
+config.status:697: creating Makefile
+config.status:697: creating src/Makefile
+config.status:697: creating tools/Makefile
+config.status:697: creating data/Makefile
+config.status:697: creating doc/Makefile
+config.status:697: creating doc/Doxyfile
+config.status:697: creating examples/Makefile
+config.status:697: creating examples/properties/Makefile
+config.status:697: creating examples/echo/Makefile
+config.status:697: creating examples/hal/Makefile
+config.status:697: creating examples/glib/Makefile
+config.status:697: creating dbus-c++-1.pc
+config.status:697: creating dbus-c++-1-uninstalled.pc
+config.status:697: creating libdbus-c++.spec
+config.status:697: creating include/dbus-c++/config.h
+config.status:929: include/dbus-c++/config.h is unchanged
+config.status:976: executing depfiles commands
## ---------------- ##
## Cache variables. ##
@@ -629,7 +632,8 @@ ac_cv_path_EGREP='/bin/grep -E'
ac_cv_path_GREP=/bin/grep
ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
ac_cv_path_install='/usr/bin/install -c'
-ac_cv_prog_AWK=gawk
+ac_cv_path_mkdir=/bin/mkdir
+ac_cv_prog_AWK=mawk
ac_cv_prog_CPP='gcc -E'
ac_cv_prog_CXXCPP='g++ -E'
ac_cv_prog_ac_ct_AR=ar
@@ -665,7 +669,7 @@ lt_cv_prog_gnu_ldcxx=yes
lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ ]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ ][ ]*\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2 \2/p'\'''
lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/ {\"\1\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \([^ ]*\) \([^ ]*\)$/ {"\2", (lt_ptr) \&\2},/p'\'''
lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^. .* \(.*\)$/extern int \1;/p'\'''
-lt_cv_sys_lib_dlsearch_path_spec='/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/lib/kde4/lib /usr/local/lib '
+lt_cv_sys_lib_dlsearch_path_spec='/lib /usr/lib /lib/i486-linux-gnu /usr/lib/i486-linux-gnu /usr/local/lib '
lt_cv_sys_lib_search_path_spec='/usr/lib/gcc/i486-linux-gnu/4.2.3 /usr/lib /lib'
lt_cv_sys_max_cmd_len=98304
lt_lt_cv_prog_compiler_c_o='"yes"'
@@ -680,16 +684,16 @@ pkg_cv_dbus_LIBS='-ldbus-1 '
## Output variables. ##
## ----------------- ##
-ACLOCAL='${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run aclocal-1.9'
+ACLOCAL='${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run aclocal-1.10'
AMDEPBACKSLASH='\'
AMDEP_FALSE='#'
AMDEP_TRUE=''
-AMTAR='${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run tar'
+AMTAR='${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run tar'
AR='ar'
-AUTOCONF='${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run autoconf'
-AUTOHEADER='${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run autoheader'
-AUTOMAKE='${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run automake-1.9'
-AWK='gawk'
+AUTOCONF='${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run autoconf'
+AUTOHEADER='${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run autoheader'
+AUTOMAKE='${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run automake-1.10'
+AWK='mawk'
BUILD_LIBDBUS_CXX_DIR='$(top_builddir)'
CC='gcc'
CCDEPMODE='depmode=gcc3'
@@ -701,7 +705,7 @@ CROSS_COMPILING_TRUE='#'
CXX='g++'
CXXCPP='g++ -E'
CXXDEPMODE='depmode=gcc3'
-CXXFLAGS='-fvisibility=hidden -Wall -ggdb -O0 -DDEBUG -Wfatal-errors -Werror'
+CXXFLAGS='-fvisibility=hidden -Wall -O3'
CXX_FOR_BUILD='g++'
CYGPATH_W='echo'
DBUS_DOXYGEN_DOCS_ENABLED_FALSE=''
@@ -726,14 +730,14 @@ HAVE_GTKMM_TRUE='#'
INSTALL_DATA='${INSTALL} -m 644'
INSTALL_PROGRAM='${INSTALL}'
INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s'
+INSTALL_STRIP_PROGRAM='$(install_sh) -c -s'
LDFLAGS=''
LIBOBJS=''
LIBS=''
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
LN_S='ln -s'
LTLIBOBJS=''
-MAKEINFO='${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run makeinfo'
+MAKEINFO='${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run makeinfo'
NMEDIT=''
OBJEXT='o'
PACKAGE='libdbus-c++'
@@ -758,6 +762,7 @@ am__fastdepCC_TRUE=''
am__fastdepCXX_FALSE='#'
am__fastdepCXX_TRUE=''
am__include='include'
+am__isrc=''
am__leading_dot='.'
am__quote=''
am__tar='${AMTAR} chof - "$$tardir"'
@@ -787,13 +792,13 @@ host_vendor='pc'
htmldir='${docdir}'
includedir='${prefix}/include'
infodir='${datarootdir}/info'
-install_sh='/home-local/manu/dev/sfl/dbus-c++/install-sh'
+install_sh='$(SHELL) /home/yun/release/sflphone/libs/dbus-c++/install-sh'
libdir='${exec_prefix}/lib'
libexecdir='${exec_prefix}/libexec'
localedir='${datarootdir}/locale'
localstatedir='${prefix}/var'
mandir='${datarootdir}/man'
-mkdir_p='mkdir -p --'
+mkdir_p='/bin/mkdir -p'
oldincludedir='/usr/include'
pdfdir='${docdir}'
prefix='/usr'
diff --git a/libs/dbus-c++/config.status b/libs/dbus-c++/config.status
index 001d16349b407ccf72909ff539a499143abfefd1..0ea3449c3ea8075c1ab6f61c22bae17f4abe0b88 100755
--- a/libs/dbus-c++/config.status
+++ b/libs/dbus-c++/config.status
@@ -335,15 +335,16 @@ Report bugs to <bug-autoconf@gnu.org>."
ac_cs_version="\
libdbus-c++ config.status 0.5.0
configured by ./configure, generated by GNU Autoconf 2.61,
- with options \"'--prefix=/usr' '--enable-debug'\"
+ with options \"'--prefix=/usr'\"
Copyright (C) 2006 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-ac_pwd='/home-local/manu/dev/sfl/dbus-c++'
+ac_pwd='/home/yun/release/sflphone/libs/dbus-c++'
srcdir='.'
INSTALL='/usr/bin/install -c'
+MKDIR_P='/bin/mkdir -p'
# If no file are specified by the user, then we need to provide default
# value. By we need to know if files were specified by the user.
ac_need_defaults=:
@@ -409,10 +410,10 @@ if $ac_cs_silent; then
fi
if $ac_cs_recheck; then
- echo "running CONFIG_SHELL=/bin/bash /bin/bash ./configure " '--prefix=/usr' '--enable-debug' $ac_configure_extra_args " --no-create --no-recursion" >&6
+ echo "running CONFIG_SHELL=/bin/bash /bin/bash ./configure " '--prefix=/usr' $ac_configure_extra_args " --no-create --no-recursion" >&6
CONFIG_SHELL=/bin/bash
export CONFIG_SHELL
- exec /bin/bash "./configure" '--prefix=/usr' '--enable-debug' $ac_configure_extra_args --no-create --no-recursion
+ exec /bin/bash "./configure" '--prefix=/usr' $ac_configure_extra_args --no-create --no-recursion
fi
exec 5>>config.log
@@ -547,22 +548,23 @@ s,@target_alias@,|#_!!_#|,g
s,@INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g
s,@INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g
s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g
+s,@am__isrc@,|#_!!_#|,g
s,@CYGPATH_W@,|#_!!_#|echo,g
s,@PACKAGE@,|#_!!_#|libdbus-c++,g
s,@VERSION@,|#_!!_#|0.5.0,g
-s,@ACLOCAL@,|#_!!_#|${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run aclocal-1.9,g
-s,@AUTOCONF@,|#_!!_#|${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run autoconf,g
-s,@AUTOMAKE@,|#_!!_#|${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run automake-1.9,g
-s,@AUTOHEADER@,|#_!!_#|${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run autoheader,g
-s,@MAKEINFO@,|#_!!_#|${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run makeinfo,g
-s,@install_sh@,|#_!!_#|/home-local/manu/dev/sfl/dbus-c++/install-sh,g
+s,@ACLOCAL@,|#_!!_#|${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run aclocal-1.10,g
+s,@AUTOCONF@,|#_!!_#|${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run autoconf,g
+s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run automake-1.10,g
+s,@AUTOHEADER@,|#_!!_#|${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run autoheader,g
+s,@MAKEINFO@,|#_!!_#|${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run makeinfo,g
+s,@install_sh@,|#_!!_#|$(SHELL) /home/yun/release/sflphone/libs/dbus-c++/install-sh,g
s,@STRIP@,|#_!!_#|strip,g
-s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|${SHELL} $(install_sh) -c -s,g
-s,@mkdir_p@,|#_!!_#|mkdir -p --,g
-s,@AWK@,|#_!!_#|gawk,g
+s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g
+s,@mkdir_p@,|#_!!_#|/bin/mkdir -p,g
+s,@AWK@,|#_!!_#|mawk,g
s,@SET_MAKE@,|#_!!_#|,g
s,@am__leading_dot@,|#_!!_#|.,g
-s,@AMTAR@,|#_!!_#|${SHELL} /home-local/manu/dev/sfl/dbus-c++/missing --run tar,g
+s,@AMTAR@,|#_!!_#|${SHELL} /home/yun/release/sflphone/libs/dbus-c++/missing --run tar,g
s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g
s,@am__untar@,|#_!!_#|${AMTAR} xf -,g
s,@build@,|#_!!_#|i686-pc-linux-gnu,g
@@ -590,7 +592,7 @@ s,@CCDEPMODE@,|#_!!_#|depmode=gcc3,g
s,@am__fastdepCC_TRUE@,|#_!!_#|,g
s,@am__fastdepCC_FALSE@,|#_!!_#|#,g
s,@CXX@,|#_!!_#|g++,g
-s,@CXXFLAGS@,|#_!!_#|-fvisibility=hidden -Wall -ggdb -O0 -DDEBUG -Wfatal-errors -Werror,g
+s,@CXXFLAGS@,|#_!!_#|-fvisibility=hidden -Wall -O3,g
s,@ac_ct_CXX@,|#_!!_#|g++,g
s,@CXXDEPMODE@,|#_!!_#|depmode=gcc3,g
s,@am__fastdepCXX_TRUE@,|#_!!_#|,g
@@ -603,10 +605,10 @@ s,@LN_S@,|#_!!_#|ln -s,g
s,@ECHO@,|#_!!_#|echo,g
s,@AR@,|#_!!_#|ar,g
s,@RANLIB@,|#_!!_#|ranlib,g
-s,@DSYMUTIL@,|#_!!_#|,g
CEOF
cat >"$tmp/subs-2.sed" <<\CEOF
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
+s,@DSYMUTIL@,|#_!!_#|,g
s,@NMEDIT@,|#_!!_#|,g
s,@CPP@,|#_!!_#|gcc -E,g
s,@CXXCPP@,|#_!!_#|g++ -E,g
@@ -811,6 +813,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -858,6 +865,7 @@ s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
@@ -930,21 +938,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -979,8 +988,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff --git a/libs/dbus-c++/configure b/libs/dbus-c++/configure
index 48123fda540424a6d1b09fa6b4a7ac3f6e40a710..589d261d54f4511560e32fc7659c37c43a5643be 100755
--- a/libs/dbus-c++/configure
+++ b/libs/dbus-c++/configure
@@ -808,6 +808,7 @@ target_alias
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
+am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -1972,7 +1973,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version="1.9"
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -2155,38 +2157,53 @@ else
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
-else
- # On NextStep and OpenStep, the `mkdir' command does not
- # recognize any option. It will interpret all options as
- # directories to create, and then abort because `.' already
- # exists.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
else
- mkdir_p='$(install_sh) -d'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
fi
fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
for ac_prog in gawk mawk nawk awk
do
@@ -2269,12 +2286,16 @@ else
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2317,7 +2338,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2421,7 +2442,7 @@ else
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -3534,9 +3555,7 @@ if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
@@ -3546,7 +3565,6 @@ fi
-
depcc="$CC" am_compiler_list=
{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -3614,6 +3632,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -3643,9 +3662,7 @@ fi
echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
@@ -4087,6 +4104,7 @@ else
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -4116,9 +4134,7 @@ fi
echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-if
+ if
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
@@ -4859,7 +4875,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4862 "configure"' > conftest.$ac_ext
+ echo '#line 4878 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7443,11 +7459,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7446: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7462: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7450: \$? = $ac_status" >&5
+ echo "$as_me:7466: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7733,11 +7749,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7736: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7752: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7740: \$? = $ac_status" >&5
+ echo "$as_me:7756: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7837,11 +7853,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7840: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7856: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7844: \$? = $ac_status" >&5
+ echo "$as_me:7860: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10214,7 +10230,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10217 "configure"
+#line 10233 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10314,7 +10330,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10317 "configure"
+#line 10333 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12715,11 +12731,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12718: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12734: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12722: \$? = $ac_status" >&5
+ echo "$as_me:12738: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12819,11 +12835,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12822: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12838: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12826: \$? = $ac_status" >&5
+ echo "$as_me:12842: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14417,11 +14433,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14420: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14436: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14424: \$? = $ac_status" >&5
+ echo "$as_me:14440: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14521,11 +14537,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14524: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14540: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14528: \$? = $ac_status" >&5
+ echo "$as_me:14544: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16741,11 +16757,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16744: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16760: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16748: \$? = $ac_status" >&5
+ echo "$as_me:16764: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17031,11 +17047,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17034: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17050: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17038: \$? = $ac_status" >&5
+ echo "$as_me:17054: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17135,11 +17151,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17138: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17154: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17142: \$? = $ac_status" >&5
+ echo "$as_me:17158: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20216,9 +20232,7 @@ echo "${ECHO_T}yes" >&6; }
fi
-
-
-if test 1 = 1; then
+ if test 1 = 1; then
ENABLE_GLIB_TRUE=
ENABLE_GLIB_FALSE='#'
else
@@ -20287,9 +20301,7 @@ fi
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -20299,9 +20311,7 @@ fi
elif test $pkg_failed = untried; then
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -20315,9 +20325,7 @@ else
gtkmm_LIBS=$pkg_cv_gtkmm_LIBS
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-
-
-if test 1 = 1; then
+ if test 1 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -20329,9 +20337,7 @@ fi
else
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
ENABLE_GLIB_TRUE=
ENABLE_GLIB_FALSE='#'
else
@@ -20339,9 +20345,7 @@ else
ENABLE_GLIB_FALSE=
fi
-
-
-if test 0 = 1; then
+ if test 0 = 1; then
HAVE_GTKMM_TRUE=
HAVE_GTKMM_FALSE='#'
else
@@ -20878,9 +20882,7 @@ echo "$as_me: error: Building Doxygen docs explicitly required, but Doxygen not
echo "${ECHO_T}yes" >&6; }
fi
-
-
-if test "$enable_doxygen_docs" = "yes"; then
+ if test "$enable_doxygen_docs" = "yes"; then
DBUS_DOXYGEN_DOCS_ENABLED_TRUE=
DBUS_DOXYGEN_DOCS_ENABLED_FALSE='#'
else
@@ -20891,9 +20893,7 @@ fi
# For the tools/, we need libdbus-c++ for the "build" architecture as well
-
-
-if test "$cross_compiling" = "yes"; then
+ if test "$cross_compiling" = "yes"; then
CROSS_COMPILING_TRUE=
CROSS_COMPILING_FALSE='#'
else
@@ -21448,6 +21448,7 @@ gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -21668,6 +21669,7 @@ target_alias!$target_alias$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -21724,7 +21726,6 @@ LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
-DSYMUTIL!$DSYMUTIL$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -21766,6 +21767,7 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+DSYMUTIL!$DSYMUTIL$ac_delim
NMEDIT!$NMEDIT$ac_delim
CPP!$CPP$ac_delim
CXXCPP!$CXXCPP$ac_delim
@@ -21796,7 +21798,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -22023,6 +22025,11 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -22076,6 +22083,7 @@ s&@builddir@&$ac_builddir&;t t
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
@@ -22191,21 +22199,22 @@ echo "$as_me: $ac_file is unchanged" >&6;}
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
+_am_arg=$ac_file
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ $_am_arg | $_am_arg:* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$_am_arg" : 'X\(//\)[^/]' \| \
+ X"$_am_arg" : 'X\(//\)$' \| \
+ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
+echo X"$_am_arg" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -22240,8 +22249,9 @@ echo "$as_me: executing $ac_file commands" >&6;}
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
- # So let's grep whole file.
- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ # Grep'ing the whole file is not good either: AIX grep has a line
+ # limit of 2048, but all sed's we know have understand at least 4000.
+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
diff --git a/libs/dbus-c++/depcomp b/libs/dbus-c++/depcomp
index 04701da536f33a7c39d7bb01b87a70ae3a776df5..e5f9736c7239301c765e2d7abefb9bb9b9237ac5 100755
--- a/libs/dbus-c++/depcomp
+++ b/libs/dbus-c++/depcomp
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-07-09.11
+scriptversion=2007-03-29.01
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+# Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -91,7 +92,20 @@ gcc3)
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+ case $arg in
+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+ *) set fnord "$@" "$arg" ;;
+ esac
+ shift # fnord
+ shift # $arg
+ done
+ "$@"
stat=$?
if test $stat -eq 0; then :
else
@@ -201,34 +215,39 @@ aix)
# current directory. Also, the AIX compiler puts `$object:' at the
# start of each line; $object doesn't have directory information.
# Version 6 uses the directory in both cases.
- stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
- tmpdepfile="$stripped.u"
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$base.u
+ tmpdepfile3=$dir.libs/$base.u
"$@" -Wc,-M
else
+ tmpdepfile1=$dir$base.u
+ tmpdepfile2=$dir$base.u
+ tmpdepfile3=$dir$base.u
"$@" -M
fi
stat=$?
- if test -f "$tmpdepfile"; then :
- else
- stripped=`echo "$stripped" | sed 's,^.*/,,'`
- tmpdepfile="$stripped.u"
- fi
-
if test $stat -eq 0; then :
else
- rm -f "$tmpdepfile"
+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
exit $stat
fi
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+ do
+ test -f "$tmpdepfile" && break
+ done
if test -f "$tmpdepfile"; then
- outname="$stripped.o"
# Each line is of the form `foo.o: dependent.h'.
# Do two passes, one to just change these to
# `$object: dependent.h' and one to simply `dependent.h:'.
- sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
- sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a tab and a space in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
else
# The sourcefile does not contain any dependencies, so just
# store a dummy comment line, to avoid errors with the Makefile
@@ -276,6 +295,46 @@ icc)
rm -f "$tmpdepfile"
;;
+hp2)
+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+ # compilers, which have integrated preprocessors. The correct option
+ # to use with these is +Maked; it writes dependencies to a file named
+ # 'foo.d', which lands next to the object file, wherever that
+ # happens to be.
+ # Much of this is similar to the tru64 case; see comments there.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+ if test "$libtool" = yes; then
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir.libs/$base.d
+ "$@" -Wc,+Maked
+ else
+ tmpdepfile1=$dir$base.d
+ tmpdepfile2=$dir$base.d
+ "$@" +Maked
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+ do
+ test -f "$tmpdepfile" && break
+ done
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+ # Add `dependent.h:' lines.
+ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile" "$tmpdepfile2"
+ ;;
+
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +347,13 @@ tru64)
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
- # static library. This mecanism is used in libtool 1.4 series to
+ # static library. This mechanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in in $dir.libs/$base.o.d and
+ # compilations output dependencies in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
diff --git a/libs/dbus-c++/install-sh b/libs/dbus-c++/install-sh
index 4d4a9519eaf88b18fb157dfe5fae59c1c5d005c7..a5897de6ea7f74f83fd793474bb4738d32884719 100755
--- a/libs/dbus-c++/install-sh
+++ b/libs/dbus-c++/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2005-05-14.22
+scriptversion=2006-12-25.00
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@ scriptversion=2005-05-14.22
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch. It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" "" $nl"
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
-chmodcmd="$chmodprog 0755"
-chowncmd=
chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
src=
dst=
dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
no_target_directory=
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
or: $0 [OPTION]... SRCFILES... DIRECTORY
or: $0 [OPTION]... -t DIRECTORY SRCFILES...
or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
In the 4th, create DIRECTORIES.
Options:
--c (ignored)
--d create directories instead of installing files.
--g GROUP $chgrpprog installed files to GROUP.
--m MODE $chmodprog installed files to MODE.
--o USER $chownprog installed files to USER.
--s $stripprog installed files.
--t DIRECTORY install into DIRECTORY.
--T report an error if DSTFILE is a directory.
---help display this help and exit.
---version display version info and exit.
+ --help display this help and exit.
+ --version display version info and exit.
+
+ -c (ignored)
+ -C install only if different (preserve the last data modification time)
+ -d create directories instead of installing files.
+ -g GROUP $chgrpprog installed files to GROUP.
+ -m MODE $chmodprog installed files to MODE.
+ -o USER $chownprog installed files to USER.
+ -s $stripprog installed files.
+ -t DIRECTORY install into DIRECTORY.
+ -T report an error if DSTFILE is a directory.
Environment variables override the default commands:
- CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+ RMPROG STRIPPROG
"
-while test -n "$1"; do
+while test $# -ne 0; do
case $1 in
- -c) shift
- continue;;
+ -c) ;;
+
+ -C) copy_on_change=true;;
- -d) dir_arg=true
- shift
- continue;;
+ -d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
+ shift;;
--help) echo "$usage"; exit $?;;
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
+ -m) mode=$2
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
-o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
+ shift;;
- -s) stripcmd=$stripprog
- shift
- continue;;
+ -s) stripcmd=$stripprog;;
- -t) dstarg=$2
- shift
- shift
- continue;;
+ -t) dst_arg=$2
+ shift;;
- -T) no_target_directory=true
- shift
- continue;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
- *) # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- test -n "$dir_arg$dstarg" && break
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
+ --) shift
break;;
+
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
+
+ *) break;;
esac
+ shift
done
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dst_arg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dst_arg"
+ shift # fnord
+ fi
+ shift # arg
+ dst_arg=$arg
+ done
+fi
+
+if test $# -eq 0; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
@@ -164,24 +199,47 @@ if test -z "$1"; then
exit 0
fi
+if test -z "$dir_arg"; then
+ trap '(exit $?); exit' 1 2 13 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+ case $mode in
+ # Optimize common cases.
+ *644) cp_umask=133;;
+ *755) cp_umask=22;;
+
+ *[0-7])
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw='% 200'
+ fi
+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+ *)
+ if test -z "$stripcmd"; then
+ u_plus_rw=
+ else
+ u_plus_rw=,u+rw
+ fi
+ cp_umask=$mode$u_plus_rw;;
+ esac
+fi
+
for src
do
# Protect names starting with `-'.
case $src in
- -*) src=./$src ;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
dst=$src
- src=
-
- if test -d "$dst"; then
- mkdircmd=:
- chmodcmd=
- else
- mkdircmd=$mkdirprog
- fi
+ dstdir=$dst
+ test -d "$dstdir"
+ dstdir_status=$?
else
+
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@ do
exit 1
fi
- if test -z "$dstarg"; then
+ if test -z "$dst_arg"; then
echo "$0: no destination specified." >&2
exit 1
fi
- dst=$dstarg
+ dst=$dst_arg
# Protect names starting with `-'.
case $dst in
- -*) dst=./$dst ;;
+ -*) dst=./$dst;;
esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
if test -d "$dst"; then
if test -n "$no_target_directory"; then
- echo "$0: $dstarg: Is a directory" >&2
+ echo "$0: $dst_arg: Is a directory" >&2
exit 1
fi
- dst=$dst/`basename "$src"`
+ dstdir=$dst
+ dst=$dstdir/`basename "$src"`
+ dstdir_status=0
+ else
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+ dstdir_status=$?
fi
fi
- # This sed command emulates the dirname command.
- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+ obsolete_mkdir_used=false
+
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
+ else
+ mkdir_mode=
+ fi
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
+ esac
- # Make sure that the destination directory exists.
+ if
+ $posix_mkdir && (
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ )
+ then :
+ else
- # Skip lots of stat calls in the usual case.
- if test ! -d "$dstdir"; then
- defaultIFS='
- '
- IFS="${IFS-$defaultIFS}"
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
+ # or it failed possibly due to a race condition. Create the
+ # directory the slow way, step by step, checking for races as we go.
- oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
- shift
- IFS=$oIFS
+ case $dstdir in
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
+ esac
- pathcomp=
+ eval "$initialize_posix_glob"
- while test $# -ne 0 ; do
- pathcomp=$pathcomp$1
+ oIFS=$IFS
+ IFS=/
+ $posix_glob set -f
+ set fnord $dstdir
shift
- if test ! -d "$pathcomp"; then
- $mkdirprog "$pathcomp"
- # mkdir can fail with a `File exist' error in case several
- # install-sh are creating the directory concurrently. This
- # is OK.
- test -d "$pathcomp" || exit
+ $posix_glob set +f
+ IFS=$oIFS
+
+ prefixes=
+
+ for d
+ do
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
+ done
+
+ if test -n "$prefixes"; then
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
- pathcomp=$pathcomp/
- done
+ fi
fi
if test -n "$dir_arg"; then
- $doit $mkdircmd "$dst" \
- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
else
- dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@ do
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
- trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
- $doit $cpprog "$src" "$dsttmp" &&
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -273,48 +458,59 @@ do
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $cpprog $src $dsttmp" command.
#
- { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
- && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
- # Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
- || {
- # The rename failed, perhaps because mv can't rename something else
- # to itself, or perhaps because mv is so ancient that it does not
- # support -f.
-
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- if test -f "$dstdir/$dstfile"; then
- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
- || {
- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
- (exit 1); exit 1
- }
- else
- :
- fi
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- }
- }
- fi || { (exit 1); exit 1; }
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
+ trap '' 0
+ fi
done
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
- (exit 0); exit 0
-}
-
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
diff --git a/libs/dbus-c++/missing b/libs/dbus-c++/missing
index 894e786e16c1d0d94dfc08d6b475270fe1418d6a..1c8ff7049d8f3aaa9741c53e7f3145d9b76a77d8 100755
--- a/libs/dbus-c++/missing
+++ b/libs/dbus-c++/missing
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
@@ -33,6 +33,8 @@ if test $# -eq 0; then
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@ fi
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@ Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@ esac
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@ esac
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg. You should only need it if
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@ WARNING: \`$1' $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg. You should only need it if
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg. You should only need it if
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@ WARNING: \`$1' is $msg. You should only need it if
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@ WARNING: \`$1' is $msg. You should only need it if
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0