libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RFC: tag docs and usability improvements


From: bonzini
Subject: RFC: tag docs and usability improvements
Date: Fri, 12 Mar 2004 17:28:21 +0100
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20031107 Debian/1.5-3

This has been on my promises list for too long. I will not be able to work on it until Monday, so I thought I'd post it and let other people move in and remark about it.

The patch is as big as it is boring. Most of it is about renaming _LT_AC_TAGVAR to LT_TAGVAR so that it is in the public namespace. Hope the ChangeLog helps.

The extr-doc-tags.sh scripts is also attached.

Paolo

Attachment: extr-tag-doc.sh
Description: Bourne shell script

2004-03-12  Paolo Bonzini  <address@hidden>

        * doc/Makefile.am: Add tags.texi and the associated
        rules
        * doc/libtool.texi (Invoking libtool): Document --tag.
        (Tags): New node.
        * doc/extr-tag-doc.sh: New file.
        * m4/libtool.m4 (_LT_AC_TAG_VAR): Rename to LT_TAGVAR.
        (throughout): Make enable_shared and enable_static
        tag-dependent variables.
        (AC_LIBTOOL_LANG_CXX_CONFIG, AC_LIBTOOL_LANG_GCJ_CONFIG,
        (AC_LIBTOOL_LANG_F77_CONFIG, AC_LIBTOOL_LANG_RC_CONFIG):
        Copy enable_shared and enable_static to the tag-local
        variable.
        (Tags): New node.
        * m4/ltoptions.m4 (_LT_ENABLE_SHARED): Declare
        enable_shared with _LT_TAGDECL.
        (_LT_ENABLE_STATIC): Likewise for enable_static.


Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/doc/Makefile.am,v
retrieving revision 1.4
diff -u -b -r1.4 Makefile.am
--- doc/Makefile.am     25 Nov 2003 15:48:22 -0000      1.4
+++ doc/Makefile.am     12 Mar 2004 16:13:34 -0000
@@ -1,4 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 info_TEXINFOS = libtool.texi
-libtool_TEXINFOS = PLATFORMS fdl.texi
+libtool_TEXINFOS = PLATFORMS fdl.texi tags.texi
+
+$(srcdir)/tags.texi: $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4
+       srcdir=$(srcdir) sh extr-tag-doc.sh
Index: doc/libtool.texi
===================================================================
RCS file: /cvsroot/libtool/libtool/doc/libtool.texi,v
retrieving revision 1.152
diff -u -b -r1.152 libtool.texi
--- doc/libtool.texi    5 Mar 2004 17:34:25 -0000       1.152
+++ doc/libtool.texi    12 Mar 2004 16:13:36 -0000
@@ -1157,6 +1157,15 @@
 required, this option will preserve them, only stripping the libraries
 that libtool knows it can safely.
 
address@hidden address@hidden
+Use @var{tag} as the configuration tag.  Tags are a way of specifying
+multiple compilers and options to be used by libtool, and libtool's
+multi-language suppotr is based on tags.  Libtool is usually smart
+enough to pick the appropriate tag to invoke C++, Java or Fortran 77
+compilers, as well as the Windows resource compiler.  User-defined
+tags, instead, have to be specified manually on the libtool
+script's command line.  @xref{Tags}, for more information.
+
 @item --quiet
 @itemx --silent
 Do not print out any progress or informational messages.
@@ -2152,6 +2161,7 @@
 
 @menu
 * C++ libraries::
+* Tags::
 @end menu
 
 @node C++ libraries
@@ -2191,6 +2201,150 @@
 compiled with the C++ compiler for static C++ objects to be properly
 initialized.
 
+
address@hidden Tags
address@hidden Customizing Libtool with tags
address@hidden customizing Libtool
address@hidden tags
address@hidden tags, defining
+
+The mechanism underlying Libtool's implementation of multi-language
+libraries is based on the definition of different @dfn{tags}, one per
+language.  A tag is a set of definitions that describe a particular
+compiler and linker's support for static and shared libraries: some of
+these definitions publish the results of feature tests (for example
+``Should we explicitly add @code{-lc} when making the shared
+library?'', or ``What is the extension of the object files?''); other
+definitions, instead, publish the name of programs (such as the
+compiler itself) or the options that Libtool will pass to these
+programs.
+
+Libtool includes feature tests for C, which are always performed, as
+well as optional support for C++, Java, Fortran 77 and Windows
+resource files.  By default the tags for these languages are
+included in the generated Libtool script, but it is possible to
+omit them using the @code{AC_LIBTOOL_TAGS} macro (@pxref{LT_INIT}).
+
+It is also possible to define your own tags.  This is a very
+specialized operation which should not be necessary under most
+conditions: in general, creating a new tag for a new language (say,
+Fortran 90) is a complex operation, and in case you want to attempt
+it, you may want to check if the Libtool team already has this in its
+to-do list.  It may be the case, however, that all you have to do is
+to tweak a compiler option for a particular library---in this case,
+tags provide a very convenient mean to achieve this.
+
+Libtool itself provides two special tags, called @code{disable-shared}
+and @code{disable-static}, which allow to choose whether to build
+shared or static libraries independently for each archive.  While
+Libtool is smart enough to pick the appropriate tag among those it
+defines, user-defined tags have to be specified manually on the
+libtool script's command line; it is best if you specify the
+tag in all of the script's operation modes (@pxref{Invoking libtool}).
+To specify a tag, just use the @code{--tag} option.
+
+For example, @acronym{GNU} Smalltalk includes a virtual machine whose
+performance has been carefully tuned.  Until recently, the virtual
+machine had only been distributed as a static library because of
+performance problems in the shared library: to do this, it was
+sufficient to add this line to the virtual machine's
address@hidden file:
+
address@hidden
+LIBTOOL += --tag=disable-shared
address@hidden example
+
+ allowed the maintainer of the @acronym{GNU}
+Smalltalk package to  performance
+
address@hidden TODO: @pxref{Efficient shared libraries})
address@hidden See Ulrich Drepper's article on this argument.  He works for
address@hidden Red Hat so we do not even need a copyright assignment.
+The addition of the @code{visibility} attribute to the @acronym{GNU} C
+compiler made it possible to make the virtual machine registers global
+across the library and still have a decent performance (without the
+attribute, the compiler would have had to do a very slow indirect
+lookup).
+Unfortunately, this was not enough because, on the very popular x86
+architecture, the shared library's usage of position-independent code
+meant that one less register was available, causing another big loss
+of performance.
+
+As a compromise, it was decided to compile the virtual machine with
+the @code{-fomit-frame-pointer} option.  This recovered a register but
+made the library address@hidden versions of the
+  @acronym{GNU C compiler} actually remove this limit of
+  @code{-fomit-frame-pointer}.}, so this only had to be done for the
+shared library and only on the x86 architecture.  In addition, the
+shared library should not be built at all unless the compiler
+supported the @code{visibility} attribute, because otherwise it would
+incur a 10x approximate slowdown.
+
+Since the package included several other shared libraries, some of
+which are loadable modules that are never built as static libraries:
+therefore, it would have been very unconvenient to make these
+modules undebuggable as well.  Without tags, the only solution
+would have been to use a separate @code{configure} script for the
+virtual machine library, and to generate a separate libtool
+script containing the necessary tweaks.  Libtool however, starting
+from version 1.6, provides the following macro to customize the
+libtool script:
+
address@hidden LT_DEFINE_TAG (@var{tagname}, address@hidden, address@hidden)
+Define an additional Libtool tag called @var{tagname}.  This tag is
+based on the base tag @var{basetag}; to specify the default tag you
+can use either @samp{CC} or an empty string.  The special tags
+disable-shared and disable-static @emph{cannot} be specified as base
+tags because they are defined specially by the libtool script.  The
+additional tests in @var{init-code} are performed before establishing
+the configuration that will be written to the libtool script.
address@hidden defmac
+
address@hidden LT_TAGVAR (@var{varname}, @var{tagname})
+This macro expands to the name under which the @file{configure} script
+saves the value of the @var{varname} variable for the @var{tagname}
+configuration tag.
address@hidden defmac
+
+The list of the available variables will be presented shortly.  In
+the meanwhile, here is the @code{configure} script snippet that adds
+a special tag used when building the @acronym{GNU} Smalltalk virtual
+machine.
+
address@hidden
+LT_DEFINE_TAG(LIBGST, CC, [
+  if test "$GCC"=yes; then
+    gcc_version=`$CC -v 2>&1 | \
+      sed -n '[s/^gcc version \([0-9.]*\).*/\1/p]'`
+  else
+    gcc_version=no
+  fi
+
+  case "$host_cpu:$gcc_version" in
+   [*:no|*:[12].*|*:*:3.[012]*])
+      # If not gcc, or an old versions without support for the
+      # visibility attribute, don't build the shared library;
+      # anyway, it would be unusably slow.
+     LT_TAGVAR(build_libtool_libs, LIBGST)=no ;;
+
+   i?86:*)
+     # For the x86, building a shared library with the frame pointer
+     # is too slow.  On the other hand, the undebuggability of code
+     # compiled without frame pointer will be a problem with respeect
+     # to bug reports.  For this reason, we hack libtool to allow
+     # additional flags to be specified for the PIC case.
+     LT_TAGVAR(lt_prog_compiler_pic, LIBGST)="dnl
+$lt_prog_compiler_pic -fomit-frame-pointer" ;;
+
+   *) ;;
+  esac
+])
address@hidden example
+
+Now, here is the list of the variables that can be specified together
+with @code{LT_TAGVAR}:
+
address@hidden tags.texi
 
 @node Versioning
 @chapter Library interface versions
Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.49
diff -u -b -r1.49 libtool.m4
--- m4/libtool.m4       5 Mar 2004 20:39:21 -0000       1.49
+++ m4/libtool.m4       12 Mar 2004 16:13:38 -0000
@@ -405,9 +405,9 @@
     [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
 
 
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
+# LT_TAGVAR(VARNAME, [TAGNAME])
 # ---------------------------------
-m4_define([_LT_AC_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+m4_define([LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
 
 
 # _LT_CONFIG_COMMANDS
@@ -1167,7 +1167,7 @@
 
 
 # AC_LIBTOOL_DLOPEN_SELF
-# -------------------
+# ----------------------
 AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
 [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 if test "x$enable_dlopen" != xyes; then
@@ -1292,8 +1292,8 @@
 [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 AC_REQUIRE([AC_OBJEXT])dnl
 AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+  [LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -1319,7 +1319,7 @@
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test ! -s out/conftest.err; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+       LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
      fi
    fi
    chmod u+w .
@@ -1345,7 +1345,7 @@
 AC_REQUIRE([_LT_AC_LOCK])dnl
 
 hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test 
"$need_locks" != no; then
+if test "$LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" 
!= no; then
   # do not overwrite the value of need_locks provided by the user
   AC_MSG_CHECKING([if we can lock with hard links])
   hard_links=yes
@@ -1390,36 +1390,36 @@
 # Check hardcoding attributes.
 AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
 [AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" ||
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
+LT_TAGVAR(hardcode_action, $1)=
+if test -n "$LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$LT_TAGVAR(runpath_var $1)" ||
+   test "X$LT_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
 
   # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+  if test "$LT_TAGVAR(hardcode_direct, $1)" != no &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+     ## test "$LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
+     test "$LT_TAGVAR(hardcode_minus_L, $1)" != no; then
     # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+    LT_TAGVAR(hardcode_action, $1)=relink
   else
     # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+    LT_TAGVAR(hardcode_action, $1)=immediate
   fi
 else
   # We cannot hardcode anything, or else we can only hardcode existing
   # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+  LT_TAGVAR(hardcode_action, $1)=unsupported
 fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+AC_MSG_RESULT([$LT_TAGVAR(hardcode_action, $1)])
 
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+if test "$LT_TAGVAR(hardcode_action, $1)" = relink; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
+     test "$LT_TAGVAR(enable_shared, $1)" = no; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
@@ -2057,6 +2057,24 @@
   [m4_define([_LT_TAG_]$1, [])])
 ]) # _LT_AC_TAG_CHECK
 
+# LT_DEFINE_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.
+m4_define([LT_DEFINE_TAG],
+[m4_define([_LT_TAG], m4_if([$2], [CC], [], [$2]))dnl
+m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])
+    
+$3
+AC_LIBTOOL_CONFIG($1)
+])
+
 # _LT_AC_TAG_CONFIG
 # -----------------
 m4_define([_LT_AC_TAG_CONFIG],
@@ -2667,15 +2685,15 @@
 AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
 [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
 if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+  LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 
   AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
     lt_cv_prog_compiler_rtti_exceptions,
     [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, 
$1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti 
-fno-exceptions"])
+    [LT_TAGVAR(lt_prog_compiler_no_builtin_flag, 
$1)="$LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti 
-fno-exceptions"])
 fi
 _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
        [Compiler flag to turn off builtin functions])
@@ -2831,7 +2849,7 @@
          lt_save_LIBS="$LIBS"
          lt_save_CFLAGS="$CFLAGS"
          LIBS="conftstm.$ac_objext"
-         CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+         CFLAGS="$CFLAGS$LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
          if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
            pipe_works=yes
          fi
@@ -2882,23 +2900,23 @@
 # AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
 # ---------------------------------------
 AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
+[LT_TAGVAR(lt_prog_compiler_wl, $1)=
+LT_TAGVAR(lt_prog_compiler_pic, $1)=
+LT_TAGVAR(lt_prog_compiler_static, $1)=
 
 AC_MSG_CHECKING([for $compiler option to produce PIC])
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+    LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
     aix*)
       # All AIX code is PIC.
       if test "$host_cpu" = ia64; then
        # AIX 5 now supports IA64 processor
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
       ;;
     amigaos*)
@@ -2906,7 +2924,7 @@
         # FIXME: we need at least 68020 code to build shared libraries, but
         # adding the `-m68020' flag to GCC prevents building anything better,
         # like `-m68040'.
-        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 
-malways-restore-a4'
+        LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 
-malways-restore-a4'
       fi
       ;;
     beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
@@ -2915,20 +2933,20 @@
     mingw* | os2* | pw32*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
     *djgpp*)
       # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+      LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
     sysv4*MP*)
       if test -d /usr/nec; then
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+       LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
       fi
       ;;
     hpux*)
@@ -2938,12 +2956,12 @@
       hppa*64*|ia64*)
        ;;
       *)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
       esac
       ;;
     *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
   else
@@ -2952,27 +2970,27 @@
        # All AIX code is PIC.
        if test "$host_cpu" = ia64; then
          # AIX 5 now supports IA64 processor
-         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+         LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
        else
-         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso 
-bI:/lib/syscalls.exp'
+         LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
       chorus*)
        case $cc_basename in
        cxch68)
          # Green Hills C++ Compiler
