Fix broken default help strings for enable-shared, enable-static, and enable-fast...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42066 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/m4/libtool.m4 b/autoconf/m4/libtool.m4
index 5de110bddba45d4cd3243b2be87feee72cc46245..a8b5e6a94fc59ec68d22b3a463492a57fc303ff0 100644 (file)
--- a/autoconf/m4/libtool.m4
+++ b/autoconf/m4/libtool.m4
@@ -1905,7 +1905,7 @@ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
 AC_DEFUN([AC_ENABLE_SHARED],
 [define([enable_shared_default], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],[build shared libraries @<:@default=enable_shared_default@:>@])],
+    AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],[build shared libraries @<:@default=enable_shared_default@:>@]),
     [p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -1943,7 +1943,7 @@ AC_ENABLE_SHARED(no)
 AC_DEFUN([AC_ENABLE_STATIC],
 [define([enable_static_default], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],[build static libraries @<:@default=enable_static_default@:>@])],
+    AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],[build static libraries @<:@default=enable_static_default@:>@]),
     [p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
@@ -1981,7 +1981,7 @@ AC_ENABLE_STATIC(no)
 AC_DEFUN([AC_ENABLE_FAST_INSTALL],
 [define([enable_Fast_install_default], ifelse($1, no, no, yes))dnl
 AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],[optimize for fast installation @<:@default=enable_Fast_install_default@:>@])],
+    AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],[optimize for fast installation @<:@default=enable_Fast_install_default@:>@]),
     [p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;

diff --git a/configure b/configure
index 69ad9907b942f016635a4d5f093759ad97f1cf64..42c3756613b5aca0d0e91eaa8ebe665cbf8e8b2d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1542,12 +1542,12 @@ Optional Features:
                           %a (default is YES)
   --enable-ltdl-install   install libltdl
   --enable-shared[=PKGS]  build shared libraries
-                          [default=enable_shared_default]
+                          [default=yes]
   --enable-static[=PKGS]  build static libraries
-                          [default=enable_static_default]
+                          [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation
-                          [default=enable_Fast_install_default]
+                          [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
 
 Optional Packages: