Re: [PATCH] solve my libtool 1.5 tag woes

[Paolo Bonzini]

> > This patch...
>
> Which patch? :-)

This patch.

I-should-attach-the-files-before-writing-the-content-Paolo

--- libtool-1.6.m4.orig 2003-11-17 10:37:54.000000000 +0100
+++ libtool-1.6.m4      2003-11-17 10:36:24.000000000 +0100
@@ -5944,6 +5944,64 @@
 [AC_CHECK_TOOL(RC, windres, no)
 ])
 
+# AC_LIBTOOL_TAG(TAGNAME, [BASETAG], [INIT-CODE]
+# ----------------------------------------------
+dnl Define an additional libtool tag called TAGNAME based on the
+dnl base tag BASETAG (to specify the default tag you can use C
+dnl as well as an empty string).  The special tags disable-shared
+dnl and disable-static can *not* be specified as base tags because
+dnl they are defined specially by the libtool script.  The additional
+dnl tests in INIT-CODE are performed before appending the configuration
+dnl to config.status, thus allowing one to customize the settings.
+AC_DEFUN([AC_LIBTOOL_TAG], [dnl
+m4_define([_LT_TAG], m4_if([$2], [C], [], [$2]))dnl
+
+_LT_AC_TAGVAR(compiler, $1)=$_LT_AC_TAGVAR(compiler, _LT_TAG)
+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=$_LT_AC_TAGVAR(archive_cmds_need_lc, 
_LT_TAG)
+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, 
$1)=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, _LT_TAG)
+_LT_AC_TAGVAR(GCC, $1)=$_LT_AC_TAGVAR(GCC, _LT_TAG)
+_LT_AC_TAGVAR(LD, $1)=$_LT_AC_TAGVAR(LD, _LT_TAG)
+_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=$_LT_AC_TAGVAR(lt_prog_compiler_wl, 
_LT_TAG)
+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_AC_TAGVAR(lt_prog_compiler_pic, 
_LT_TAG)
+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, 
$1)=$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, _LT_TAG)
+_LT_AC_TAGVAR(lt_prog_compiler_static, 
$1)=$_LT_AC_TAGVAR(lt_prog_compiler_static, _LT_TAG)
+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, 
$1)=$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, _LT_TAG)
+_LT_AC_TAGVAR(export_dynamic_flag_spec, 
$1)=$_LT_AC_TAGVAR(export_dynamic_flag_spec, _LT_TAG)
+_LT_AC_TAGVAR(whole_archive_flag_spec, 
$1)=$_LT_AC_TAGVAR(whole_archive_flag_spec, _LT_TAG)
+_LT_AC_TAGVAR(thread_safe_flag_spec, $1)=$_LT_AC_TAGVAR(thread_safe_flag_spec, 
_LT_TAG)
+_LT_AC_TAGVAR(old_archive_cmds, $1)=$_LT_AC_TAGVAR(old_archive_cmds, _LT_TAG)
+_LT_AC_TAGVAR(old_archive_from_new_cmds, 
$1)=$_LT_AC_TAGVAR(old_archive_from_new_cmds, _LT_TAG)
+_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, 
$1)=$_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, _LT_TAG)
+_LT_AC_TAGVAR(archive_cmds, $1)=$_LT_AC_TAGVAR(archive_cmds, _LT_TAG)
+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=$_LT_AC_TAGVAR(archive_expsym_cmds, 
_LT_TAG)
+_LT_AC_TAGVAR(module_cmds, $1)=$_LT_AC_TAGVAR(module_cmds, _LT_TAG)
+_LT_AC_TAGVAR(module_expsym_cmds, $1)=$_LT_AC_TAGVAR(module_expsym_cmds, 
_LT_TAG)
+_LT_AC_TAGVAR(predep_objects, $1)=$_LT_AC_TAGVAR(predep_objects, _LT_TAG)
+_LT_AC_TAGVAR(postdep_objects, $1)=$_LT_AC_TAGVAR(postdep_objects, _LT_TAG)
+_LT_AC_TAGVAR(predeps, $1)=$_LT_AC_TAGVAR(predeps, _LT_TAG)
+_LT_AC_TAGVAR(postdeps, $1)=$_LT_AC_TAGVAR(postdeps, _LT_TAG)
+_LT_AC_TAGVAR(compiler_lib_search_path, 
$1)=$_LT_AC_TAGVAR(compiler_lib_search_path, _LT_TAG)
+_LT_AC_TAGVAR(allow_undefined_flag, $1)=$_LT_AC_TAGVAR(allow_undefined_flag, 
_LT_TAG)
+_LT_AC_TAGVAR(no_undefined_flag, $1)=$_LT_AC_TAGVAR(no_undefined_flag, _LT_TAG)
+_LT_AC_TAGVAR(hardcode_action, $1)=$_LT_AC_TAGVAR(hardcode_action, _LT_TAG)
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, 
$1)=$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, _LT_TAG)
+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, 
$1)=$_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, _LT_TAG)
+_LT_AC_TAGVAR(hardcode_libdir_separator, 
$1)=$_LT_AC_TAGVAR(hardcode_libdir_separator, _LT_TAG)
+_LT_AC_TAGVAR(hardcode_direct, $1)=$_LT_AC_TAGVAR(hardcode_direct, _LT_TAG)
+_LT_AC_TAGVAR(hardcode_minus_L, $1)=$_LT_AC_TAGVAR(hardcode_minus_L, _LT_TAG)
+_LT_AC_TAGVAR(hardcode_shlibpath_var, 
$1)=$_LT_AC_TAGVAR(hardcode_shlibpath_var, _LT_TAG)
+_LT_AC_TAGVAR(hardcode_automatic, $1)=$_LT_AC_TAGVAR(hardcode_automatic, 
_LT_TAG)
+_LT_AC_TAGVAR(link_all_deplibs, $1)=$_LT_AC_TAGVAR(link_all_deplibs, _LT_TAG)
+_LT_AC_TAGVAR(fix_srcfile_path, $1)=$_LT_AC_TAGVAR(fix_srcfile_path, _LT_TAG)
+_LT_AC_TAGVAR(always_export_symbols, $1)=$_LT_AC_TAGVAR(always_export_symbols, 
_LT_TAG)
+_LT_AC_TAGVAR(export_symbols_cmds, $1)=$_LT_AC_TAGVAR(export_symbols_cmds, 
_LT_TAG)
+_LT_AC_TAGVAR(exclude_expsyms, $1)=$_LT_AC_TAGVAR(exclude_expsyms, _LT_TAG)
+_LT_AC_TAGVAR(include_expsyms, $1)=$_LT_AC_TAGVAR(include_expsyms, _LT_TAG)
+
+$3
+AC_LIBTOOL_CONFIG($1)
+])
+
 ############################################################
 # NOTE: This macro has been submitted for inclusion into   #
 #  GNU Autoconf as AC_PROG_SED.  When it is available in   #