-         # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation 
-u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a 
$MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+         # LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u 
__main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a 
$MVME_DIR/lib/classix/libcx.s.a"
          ;;
        esac
        ;;
       dgux*)
        case $cc_basename in
          ec++)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
            ;;
          ghcx)
            # Green Hills C++ Compiler
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
            ;;
          *)
            ;;
@@ -2984,21 +3002,21 @@
       hpux9* | hpux10* | hpux11*)
        case $cc_basename in
          CC)
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a 
${ac_cv_prog_cc_wl}archive"
+           LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           LT_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a 
${ac_cv_prog_cc_wl}archive"
            if test "$host_cpu" != ia64; then
-             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+             LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
            fi
            ;;
          aCC)
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a 
${ac_cv_prog_cc_wl}archive"
+           LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           LT_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a 
${ac_cv_prog_cc_wl}archive"
            case "$host_cpu" in
            hppa*64*|ia64*)
              # +Z the default
              ;;
            *)
-             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+             LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
              ;;
            esac
            ;;
@@ -3009,8 +3027,8 @@
       irix5* | irix6* | nonstopux*)
        case $cc_basename in
          CC)
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
            # CC pic flag -KPIC is the default.
            ;;
          *)
@@ -3021,21 +3039,21 @@
        case $cc_basename in
          KCC)
            # KAI C++ Compiler
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+           LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
            ;;
          icpc)
            # Intel C++
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+           LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
            ;;
          cxx)
            # Compaq C++
            # Make sure the PIC flag is empty.  It appears that all Alpha
            # Linux and Compaq Tru64 Unix objects are PIC.
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)=
+           LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
            ;;
          *)
            ;;
@@ -3048,7 +3066,7 @@
       mvs*)
        case $cc_basename in
          cxx)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
            ;;
          *)
            ;;
@@ -3059,19 +3077,19 @@
       osf3* | osf4* | osf5*)
        case $cc_basename in
          KCC)
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+           LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
            ;;
          RCC)
            # Rational C++ 2.4.1
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
            ;;
          cxx)
            # Digital/Compaq C++
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+           LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
            # Make sure the PIC flag is empty.  It appears that all Alpha
            # Linux and Compaq Tru64 Unix objects are PIC.
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)=
+           LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
            ;;
          *)
            ;;
@@ -3082,7 +3100,7 @@
       sco*)
        case $cc_basename in
          CC)
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
            ;;
          *)
            ;;
@@ -3092,13 +3110,13 @@
        case $cc_basename in
          CC)
            # Sun C++ 4.2, 5.x and Centerline C++
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
            ;;
          gcx)
            # Green Hills C++ Compiler
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
            ;;
          *)
            ;;
@@ -3108,12 +3126,12 @@
        case $cc_basename in
          CC)
            # Sun C++ 4.x
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-           _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
            ;;
          lcc)
            # Lucid
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
            ;;
          *)
            ;;
@@ -3123,7 +3141,7 @@
        case $cc_basename in
          NCC)
            # NonStop-UX NCC 3.20
-           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+           LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
            ;;
          *)
            ;;
@@ -3134,22 +3152,22 @@
       vxworks*)
        ;;
       *)
-       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
        ;;
     esac
   fi
 ],
 [
   if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+    LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
       if test "$host_cpu" = ia64; then
        # AIX 5 now supports IA64 processor
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
       ;;
 
@@ -3158,7 +3176,7 @@
         # FIXME: we need at least 68020 code to build shared libraries, but
         # adding the `-m68020' flag to GCC prevents building anything better,
         # like `-m68040'.
-        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 
-malways-restore-a4'
+        LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 
-malways-restore-a4'
       fi
       ;;
 
@@ -3169,25 +3187,25 @@
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
 
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
+      LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      LT_TAGVAR(enable_shared, $1)=no
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec; then
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+       LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
       fi
       ;;
 
@@ -3199,36 +3217,36 @@
        # +Z the default
        ;;
       *)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
        ;;
       esac
       ;;
 
     *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
     aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       if test "$host_cpu" = ia64; then
        # AIX 5 now supports IA64 processor
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       else
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
 
     mingw* | pw32* | os2*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
       ;;
 
     hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
       case "$host_cpu" in
@@ -3236,82 +3254,82 @@
        # +Z the default
        ;;
       *)
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+       LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
        ;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled 
CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+      LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
     newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
     linux*)
       case $CC in
       icc* | ecc*)
