OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libtool.m4: Update to libtool 2.2.6. 

* libtool.m4: Update to libtool 2.2.6.
        * lt~obsolete.m4: Update to libtool 2.2.6.
        * ltmain.sh: Update to libtool 2.2.6.
        * ltsugar.m4: Update to libtool 2.2.6.
        * ltversion.m4: Update to libtool 2.2.6.
        * ltoptions.m4: Update to libtool 2.2.6.
        * ltgcc.m4: Update to match changes from libtool 2.2.6.

From-SVN: r140698
This commit is contained in:
Peter O'Gorman 2008-09-26 16:21:02 +00:00 committed by Steve Ellcey
parent 74c061dec3
commit ae11dff459
8 changed files with 3519 additions and 2268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-09-26 Peter O'Gorman <pogma@thewrittenword.com>
* libtool.m4: Update to libtool 2.2.6.
* lt~obsolete.m4: Update to libtool 2.2.6.
* ltmain.sh: Update to libtool 2.2.6.
* ltsugar.m4: Update to libtool 2.2.6.
* ltversion.m4: Update to libtool 2.2.6.
* ltoptions.m4: Update to libtool 2.2.6.
* ltgcc.m4: Update to match changes from libtool 2.2.6.
2008-09-22 Chris Fairles <cfairles@gcc.gnu.org> 2008-09-22 Chris Fairles <cfairles@gcc.gnu.org>
* MAINTAINERS (Write After Approval): Add myself. * MAINTAINERS (Write After Approval): Add myself.

860
libtool.m4 vendored
View File

File diff suppressed because it is too large Load Diff

2
ltgcc.m4
View File

@ -30,6 +30,7 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE _LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments. # Allow CC to be a program name with arguments.
GCC=yes
compiler=$CC compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC _LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler]) _LT_CC_BASENAME([$compiler])
@ -49,7 +50,6 @@ if test -n "$compiler"; then
_LT_COMPILER_C_O($1) _LT_COMPILER_C_O($1)
_LT_COMPILER_FILE_LOCKS($1) _LT_COMPILER_FILE_LOCKS($1)
_LT_LINKER_SHLIBS($1) _LT_LINKER_SHLIBS($1)
_LT_SYS_DYNAMIC_LINKER($1)
_LT_LINKER_HARDCODE_LIBPATH($1) _LT_LINKER_HARDCODE_LIBPATH($1)
_LT_CONFIG($1) _LT_CONFIG($1)

4664
ltmain.sh
View File

File diff suppressed because it is too large Load Diff

172
ltoptions.m4 vendored
View File

