diff --git a/ChangeLog b/ChangeLog index 51913df763c..cb67e0c9655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-02 Benjamin Kosnik + + * configure.ac: Adjust to check VTV_SUPPORTED. + * configure: Regenerated. + 2013-08-02 Caroline Tice * configure.ac: Add target-libvtv to target_libraries; disable libvtv diff --git a/configure b/configure index 00bd73babc0..ee45e1b00f9 100755 --- a/configure +++ b/configure @@ -3223,7 +3223,7 @@ if test -d ${srcdir}/libvtv; then $as_echo_n "checking for libvtv support... " >&6; } if (srcdir=${srcdir}/libvtv; \ . ${srcdir}/configure.tgt; \ - test -n "$UNSUPPORTED") + test "$VTV_SUPPORTED" != "yes") then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } diff --git a/configure.ac b/configure.ac index bcbc95c32f9..6f3d801ab06 100644 --- a/configure.ac +++ b/configure.ac @@ -561,7 +561,7 @@ if test -d ${srcdir}/libvtv; then AC_MSG_CHECKING([for libvtv support]) if (srcdir=${srcdir}/libvtv; \ . ${srcdir}/configure.tgt; \ - test -n "$UNSUPPORTED") + test "$VTV_SUPPORTED" != "yes") then AC_MSG_RESULT([no]) noconfigdirs="$noconfigdirs target-libvtv" diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog index fb896cceed5..d05a8e7b4fe 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,8 @@ +2013-08-08 Benjamin Kosnik + Michael Meissner + + * configure.tgt : Simplify, just use VTV_SUPPORTED. + 2013-08-07 Benjamin Kosnik * Makefile.am (SUBDIRS): Protect with ENABLE_VTABLE_VERIFY. diff --git a/libvtv/configure.tgt b/libvtv/configure.tgt index a84ed27f8ec..801d2f09564 100644 --- a/libvtv/configure.tgt +++ b/libvtv/configure.tgt @@ -19,6 +19,7 @@ # lets us skip running autoconf when modifying target specific information. # Filter out unsupported systems. +VTV_SUPPORTED=no case "${target}" in x86_64-*-linux* | i?86-*-linux*) VTV_SUPPORTED=yes @@ -30,9 +31,7 @@ case "${target}" in arm*-*-linux*) ;; x86_64-*-darwin[1]* | i?86-*-darwin[1]*) - VTV_SUPPORTED=no ;; *) - UNSUPPORTED=1 ;; esac