-       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+       LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+       LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+       LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
         ;;
       ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
         # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
       esac
       ;;
 
     osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
       # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
     sco3.2v5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+      LT_TAGVAR(lt_prog_compiler_static, $1)='-dn'
       ;;
 
     solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
     sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
     sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec ;then
-       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+       LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       fi
       ;;
 
     uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       ;;
 
     *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
       ;;
     esac
   fi
@@ -3319,29 +3337,29 @@
 case "$host_os" in
   # For platforms which do not support PIC, -DPIC is meaningless:
   *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+    LT_TAGVAR(lt_prog_compiler_pic, $1)=
     ;;
   *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, 
$1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)@&address@hidden([$1],[],[ 
-DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    LT_TAGVAR(lt_prog_compiler_pic, $1)="$LT_TAGVAR(lt_prog_compiler_pic, 
$1)@&address@hidden([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+AC_MSG_RESULT([$LT_TAGVAR(lt_prog_compiler_pic, $1)])
 _LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
        [How to pass a linker flag through the compiler])
 
 #
 # Check to make sure the PIC flag actually works.
 #
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag 
$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1)],
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)@&address@hidden([$1],[],[ 
-DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+if test -n "$LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag 
$LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [LT_TAGVAR(lt_prog_compiler_pic_works, $1)],
+    [$LT_TAGVAR(lt_prog_compiler_pic, $1)@&address@hidden([$1],[],[ 
-DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $LT_TAGVAR(lt_prog_compiler_pic, $1) in
      "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" 
$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     *) LT_TAGVAR(lt_prog_compiler_pic, $1)=" $LT_TAGVAR(lt_prog_compiler_pic, 
$1)" ;;
      esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+    [LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
 fi
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
        [Additional compiler flags for building library objects])
@@ -3349,11 +3367,11 @@
 #
 # Check to make sure the static flag actually works.
 #
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag 
$_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag 
$LT_TAGVAR(lt_prog_compiler_static, $1) works],
+  LT_TAGVAR(lt_prog_compiler_static_works, $1),
+  $LT_TAGVAR(lt_prog_compiler_static, $1),
   [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+  [LT_TAGVAR(lt_prog_compiler_static, $1)=])
 _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
        [Compiler flag to prevent dynamic linking])
 ])# AC_LIBTOOL_PROG_COMPILER_PIC
