From: Gary V. Vaughan Date: Wed, 10 Nov 2004 13:20:52 +0000 (+0000) Subject: From James Henstridge : X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74f52b699b63d8e3f588ed136039c3d7402c2802;p=thirdparty%2Flibtool.git From James Henstridge : * m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4: Added commented out empty macro definitions to match each AU_DEFUN to help aclocal from automake-1.4 regexps find the right libtool macro files. --- diff --git a/ChangeLog b/ChangeLog index 9c28e2902..013120308 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,20 @@ -2004-11-10 James E Wilson , - Ralf Wildenhues +2004-11-10 Gary V. Vaughan + + From James Henstridge : + * m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4: Added commented out + empty macro definitions to match each AU_DEFUN to help aclocal + from automake-1.4 regexps find the right libtool macro files. + +2004-11-10 James E Wilson , + Ralf Wildenhues * config/ltmain.m4sh (func_mode_link), tests/Makefile.am, Fix error message with `-objectlist' file that does not exist. - tests/objectlist.test: New test for this. + * tests/objectlist.test: New test for this. * Makefile.am: config/ltmain.sh is generated by config/ltmain.m4sh. -2004-11-09 Ralf Wildenhues +2004-11-09 Ralf Wildenhues * doc/libtool.texi (Compile mode, Link mode, Libltdl interface, Test descriptions, libtool script @@ -25,12 +32,12 @@ two spaces at start of sentence, no TABs. 2004-11-09 Gary V. Vaughan , - Ralf Wildenhues + Ralf Wildenhues * doc/libtool.texi (libtool script contents): Fix description of need_lib_prefix. -2004-11-07 Ralf Wildenhues +2004-11-07 Ralf Wildenhues * m4/ltoptions.m4: Change all references of LT_LIBTOOL_INIT to LT_INIT. @@ -45,7 +52,7 @@ * m4/ltdl.m4 (LT_SYS_DLOPEN_DEPLIBS), m4/ltoptions.m4 (_LT_SET_OPTIONS), README, README.alpha: Typos. -2004-11-03 Ralf Wildenhues +2004-11-03 Ralf Wildenhues * ltmain.m4sh (cwrappersource): Cast isalpha arguments correctly. @@ -95,7 +102,7 @@ use postinstall_cmds to strip DLL (not import lib!) when symbol stripped installation was requested. -2004-10-30 Ralf Wildenhues +2004-10-30 Ralf Wildenhues * libltdl/ltdl.c (loader_init_callback): Back out broken cast. @@ -105,8 +112,8 @@ * tests/defs.m4sh (func_exec): `shift'ing when there is nothing to shift is non-portable. -2004-10-28 Patrick Welche , - Ralf Wildenhues +2004-10-28 Patrick Welche , + Ralf Wildenhues * Makefile.am, Makefile.maint, tests/Makefile.am: Use path for dependencies built in the source tree, to cater for BSD make. @@ -324,7 +331,7 @@ working directory if $progname has no directory separators (e.g when invoked as `$SHELL progname'). -2004-10-08 Ralf Wildenhues +2004-10-08 Ralf Wildenhues * libltdl/ltdl.c (lt_dlexit, lt_dlpath_insertdir): Fix memleaks, free user_search_path on lt_dlexit. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 1225ac1ed..9e3f73fbe 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -75,6 +75,9 @@ m4_define([LT_INIT]) # Old names: AU_DEFUN([AC_PROG_LIBTOOL], [LT_INIT]) AU_DEFUN([AM_PROG_LIBTOOL], [LT_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PROG_LIBTOOL], []) +dnl AC_DEFUN([AM_PROG_LIBTOOL], []) # _LT_SETUP @@ -619,10 +622,14 @@ AC_PROVIDE_IFELSE([LT_PROG_RC], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) ])# _LT_LANG_DEFAULT_CONFIG -# Obsolete macros +# Obsolete macros: AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_CXX], []) +dnl AC_DEFUN([AC_LIBTOOL_F77], []) +dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) # _LT_TAG_COMPILER @@ -1043,6 +1050,8 @@ fi # Old name: AU_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) # _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, @@ -1078,6 +1087,8 @@ fi # Old name: AU_DEFUN([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) # LT_CMD_MAX_LEN @@ -1174,6 +1185,8 @@ _LT_DECL([], [max_cmd_len], [0], # Old name: AU_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) # _LT_HEADER_DLFCN @@ -1392,6 +1405,8 @@ _LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], # Old name: AU_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) # _LT_COMPILER_C_O([TAGNAME]) @@ -2248,6 +2263,8 @@ _LT_DECL([], [MAGIC_CMD], [0], # Old name: AU_DEFUN([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) # _LT_PATH_MAGIC @@ -2358,6 +2375,9 @@ _LT_TAGDECL([], [LD], [1], [The linker used to build libraries]) # Old names: AU_DEFUN([AM_PROG_LD], [LT_PATH_LD]) AU_DEFUN([AC_PROG_LD], [LT_PATH_LD]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_LD], []) +dnl AC_DEFUN([AC_PROG_LD], []) # _LT_PATH_LD_GNU @@ -2644,6 +2664,9 @@ _LT_DECL([], [NM], [1], [A BSD-compatible nm program])dnl # Old names: AU_DEFUN([AM_PROG_NM], [LT_PATH_NM]) AU_DEFUN([AC_PROG_NM], [LT_PATH_NM]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AM_PROG_NM], []) +dnl AC_DEFUN([AC_PROG_NM], []) # LT_LIB_M @@ -2669,6 +2692,8 @@ AC_SUBST([LIBM]) # Old name: AU_DEFUN([AC_CHECK_LIBM], [LT_LIB_M]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_CHECK_LIBM], []) # _LT_COMPILER_NO_RTTI([TAGNAME]) @@ -5813,6 +5838,8 @@ AC_DEFUN([LT_PROG_GCJ], # Old name: AU_DEFUN([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_GCJ], []) # LT_PROG_RC @@ -5823,6 +5850,8 @@ AC_DEFUN([LT_PROG_RC], # Old name: AU_DEFUN([LT_AC_PROG_RC], [LT_PROG_RC]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([LT_AC_PROG_RC], []) # _LT_DECL_EGREP diff --git a/m4/ltdl.m4 b/m4/ltdl.m4 index 9647b7122..2c329e945 100644 --- a/m4/ltdl.m4 +++ b/m4/ltdl.m4 @@ -68,6 +68,8 @@ AC_CONFIG_SUBDIRS(m4_if($#, 1, [$1], [libltdl])) # Old name: AU_DEFUN([AC_WITH_LTDL], [LT_WITH_LTDL]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_WITH_LTDL], []) # LTDL_CONVENIENCE([DIRECTORY]) @@ -100,6 +102,8 @@ AC_SUBST([INCLTDL]) # Old name: AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [LTDL_CONVENIENCE]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBLTDL_CONVENIENCE], []) # LTDL_INSTALLABLE([DIRECTORY]) @@ -143,6 +147,8 @@ AC_SUBST([INCLTDL]) # Old name: AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [LTDL_INSTALLABLE]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], []) # LTDL_INIT @@ -186,6 +192,8 @@ AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) # Old name: AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIB_LTDL], []) # _LT_ENABLE_INSTALL @@ -285,6 +293,8 @@ fi # Old name: AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], []) # LT_SYS_MODULE_EXT @@ -306,6 +316,8 @@ fi # Old name: AU_DEFUN([AC_LTDL_SHLIBEXT], [LT_SYS_MODULE_EXT]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LTDL_SHLIBEXT], []) # LT_SYS_MODULE_PATH @@ -323,6 +335,8 @@ fi # Old name: AU_DEFUN([AC_LTDL_SHLIBPATH], [LT_SYS_MODULE_PATH]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LTDL_SHLIBPATH], []) # LT_SYS_DLSEARCH_PATH @@ -349,6 +363,8 @@ fi # Old name: AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [LT_SYS_DLSEARCH_PATH]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LTDL_SYSSEARCHPATH], []) # _LT_CHECK_DLPREOPEN @@ -457,6 +473,8 @@ AC_LANG_POP # Old name: AU_DEFUN([AC_LTDL_DLLIB], [LT_LIB_DLLOAD]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LTDL_DLLIB], []) # LT_SYS_SYMBOL_USCORE @@ -500,6 +518,8 @@ EOF # Old name: AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], []) # LT_FUNC_DLSYM_USCORE @@ -530,3 +550,5 @@ fi # Old name: AU_DEFUN([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], []) diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index f20e92130..00ba0721b 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -112,6 +112,9 @@ AC_DIAGNOSE([obsolete], put the `dlopen' option into LT_INIT's first parameter.]) ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) + # win32-dll # --------- @@ -144,6 +147,9 @@ AC_DIAGNOSE([obsolete], put the `win32-dll' option into LT_INIT's first parameter.]) ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) + # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- @@ -210,6 +216,13 @@ AC_DIAGNOSE([obsolete], the `disable-shared' option into LT_INIT's first parameter.]) ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_SHARED], []) +dnl AC_DEFUN([AM_ENABLE_SHARED], []) +dnl AC_DEFUN([AC_DISABLE_SHARED], []) +dnl AC_DEFUN([AM_DISABLE_SHARED], []) + + # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- @@ -276,6 +289,13 @@ AC_DIAGNOSE([obsolete], the `disable-static' option into LT_INIT's first parameter.]) ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_STATIC], []) +dnl AC_DEFUN([AM_ENABLE_STATIC], []) +dnl AC_DEFUN([AC_DISABLE_STATIC], []) +dnl AC_DEFUN([AM_DISABLE_STATIC], []) + + # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- @@ -328,6 +348,10 @@ AC_DIAGNOSE([obsolete], the `disable-fast-install' option into LT_INIT's first parameter.]) ]) +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) + # _LT_WITH_PIC([MODE]) # -------------------- @@ -356,3 +380,6 @@ AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put the `pic-only' option into LT_INIT's first parameter.]) ]) + +dnl aclocal-1.4 backwards compatibility: +dnl AC_DEFUN([AC_LIBTOOL_PIC_MODE], [])