diff options
author | Simon McVittie <smcv@debian.org> | 2012-06-27 17:57:41 +0100 |
---|---|---|
committer | Simon McVittie <smcv@debian.org> | 2012-06-27 17:57:41 +0100 |
commit | b313f4096282ed86c088e0d27f4f0798e5529521 (patch) | |
tree | ddc1abe13deed4d1d352d23c685b51cf9a56a43c /configure | |
parent | 5f8487730b96ad8d44f02d1a3aa74a6cceaf72b6 (diff) | |
download | dbus-7c84ae1cdcc3558a5e22b30e9adbc548f30ee806.tar.gz |
Imported Upstream version 1.6.2upstream/1.6.2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 106 |
1 files changed, 50 insertions, 56 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dbus 1.6.0. +# Generated by GNU Autoconf 2.69 for dbus 1.6.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dbus' PACKAGE_TARNAME='dbus' -PACKAGE_VERSION='1.6.0' -PACKAGE_STRING='dbus 1.6.0' +PACKAGE_VERSION='1.6.2' +PACKAGE_STRING='dbus 1.6.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=dbus' PACKAGE_URL='' @@ -758,6 +758,7 @@ DBUS_ENABLE_EMBEDDED_TESTS_FALSE DBUS_ENABLE_EMBEDDED_TESTS_TRUE DBUS_BUILD_TESTS_FALSE DBUS_BUILD_TESTS_TRUE +DBUS_STATIC_BUILD_CPPFLAGS DBUS_CYGWIN_FALSE DBUS_CYGWIN_TRUE DBUS_UNIX_FALSE @@ -916,6 +917,7 @@ with_sysroot enable_libtool_lock enable_compiler_coverage enable_compiler_optimisations +enable_developer enable_ansi enable_verbose_mode enable_asserts @@ -1525,7 +1527,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dbus 1.6.0 to adapt to many kinds of systems. +\`configure' configures dbus 1.6.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1599,7 +1601,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dbus 1.6.0:";; + short | recursive ) echo "Configuration of dbus 1.6.2:";; esac cat <<\_ACEOF @@ -1607,7 +1609,7 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful + --disable-maintainer-mode disable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-silent-rules less verbose build output (undo: `make V=1') --disable-silent-rules verbose build output (undo: `make V=0') @@ -1622,6 +1624,9 @@ Optional Features: Enable generation of coverage data --disable-compiler-optimisations Disable compiler optimisations + --enable-developer set defaults to be appropriate for a D-Bus developer + instead of a distribution/end-user, + , enable_developer=no --enable-ansi enable -ansi -pedantic gcc flags --enable-verbose-mode support verbose debug mode --enable-asserts include assertion checks @@ -1795,7 +1800,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dbus configure 1.6.0 +dbus configure 1.6.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2514,7 +2519,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dbus $as_me 1.6.0, which was +It was created by dbus $as_me 1.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3406,7 +3411,7 @@ fi # Define the identity of the package. PACKAGE='dbus' - VERSION='1.6.0' + VERSION='1.6.2' cat >>confdefs.h <<_ACEOF @@ -3536,7 +3541,8 @@ cat >>confdefs.h <<_ACEOF _ACEOF - ## must come before we use the $USE_MAINTAINER_MODE variable later +# By default, rebuild autotools files on demand; only use ./missing if the +# user says --disable-maintainer-mode (some distributions like to do this) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } @@ -3544,7 +3550,7 @@ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else - USE_MAINTAINER_MODE=no + USE_MAINTAINER_MODE=yes fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 @@ -3617,7 +3623,7 @@ LT_CURRENT=10 ## increment any time the source changes; set to ## 0 if you increment CURRENT -LT_REVISION=1 +LT_REVISION=2 ## increment if any interfaces have been added; set to 0 ## if any interfaces have been changed or removed. removal has @@ -3630,8 +3636,8 @@ LT_AGE=7 DBUS_MAJOR_VERSION=1 DBUS_MINOR_VERSION=6 -DBUS_MICRO_VERSION=0 -DBUS_VERSION=1.6.0 +DBUS_MICRO_VERSION=2 +DBUS_VERSION=1.6.2 @@ -6883,10 +6889,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -6925,7 +6927,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -9595,7 +9597,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -11765,17 +11767,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -11892,7 +11883,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -13715,9 +13706,6 @@ fi ld_shlibs_CXX=yes ;; - gnu*) - ;; - haiku*) archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' link_all_deplibs_CXX=yes @@ -13879,7 +13867,7 @@ fi inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -14739,7 +14727,7 @@ lt_prog_compiler_static_CXX= ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -15611,17 +15599,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -15738,7 +15715,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -16633,6 +16610,23 @@ else fi +# this must come first: other options use this to set their defaults +# Check whether --enable-developer was given. +if test "${enable_developer+set}" = set; then : + enableval=$enable_developer; +fi + + +DBUS_STATIC_BUILD_CPPFLAGS= +if test "x$enable_shared" = xno; then + # On Windows, linking against the static library requires special effort + # to turn off DLL import/export processing. We normally link some things + # against the dynamic library, but if we're not building that, we'll + # have to link everything statically. + DBUS_STATIC_BUILD_CPPFLAGS=-DDBUS_STATIC_BUILD +fi + + # Check whether --enable-ansi was given. if test "${enable_ansi+set}" = set; then : enableval=$enable_ansi; enable_ansi=$enableval @@ -16644,14 +16638,14 @@ fi if test "${enable_verbose_mode+set}" = set; then : enableval=$enable_verbose_mode; enable_verbose_mode=$enableval else - enable_verbose_mode=$USE_MAINTAINER_MODE + enable_verbose_mode=$enable_developer fi # Check whether --enable-asserts was given. if test "${enable_asserts+set}" = set; then : enableval=$enable_asserts; enable_asserts=$enableval else - enable_asserts=$USE_MAINTAINER_MODE + enable_asserts=$enable_developer fi # Check whether --enable-checks was given. @@ -16825,7 +16819,7 @@ fi if test "${enable_embedded_tests+set}" = set; then : enableval=$enable_embedded_tests; else - enable_embedded_tests=$USE_MAINTAINER_MODE + enable_embedded_tests=$enable_developer fi # Check whether --enable-modular-tests was given. @@ -21563,7 +21557,7 @@ else fi - if test "x$tp_werror" = xyes && test x$dbus_win != xyes -a x$dbus_cygwin != xyes -a x$USE_MAINTAINER_MODE = xyes; then + if test "x$tp_werror" = xyes && test x$dbus_win != xyes -a x$dbus_cygwin != xyes -a x$enable_developer = xyes; then WARNING_CFLAGS="$tp_error_flags $tp_warnings" else WARNING_CFLAGS="$tp_warnings" @@ -23178,7 +23172,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dbus $as_me 1.6.0, which was +This file was extended by dbus $as_me 1.6.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23244,7 +23238,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dbus config.status 1.6.0 +dbus config.status 1.6.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -25579,7 +25573,7 @@ echo " man2html: ${MAN2HTML:-not found}" echo " - Maintainer mode: ${USE_MAINTAINER_MODE} + Rebuilding generated files: ${USE_MAINTAINER_MODE} gcc coverage profiling: ${enable_compiler_coverage} Building embedded tests: ${enable_embedded_tests} Building modular tests: ${enable_modular_tests} |