@@ -3369,58 +3387,58 @@
 AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 m4_if([$1], [CXX], [
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
   aix4* | aix5*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | 
awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && 
([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+      LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk 
'\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && 
([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
     else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience 
| awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && 
([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+      LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | 
awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && 
([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+    LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
   ;;
   cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* 
__nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' 
| sort | uniq > $export_symbols'
+    LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* 
__nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' 
| sort | uniq > $export_symbols'
   ;;
   *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   ;;
   esac
 ], [
   runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+  LT_TAGVAR(allow_undefined_flag, $1)=
+  LT_TAGVAR(always_export_symbols, $1)=no
+  LT_TAGVAR(archive_cmds, $1)=
+  LT_TAGVAR(archive_expsym_cmds, $1)=
+  LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  LT_TAGVAR(hardcode_automatic, $1)=no
+  LT_TAGVAR(hardcode_direct, $1)=no
+  LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+  LT_TAGVAR(hardcode_libdir_separator, $1)=
+  LT_TAGVAR(hardcode_minus_L, $1)=no
+  LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  LT_TAGVAR(link_all_deplibs, $1)=unknown
+  LT_TAGVAR(module_cmds, $1)=
+  LT_TAGVAR(module_expsym_cmds, $1)=
+  LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  LT_TAGVAR(thread_safe_flag_spec, $1)=
+  LT_TAGVAR(whole_archive_flag_spec, $1)=
   # include_expsyms should be a list of space-separated symbols to be *always*
   # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
+  LT_TAGVAR(include_expsyms, $1)=
   # exclude_expsyms can be an extended regexp of symbols to exclude
   # it will be wrapped by ` (' and `)$', so one must not match beginning or
   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
   # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
+  LT_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
@@ -3442,7 +3460,7 @@
     ;;
   esac
 
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+  LT_TAGVAR(ld_shlibs, $1)=yes
   if test "$with_gnu_ld" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
@@ -3452,7 +3470,7 @@
     aix3* | aix4* | aix5*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        cat <<_LT_EOF 1>&2
 
 *** Warning: the GNU linker, at least up to release 2.9.1, is reported
@@ -3467,9 +3485,9 @@
 
     amigaos*)
       if test "$host_cpu" = m68k; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm 
$output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > 
$output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> 
$output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> 
$output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> 
$output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd 
$output_objdir && a2ixlibrary -32)'
-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+        LT_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo 
"#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define 
LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" 
>> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> 
$output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd 
$output_objdir && a2ixlibrary -32)'
+        LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        LT_TAGVAR(hardcode_minus_L, $1)=yes
       fi
 
       # Samuel A. Falvo II <address@hidden> reports
@@ -3478,34 +3496,34 @@
       # with the same dynamic library.  Since this doesn't match the
       # behavior of shared libraries on other platforms, we can't use
       # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      LT_TAGVAR(ld_shlibs, $1)=no
       ;;
 
     beos*)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+       LT_TAGVAR(allow_undefined_flag, $1)=unsupported
        # Joseph Beckenbach <address@hidden> says some releases of gcc
        # support --undefined.  This deserves some investigation.  FIXME
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+       LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
       else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
     cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | 
$SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      LT_TAGVAR(always_export_symbols, $1)=no
+      LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | 
$global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | 
$SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 
${wl}--out-implib,$lib'
+        LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 
${wl}--out-implib,$lib'
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q 
$export_symbols`" = xEXPORTS; then
+       LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q 
$export_symbols`" = xEXPORTS; then
          cp $export_symbols $output_objdir/$soname.def;
        else
          echo EXPORTS > $output_objdir/$soname.def;
@@ -3519,17 +3537,17 @@
 
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs 
$linker_flags -o $lib'
+       LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs 
$linker_flags -o $lib'
        wlarc=
       else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file 
$wl$export_symbols -o $lib'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+       LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file 
$wl$export_symbols -o $lib'
       fi
       ;;
 
     solaris* | sysv5*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        cat <<_LT_EOF 1>&2
 
 *** Warning: The releases 2.8.* of the GNU linker cannot reliably
@@ -3541,23 +3559,23 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; 
then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file 
$wl$export_symbols -o $lib'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+       LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file 
$wl$export_symbols -o $lib'
       else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
 
     sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o 
$lib $libobjs $deplibs $linker_flags'
+      LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib 
$libobjs $deplibs $linker_flags'
       wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
   linux*)
     if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+      LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
       case `$LD -v 2>&1` in
         *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
         *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -3566,50 +3584,50 @@
         *) supports_anon_versioning=yes ;;
       esac
       if test "x$supports_anon_versioning" = xyes; then
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$output_objdir/$libname.ver~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> 
$output_objdir/$libname.ver~$echo "local: *; };" >> 
$output_objdir/$libname.ver~$CC -shared $libobjs $deplibs $compiler_flags 
${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver 
-o $lib'
+        LT_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$output_objdir/$libname.ver~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> 
$output_objdir/$libname.ver~$echo "local: *; };" >> 
$output_objdir/$libname.ver~$CC -shared $libobjs $deplibs $compiler_flags 
${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver 
-o $lib'
       else
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)=$_LT_AC_TAGVAR(archive_cmds, $1)
+        LT_TAGVAR(archive_expsym_cmds, $1)=$LT_TAGVAR(archive_cmds, $1)
       fi
     else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      LT_TAGVAR(ld_shlibs, $1)=no
     fi
     ;;
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file 
$wl$export_symbols -o $lib'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+       LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file 
$wl$export_symbols -o $lib'
       else
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
     esac
 
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+    if test "$LT_TAGVAR(ld_shlibs, $1)" = yes; then
       runpath_var=LD_RUN_PATH
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+      LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
       # ancient GNU ld didn't support --whole-archive et. al.
       if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-       _LT_AC_TAGVAR(whole_archive_flag_spec, 
$1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+       LT_TAGVAR(whole_archive_flag_spec, 
$1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
       else
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+       LT_TAGVAR(whole_archive_flag_spec, $1)=
       fi
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
     case $host_os in
     aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname 
$libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR 
$AR_FLAGS $lib $output_objdir/$soname'
+      LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      LT_TAGVAR(always_export_symbols, $1)=yes
+      LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname 
$libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR 
$AR_FLAGS $lib $output_objdir/$soname'
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      LT_TAGVAR(hardcode_minus_L, $1)=yes
       if test "$GCC" = yes && test -z "$link_static_flag"; then
        # Neither direct hardcoding nor static linking is supported with a
        # broken collect2.
-       _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+       LT_TAGVAR(hardcode_direct, $1)=unsupported
       fi
       ;;
 
@@ -3624,9 +3642,9 @@
        # If we're using GNU nm, then we don't want the "-C" option.
        # -C means demangle to AIX nm, but means don't demangle with GNU nm
        if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-         _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs 
$convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == 
"B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > 
$export_symbols'
+         LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | 
awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && 
([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
        else
-         _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs 
$convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == 
"B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > 
$export_symbols'
+         LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | 
awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && 
([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
        fi
        aix_use_runtimelinking=no
 
@@ -3652,10 +3670,10 @@
       # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
       # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      LT_TAGVAR(archive_cmds, $1)=''
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      LT_TAGVAR(link_all_deplibs, $1)=yes
 
       if test "$GCC" = yes; then
        case $host_os in aix4.[012]|aix4.[012].*)
@@ -3666,16 +3684,16 @@
           strings "$collect2name" | $GREP resolve_lib_name >/dev/null
          then
          # We have reworked collect2
-         _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+         LT_TAGVAR(hardcode_direct, $1)=yes
          else
          # We have old collect2
-         _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+         LT_TAGVAR(hardcode_direct, $1)=unsupported
          # It fails to find uninstalled libraries when the uninstalled
          # path is not listed in the libpath.  Setting hardcode_minus_L
          # to unsupported forces relinking
-         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+         LT_TAGVAR(hardcode_minus_L, $1)=yes
+         LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         LT_TAGVAR(hardcode_libdir_separator, $1)=
          fi
        esac
        shared_flag='-shared'
@@ -3696,53 +3714,53 @@
 
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to 
export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+      LT_TAGVAR(always_export_symbols, $1)=yes
       if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+       LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
        _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o 
$output_objdir/$soname $libobjs $deplibs $compiler_flags `if test 
"x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; 
else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols 
$shared_flag"
+       LT_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+       LT_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname 
$libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; 
then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag 
\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
        if test "$host_cpu" = ia64; then
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R 
$libdir:/usr/lib:/lib'
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o 
$output_objdir/$soname $libobjs $deplibs $compiler_flags 
${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag 
\${wl}$exp_sym_flag:\$export_symbols"
+         LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R 
$libdir:/usr/lib:/lib'
+         LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+         LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o 
$output_objdir/$soname $libobjs $deplibs $compiler_flags 
${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag 
\${wl}$exp_sym_flag:\$export_symbols"
        else
         # Determine the default libpath from the value encoded in an
         # empty executable.
         _LT_AC_SYS_LIBPATH_AIX
-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+        LT_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
          # Warning - without using the other run time loading flags,
          # -berok will link without error, but may produce a broken library.
-         _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+         LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+         LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
          # -bexpall does not export symbols beginning with underscore (_)
-         _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+         LT_TAGVAR(always_export_symbols, $1)=yes
          # Exported symbols can be pulled into shared objects from archives
-         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+         LT_TAGVAR(whole_archive_flag_spec, $1)=' '
+         LT_TAGVAR(archive_cmds_need_lc, $1)=yes
          # This is similar to how AIX traditionally builds it's shared 
libraries.
-         _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o 
$output_objdir/$soname $libobjs $deplibs $compiler_flags 
${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS 
$output_objdir/$libname$release.a $output_objdir/$soname'
+         LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o 
$output_objdir/$soname $libobjs $deplibs $compiler_flags 
${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS 
$output_objdir/$libname$release.a $output_objdir/$soname'
        fi
       fi
       ;;
 
     amigaos*)
       if test "$host_cpu" = m68k; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm 
$output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > 
$output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> 
$output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> 
$output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> 
$output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd 
$output_objdir && a2ixlibrary -32)'
-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+        LT_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo 
"#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define 
LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" 
>> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> 
$output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd 
$output_objdir && a2ixlibrary -32)'
+        LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+        LT_TAGVAR(hardcode_minus_L, $1)=yes
       fi
       # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      LT_TAGVAR(ld_shlibs, $1)=no
       ;;
 
     bsdi4*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
       ;;
 
     cygwin* | mingw* | pw32*)
@@ -3750,67 +3768,67 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+      LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       # Tell ltmain to make .lib files, not .a files.
       libext=lib
       # Tell ltmain to make .dll files, not .so files.
       shrext_cmds=".dll"
       # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags 
`echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+      LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo 
"$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
       # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_from_new_cmds, $1)='true'
+      LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
       # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib 
/OUT:$oldlib$oldobjs$old_deplibs'
+      LT_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
       fix_srcfile_path='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
       ;;
 
     darwin* | rhapsody*)
     if test "$GCC" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      LT_TAGVAR(archive_cmds_need_lc, $1)=no
       case "$host_os" in
       rhapsody* | darwin1.[[012]])
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+       LT_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
        ;;
       *) # Darwin 1.3 on
       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined 
suppress'
+       LT_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined 
suppress'
       else
         case ${MACOSX_DEPLOYMENT_TARGET} in
           10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace 
-undefined suppress'
+            LT_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined 
suppress'
             ;;
           10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+            LT_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
             ;;
         esac
       fi
        ;;
       esac
        output_verbose_link_cmd='echo'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag 
-o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname 
$verstring'
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib 
-bundle $libobjs $deplibs$compiler_flags'
+        LT_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o 
$lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+      LT_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle 
$libobjs $deplibs$compiler_flags'
       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't 
exist in older darwin ld's
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    
]*,," -e "s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag 
-o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname 
$verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    
]*,," -e "s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib 
-bundle $libobjs $deplibs$compiler_flags~nmedit -s 
$output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      LT_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," 
-e "s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag 
-o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname 
$verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+      LT_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e 
"s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib 
-bundle $libobjs $deplibs$compiler_flags~nmedit -s 
$output_objdir/${libname}-symbols.expsym ${lib}'
+      LT_TAGVAR(hardcode_direct, $1)=no
+      LT_TAGVAR(hardcode_automatic, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      LT_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      LT_TAGVAR(link_all_deplibs, $1)=yes
     else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      LT_TAGVAR(ld_shlibs, $1)=no
     fi
       ;;
     dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs 
$linker_flags'
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      LT_TAGVAR(ld_shlibs, $1)=no
       ;;
 
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
@@ -3818,91 +3836,91 @@
     # does not break anything, and helps significantly (at the cost of a little
     # extra space).
     freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs 
$deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs 
$linker_flags /usr/lib/c++rt0.o'
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
     freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs 
$deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs 
$linker_flags'
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_minus_L, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | kfreebsd*-gnu)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs 
$compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs 
$compiler_flags'
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     hpux9*)
       if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared 
-fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname 
$lib'
+       LT_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared 
-fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs 
$compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname 
$lib'
       else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b 
$install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test 
$output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+       LT_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b 
$install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test 
$output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+      LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      LT_TAGVAR(hardcode_direct, $1)=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+      LT_TAGVAR(hardcode_minus_L, $1)=yes
+      LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       ;;
 
     hpux10* | hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
        case "$host_cpu" in
        hppa*64*|ia64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o 
$lib $libobjs $deplibs $compiler_flags'
+         LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib 
$libobjs $deplibs $compiler_flags'
          ;;
        *)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h 
${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs 
$compiler_flags'
+         LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname 
${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
          ;;
        esac
       else
        case "$host_cpu" in
        hppa*64*|ia64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs 
$deplibs $linker_flags'
+         LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs 
$deplibs $linker_flags'
          ;;
        *)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir 
-o $lib $libobjs $deplibs $linker_flags'
+         LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o 
$lib $libobjs $deplibs $linker_flags'
          ;;
        esac
       fi
       if test "$with_gnu_ld" = no; then
        case "$host_cpu" in
        hppa*64*)
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-         _LT_AC_TAGVAR(hardcode_direct, $1)=no
-         _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+         LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+         LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+         LT_TAGVAR(hardcode_libdir_separator, $1)=:
+         LT_TAGVAR(hardcode_direct, $1)=no
+         LT_TAGVAR(hardcode_shlibpath_var, $1)=no
          ;;
        ia64*)
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-         _LT_AC_TAGVAR(hardcode_direct, $1)=no
-         _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+         LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         LT_TAGVAR(hardcode_direct, $1)=no
+         LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 
          # hardcode_minus_L: Not really in the search PATH,
          # but as the default location of the library.
-         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+         LT_TAGVAR(hardcode_minus_L, $1)=yes
          ;;
        *)
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-         _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+         LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+         LT_TAGVAR(hardcode_libdir_separator, $1)=:
+         LT_TAGVAR(hardcode_direct, $1)=yes
+         LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 
          # hardcode_minus_L: Not really in the search PATH,
          # but as the default location of the library.
-         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+         LT_TAGVAR(hardcode_minus_L, $1)=yes
          ;;
        esac
       fi
@@ -3910,214 +3928,214 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo 
${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${output_objdir}/so_locations -o $lib'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo 
${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${output_objdir}/so_locations -o $lib'
       else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs 
$linker_flags -soname $soname `test -n "$verstring" && echo -set_version 
$verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+       LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs 
$linker_flags -soname $soname `test -n "$verstring" && echo -set_version 
$verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+       LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs 
$deplibs $linker_flags'  # a.out
+       LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs 
$linker_flags'  # a.out
       else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs 
$linker_flags'      # ELF
+       LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs 
$linker_flags'      # ELF
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs 
$linker_flags'
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test 
"$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs 
$deplibs $compiler_flags'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs 
$deplibs $compiler_flags'
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       else
        case $host_os in
         openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-          _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs 
$deplibs $linker_flags'
-          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+          LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs 
$deplibs $linker_flags'
+          LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
           ;;
         *)
-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib 
$libobjs $deplibs $compiler_flags'
-          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+          LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs 
$deplibs $compiler_flags'
+          LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
           ;;
        esac
       fi
       ;;
 
     os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > 
$output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> 
$output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " 
SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> 
$output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC 
-Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags 
$output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o 
$output_objdir/$libname.a $output_objdir/$libname.def'
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      LT_TAGVAR(hardcode_minus_L, $1)=yes
+      LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      LT_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > 
$output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> 
$output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " 
SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> 
$output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC 
-Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags 
$output_objdir/$libname.def'
+      LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o 
$output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved 
${wl}\*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} 
$libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n 
"$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${output_objdir}/so_locations -o $lib'
+       LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} 
$libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n 
"$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${output_objdir}/so_locations -o $lib'
       else
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} 
$libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo 
-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+       LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       LT_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} 
$libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo 
-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      LT_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
     osf4* | osf5*)     # as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved 
