* libltdl/m4/libtool.m4 (_LT_SETUP): Remove duplicate

--enable-libtool-lock declaration.

diff --git a/ChangeLog b/ChangeLog
index aa44d687ca88dc40c1ac5dd7a574b77f12cfe2ad..95857358265cf83926c6c45286856a9335d3bd6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-30  Gary V. Vaughan  <gary@gnu.org>
+
+       * libltdl/m4/libtool.m4 (_LT_SETUP): Remove duplicate
+       --enable-libtool-lock declaration.
+
 2005-08-29  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libltdl/m4/libtool.m4 (_LT_SYS_DYNAMIC_LINKER)

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 7756d926ea1f84dec2787416a5fc356212e98b16..e6106d1c5ce30ee9f074211433603480499c9ef7 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -229,11 +229,6 @@ file_magic*)
   ;;
 esac
 
-AC_ARG_ENABLE([libtool-lock],
-    [AS_HELP_STRING([--disable-libtool-lock],
-       [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
 # Use C for the default configuration in the libtool script
 LT_SUPPORTED_TAG([CC])
 _LT_LANG_C_CONFIG