@ -1,82 +1,87 @@
# Helper functions for option handling. -*- Autoconf -*- # Helper functions for option handling. -*- Autoconf -*-
#
# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Gary V. Vaughan <gary@gnu.org> # Written by Gary V. Vaughan, 2004
# #
# This file is free software; the Free Software Foundation gives # This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without # unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved. # modifications, as long as this notice is preserved.
# serial 3 ltoptions.m4 # serial 6 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define. # This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
# _LT_MANGLE_OPTION(NAME) # _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
# ----------------------- # ------------------------------------------
m4_define([_LT_MANGLE_OPTION], m4_define([_LT_MANGLE_OPTION],
[[_LT_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) [[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
# _LT_SET_OPTION(NAME) # _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
# -------------------- # ---------------------------------------
# Set option NAME, and if there is a matching handler defined, # Set option OPTION-NAME for macro MACRO-NAME, and if there is a
# dispatch to it. Other NAMEs are saved as a flag. # matching handler defined, dispatch to it. Other OPTION-NAMEs are
# saved as a flag.
m4_define([_LT_SET_OPTION], m4_define([_LT_SET_OPTION],
[m4_define(_LT_MANGLE_OPTION([$1]))dnl [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1]), m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1]), _LT_MANGLE_DEFUN([$1], [$2]),
[m4_warning([Unknown Libtool option `$1'])])[]dnl [m4_warning([Unknown $1 option `$2'])])[]dnl
]) ])
# _LT_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) # _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
# ------------------------------------------- # ------------------------------------------------------------
# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
m4_define([_LT_IF_OPTION], m4_define([_LT_IF_OPTION],
[m4_ifdef(_LT_MANGLE_OPTION([$1]), [$2], [$3])]) [m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
# _LT_UNLESS_OPTIONS(OPTIONS, IF-NOT-SET) # _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
# --------------------------------------- # -------------------------------------------------------
# Execute IF-NOT-SET if all OPTIONS are not set. # Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
# are set.
m4_define([_LT_UNLESS_OPTIONS], m4_define([_LT_UNLESS_OPTIONS],
[m4_foreach([_LT_Option], m4_split(m4_normalize([$1])), [m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
[m4_ifdef(_LT_MANGLE_OPTION(_LT_Option), [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
[m4_define([$0_found])])])[]dnl [m4_define([$0_found])])])[]dnl
m4_ifdef([$0_found], [m4_undefine([$0_found])], [$2 m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
])[]dnl ])[]dnl
]) ])
# _LT_SET_OPTIONS(OPTIONS) # _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
# ------------------------ # ----------------------------------------
# OPTIONS is a space-separated list of Libtool options. # OPTION-LIST is a space-separated list of Libtool options associated
# If any OPTION has a handler macro declared with LT_OPTION_DEFINE, # with MACRO-NAME. If any OPTION has a matching handler declared with
# dispatch to that macro; otherwise complain about the unknown option # LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
# and exit. # the unknown option and exit.
m4_defun([_LT_SET_OPTIONS], m4_defun([_LT_SET_OPTIONS],
[# Set options [# Set options
m4_foreach([_LT_Option], m4_split(m4_normalize([$1])), m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
[_LT_SET_OPTION(_LT_Option)]) [_LT_SET_OPTION([$1], _LT_Option)])
dnl
dnl Simply set some default values (i.e off) if boolean options were not m4_if([$1],[LT_INIT],[
dnl specified: dnl
_LT_UNLESS_OPTIONS([dlopen], [enable_dlopen=no dnl Simply set some default values (i.e off) if boolean options were not
]) dnl specified:
_LT_UNLESS_OPTIONS([win32-dll], [enable_win32_dll=no _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
]) ])
dnl _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
dnl If no reference was made to various pairs of opposing options, then ])
dnl we run the default mode handler for the pair. For example, if neither dnl
dnl `shared' nor `disable-shared' was passed, we enable building of shared dnl If no reference was made to various pairs of opposing options, then
dnl archives by default: dnl we run the default mode handler for the pair. For example, if neither
_LT_UNLESS_OPTIONS([shared disable-shared], [_LT_ENABLE_SHARED]) dnl `shared' nor `disable-shared' was passed, we enable building of shared
_LT_UNLESS_OPTIONS([static disable-static], [_LT_ENABLE_STATIC]) dnl archives by default:
_LT_UNLESS_OPTIONS([pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([fast-install disable-fast-install], _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
[_LT_ENABLE_FAST_INSTALL]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
[_LT_ENABLE_FAST_INSTALL])
])
])# _LT_SET_OPTIONS ])# _LT_SET_OPTIONS
@ -84,24 +89,26 @@ _LT_UNLESS_OPTIONS([fast-install disable-fast-install],
## Macros to handle LT_INIT options. ## ## Macros to handle LT_INIT options. ##
## --------------------------------- ## ## --------------------------------- ##
# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
# -----------------------------------------
m4_define([_LT_MANGLE_DEFUN], m4_define([_LT_MANGLE_DEFUN],
[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1]), [[^A-Z0-9_]], [_])]) [[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
# LT_OPTION_DEFINE(NAME, CODE) # LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
# ---------------------------- # -----------------------------------------------
m4_define([LT_OPTION_DEFINE], m4_define([LT_OPTION_DEFINE],
[m4_define(_LT_MANGLE_DEFUN([$1]), [$2])[]dnl [m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
])# LT_OPTION_DEFINE ])# LT_OPTION_DEFINE
# dlopen # dlopen
# ------ # ------
LT_OPTION_DEFINE([dlopen], [enable_dlopen=yes LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
]) ])
AU_DEFUN([AC_LIBTOOL_DLOPEN], AU_DEFUN([AC_LIBTOOL_DLOPEN],
[_LT_SET_OPTION([dlopen]) [_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete], AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you [$0: Remove this warning and the call to _LT_SET_OPTION when you
put the `dlopen' option into LT_INIT's first parameter.]) put the `dlopen' option into LT_INIT's first parameter.])
@ -114,11 +121,11 @@ dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
# win32-dll # win32-dll
# --------- # ---------
# Declare package support for building win32 dll's. # Declare package support for building win32 dll's.
LT_OPTION_DEFINE([win32-dll], LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes [enable_win32_dll=yes
case $host in case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32*) *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false) AC_CHECK_TOOL(OBJDUMP, objdump, false)
@ -136,7 +143,8 @@ _LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
])# win32-dll ])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL], AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
[_LT_SET_OPTION([win32-dll]) [AC_REQUIRE([AC_CANONICAL_HOST])dnl
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete], AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you [$0: Remove this warning and the call to _LT_SET_OPTION when you
put the `win32-dll' option into LT_INIT's first parameter.]) put the `win32-dll' option into LT_INIT's first parameter.])
@ -179,16 +187,16 @@ AC_ARG_ENABLE([shared],
[Whether or not to build shared libraries]) [Whether or not to build shared libraries])
])# _LT_ENABLE_SHARED ])# _LT_ENABLE_SHARED
LT_OPTION_DEFINE([shared], [_LT_ENABLE_SHARED([yes])]) LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
LT_OPTION_DEFINE([disable-shared], [_LT_ENABLE_SHARED([no])]) LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
# Old names: # Old names:
AC_DEFUN([AC_ENABLE_SHARED], AC_DEFUN([AC_ENABLE_SHARED],
[_LT_SET_OPTION([shared]) [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
]) ])
AC_DEFUN([AC_DISABLE_SHARED], AC_DEFUN([AC_DISABLE_SHARED],
[_LT_SET_OPTION([disable-shared]) [_LT_SET_OPTION([LT_INIT], [disable-shared])
]) ])
AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
@ -233,16 +241,16 @@ AC_ARG_ENABLE([static],
[Whether or not to build static libraries]) [Whether or not to build static libraries])
])# _LT_ENABLE_STATIC ])# _LT_ENABLE_STATIC
LT_OPTION_DEFINE([static], [_LT_ENABLE_STATIC([yes])]) LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
LT_OPTION_DEFINE([disable-static], [_LT_ENABLE_STATIC([no])]) LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
# Old names: # Old names:
AC_DEFUN([AC_ENABLE_STATIC], AC_DEFUN([AC_ENABLE_STATIC],
[_LT_SET_OPTION([static]) [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
]) ])
AC_DEFUN([AC_DISABLE_STATIC], AC_DEFUN([AC_DISABLE_STATIC],
[_LT_SET_OPTION([disable-static]) [_LT_SET_OPTION([LT_INIT], [disable-static])
]) ])
AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
@ -287,19 +295,19 @@ _LT_DECL([fast_install], [enable_fast_install], [0],
[Whether or not to optimize for fast installation])dnl [Whether or not to optimize for fast installation])dnl
])# _LT_ENABLE_FAST_INSTALL ])# _LT_ENABLE_FAST_INSTALL
LT_OPTION_DEFINE([fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
LT_OPTION_DEFINE([disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
# Old names: # Old names:
AU_DEFUN([AC_ENABLE_FAST_INSTALL], AU_DEFUN([AC_ENABLE_FAST_INSTALL],
[_LT_SET_OPTION([fast-install]) [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete], AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put [$0: Remove this warning and the call to _LT_SET_OPTION when you put
the `fast-install' option into LT_INIT's first parameter.]) the `fast-install' option into LT_INIT's first parameter.])
]) ])
AU_DEFUN([AC_DISABLE_FAST_INSTALL], AU_DEFUN([AC_DISABLE_FAST_INSTALL],
[_LT_SET_OPTION([disable-fast-install]) [_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete], AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put [$0: Remove this warning and the call to _LT_SET_OPTION when you put
the `disable-fast-install' option into LT_INIT's first parameter.]) the `disable-fast-install' option into LT_INIT's first parameter.])
@ -327,12 +335,12 @@ test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC ])# _LT_WITH_PIC
LT_OPTION_DEFINE([pic-only], [_LT_WITH_PIC([yes])]) LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
LT_OPTION_DEFINE([no-pic], [_LT_WITH_PIC([no])]) LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
# Old name: # Old name:
AU_DEFUN([AC_LIBTOOL_PICMODE], AU_DEFUN([AC_LIBTOOL_PICMODE],
[_LT_SET_OPTION([pic-only]) [_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete], AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you [$0: Remove this warning and the call to _LT_SET_OPTION when you
put the `pic-only' option into LT_INIT's first parameter.]) put the `pic-only' option into LT_INIT's first parameter.])
@ -340,3 +348,21 @@ put the `pic-only' option into LT_INIT's first parameter.])
dnl aclocal-1.4 backwards compatibility: dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
## ----------------- ##
## LTDL_INIT Options ##
## ----------------- ##
m4_define([_LTDL_MODE], [])
LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
[m4_define([_LTDL_MODE], [nonrecursive])])
LT_OPTION_DEFINE([LTDL_INIT], [recursive],
[m4_define([_LTDL_MODE], [recursive])])
LT_OPTION_DEFINE([LTDL_INIT], [subproject],
[m4_define([_LTDL_MODE], [subproject])])
m4_define([_LTDL_TYPE], [])
LT_OPTION_DEFINE([LTDL_INIT], [installable],
[m4_define([_LTDL_TYPE], [installable])])
LT_OPTION_DEFINE([LTDL_INIT], [convenience],
[m4_define([_LTDL_TYPE], [convenience])])

52
ltsugar.m4 vendored
View File

@ -1,13 +1,13 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
# #
# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. # Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Gary V. Vaughan. # Written by Gary V. Vaughan, 2004
# #
# This file is free software; the Free Software Foundation gives # This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without # unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved. # modifications, as long as this notice is preserved.
# serial 4 ltsugar.m4 # serial 6 ltsugar.m4
# This is to help aclocal find these macros, as it can't see m4_define. # This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
@ -17,19 +17,15 @@ AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
# ----------------------------- # -----------------------------
# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their # Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
# associated separator. # associated separator.
# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
# versions in m4sugar had bugs.
m4_define([lt_join], m4_define([lt_join],
[m4_case([$#], [m4_if([$#], [1], [],
[0], [m4_fatal([$0: too few arguments: $#])], [$#], [2], [[$2]],
[1], [], [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
[2], [[$2]],
[m4_ifval([$2],
[[$2][]m4_foreach(_lt_Arg, lt_car([m4_shiftn(2, $@)]),
[_$0([$1], _lt_Arg)])],
[$0([$1], m4_shiftn(2, $@))])])[]dnl
])
m4_define([_lt_join], m4_define([_lt_join],
[m4_ifval([$2],[$1][$2])[]dnl [m4_if([$#$2], [2], [],
]) [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
# lt_car(LIST) # lt_car(LIST)
@ -49,11 +45,13 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR]) # lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------ # ------------------------------------------
# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. # Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
# Note that neither SEPARATOR nor STRING are expanded. No SEPARATOR is # Note that neither SEPARATOR nor STRING are expanded; they are appended
# output if MACRO-NAME was previously undefined (different than defined # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# and empty). # No SEPARATOR is output if MACRO-NAME was previously undefined (different
# than defined and empty).
#
# This macro is needed until we can rely on Autoconf 2.62, since earlier # This macro is needed until we can rely on Autoconf 2.62, since earlier
# versions of m4 mistakenly expanded SEPARATOR. # versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
m4_define([lt_append], m4_define([lt_append],
[m4_define([$1], [m4_define([$1],
m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
@ -65,14 +63,14 @@ m4_define([lt_append],
# Produce a SEP delimited list of all paired combinations of elements of # Produce a SEP delimited list of all paired combinations of elements of
# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list # PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
# has the form PREFIXmINFIXSUFFIXn. # has the form PREFIXmINFIXSUFFIXn.
# Needed until we can rely on m4_combine added in Autoconf 2.62.
m4_define([lt_combine], m4_define([lt_combine],
[m4_if([$2], [], [], [m4_if(m4_eval([$# > 3]), [1],
[m4_if([$4], [], [], [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
[lt_join(m4_quote(m4_default([$1], [[, ]])), [[m4_foreach([_Lt_prefix], [$2],
lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_prefix, [$2], [m4_foreach([_Lt_suffix],
[m4_foreach(_Lt_suffix, lt_car([m4_shiftn(3, $@)]), ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
[_Lt_prefix[]$3[]_Lt_suffix ])])))))])])dnl [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
])
# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) # lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
@ -84,13 +82,13 @@ m4_define([lt_if_append_uniq],
[m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
[lt_append([$1], [$2], [$3])$4], [lt_append([$1], [$2], [$3])$4],
[$5])], [$5])],
[lt_append([$1], [$2], [$3])$4])]) [lt_append([$1], [$2], [$3])$4])])
# lt_dict_add(DICT, KEY, VALUE) # lt_dict_add(DICT, KEY, VALUE)
# ----------------------------- # -----------------------------
m4_define([lt_dict_add], m4_define([lt_dict_add],
[m4_define([$1($2)], [$4])]) [m4_define([$1($2)], [$3])])
# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) # lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)

18
ltversion.m4 vendored
View File

@ -1,23 +1,23 @@
# ltversion.m4 -- version numbers -*- Autoconf -*- # ltversion.m4 -- version numbers -*- Autoconf -*-
# #
# Copyright (C) 2004 Free Software Foundation, Inc. # Copyright (C) 2004 Free Software Foundation, Inc.
# Written by Scott James Remnant. # Written by Scott James Remnant, 2004
# #
## This file is free software; the Free Software Foundation gives # This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without # unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved. # modifications, as long as this notice is preserved.
# Generated from ltversion.in; do not edit by hand # Generated from ltversion.in.
# serial 2435 ltversion.m4 # serial 3012 ltversion.m4
# This file is part of GNU Libtool # This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.1a]) m4_define([LT_PACKAGE_VERSION], [2.2.6])
m4_define([LT_PACKAGE_REVISION], [1.2435]) m4_define([LT_PACKAGE_REVISION], [1.3012])
AC_DEFUN([LTVERSION_VERSION], AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.1a' [macro_version='2.2.6'
macro_revision='1.2435' macro_revision='1.3012'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0) _LT_DECL(, macro_revision, 0)
]) ])

9
lt~obsolete.m4 vendored
View File

@ -1,13 +1,13 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
# #
# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
# Written by Scott James Remnant. # Written by Scott James Remnant, 2004.
# #
# This file is free software; the Free Software Foundation gives # This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without # unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved. # modifications, as long as this notice is preserved.
# serial 2 # serial 4 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool. # These exist entirely to fool aclocal when bootstrapping libtool.
# #
@ -32,6 +32,9 @@
# we give up compatibility with versions before 1.7, at which point # we give up compatibility with versions before 1.7, at which point
# we need to keep only those names which we still refer to. # we need to keep only those names which we still refer to.
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])])
m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])