${wl}\*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} 
$libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n 
"$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${output_objdir}/so_locations -o $lib'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} 
$libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && 
echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o 
$lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; 
do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> 
$lib.exp~
+       LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} 
$libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n 
"$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${output_objdir}/so_locations -o $lib'
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+      else
+       LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       LT_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} 
$libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && 
echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o 
$lib'
+       LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do 
printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> 
$lib.exp~
        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags 
$libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version 
$verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
 
        # Both c and cxx compiler support -rpath directly
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      LT_TAGVAR(hardcode_libdir_separator, $1)=:
       ;;
 
     sco3.2v5*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+      LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs 
$linker_flags'
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
       runpath_var=LD_RUN_PATH
       hardcode_runpath_var=yes
       ;;
 
     solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      LT_TAGVAR(no_undefined_flag, $1)=' -z text'
       if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o 
$lib $libobjs $deplibs $compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo 
"local: *; };" >> $lib.exp~
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib 
$libobjs $deplibs $compiler_flags'
+       LT_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat 
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> 
$lib.exp~
          $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib 
$libobjs $deplibs $compiler_flags~$rm $lib.exp'
       else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h 
$soname -o $lib $libobjs $deplibs $linker_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo 
"local: *; };" >> $lib.exp~
+       LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname 
-o $lib $libobjs $deplibs $linker_flags'
+       LT_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat 
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> 
$lib.exp~
        $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs 
$deplibs $linker_flags~$rm $lib.exp'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       case $host_os in
       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
       *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience 
-z defaultextract' ;;
+       LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z 
defaultextract' ;;
       esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+      LT_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
     sunos4*)
       if test "x$host_vendor" = xsequent; then
        # Use $CC to link under sequent, because it throws in some extra .o
        # files that make .init and .fini sections work.
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib 
$libobjs $deplibs $compiler_flags'
+       LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs 
$deplibs $compiler_flags'
       else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib 
$libobjs $deplibs $linker_flags'
+       LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib 
$libobjs $deplibs $linker_flags'
       fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_minus_L, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     sysv4)
       case $host_vendor in
        sni)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
-         _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+         LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
+         LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
        ;;
        siemens)
          ## LD is ld it makes a PLAMLIB
          ## CC just makes a GrossModule.
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs 
$linker_flags'
-         _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-         _LT_AC_TAGVAR(hardcode_direct, $1)=no
+         LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs 
$linker_flags'
+         LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+         LT_TAGVAR(hardcode_direct, $1)=no
         ;;
        motorola)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
-         _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but 
my tests say they lie
+         LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
+         LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my 
tests say they lie
        ;;
       esac
       runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs 
$linker_flags'
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
+       LT_TAGVAR(hardcode_shlibpath_var, $1)=no
        runpath_var=LD_RUN_PATH
        hardcode_runpath_var=yes
-       _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+       LT_TAGVAR(ld_shlibs, $1)=yes
       fi
       ;;
 
     sysv4.2uw2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs 
$linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs 
$linker_flags'
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_minus_L, $1)=no
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       hardcode_runpath_var=yes
       runpath_var=LD_RUN_PATH
       ;;
 
    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+      LT_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
       if test "$GCC" = yes; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o 
$lib $libobjs $deplibs $compiler_flags'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib 
$libobjs $deplibs $compiler_flags'
       else
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib 
$libobjs $deplibs $compiler_flags'
+       LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib 
$libobjs $deplibs $compiler_flags'
       fi
       runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     sysv5*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+      LT_TAGVAR(no_undefined_flag, $1)=' -z text'
       # $CC -shared without GNU ld will not create a library from C++
       # object files and a static libstdc++, better avoid it by now
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h 
$soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat 
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> 
$lib.exp~
+      LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o 
$lib $libobjs $deplibs $linker_flags'
+      LT_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat 
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> 
$lib.exp~
                $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib 
$libobjs $deplibs $linker_flags~$rm $lib.exp'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       runpath_var='LD_RUN_PATH'
       ;;
 
     uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs 
$deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs 
$linker_flags'
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
     *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      LT_TAGVAR(ld_shlibs, $1)=no
       ;;
     esac
 
@@ -4130,8 +4148,8 @@
     fi
   fi
 ])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+AC_MSG_RESULT([$LT_TAGVAR(ld_shlibs, $1)])
+test "$LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
 _LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
 _LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
@@ -4149,13 +4167,13 @@
 #
 # Do we need to explicitly link libc?
 #
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
+case "x$LT_TAGVAR(archive_cmds_need_lc, $1)" in
 x|xyes)
   # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+  LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
+  if test "$LT_TAGVAR(enable_shared, $1)" = yes && test "$GCC" = yes; then
+    case $LT_TAGVAR(archive_cmds, $1) in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
       ;;
@@ -4172,26 +4190,26 @@
         lib=conftest
         libobjs=conftest.$ac_objext
         deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+        wl=$LT_TAGVAR(lt_prog_compiler_wl, $1)
         compiler_flags=-v
         linker_flags=-v
         verstring=
         output_objdir=.
         libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc 
\" \>/dev/null 2\>\&1)
+        lt_save_allow_undefined_flag=$LT_TAGVAR(allow_undefined_flag, $1)
+        LT_TAGVAR(allow_undefined_flag, $1)=
+        if AC_TRY_EVAL(LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" 
\>/dev/null 2\>\&1)
         then
-         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+         LT_TAGVAR(archive_cmds_need_lc, $1)=no
         else
-         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+         LT_TAGVAR(archive_cmds_need_lc, $1)=yes
         fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+        LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
       else
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
+      AC_MSG_RESULT([$LT_TAGVAR(archive_cmds_need_lc, $1)])
       ;;
     esac
   fi
@@ -4339,7 +4357,7 @@
 
 # Object file extension for compiled C test sources.
 objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
+LT_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
 lt_simple_compile_test_code="int some_variable = 0;\n"
@@ -4349,26 +4367,26 @@
 
 _LT_AC_SYS_COMPILER
 # Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_AC_TAGVAR(compiler, []) is a NOP.
+# tags are being tested, and LT_TAGVAR(compiler, []) is a NOP.
 compiler_DEFAULT=$CC
 
 #
 # Check for any special shared library compilation flags.
 #
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+LT_TAGVAR(lt_prog_cc_shlib, $1)=
 if test "$GCC" = no; then
   case $host_os in
   sco3.2v5*)
-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+    LT_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
     ;;
   esac
 fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build 
shared libraries])
-  if echo "$old_CC $old_CFLAGS " | $GREP "[[   
]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[        ]]" >/dev/null; then :
+if test -n "$LT_TAGVAR(lt_prog_cc_shlib, $1)"; then
+  AC_MSG_WARN([`$CC' requires `$LT_TAGVAR(lt_prog_cc_shlib, $1)' to build 
shared libraries])
+  if echo "$old_CC $old_CFLAGS " | $GREP "[[   ]]$LT_TAGVAR(lt_prog_cc_shlib, 
$1)[[    ]]" >/dev/null; then :
   else
