From a8adc78f494c920da7786b4639f827d2422d3215 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Mon, 9 Feb 2015 12:41:22 +0100 Subject: [PATCH] libvtv: autoreconf. libvtv/ * Makefile.in: Regenerate. * aclocal.m4: Likewise. * configure: Likewise. * testsuite/Makefile.in: Likewise. From-SVN: r220535 --- libvtv/ChangeLog | 7 +++++++ libvtv/Makefile.in | 2 ++ libvtv/aclocal.m4 | 1 + libvtv/configure | 28 +++++++++++++++++++++++++--- libvtv/testsuite/Makefile.in | 2 ++ 5 files changed, 37 insertions(+), 3 deletions(-) diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog index 7dd9f096a61..dd8d2a4e608 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,10 @@ +2015-02-09 Thomas Schwinge + + * Makefile.in: Regenerate. + * aclocal.m4: Likewise. + * configure: Likewise. + * testsuite/Makefile.in: Likewise. + 2015-01-29 Caroline Tice Committing VTV Cywin/Ming patch for Patrick Wollgast diff --git a/libvtv/Makefile.in b/libvtv/Makefile.in index 098ee888fc1..bc472fd518b 100644 --- a/libvtv/Makefile.in +++ b/libvtv/Makefile.in @@ -46,6 +46,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/libstdc++-raw-cxx.m4 \ + $(top_srcdir)/../config/lthostflags.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ @@ -257,6 +258,7 @@ libvtv_builddir = @libvtv_builddir@ libvtv_srcdir = @libvtv_srcdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_host_flags = @lt_host_flags@ mandir = @mandir@ mkdir_p = @mkdir_p@ multi_basedir = @multi_basedir@ diff --git a/libvtv/aclocal.m4 b/libvtv/aclocal.m4 index 5478f2b7df7..cb5eb67a3f9 100644 --- a/libvtv/aclocal.m4 +++ b/libvtv/aclocal.m4 @@ -1007,6 +1007,7 @@ m4_include([../config/acx.m4]) m4_include([../config/depstand.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/libstdc++-raw-cxx.m4]) +m4_include([../config/lthostflags.m4]) m4_include([../config/multi.m4]) m4_include([../config/override.m4]) m4_include([../ltoptions.m4]) diff --git a/libvtv/configure b/libvtv/configure index 64b6f759557..a7211b87f82 100755 --- a/libvtv/configure +++ b/libvtv/configure @@ -608,6 +608,7 @@ XCFLAGS libtool_VERSION enable_static enable_shared +lt_host_flags CXXCPP OTOOL64 OTOOL @@ -12129,7 +12130,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12132 "configure" +#line 12133 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12235,7 +12236,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12238 "configure" +#line 12239 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15488,7 +15489,28 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Only expand once: -ACX_LT_HOST_FLAGS + + + +case $host in + *-cygwin* | *-mingw*) + # 'host' will be top-level target in the case of a target lib, + # we must compare to with_cross_host to decide if this is a native + # or cross-compiler and select where to install dlls appropriately. + if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + lt_host_flags='-no-undefined -bindir "$(toolexeclibdir)"'; + else + lt_host_flags='-no-undefined -bindir "$(bindir)"'; + fi + ;; + *) + lt_host_flags= + ;; +esac + + + diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in index ba28e744f95..c8fd48ce430 100644 --- a/libvtv/testsuite/Makefile.in +++ b/libvtv/testsuite/Makefile.in @@ -41,6 +41,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/depstand.m4 \ $(top_srcdir)/../config/lead-dot.m4 \ $(top_srcdir)/../config/libstdc++-raw-cxx.m4 \ + $(top_srcdir)/../config/lthostflags.m4 \ $(top_srcdir)/../config/multi.m4 \ $(top_srcdir)/../config/override.m4 \ $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \ @@ -167,6 +168,7 @@ libvtv_builddir = @libvtv_builddir@ libvtv_srcdir = @libvtv_srcdir@ localedir = @localedir@ localstatedir = @localstatedir@ +lt_host_flags = @lt_host_flags@ mandir = @mandir@ mkdir_p = @mkdir_p@ multi_basedir = @multi_basedir@ -- 2.30.2