pull up r18352 from trunk

 r18352@cathode-dark-space:  raeburn | 2006-07-21 15:03:02 -0400
 ticket: 4036

 * aclocal.m4 (KRB5_LIB_AUX): Disallow --enable-profiled and --disable-shared
 options as well.  Don't generate help messages for these options.

ticket: 4036
version_fixed: 1.5.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18402 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 77598867b523c00f53309c5a1ce3de36281b49f2..a790f209fb1ecf926586a587593dc507cd0752c4 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1211,9 +1211,9 @@ AC_DEFUN(KRB5_LIB_AUX,
 [AC_REQUIRE([KRB5_LIB_PARAMS])dnl
 
 # Check whether to build static libraries.
-AC_ARG_ENABLE([static],
-AC_HELP_STRING([--enable-static],[build static libraries @<:@disabled for most platforms@:>@])
-AC_HELP_STRING([--disable-static],[don't build static libraries]), ,
+dnl AC_HELP_STRING([--enable-static],[build static libraries @<:@disabled for most platforms@:>@])
+dnl AC_HELP_STRING([--disable-static],[don't build static libraries])
+AC_ARG_ENABLE([static],, ,
 [enable_static=$default_static])
 
 if test "$enable_static" = yes; then
@@ -1236,10 +1236,15 @@ fi
 
 # Check whether to build shared libraries.
 AC_ARG_ENABLE([shared],
-AC_HELP_STRING([--enable-shared],[build shared libraries @<:@enabled for most platforms@:>@])
-AC_HELP_STRING([--disable-shared],[don't build shared libraries]), ,
+dnl AC_HELP_STRING([--enable-shared],[build shared libraries @<:@enabled for most platforms@:>@])
+dnl AC_HELP_STRING([--disable-shared],[don't build shared libraries])
+, ,
 [enable_shared=$default_shared])
 
+if test "$enable_shared" != yes; then
+  AC_MSG_ERROR([Sorry, this release builds only shared libraries, cannot disable them.])
+fi
+
 if test "$enable_shared" = yes; then
        case "$SHLIBEXT" in
        .so-nobuild)
@@ -1302,8 +1307,12 @@ fi
 
 # Check whether to build profiled libraries.
 AC_ARG_ENABLE([profiled],
-[  --enable-profiled       build profiled libraries @<:@disabled@:>@],
+dnl [  --enable-profiled       build profiled libraries @<:@disabled@:>@]
+,
 [if test "$enableval" = yes; then
+  AC_MSG_ERROR([Sorry, profiled libraries do not work in this release.])
+fi
+if false; then
        case $PFLIBEXT in
        .po-nobuild)
                AC_MSG_WARN([Profiled libraries not supported on this architecture.])