-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or 
CFLAGS env variable and reconfigure])
-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+    AC_MSG_WARN([add `$LT_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS 
env variable and reconfigure])
+    LT_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
   fi
 fi
 
@@ -4392,13 +4410,13 @@
 AC_MSG_RESULT([$can_build_shared])
 
 AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
+test "$can_build_shared" = "no" && LT_TAGVAR(enable_shared, $1)=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
 case "$host_os" in
 aix3*)
-  test "$enable_shared" = yes && enable_static=no
+  test "$LT_TAGVAR(enable_shared, $1)" = yes && LT_TAGVAR(enable_static, $1)=no
   if test -n "$RANLIB"; then
     archive_cmds="$archive_cmds~\$RANLIB \$lib"
     postinstall_cmds='$RANLIB $lib'
@@ -4407,16 +4425,16 @@
 
 aix4* | aix5*)
   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
+    test "$LT_TAGVAR(enable_shared, $1)" = yes && LT_TAGVAR(enable_static, 
$1)=no
   fi
   ;;
 esac
-AC_MSG_RESULT([$enable_shared])
+AC_MSG_RESULT([$LT_TAGVAR(enable_shared, $1)])
 
 AC_MSG_CHECKING([whether to build static libraries])
 # Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
+test "$LT_TAGVAR(enable_shared, $1)" = yes || LT_TAGVAR(enable_static, $1)=yes
+AC_MSG_RESULT([$LT_TAGVAR(enable_static, $1)])
 
 AC_LIBTOOL_CONFIG($1)
 
@@ -4437,31 +4455,33 @@
 AC_REQUIRE([AC_PROG_CXX])
 AC_REQUIRE([AC_PROG_CXXCPP])
 
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+LT_TAGVAR(archive_cmds_need_lc, $1)=no
+LT_TAGVAR(allow_undefined_flag, $1)=
+LT_TAGVAR(always_export_symbols, $1)=no
+LT_TAGVAR(archive_expsym_cmds, $1)=
+LT_TAGVAR(export_dynamic_flag_spec, $1)=
+LT_TAGVAR(hardcode_direct, $1)=no
+LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+LT_TAGVAR(hardcode_libdir_separator, $1)=
+LT_TAGVAR(hardcode_minus_L, $1)=no
+LT_TAGVAR(hardcode_automatic, $1)=no
+LT_TAGVAR(module_cmds, $1)=
+LT_TAGVAR(module_expsym_cmds, $1)=
+LT_TAGVAR(link_all_deplibs, $1)=unknown
+LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+LT_TAGVAR(no_undefined_flag, $1)=
+LT_TAGVAR(whole_archive_flag_spec, $1)=
+LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+LT_TAGVAR(enable_shared, $1)=$enable_shared
+LT_TAGVAR(enable_static, $1)=$enable_static
 
 # Source file extension for C++ test sources.
 ac_ext=cc
 
 # Object file extension for compiled C++ test sources.
 objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
+LT_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
 lt_simple_compile_test_code="int some_variable = 0;\n"
@@ -4492,15 +4512,15 @@
 test -z "${LDCXX+set}" || LD=$LDCXX
 CC=${CXX-"c++"}
 compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
+LT_TAGVAR(compiler, $1)=$CC
 cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 
 # We don't want -fno-exception when compiling C++ code, so set the
 # no_builtin_flag separately
 if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+  LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+  LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 fi
 
 if test "$GXX" = yes; then
@@ -4511,11 +4531,11 @@
   # Check if GNU C++ uses GNU ld as the underlying linker, since the
   # archiving commands below assume that GNU ld is being used.
   if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o 
$lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
$wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+    LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o 
$lib'
+    LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname 
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+    LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+    LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 
     # If archive_cmds runs LD, not CC, wlarc should be empty
     # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
@@ -4525,9 +4545,9 @@
     # ancient GNU ld didn't support --whole-archive et. al.
     if eval "`$CC -print-prog-name=ld` --help 2>&1" |
        $GREP 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, 
$1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+      LT_TAGVAR(whole_archive_flag_spec, 
$1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
     else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+      LT_TAGVAR(whole_archive_flag_spec, $1)=
     fi
   else
     with_gnu_ld=no
@@ -4538,7 +4558,7 @@
     # linker, instead of GNU ld.  If possible, this setting should
     # overridden to take advantage of the native linker features on
     # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+    LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
   fi
 
   # Commands to make compiler produce verbose output that lists
@@ -4554,11 +4574,11 @@
 
 # PORTME: fill in a description of your system's C++ link characteristics
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+LT_TAGVAR(ld_shlibs, $1)=yes
 case $host_os in
   aix3*)
     # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    LT_TAGVAR(ld_shlibs, $1)=no
     ;;
   aix4* | aix5*)
     if test "$host_cpu" = ia64; then
@@ -4594,10 +4614,10 @@
     # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
     # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+    LT_TAGVAR(archive_cmds, $1)=''
+    LT_TAGVAR(hardcode_direct, $1)=yes
+    LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+    LT_TAGVAR(link_all_deplibs, $1)=yes
 
     if test "$GXX" = yes; then
       case $host_os in aix4.[012]|aix4.[012].*)
@@ -4608,16 +4628,16 @@
           strings "$collect2name" | $GREP resolve_lib_name >/dev/null
        then
          # We have reworked collect2
-         _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+         LT_TAGVAR(hardcode_direct, $1)=yes
        else
          # We have old collect2
-         _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+         LT_TAGVAR(hardcode_direct, $1)=unsupported
          # It fails to find uninstalled libraries when the uninstalled
          # path is not listed in the libpath.  Setting hardcode_minus_L
          # to unsupported forces relinking
-         _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+         LT_TAGVAR(hardcode_minus_L, $1)=yes
+         LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+         LT_TAGVAR(hardcode_libdir_separator, $1)=
        fi
       esac
       shared_flag='-shared'
@@ -4638,38 +4658,38 @@
 
     # It seems that -bexpall does not export symbols beginning with
     # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+    LT_TAGVAR(always_export_symbols, $1)=yes
     if test "$aix_use_runtimelinking" = yes; then
       # Warning - without using the other runtime loading flags (-brtl),
       # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+      LT_TAGVAR(allow_undefined_flag, $1)='-berok'
       # Determine the default libpath from the value encoded in an empty
       # executable.
       _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+      LT_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname 
$libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; 
then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag 
\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+      LT_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname 
$libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; 
then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag 
\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
      else
       if test "$host_cpu" = ia64; then
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R 
$libdir:/usr/lib:/lib'
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o 
$output_objdir/$soname $libobjs $deplibs $compiler_flags 
${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag 
\${wl}$exp_sym_flag:\$export_symbols"
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+       LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+       LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o 
$output_objdir/$soname $libobjs $deplibs $compiler_flags 
${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag 
\${wl}$exp_sym_flag:\$export_symbols"
       else
        # Determine the default libpath from the value encoded in an
        # empty executable.
        _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+       LT_TAGVAR(hardcode_libdir_flag_spec, 
$1)='${wl}-blibpath:$libdir:'"$aix_libpath"
        # Warning - without using the other run time loading flags,
        # -berok will link without error, but may produce a broken library.
-       _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+       LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+       LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
        # -bexpall does not export symbols beginning with underscore (_)
-       _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+       LT_TAGVAR(always_export_symbols, $1)=yes
        # Exported symbols can be pulled into shared objects from archives
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+       LT_TAGVAR(whole_archive_flag_spec, $1)=' '
+       LT_TAGVAR(archive_cmds_need_lc, $1)=yes
        # This is similar to how AIX traditionally builds it's shared libraries.
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o 
$output_objdir/$soname $libobjs $deplibs $compiler_flags 
${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS 
$output_objdir/$libname$release.a $output_objdir/$soname'
+       LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o 
$output_objdir/$soname $libobjs $deplibs $compiler_flags 
${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS 
$output_objdir/$libname$release.a $output_objdir/$soname'
       fi
     fi
     ;;
@@ -4677,24 +4697,24 @@
     case $cc_basename in
       *)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
     esac
     ;;
 
   cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+    # LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
     # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+    LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+    LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+    LT_TAGVAR(always_export_symbols, $1)=no
+    LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 
     if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname 
${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
+      LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname 
${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
       # If the export-symbols file already is a .def file (1st line
       # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q 
$export_symbols`" = xEXPORTS; then
+      LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" 
= xEXPORTS; then
        cp $export_symbols $output_objdir/$soname.def;
       else
        echo EXPORTS > $output_objdir/$soname.def;
@@ -4702,26 +4722,26 @@
       fi~
       $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname 
${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
     else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      LT_TAGVAR(ld_shlibs, $1)=no
     fi
   ;;
     darwin* | rhapsody*)
     if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+      LT_TAGVAR(archive_cmds_need_lc, $1)=no
       case "$host_os" in
       rhapsody* | darwin1.[[012]])
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+       LT_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
        ;;
       *) # Darwin 1.3 on
       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined 
suppress'
+       LT_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined 
suppress'
       else
         case ${MACOSX_DEPLOYMENT_TARGET} in
           10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace 
-undefined suppress'
+            LT_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined 
suppress'
             ;;
           10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+            LT_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
             ;;
         esac
       fi
@@ -4733,25 +4753,25 @@
          lt_int_apple_cc_single_mod=yes
        fi
        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module 
$allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name 
$rpath/$soname $verstring'
+         LT_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module 
$allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name 
$rpath/$soname $verstring'
        else
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs 
-nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o 
$lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname 
$verstring'
+        LT_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o 
${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib 
${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname 
$verstring'
       fi
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib 
-bundle $libobjs $deplibs$compiler_flags'
+      LT_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle 
$libobjs $deplibs$compiler_flags'
       # Don't fix this by using the ld -exported_symbols_list flag, it doesn't 
exist in older darwin ld's
         if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    
]*,," -e "s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module 
$allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name 
$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym 
${lib}'
+          LT_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    
]*,," -e "s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module 
$allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name 
$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym 
${lib}'
         else
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    
]*,," -e "s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib 
-o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib 
${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname 
$verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          LT_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    
]*,," -e "s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib 
-o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib 
${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname 
$verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
         fi
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    
]*,," -e "s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib 
-bundle $libobjs $deplibs$compiler_flags~nmedit -s 
$output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+          LT_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    
]*,," -e "s,^\(..*\),_&," < $export_symbols > 
$output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib 
-bundle $libobjs $deplibs$compiler_flags~nmedit -s 
$output_objdir/${libname}-symbols.expsym ${lib}'
+      LT_TAGVAR(hardcode_direct, $1)=no
+      LT_TAGVAR(hardcode_automatic, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+      LT_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+      LT_TAGVAR(link_all_deplibs, $1)=yes
     else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      LT_TAGVAR(ld_shlibs, $1)=no
     fi
       ;;
 
@@ -4759,49 +4779,49 @@
     case $cc_basename in
       ec++)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       ghcx)
        # Green Hills C++ Compiler
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       *)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
     esac
     ;;
   freebsd[12]*)
     # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    LT_TAGVAR(ld_shlibs, $1)=no
     ;;
   freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    LT_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
   freebsd* | kfreebsd*-gnu)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+    LT_TAGVAR(ld_shlibs, $1)=yes
     ;;
   gnu*)
     ;;
   hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+    LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+    LT_TAGVAR(hardcode_libdir_separator, $1)=:
+    LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+    LT_TAGVAR(hardcode_direct, $1)=yes
+    LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
                                # but as the default
                                # location of the library.
 
     case $cc_basename in
     CC)
       # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+      LT_TAGVAR(ld_shlibs, $1)=no
       ;;
     aCC)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b 
