diff options
Diffstat (limited to 'libvtv/configure')
| -rwxr-xr-x | libvtv/configure | 146 |
1 files changed, 75 insertions, 71 deletions
diff --git a/libvtv/configure b/libvtv/configure index 2aeb42cb39b..43865283321 100755 --- a/libvtv/configure +++ b/libvtv/configure @@ -602,14 +602,6 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -VTV_SUPPORTED_FALSE -VTV_SUPPORTED_TRUE -toplevel_srcdir -toplevel_builddir -libvtv_srcdir -libvtv_builddir -ENABLE_VTABLE_VERIFY_FALSE -ENABLE_VTABLE_VERIFY_TRUE XCFLAGS libtool_VERSION enable_static @@ -661,6 +653,10 @@ CFLAGS CC toolexeclibdir toolexecdir +toplevel_srcdir +toplevel_builddir +libvtv_srcdir +libvtv_builddir MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -703,6 +699,8 @@ build_os build_vendor build_cpu build +ENABLE_VTABLE_VERIFY_FALSE +ENABLE_VTABLE_VERIFY_TRUE target_alias host_alias build_alias @@ -745,6 +743,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_version_specific_runtime_libs +enable_vtable_verify enable_multilib enable_maintainer_mode enable_dependency_tracking @@ -754,7 +753,6 @@ with_pic enable_fast_install with_gnu_ld enable_libtool_lock -enable_vtable_verify ' ac_precious_vars='build_alias host_alias @@ -1383,6 +1381,7 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory + --enable-vtable-verify Enable vtable verification feature --enable-multilib build many library versions (default) --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer @@ -1393,7 +1392,6 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-vtable-verify Enable vtable verification feature Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2254,6 +2252,49 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $version_specific_libs" >&5 $as_echo "$version_specific_libs" >&6; } +# Use same top-level configure hooks in libgcc/libstdc++/libvtv. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-vtable-verify" >&5 +$as_echo_n "checking for --enable-vtable-verify... " >&6; } +# Check whether --enable-vtable-verify was given. +if test "${enable_vtable_verify+set}" = set; then : + enableval=$enable_vtable_verify; case "$enableval" in + yes) enable_vtable_verify=yes ;; + no) enable_vtable_verify=no ;; + *) enable_vtable_verify=no;; + esac +else + enable_vtable_verify=no +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtable_verify" >&5 +$as_echo "$enable_vtable_verify" >&6; } + +# See if supported. +unset VTV_SUPPORTED +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for host support for vtable verification" >&5 +$as_echo_n "checking for host support for vtable verification... " >&6; } +. ${srcdir}/configure.tgt +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTV_SUPPORTED" >&5 +$as_echo "$VTV_SUPPORTED" >&6; } + +# Decide if it's usable. +use_vtable_verify=no +if test "x$VTV_SUPPORTED" = "xyes"; then + if test "x$enable_vtable_verify" = "xyes"; then + use_vtable_verify=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: using vtable verification" >&5 +$as_echo "$as_me: using vtable verification" >&6;} + fi +fi + if test $use_vtable_verify = yes; then + ENABLE_VTABLE_VERIFY_TRUE= + ENABLE_VTABLE_VERIFY_FALSE='#' +else + ENABLE_VTABLE_VERIFY_TRUE='#' + ENABLE_VTABLE_VERIFY_FALSE= +fi + + # Do not delete or change the following two lines. For why, see # http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html ac_aux_dir= @@ -2960,6 +3001,24 @@ fi + + + # These need to be absolute paths, yet at the same time need to + # canonicalize only relative paths, because then amd will not unmount + # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. + libvtv_builddir=`${PWDCMD-pwd}` + case $srcdir in + \\/$* | ?:\\/*) libvtv_srcdir=${srcdir} ;; + *) libvtv_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; + esac + toplevel_builddir=${libvtv_builddir}/.. + toplevel_srcdir=${libvtv_srcdir}/.. + + + + + + # Calculate toolexeclibdir # Also toolexecdir, though it's only used in toolexeclibdir case ${version_specific_libs} in @@ -11217,7 +11276,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11220 "configure" +#line 11279 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11323,7 +11382,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11326 "configure" +#line 11385 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14592,57 +14651,6 @@ else multilib_arg= fi - - - # Use same top-level configure hooks in libgcc/libstdc++/libvtv. - # Check whether --enable-vtable-verify was given. -if test "${enable_vtable_verify+set}" = set; then : - enableval=$enable_vtable_verify; case "$enableval" in - yes) enable_vtable_verify=yes ;; - no) enable_vtable_verify=no ;; - *) enable_vtable_verify=no;; - esac -else - enable_vtable_verify=no -fi - - if test $enable_vtable_verify = yes; then - ENABLE_VTABLE_VERIFY_TRUE= - ENABLE_VTABLE_VERIFY_FALSE='#' -else - ENABLE_VTABLE_VERIFY_TRUE='#' - ENABLE_VTABLE_VERIFY_FALSE= -fi - - - # These need to be absolute paths, yet at the same time need to - # canonicalize only relative paths, because then amd will not unmount - # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd. - libvtv_builddir=`${PWDCMD-pwd}` - case $srcdir in - \\/$* | ?:\\/*) libvtv_srcdir=${srcdir} ;; - *) libvtv_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;; - esac - toplevel_builddir=${libvtv_builddir}/.. - toplevel_srcdir=${libvtv_srcdir}/.. - - - - - - -# Get target configury. -unset VTV_SUPPORTED -. ${srcdir}/configure.tgt - if test "x$VTV_SUPPORTED" = "xyes"; then - VTV_SUPPORTED_TRUE= - VTV_SUPPORTED_FALSE='#' -else - VTV_SUPPORTED_TRUE='#' - VTV_SUPPORTED_FALSE= -fi - - ac_config_files="$ac_config_files Makefile" @@ -14784,6 +14792,10 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +if test -z "${ENABLE_VTABLE_VERIFY_TRUE}" && test -z "${ENABLE_VTABLE_VERIFY_FALSE}"; then + as_fn_error "conditional \"ENABLE_VTABLE_VERIFY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -14808,14 +14820,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ENABLE_VTABLE_VERIFY_TRUE}" && test -z "${ENABLE_VTABLE_VERIFY_FALSE}"; then - as_fn_error "conditional \"ENABLE_VTABLE_VERIFY\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi -if test -z "${VTV_SUPPORTED_TRUE}" && test -z "${VTV_SUPPORTED_FALSE}"; then - as_fn_error "conditional \"VTV_SUPPORTED\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 |