libtool-1.9f problems with Automake 1.4

[James Henstridge]

I know Automake 1.4 is quite old, but it would reduce the barrier to 
upgrading if libtool-2.0 worked with this version (especially since 
libtool-1.9f doesn't appear to be parallel installable with 1.x).

The problem is that aclocal-1.4 doesn't manage to successfully pull in 
the libtool macros.  This is because it doesn't correctly recognise 
AU_DEFUN() style macro definitions.  This can be solved by including a 
commented out AC_DEFUN() line for the macro in the same file, which will 
satisfy aclocal-1.4's regexps but get ignored by autoconf.

Attached is a patch that adds these commented out definitions, made 
against the libtool-1.9f release.

James.

--- libtool-1.9f/m4/ltoptions.m4.orig   2004-09-03 09:54:37.000000000 +0800
+++ libtool-1.9f/m4/ltoptions.m4        2004-10-27 13:33:25.758974304 +0800
@@ -356,3 +356,19 @@
 [$0: Remove this warning and the call to _LT_SET_OPTION when you
 put the `pic-only' option into LT_LIBTOOL_INIT's first parameter.])
 ])
+
+dnl  aclocal-1.4 backward compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+dnl AC_DEFUN([AC_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AC_DISABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+dnl AC_DEFUN([AC_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AC_DISABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AC_DISABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AC_LIBTOOL_PIC_MODE], [])
+
--- libtool-1.9f/m4/ltdl.m4.orig        2004-09-15 09:39:18.000000000 +0800
+++ libtool-1.9f/m4/ltdl.m4     2004-10-27 13:33:22.518466936 +0800
@@ -530,3 +530,17 @@
 
 # Old name:
 AU_DEFUN([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE])
+
+dnl  aclocal-1.4 backward compatibility:
+dnl AC_DEFUN([AC_WITH_LTDL], [])
+dnl AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [])
+dnl AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [])
+dnl AC_DEFUN([AC_LIB_LTDL], [])
+dnl AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [])
+dnl AC_DEFUN([AC_LTDL_SHLIBEXT], [])
+dnl AC_DEFUN([AC_LTDL_SHLIBPATH], [])
+dnl AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [])
+dnl AC_DEFUN([AC_LTDL_DLLIB], [])
+dnl AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [])
+dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], [])
+
--- libtool-1.9f/m4/libtool.m4.orig     2004-10-18 01:34:55.000000000 +0800
+++ libtool-1.9f/m4/libtool.m4  2004-10-27 13:33:16.288414048 +0800
@@ -5912,3 +5912,26 @@
 AC_MSG_RESULT([$SED])
 ])#AC_PROG_SED
 ])#m4_ifndef
+
+dnl  aclocal-1.4 backward compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+dnl
+dnl AC_DEFUN([_LT_PROG_CXX], [])
+dnl AC_DEFUN([_LT_PROG_F77], [])
+