${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || 
mv $output_objdir/$soname $lib'
+      LT_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b 
${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || 
mv $output_objdir/$soname $lib'
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
@@ -4814,10 +4834,10 @@
       ;;
     *)
       if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC 
-shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test 
$output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+        LT_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared 
-nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test 
$output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
         # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
+        LT_TAGVAR(ld_shlibs, $1)=no
       fi
       ;;
     esac
@@ -4826,35 +4846,35 @@
     if test $with_gnu_ld = no; then
       case "$host_cpu" in
       hppa*64*)
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+       LT_TAGVAR(hardcode_libdir_separator, $1)=:
         ;;
       ia64*)
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
         ;;
       *)
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       LT_TAGVAR(hardcode_libdir_separator, $1)=:
+       LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
         ;;
       esac
     fi
     case "$host_cpu" in
     hppa*64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_direct, $1)=no
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
     ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+      LT_TAGVAR(hardcode_direct, $1)=no
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
                                              # but as the default
                                              # location of the library.
       ;;
     *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
                                              # but as the default
                                              # location of the library.
       ;;
@@ -4863,15 +4883,15 @@
     case $cc_basename in
       CC)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       aCC)
        case "$host_cpu" in
        hppa*64*|ia64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib 
$linker_flags $libobjs $deplibs'
+         LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags 
$libobjs $deplibs'
          ;;
        *)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b 
${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects 
$compiler_flags'
+         LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b 
${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects 
$compiler_flags'
          ;;
        esac
        # Commands to make compiler produce verbose output that lists
@@ -4889,16 +4909,16 @@
          if test $with_gnu_ld = no; then
            case "$host_cpu" in
            ia64*|hppa*64*)
-             _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib 
$linker_flags $libobjs $deplibs'
+             LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib 
$linker_flags $libobjs $deplibs'
              ;;
            *)
-             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC 
${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags'
+             LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h 
${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags'
              ;;
            esac
          fi
        else
          # FIXME: insert proper C++ library support
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+         LT_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
     esac
@@ -4907,27 +4927,27 @@
     case $cc_basename in
       CC)
        # SGI C++
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname 
$soname `test -n "$verstring" && echo -set_version $verstring` -update_registry 
${objdir}/so_locations -o $lib'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n 
"$verstring" && echo -set_version $verstring` -update_registry 
${objdir}/so_locations -o $lib'
 
        # Archives containing C++ object files must be created using
        # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
        # necessary to make sure instantiated templates are included
        # in the archive.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+       LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
        ;;
       *)
        if test "$GXX" = yes; then
          if test "$with_gnu_ld" = no; then
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` 
${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
+           LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname 
`test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` 
${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
          else
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` 
-o $lib'
+           LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname 
`test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
          fi
        fi
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       LT_TAGVAR(link_all_deplibs, $1)=yes
        ;;
     esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+    LT_TAGVAR(hardcode_libdir_separator, $1)=:
     ;;
   linux*)
     case $cc_basename in
@@ -4937,8 +4957,8 @@
        # KCC will only create a shared library if the output file
        # ends with ".so" (or ".sl" for HP-UX), so rename the library
        # to its proper name (with version) after linking.
-       _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e 
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e 
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs 
$postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib 
$lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | 
$SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED 
-e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs 
$postdep_objects $compiler_flags --soname $soname -o \$templib 
${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+       LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e 
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e 
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs 
$postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib 
$lib'
+       LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e 
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e 
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs 
$postdep_objects $compiler_flags --soname $soname -o \$templib 
${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
@@ -4949,31 +4969,31 @@
        # dependencies.
        output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o 
libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; 
list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; 
*.$objext);; *) list="$list $z";;esac; done; echo $list'
 
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
+       LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 
        # Archives containing C++ object files must be created using
        # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+       LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
        ;;
       icpc)
        # Intel C++
        with_gnu_ld=yes
-       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname 
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-       _LT_AC_TAGVAR(whole_archive_flag_spec, 
$1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+       LT_TAGVAR(archive_cmds_need_lc, $1)=no
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname 
${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+       LT_TAGVAR(whole_archive_flag_spec, 
$1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
        ;;
       cxx)
        # Compaq C++
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o 
$lib ${wl}-retain-symbols-file $wl$export_symbols'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+       LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o 
$lib ${wl}-retain-symbols-file $wl$export_symbols'
 
        runpath_var=LD_RUN_PATH
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+       LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
@@ -4989,31 +5009,31 @@
     ;;
   lynxos*)
     # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    LT_TAGVAR(ld_shlibs, $1)=no
     ;;
   m88k*)
     # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    LT_TAGVAR(ld_shlibs, $1)=no
     ;;
   mvs*)
     case $cc_basename in
       cxx)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       *)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
     esac
     ;;
   netbsd*)
     if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib 
$predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+      LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects 
$libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+      LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      LT_TAGVAR(hardcode_direct, $1)=yes
+      LT_TAGVAR(hardcode_shlibpath_var, $1)=no
     fi
     # Workaround some broken pre-1.5 toolchains
     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | 
$GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
@@ -5026,27 +5046,27 @@
        # KCC will only create a shared library if the output file
        # ends with ".so" (or ".sl" for HP-UX), so rename the library
        # to its proper name (with version) after linking.
-       _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e 
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e 
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs 
$postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib 
$lib'
+       LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e 
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e 
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs 
$postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib 
$lib'
 
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
        # Archives containing C++ object files must be created using
        # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+       LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 
        ;;
       RCC)
        # Rational C++ 2.4.1
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       cxx)
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved 
${wl}\*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
$soname `test -n "$verstring" && echo ${wl}-set_version $verstring` 
-update_registry ${objdir}/so_locations -o $lib'
+       LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname 
$soname `test -n "$verstring" && echo ${wl}-set_version $verstring` 
-update_registry ${objdir}/so_locations -o $lib'
 
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+       LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
@@ -5060,11 +5080,11 @@
        ;;
       *)
        if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved 
${wl}\*'
-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib 
${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects 
$compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo 
${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${objdir}/so_locations -o $lib'
+         LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+         LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib 
${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects 
$compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo 
${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${objdir}/so_locations -o $lib'
 
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath 
${wl}$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+         LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+         LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
          # Commands to make compiler produce verbose output that lists
          # what "hidden" libraries, object files and flags are used when
@@ -5073,7 +5093,7 @@
 
        else
          # FIXME: insert proper C++ library support
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+         LT_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
     esac
@@ -5086,30 +5106,30 @@
        # KCC will only create a shared library if the output file
        # ends with ".so" (or ".sl" for HP-UX), so rename the library
        # to its proper name (with version) after linking.
-       _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e 
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e 
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs 
$postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib 
$lib'
+       LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e 
'\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e 
"s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs 
$postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib 
$lib'
 
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+       LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
        # Archives containing C++ object files must be created using
        # the KAI C++ compiler.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+       LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
        ;;
       RCC)
        # Rational C++ 2.4.1
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       cxx)
-       _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym 
-soname $soname `test -n "$verstring" && echo -set_version $verstring` 
-update_registry ${objdir}/so_locations -o $lib'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; 
do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+       LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym 
-soname $soname `test -n "$verstring" && echo -set_version $verstring` 
-update_registry ${objdir}/so_locations -o $lib'
+       LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do 
printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
          echo "-hidden">> $lib.exp~
          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs 
$postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  
`test -n "$verstring" && echo -set_version $verstring` -update_registry 
$objdir/so_locations -o $lib~
          $rm $lib.exp'
 
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+       LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
@@ -5123,11 +5143,11 @@
        ;;
       *)
        if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved 
${wl}\*'
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib 
${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects 
$compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && 
echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${objdir}/so_locations -o $lib'
+         LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+        LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib 
${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects 
$compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && 
echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry 
${wl}${objdir}/so_locations -o $lib'
 
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath 
${wl}$libdir'
-         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+         LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+         LT_TAGVAR(hardcode_libdir_separator, $1)=:
 
          # Commands to make compiler produce verbose output that lists
          # what "hidden" libraries, object files and flags are used when
@@ -5136,25 +5156,25 @@
 
        else
          # FIXME: insert proper C++ library support
-         _LT_AC_TAGVAR(ld_shlibs, $1)=no
+         LT_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
     esac
     ;;
   psos*)
     # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    LT_TAGVAR(ld_shlibs, $1)=no
     ;;
   sco*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    LT_TAGVAR(archive_cmds_need_lc, $1)=no
     case $cc_basename in
       CC)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       *)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
     esac
     ;;
@@ -5163,16 +5183,16 @@
       CC)
        # Sun C++ 4.x
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       lcc)
        # Lucid
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       *)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
     esac
     ;;
@@ -5180,13 +5200,13 @@
     case $cc_basename in
       CC)
        # Sun C++ 4.2, 5.x and Centerline C++
-       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib 
-h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects 
$compiler_flags'
-       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo 
"local: *; };" >> $lib.exp~
+       LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+       LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib 
-h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects 
$compiler_flags'
+       LT_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat 
$export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> 
$lib.exp~
        $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o 
$lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm 
$lib.exp'
 
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       LT_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
          solaris2.[0-5] | solaris2.[0-5].*) ;;
          *)
@@ -5194,10 +5214,10 @@
            # flag to pass the commands to the underlying system
            # linker.
            # Supported since Solaris 2.6 (maybe 2.5.1?)
-           _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z 
${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+           LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z 
${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
            ;;
        esac
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       LT_TAGVAR(link_all_deplibs, $1)=yes
 
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
@@ -5213,22 +5233,22 @@
        # "CC -xar", where "CC" is the Sun C++ compiler.  This is
        # necessary to make sure instantiated templates are included
        # in the archive.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+       LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
        ;;
       gcx)
        # Green Hills C++ Compiler
-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+       LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs 
$deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 
        # The C++ compiler must be used to create the archive.
-       _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib 
$oldobjs'
+       LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib 
$oldobjs'
        ;;
       *)
        # GNU C++ compiler with Solaris linker
        if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-         _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+         LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
          if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h 
