mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-01-12 14:06:37 +08:00
* NEWS, bootstrap, configure.ac, ltmain.in, m4/libtool.m4:
* m4/lt~obsolete.m4, tests/cdemo/configure.ac: Arghh. cvsapply just went crazy and committed a bunch of stuff that shouldn't have been in the last changeset. The patch backs it all out.
This commit is contained in:
Gary V. Vaughan
parent
c72336465d
commit
c695fe18f5
@ -1,5 +1,10 @@
|
||||
2004-02-10 Gary V. Vaughan <gary@gnu.org>
|
||||
|
||||
* NEWS, bootstrap, configure.ac, ltmain.in, m4/libtool.m4:
|
||||
* m4/lt~obsolete.m4, tests/cdemo/configure.ac: Arghh. cvsapply just
|
||||
went crazy and committed a bunch of stuff that shouldn't have been
|
||||
in the last changeset. The patch backs it all out.
|
||||
|
||||
* config/mailnotify: New file for mailing commit notifications,
|
||||
imported from cvs-utils.
|
||||
* commit: Updated from cvs-utils and tweaked for libtool.
|
||||
|
||||
5
NEWS
5
NEWS
@ -6,11 +6,6 @@ New in 1.5b: 2004-??-??; CVS version 1.5a, Libtool team:
|
||||
renamed. If you have any macros in this namespace please rename them to
|
||||
prevent any possible future clash with libtool supplied macros.
|
||||
* New LT_PREREQ macro for specifying minimum libtool requirement.
|
||||
* New LT_INIT interface replaces AC_PROG_LIBTOOL, AC_ENABLE_SHARED,
|
||||
AC_DISABLE_SHARED, AC_ENABLE_STATIC, AC_DISABLE_STATIC,
|
||||
AC_ENABLE_FAST_INSTALL, AC_DISABLE_FAST_INSTALL, AC_LIBTOOL_DLOPEN,
|
||||
AC_LIBTOOL_WIN32_DLL and AC_LIBTOOL_PIC_MODE. Use autoupdate to modernise
|
||||
your configure.ac files after installing this release.
|
||||
* The libtool script will complain if it was built from mismatched ltmain.sh
|
||||
and libtool m4 macro versions.
|
||||
* Like automake, libtoolize no longer installs config.guess and config.sub by
|
||||
|
||||
@ -67,6 +67,6 @@ for file in $fakes; do
|
||||
done
|
||||
|
||||
# These files con cause an infinite configure loop if left behind.
|
||||
rm -f Makefile libltdl/Makefile libtool vcl.tmp
|
||||
rm -f Makefile libltdl/Makefile libtool
|
||||
|
||||
exit 0
|
||||
|
||||
@ -181,7 +181,9 @@ AM_CONDITIONAL(HAVE_RC, [test "x$RC" != xno])
|
||||
## ----------------------- ##
|
||||
AC_CONFIG_FILES([config/ltmain.sh:./ltmain.in])
|
||||
AC_CONFIG_FILES([libtoolize], [chmod a+x libtoolize])
|
||||
LT_INIT([dlopen win32-dll])
|
||||
AC_LIBTOOL_DLOPEN
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
AC_PROG_LIBTOOL
|
||||
AC_LIB_LTDL
|
||||
|
||||
|
||||
|
||||
12
ltmain.in
12
ltmain.in
@ -73,14 +73,14 @@ if test "$package_revision" != "$macro_revision"; then
|
||||
if test -z "$macro_version"; then
|
||||
cat >&2 <<_LT_EOF
|
||||
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
||||
$progname: definition of this LT_INIT comes from an older release.
|
||||
$progname: definition of this AC_PROG_LIBTOOL comes from an older release.
|
||||
$progname: You should recreate aclocal.m4 with macro's from $PACKAGE $VERSION
|
||||
$progname: and run autoconf again.
|
||||
_LT_EOF
|
||||
else
|
||||
cat >&2 <<_LT_EOF
|
||||
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
||||
$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
|
||||
$progname: definition of this AC_PROG_LIBTOOL comes from $PACKAGE $macro_version.
|
||||
$progname: You should recreate aclocal.m4 with macro's from $PACKAGE $VERSION
|
||||
$progname: and run autoconf again.
|
||||
_LT_EOF
|
||||
@ -88,7 +88,7 @@ _LT_EOF
|
||||
else
|
||||
cat >&2 <<_LT_EOF
|
||||
$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
|
||||
$progname: but the definition used by this LT_INIT comes from revision
|
||||
$progname: but the definition used by this AC_PROG_LIBTOOL comes from revision
|
||||
$progname: $macro_revision.
|
||||
$progname: You should recreate aclocal.m4 with macro's from revision $package_revision
|
||||
$progname: of $PACKAGE $VERSION and run autoconf again.
|
||||
@ -107,14 +107,14 @@ if test "$package_revision" != "$macro_revision"; then
|
||||
if test -z "$macro_version"; then
|
||||
cat >&2 <<_LT_EOF
|
||||
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
||||
$progname: definition of this LT_INIT comes from an older release.
|
||||
$progname: definition of this AC_PROG_LIBTOOL comes from an older release.
|
||||
$progname: You should recreate aclocal.m4 with macro's from $PACKAGE $VERSION
|
||||
$progname: and run autoconf again.
|
||||
_LT_EOF
|
||||
else
|
||||
cat >&2 <<_LT_EOF
|
||||
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
|
||||
$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
|
||||
$progname: definition of this AC_PROG_LIBTOOL comes from $PACKAGE $macro_version.
|
||||
$progname: You should recreate aclocal.m4 with macro's from $PACKAGE $VERSION
|
||||
$progname: and run autoconf again.
|
||||
_LT_EOF
|
||||
@ -122,7 +122,7 @@ _LT_EOF
|
||||
else
|
||||
cat >&2 <<_LT_EOF
|
||||
$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
|
||||
$progname: but the definition used by this LT_INIT comes from revision
|
||||
$progname: but the definition used by this AC_PROG_LIBTOOL comes from revision
|
||||
$progname: $macro_revision.
|
||||
$progname: You should recreate aclocal.m4 with macro's from revision $package_revision
|
||||
$progname: of $PACKAGE $VERSION and run autoconf again.
|
||||
|
||||
302
m4/libtool.m4
vendored
302
m4/libtool.m4
vendored
@ -41,22 +41,21 @@ m4_define([LT_PREREQ],
|
||||
[$2])])
|
||||
|
||||
|
||||
# LT_INIT([OPTIONS])
|
||||
# --------------------------
|
||||
AC_DEFUN_ONCE([LT_INIT],
|
||||
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
|
||||
dnl Autoconf doesn't catch unexpanded LT_ macros by default:
|
||||
m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
|
||||
m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW)$])dnl
|
||||
dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
|
||||
dnl unless we require an AC_DEFUNed macro:
|
||||
AC_REQUIRE([LTOPTIONS_VERSION])dnl
|
||||
AC_REQUIRE([LTSUGAR_VERSION])dnl
|
||||
AC_REQUIRE([LTVERSION_VERSION])dnl
|
||||
# AC_PROG_LIBTOOL
|
||||
# ---------------
|
||||
AC_DEFUN([AC_PROG_LIBTOOL],
|
||||
[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
|
||||
]) # AC_PROG_LIBTOOL
|
||||
|
||||
|
||||
# _AC_PROG_LIBTOOL
|
||||
# ----------------
|
||||
AC_DEFUN([_AC_PROG_LIBTOOL],
|
||||
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
|
||||
AC_REQUIRE([_LT_PROG_LTMAIN])dnl
|
||||
AC_BEFORE([$0], [AC_LIBTOOL_CXX])dnl
|
||||
AC_BEFORE([$0], [AC_LIBTOOL_F77])dnl
|
||||
AC_BEFORE([$0], [AC_LIBTOOL_GCJ])dnl
|
||||
AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
|
||||
AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
|
||||
AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
|
||||
|
||||
# This can be used to rebuild libtool when needed
|
||||
LIBTOOL_DEPS="$ltmain"
|
||||
@ -65,38 +64,60 @@ LIBTOOL_DEPS="$ltmain"
|
||||
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
||||
AC_SUBST(LIBTOOL)dnl
|
||||
|
||||
# Set options
|
||||
_LT_SET_OPTIONS([$1])dnl
|
||||
|
||||
_LT_SETUP])# LT_INIT
|
||||
|
||||
# Old names:
|
||||
AU_DEFUN([AC_PROG_LIBTOOL], [LT_INIT])
|
||||
AU_DEFUN([AM_PROG_LIBTOOL], [LT_INIT])
|
||||
# Prevent multiple expansion
|
||||
define([AC_PROG_LIBTOOL], [])
|
||||
])# _AC_PROG_LIBTOOL
|
||||
|
||||
|
||||
# _LT_SETUP
|
||||
# ---------
|
||||
m4_define([_LT_SETUP],
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
# _LT_PROG_LTMAIN
|
||||
# ---------------
|
||||
# In libtool itself `ltmain.sh' is in the build tree, but everything else
|
||||
# ships it in the source tree, for completeness, if we find a copy in the
|
||||
# build tree use that before falling back to auxdir.
|
||||
#
|
||||
# Note that this code is called both from `configure', and `config.status'
|
||||
# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
|
||||
# `config.status' has no value for ac_aux_dir unless we are using Automake,
|
||||
# so we pass a copy along to make sure it has a sensible value anyway.
|
||||
AC_DEFUN([_LT_PROG_LTMAIN],
|
||||
[_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
|
||||
case $ac_aux_dir in
|
||||
$srcdir) ltmain=./ltmain.sh ;;
|
||||
$srcdir/*) ltmain=`expr "$ac_aux_dir" : "$srcdir/\(.*\)"`/ltmain.sh ;;
|
||||
esac
|
||||
test -f "$ltmain" || ltmain="$ac_aux_dir/ltmain.sh"
|
||||
])# _LT_PROG_LTMAIN
|
||||
|
||||
|
||||
# AC_LIBTOOL_SETUP
|
||||
# ----------------
|
||||
AC_DEFUN([AC_LIBTOOL_SETUP],
|
||||
[AC_PREREQ(2.58)dnl We use AC_INCLUDES_DEFAULT
|
||||
dnl Autoconf doesn't catch unexpanded LT_ macros by default:
|
||||
m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
|
||||
m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW)$])dnl
|
||||
AC_REQUIRE([LTSUGAR_VERSION])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
|
||||
_LT_DECL([], [host_alias], [0], [The host system])dnl
|
||||
_LT_DECL([], [host], [0])dnl
|
||||
dnl
|
||||
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_PROG_LD])dnl
|
||||
AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
|
||||
AC_REQUIRE([AC_PROG_NM])dnl
|
||||
dnl
|
||||
|
||||
AC_REQUIRE([AC_PROG_LN_S])dnl
|
||||
test -z "$LN_S" && LN_S="ln -s"
|
||||
_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
|
||||
dnl
|
||||
|
||||
AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
|
||||
AC_REQUIRE([AC_LIBTOOL_SYS_OLD_ARCHIVE])dnl
|
||||
AC_REQUIRE([AC_LIBTOOL_SYS_MAX_CMD_LEN])dnl
|
||||
AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
|
||||
AC_REQUIRE([AC_OBJEXT])dnl
|
||||
|
||||
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
|
||||
_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
|
||||
AC_REQUIRE([AC_EXEEXT])dnl
|
||||
_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
|
||||
@ -113,6 +134,9 @@ if test -n "${ZSH_VERSION+set}" ; then
|
||||
setopt NO_GLOB_SUBST
|
||||
fi
|
||||
|
||||
AC_ENABLE_SHARED
|
||||
AC_ENABLE_STATIC
|
||||
AC_ENABLE_FAST_INSTALL
|
||||
AC_LIBTOOL_OBJDIR
|
||||
|
||||
AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
|
||||
@ -181,37 +205,30 @@ file_magic*)
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
|
||||
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
|
||||
enable_win32_dll=yes, enable_win32_dll=no)
|
||||
|
||||
AC_ARG_ENABLE([libtool-lock],
|
||||
[AC_HELP_STRING([--disable-libtool-lock],
|
||||
[avoid locking (might break parallel builds)])])
|
||||
test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
||||
|
||||
AC_ARG_WITH([pic],
|
||||
[AC_HELP_STRING([--with-pic],
|
||||
[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
|
||||
[pic_mode="$withval"],
|
||||
[pic_mode=default])
|
||||
test -z "$pic_mode" && pic_mode=default
|
||||
_LT_DECL([], [pic_mode], [0], [What type of objects to build])
|
||||
|
||||
# Use C for the default configuration in the libtool script
|
||||
AC_LIBTOOL_LANG_C_CONFIG
|
||||
_LT_AC_TAG_CONFIG
|
||||
_LT_CONFIG_COMMANDS
|
||||
])# _LT_SETUP
|
||||
])# AC_LIBTOOL_SETUP
|
||||
|
||||
|
||||
# _LT_PROG_LTMAIN
|
||||
# ---------------
|
||||
# In libtool itself `ltmain.sh' is in the build tree, but everything else
|
||||
# ships it in the source tree, for completeness, if we find a copy in the
|
||||
# build tree use that before falling back to auxdir.
|
||||
#
|
||||
# Note that this code is called both from `configure', and `config.status'
|
||||
# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
|
||||
# `config.status' has no value for ac_aux_dir unless we are using Automake,
|
||||
# so we pass a copy along to make sure it has a sensible value anyway.
|
||||
AC_DEFUN([_LT_PROG_LTMAIN],
|
||||
[_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
|
||||
case $ac_aux_dir in
|
||||
$srcdir) ltmain=./ltmain.sh ;;
|
||||
$srcdir/*) ltmain=`expr "$ac_aux_dir" : "$srcdir/\(.*\)"`/ltmain.sh ;;
|
||||
esac
|
||||
test -f "$ltmain" || ltmain="$ac_aux_dir/ltmain.sh"
|
||||
])# _LT_PROG_LTMAIN
|
||||
|
||||
|
||||
|
||||
## ------------------------------------- ##
|
||||
@ -2119,6 +2136,173 @@ m4_define([_LT_AC_TAG_CONFIG],
|
||||
])# _LT_AC_TAG_CONFIG
|
||||
|
||||
|
||||
# AC_LIBTOOL_DLOPEN
|
||||
# -----------------
|
||||
# enable checks for dlopen support
|
||||
AC_DEFUN([AC_LIBTOOL_DLOPEN],
|
||||
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
|
||||
])# AC_LIBTOOL_DLOPEN
|
||||
|
||||
|
||||
# AC_LIBTOOL_WIN32_DLL
|
||||
# --------------------
|
||||
# declare package support for building win32 dll's
|
||||
AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
|
||||
[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
|
||||
test -z "$AS" && AS=as
|
||||
test -z "$DLLTOOL" && DLLTOOL=dlltool
|
||||
test -z "$OBJDUMP" && OBJDUMP=objdump
|
||||
|
||||
case $host in
|
||||
*-*-cygwin* | *-*-mingw* | *-*-pw32*)
|
||||
AC_CHECK_TOOL(AS, as, false)
|
||||
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
||||
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
||||
;;
|
||||
esac
|
||||
|
||||
_LT_DECL([], [AS], [0], [Assembler program])dnl
|
||||
_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
|
||||
_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
|
||||
])# AC_LIBTOOL_WIN32_DLL
|
||||
|
||||
|
||||
# AC_ENABLE_SHARED([DEFAULT])
|
||||
# ---------------------------
|
||||
# implement the --enable-shared flag
|
||||
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
||||
AC_DEFUN([AC_ENABLE_SHARED],
|
||||
[m4_define([AC_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
||||
AC_ARG_ENABLE([shared],
|
||||
[AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
|
||||
[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
|
||||
[p=${PACKAGE-default}
|
||||
case $enableval in
|
||||
yes) enable_shared=yes ;;
|
||||
no) enable_shared=no ;;
|
||||
*)
|
||||
enable_shared=no
|
||||
# Look at the argument we got. We use all the common list separators.
|
||||
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
||||
for pkg in $enableval; do
|
||||
IFS="$lt_save_ifs"
|
||||
if test "X$pkg" = "X$p"; then
|
||||
enable_shared=yes
|
||||
fi
|
||||
done
|
||||
IFS="$lt_save_ifs"
|
||||
;;
|
||||
esac],
|
||||
[enable_shared=]AC_ENABLE_SHARED_DEFAULT)
|
||||
|
||||
_LT_DECL([build_libtool_libs], [enable_shared], [0],
|
||||
[Whether or not to build shared libraries])
|
||||
])# AC_ENABLE_SHARED
|
||||
|
||||
|
||||
# AC_DISABLE_SHARED
|
||||
# -----------------
|
||||
#- set the default shared flag to --disable-shared
|
||||
AC_DEFUN([AC_DISABLE_SHARED],
|
||||
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
AC_ENABLE_SHARED(no)
|
||||
])# AC_DISABLE_SHARED
|
||||
|
||||
|
||||
# AC_ENABLE_STATIC([DEFAULT])
|
||||
# ---------------------------
|
||||
# implement the --enable-static flag
|
||||
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
||||
AC_DEFUN([AC_ENABLE_STATIC],
|
||||
[m4_define([AC_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
||||
AC_ARG_ENABLE([static],
|
||||
[AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
|
||||
[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
|
||||
[p=${PACKAGE-default}
|
||||
case $enableval in
|
||||
yes) enable_static=yes ;;
|
||||
no) enable_static=no ;;
|
||||
*)
|
||||
enable_static=no
|
||||
# Look at the argument we got. We use all the common list separators.
|
||||
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
||||
for pkg in $enableval; do
|
||||
IFS="$lt_save_ifs"
|
||||
if test "X$pkg" = "X$p"; then
|
||||
enable_static=yes
|
||||
fi
|
||||
done
|
||||
IFS="$lt_save_ifs"
|
||||
;;
|
||||
esac],
|
||||
[enable_static=]AC_ENABLE_STATIC_DEFAULT)
|
||||
|
||||
_LT_DECL([build_old_libs], [enable_static], [0],
|
||||
[Whether or not to build static libraries])
|
||||
])# AC_ENABLE_STATIC
|
||||
|
||||
|
||||
# AC_DISABLE_STATIC
|
||||
# -----------------
|
||||
# set the default static flag to --disable-static
|
||||
AC_DEFUN([AC_DISABLE_STATIC],
|
||||
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
AC_ENABLE_STATIC(no)
|
||||
])# AC_DISABLE_STATIC
|
||||
|
||||
|
||||
# AC_ENABLE_FAST_INSTALL([DEFAULT])
|
||||
# ---------------------------------
|
||||
# implement the --enable-fast-install flag
|
||||
# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
|
||||
AC_DEFUN([AC_ENABLE_FAST_INSTALL],
|
||||
[m4_define([AC_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
|
||||
AC_ARG_ENABLE([fast-install],
|
||||
[AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
|
||||
[optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
|
||||
[p=${PACKAGE-default}
|
||||
case $enableval in
|
||||
yes) enable_fast_install=yes ;;
|
||||
no) enable_fast_install=no ;;
|
||||
*)
|
||||
enable_fast_install=no
|
||||
# Look at the argument we got. We use all the common list separators.
|
||||
lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
|
||||
for pkg in $enableval; do
|
||||
IFS="$lt_save_ifs"
|
||||
if test "X$pkg" = "X$p"; then
|
||||
enable_fast_install=yes
|
||||
fi
|
||||
done
|
||||
IFS="$lt_save_ifs"
|
||||
;;
|
||||
esac],
|
||||
[enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
|
||||
|
||||
_LT_DECL([fast_install], [enable_fast_install], [0],
|
||||
[Whether or not to optimize for fast installation])
|
||||
])# AC_ENABLE_FAST_INSTALL
|
||||
|
||||
|
||||
# AC_DISABLE_FAST_INSTALL
|
||||
# -----------------------
|
||||
# set the default to --disable-fast-install
|
||||
AC_DEFUN([AC_DISABLE_FAST_INSTALL],
|
||||
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
AC_ENABLE_FAST_INSTALL(no)
|
||||
])# AC_DISABLE_FAST_INSTALL
|
||||
|
||||
|
||||
# AC_LIBTOOL_PICMODE([MODE])
|
||||
# --------------------------
|
||||
# implement the --with-pic flag
|
||||
# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
|
||||
AC_DEFUN([AC_LIBTOOL_PICMODE],
|
||||
[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
pic_mode=m4_if($#, 1, $1, default)
|
||||
])# AC_LIBTOOL_PICMODE
|
||||
|
||||
|
||||
# AC_PATH_TOOL_PREFIX
|
||||
# -------------------
|
||||
# find a file program which can recognise shared library
|
||||
@ -2288,9 +2472,6 @@ AC_SUBST([LD])
|
||||
_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
|
||||
])# AC_PROG_LD
|
||||
|
||||
# Old name:
|
||||
AU_DEFUN([AM_PROG_LD], [AC_PROG_LD])
|
||||
|
||||
|
||||
# AC_PROG_LD_GNU
|
||||
# --------------
|
||||
@ -2575,9 +2756,6 @@ AC_SUBST([NM])
|
||||
_LT_DECL([], [NM], [1], [A BSD-compatible nm program])dnl
|
||||
])# AC_PROG_NM
|
||||
|
||||
# Old name:
|
||||
AU_DEFUN([AM_PROG_NM], [AC_PROG_NM])
|
||||
|
||||
|
||||
# AC_CHECK_LIBM
|
||||
# -------------
|
||||
@ -5669,6 +5847,18 @@ AC_DEFUN([LT_AC_PROG_RC],
|
||||
[AC_CHECK_TOOL(RC, windres, no)
|
||||
])
|
||||
|
||||
# old names
|
||||
AU_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
|
||||
AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
|
||||
AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
|
||||
AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
|
||||
AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
|
||||
AU_DEFUN([AM_PROG_LD], [AC_PROG_LD])
|
||||
AU_DEFUN([AM_PROG_NM], [AC_PROG_NM])
|
||||
|
||||
# This is just to silence aclocal about the macro not being used
|
||||
m4_if([AC_DISABLE_FAST_INSTALL])
|
||||
|
||||
|
||||
# LT_AC_PROG_EGREP
|
||||
# ----------------
|
||||
|
||||
29
m4/lt~obsolete.m4
vendored
29
m4/lt~obsolete.m4
vendored
@ -1,5 +1,5 @@
|
||||
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
|
||||
#
|
||||
#
|
||||
# Copyright (C) 2004 Free Software Foundation, Inc.
|
||||
# Written by Scott James Remnant.
|
||||
#
|
||||
@ -35,25 +35,22 @@
|
||||
# using a macro with the same name in our local m4/libtool.m4 it'll
|
||||
# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
|
||||
# and doesn't know about Autoconf macros at all.)
|
||||
#
|
||||
#
|
||||
# So we provide this file, which has a silly filename so it's always
|
||||
# included after everything else. This provides aclocal with the
|
||||
# AU_DEFUNs it wants, but when m4 processes it, it doesn't do anything
|
||||
# because those macros already exist.
|
||||
#
|
||||
#
|
||||
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, but still refer to it,
|
||||
# remember to add it here.
|
||||
|
||||
m4_ifdef([AC_LIBTOOL_CONFIG],, [AU_DEFUN([AC_LIBTOOL_CONFIG])])
|
||||
m4_ifdef([AC_LIBTOOL_LINKER_OPTION],, [AU_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
|
||||
m4_ifdef([AC_LIBTOOL_SETUP],, [AU_DEFUN([AC_LIBTOOL_SETUP])])
|
||||
m4_ifdef([AC_PROG_EGREP],, [AU_DEFUN([AC_PROG_EGREP])])
|
||||
m4_ifdef([_AC_PROG_LIBTOOL],, [AU_DEFUN([_AC_PROG_LIBTOOL])])
|
||||
m4_ifdef([_LT_AC_LANG_C_CONFIG],, [AU_DEFUN([_LT_AC_LANG_C_CONFIG])])
|
||||
m4_ifdef([_LT_AC_LANG_GCJ_CONFIG],, [AU_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
|
||||
m4_ifdef([_LT_AC_LANG_RC_CONFIG],, [AU_DEFUN([_LT_AC_LANG_RC_CONFIG])])
|
||||
m4_ifdef([_LT_AC_PROG_ECHO_BACKSLASH],, [AU_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
|
||||
m4_ifdef([_LT_AC_SHELL_INIT],, [AU_DEFUN([_LT_AC_SHELL_INIT])])
|
||||
m4_ifdef([_LT_AC_SYS_LIBPATH_AIX],, [AU_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
|
||||
m4_ifdef([_LT_PROG_LTMAIN],, [AU_DEFUN([_LT_PROG_LTMAIN])])
|
||||
m4_ifdef([_LT_AC_TAGVAR],, [AU_DEFUN([_LT_AC_TAGVAR])])
|
||||
m4_ifdef([AC_LIBTOOL_CONFIG], [], [AU_DEFUN([AC_LIBTOOL_CONFIG])])dnl
|
||||
m4_ifdef([AC_LIBTOOL_LINKER_OPTION], [], [AU_DEFUN([AC_LIBTOOL_LINKER_OPTION])])dnl
|
||||
m4_ifdef([AC_PROG_EGREP], [], [AU_DEFUN([AC_PROG_EGREP])])dnl
|
||||
m4_ifdef([_LT_AC_LANG_C_CONFIG], [], [AU_DEFUN([_LT_AC_LANG_C_CONFIG])])dnl
|
||||
m4_ifdef([_LT_AC_LANG_GCJ_CONFIG], [], [AU_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])dnl
|
||||
m4_ifdef([_LT_AC_LANG_RC_CONFIG], [], [AU_DEFUN([_LT_AC_LANG_RC_CONFIG])])dnl
|
||||
m4_ifdef([_LT_AC_PROG_ECHO_BACKSLASH], [], [AU_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])dnl
|
||||
m4_ifdef([_LT_AC_SHELL_INIT], [], [AU_DEFUN([_LT_AC_SHELL_INIT])])dnl
|
||||
m4_ifdef([_LT_AC_SYS_LIBPATH_AIX], [], [AU_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])dnl
|
||||
m4_ifdef([_LT_AC_TAGVAR], [], [AU_DEFUN([_LT_AC_TAGVAR])])dnl
|
||||
|
||||
@ -42,7 +42,7 @@ AC_PROG_CC
|
||||
## Libtool initialisation. ##
|
||||
## ----------------------- ##
|
||||
AC_LIBTOOL_TAGS([])
|
||||
LT_INIT
|
||||
AC_PROG_LIBTOOL
|
||||
AC_SUBST([LIBTOOL_DEPS])
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user