$wl$soname -o $lib'
-           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo 
"local: *; };" >> $lib.exp~
+           LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h 
$wl$soname -o $lib'
+           LT_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo 
"local: *; };" >> $lib.exp~
                $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
            # Commands to make compiler produce verbose output that lists
@@ -5238,8 +5258,8 @@
          else
            # g++ 2.7 appears to require `-G' NOT `-shared' on this
            # platform.
-           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h 
$wl$soname -o $lib'
-           _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo 
"local: *; };" >> $lib.exp~
+           LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS 
$predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h 
$wl$soname -o $lib'
+           LT_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo 
"local: *; };" >> $lib.exp~
                $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects 
$libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 
            # Commands to make compiler produce verbose output that lists
@@ -5248,41 +5268,41 @@
            output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | 
$GREP \"\-L\""
          fi
 
-         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+         LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
        fi
        ;;
     esac
     ;;
   sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+    LT_TAGVAR(archive_cmds_need_lc, $1)=no
     ;;
   tandem*)
     case $cc_basename in
       NCC)
        # NonStop-UX NCC 3.20
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
       *)
        # FIXME: insert proper C++ library support
-       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       LT_TAGVAR(ld_shlibs, $1)=no
        ;;
     esac
     ;;
   vxworks*)
     # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    LT_TAGVAR(ld_shlibs, $1)=no
     ;;
   *)
     # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    LT_TAGVAR(ld_shlibs, $1)=no
     ;;
 esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+AC_MSG_RESULT([$LT_TAGVAR(ld_shlibs, $1)])
+test "$LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
+LT_TAGVAR(GCC, $1)="$GXX"
+LT_TAGVAR(LD, $1)="$LD"
 
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
@@ -5322,11 +5342,11 @@
 # objects, libraries and library flags.
 AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
 # Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+LT_TAGVAR(predep_objects, $1)=
+LT_TAGVAR(postdep_objects, $1)=
+LT_TAGVAR(predeps, $1)=
+LT_TAGVAR(postdeps, $1)=
+LT_TAGVAR(compiler_lib_search_path, $1)=
 
 dnl we can't use the lt_simple_compile_test_code here,
 dnl because it contains code intended for an executable,
@@ -5398,20 +5418,20 @@
           # Internal compiler library paths should come after those
           # provided the user.  The postdeps already come after the
           # user supplied libs so there is no need to process them.
-          if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-            _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+          if test -z "$LT_TAGVAR(compiler_lib_search_path, $1)"; then
+            LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
           else
-            _LT_AC_TAGVAR(compiler_lib_search_path, 
$1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+            LT_TAGVAR(compiler_lib_search_path, 
$1)="${LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
           fi
           ;;
         # The "-l" case would never come before the object being
         # linked, so don't bother handling this case.
         esac
        else
-        if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-          _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
+        if test -z "$LT_TAGVAR(postdeps, $1)"; then
+          LT_TAGVAR(postdeps, $1)="${prev}${p}"
         else
-          _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} 
${prev}${p}"
+          LT_TAGVAR(postdeps, $1)="${LT_TAGVAR(postdeps, $1)} ${prev}${p}"
         fi
        fi
        ;;
@@ -5425,16 +5445,16 @@
        fi
 
        if test "$pre_test_object_deps_done" = no; then
-        if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-          _LT_AC_TAGVAR(predep_objects, $1)="$p"
+        if test -z "$LT_TAGVAR(predep_objects, $1)"; then
+          LT_TAGVAR(predep_objects, $1)="$p"
         else
-          _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, 
$1) $p"
+          LT_TAGVAR(predep_objects, $1)="$LT_TAGVAR(predep_objects, $1) $p"
         fi
        else
-        if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-          _LT_AC_TAGVAR(postdep_objects, $1)="$p"
+        if test -z "$LT_TAGVAR(postdep_objects, $1)"; then
+          LT_TAGVAR(postdep_objects, $1)="$p"
         else
-          _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, 
$1) $p"
+          LT_TAGVAR(postdep_objects, $1)="$LT_TAGVAR(postdep_objects, $1) $p"
         fi
        fi
        ;;
@@ -5452,8 +5472,8 @@
 
 $rm -f confest.$objext
 
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+case " $LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
 _LT_TAGDECL([], [predep_objects], [1],
     [Dependencies to place before and after  the objects being linked to
@@ -5476,31 +5496,33 @@
 [AC_REQUIRE([AC_PROG_F77])
 AC_LANG_PUSH(Fortran 77)
 
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+LT_TAGVAR(archive_cmds_need_lc, $1)=no
+LT_TAGVAR(allow_undefined_flag, $1)=
+LT_TAGVAR(always_export_symbols, $1)=no
+LT_TAGVAR(archive_expsym_cmds, $1)=
+LT_TAGVAR(export_dynamic_flag_spec, $1)=
+LT_TAGVAR(hardcode_direct, $1)=no
+LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+LT_TAGVAR(hardcode_libdir_separator, $1)=
+LT_TAGVAR(hardcode_minus_L, $1)=no
+LT_TAGVAR(hardcode_automatic, $1)=no
+LT_TAGVAR(module_cmds, $1)=
+LT_TAGVAR(module_expsym_cmds, $1)=
+LT_TAGVAR(link_all_deplibs, $1)=unknown
+LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+LT_TAGVAR(no_undefined_flag, $1)=
+LT_TAGVAR(whole_archive_flag_spec, $1)=
+LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+LT_TAGVAR(enable_shared, $1)=$enable_shared
+LT_TAGVAR(enable_static, $1)=$enable_static
 
 # Source file extension for f77 test sources.
 ac_ext=f
 
 # Object file extension for compiled f77 test sources.
 objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
+LT_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
 lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
@@ -5515,40 +5537,40 @@
 lt_save_CC="$CC"
 CC=${F77-"f77"}
 compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
+LT_TAGVAR(compiler, $1)=$CC
 cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
 
 AC_MSG_CHECKING([if libtool supports shared libraries])
 AC_MSG_RESULT([$can_build_shared])
 
 AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
+test "$can_build_shared" = "no" && LT_TAGVAR(enable_shared, $1)=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
 # are all built from PIC.
 case "$host_os" in
 aix3*)
-  test "$enable_shared" = yes && enable_static=no
+  test "$LT_TAGVAR(enable_shared, $1)" = yes && LT_TAGVAR(enable_static, $1)=no
   if test -n "$RANLIB"; then
     archive_cmds="$archive_cmds~\$RANLIB \$lib"
     postinstall_cmds='$RANLIB $lib'
   fi
   ;;
 aix4* | aix5*)
-  test "$enable_shared" = yes && enable_static=no
+  test "$LT_TAGVAR(enable_shared, $1)" = yes && LT_TAGVAR(enable_static, $1)=no
   ;;
 esac
-AC_MSG_RESULT([$enable_shared])
+AC_MSG_RESULT([$LT_TAGVAR(enable_shared, $1)])
 
 AC_MSG_CHECKING([whether to build static libraries])
 # Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
+test "$LT_TAGVAR(enable_shared, $1)" = yes || LT_TAGVAR(enable_static, $1)=yes
+AC_MSG_RESULT([$LT_TAGVAR(enable_static, $1)])
 
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test "$LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
+LT_TAGVAR(GCC, $1)="$G77"
+LT_TAGVAR(LD, $1)="$LD"
 
 AC_LIBTOOL_PROG_COMPILER_PIC($1)
 AC_LIBTOOL_PROG_CC_C_O($1)
@@ -5580,7 +5602,7 @@
 
 # Object file extension for compiled Java test sources.
 objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
+LT_TAGVAR(objext, $1)=$objext
 
 # Code to be used in simple compile tests
 lt_simple_compile_test_code="class foo {}\n"
@@ -5595,10 +5617,13 @@
 lt_save_CC="$CC"
 CC=${GCJ-"gcj"}
 compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
+LT_TAGVAR(compiler, $1)=$CC
+
+LT_TAGVAR(enable_shared, $1)=$enable_shared
+LT_TAGVAR(enable_static, $1)=$enable_static
 
 # GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+LT_TAGVAR(archive_cmds_need_lc, $1)=no
 
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
@@ -5635,7 +5660,10 @@
 
 # Object file extension for compiled RC test sources.
 objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
+LT_TAGVAR(objext, $1)=$objext
+
+LT_TAGVAR(enable_shared, $1)=$enable_shared
+LT_TAGVAR(enable_static, $1)=$enable_static
 
 # Code to be used in simple compile tests
 lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
@@ -5650,8 +5678,8 @@
 lt_save_CC="$CC"
 CC=${RC-"windres"}
 compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+LT_TAGVAR(compiler, $1)=$CC
+LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 
 AC_LIBTOOL_CONFIG($1)
 
Index: m4/ltoptions.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/ltoptions.m4,v
retrieving revision 1.3
diff -u -b -r1.3 ltoptions.m4
--- m4/ltoptions.m4     22 Feb 2004 11:13:45 -0000      1.3
+++ m4/ltoptions.m4     12 Mar 2004 16:13:38 -0000
@@ -174,7 +174,7 @@
     esac],
     [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
 
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+    _LT_TAGDECL([build_libtool_libs], [enable_shared], [0],
        [Whether or not to build shared libraries])
 ])# _LT_ENABLE_SHARED
 
@@ -240,7 +240,7 @@
     esac],
     [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
 
-    _LT_DECL([build_old_libs], [enable_static], [0],
+    _LT_TAGDECL([build_old_libs], [enable_static], [0],
        [Whether or not to build static libraries])
 ])# _LT_ENABLE_STATIC
 

reply via email to

[Prev in Thread] Current Thread [Next in Thread]