Remove traces of enable_shared, enable_static, enable_profiled, and

build_dynobj.  Hard-code the behavior for shared libraries, no static,
no profiled.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19261 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 3450d2f4fb4718f3f4fa7905fdb69ac6c879c7bc..78a50217e687dfdf0f9510c7e71aaab770881692 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1211,14 +1211,12 @@ AC_DEFUN(KRB5_LIB_AUX,
 # Check whether to 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
+AC_ARG_ENABLE([static],,
+[if test "$enableval" != no; then
   AC_MSG_ERROR([Sorry, static libraries do not work in this release.])
-fi
+fi])
 
-if test "$enable_static" = no && test "$krb5_force_static" != yes; then
+if test "$krb5_force_static" != yes; then
        AC_MSG_NOTICE([disabling static libraries])
        LIBLINKS=
        LIBLIST=
@@ -1234,70 +1232,53 @@ fi
 
 # Check whether to build shared libraries.
 AC_ARG_ENABLE([shared],
-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
+, 
+[if test "$enableval" != yes; then
   AC_MSG_ERROR([Sorry, this release builds only shared libraries, cannot disable them.])
-fi
+fi])
 
-if test "$enable_shared" = yes; then
-       case "$SHLIBEXT" in
-       .so-nobuild)
-               AC_MSG_WARN([shared libraries not supported on this architecture])
-               RUN_ENV=
-               CC_LINK="$CC_LINK_STATIC"
-               ;;
-       *)
-               # set this now because some logic below may reset SHLIBEXT
-               DEPLIBEXT=$SHLIBEXT
-               if test "$krb5_force_static" = "yes"; then
-                       AC_MSG_RESULT([Forcing static libraries.])
-                       # avoid duplicate rules generation for AIX and such
-                       SHLIBEXT=.so-nobuild
-                       SHLIBVEXT=.so.v-nobuild
-                       SHLIBSEXT=.so.s-nobuild
-               else
-                       AC_MSG_NOTICE([enabling shared libraries])
-                       # Clear some stuff in case of AIX, etc.
-                       if test "$STLIBEXT" = "$SHLIBEXT" ; then
-                               STLIBEXT=.a-nobuild
-                               LIBLIST=
-                               LIBLINKS=
-                               OBJLISTS=
-                               LIBINSTLIST=
-                       fi
-                       LIBLIST="$LIBLIST "'lib$(LIBBASE)$(SHLIBEXT)'
-                       LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT)'
-                       case "$SHLIBSEXT" in
-                       .so.s-nobuild)
-                               LIBINSTLIST="$LIBINSTLIST install-shared"
-                               ;;
-                       *)
-                               LIBLIST="$LIBLIST "'lib$(LIBBASE)$(SHLIBSEXT)'
-                               LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT)'
-                               LIBINSTLIST="$LIBINSTLIST install-shlib-soname"
-                               ;;
-                       esac
-                       OBJLISTS="$OBJLISTS OBJS.SH"
-               fi
-               CC_LINK="$CC_LINK_SHARED"
-               ;;
-       esac
-else
+case "$SHLIBEXT" in
+.so-nobuild)
+       AC_MSG_WARN([shared libraries not supported on this architecture])
        RUN_ENV=
        CC_LINK="$CC_LINK_STATIC"
-       SHLIBEXT=.so-nobuild
-       SHLIBVEXT=.so.v-nobuild
-       SHLIBSEXT=.so.s-nobuild
-fi
-
-if test "$build_dynobj" = yes; then
-       OBJLISTS=`echo $OBJLISTS | sed -e s/OBJS.ST//g -e s/OBJS.SH//g`
-       OBJLISTS="$OBJLISTS OBJS.SH"
-fi
+       ;;
+*)
+       # set this now because some logic below may reset SHLIBEXT
+       DEPLIBEXT=$SHLIBEXT
+       if test "$krb5_force_static" = "yes"; then
+               AC_MSG_RESULT([Forcing static libraries.])
+               # avoid duplicate rules generation for AIX and such
+               SHLIBEXT=.so-nobuild
+               SHLIBVEXT=.so.v-nobuild
+               SHLIBSEXT=.so.s-nobuild
+       else
+               AC_MSG_NOTICE([enabling shared libraries])
+               # Clear some stuff in case of AIX, etc.
+               if test "$STLIBEXT" = "$SHLIBEXT" ; then
+                       STLIBEXT=.a-nobuild
+                       LIBLIST=
+                       LIBLINKS=
+                       OBJLISTS=
+                       LIBINSTLIST=
+               fi
+               LIBLIST="$LIBLIST "'lib$(LIBBASE)$(SHLIBEXT)'
+               LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(SHLIBEXT) $(TOPLIBD)/lib$(LIBBASE)$(SHLIBVEXT)'
+               case "$SHLIBSEXT" in
+               .so.s-nobuild)
+                       LIBINSTLIST="$LIBINSTLIST install-shared"
+                       ;;
+               *)
+                       LIBLIST="$LIBLIST "'lib$(LIBBASE)$(SHLIBSEXT)'
+                       LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(SHLIBSEXT)'
+                       LIBINSTLIST="$LIBINSTLIST install-shlib-soname"
+                       ;;
+               esac
+               OBJLISTS="$OBJLISTS OBJS.SH"
+       fi
+       CC_LINK="$CC_LINK_SHARED"
+       ;;
+esac
 
 if test -z "$LIBLIST"; then
        AC_MSG_ERROR([must enable one of shared or static libraries])
@@ -1309,20 +1290,6 @@ 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.])
-               ;;
-       *)
-               AC_MSG_NOTICE([enabling profiled libraries])
-               LIBLIST="$LIBLIST "'lib$(LIBBASE)$(PFLIBEXT)'
-               LIBLINKS="$LIBLINKS "'$(TOPLIBD)/lib$(LIBBASE)$(PFLIBEXT)'
-               OBJLISTS="$OBJLISTS OBJS.PF"
-               LIBINSTLIST="$LIBINSTLIST install-profiled"
-               ;;
-       esac
 fi])])
 
 dnl

diff --git a/src/plugins/kdb/db2/configure.in b/src/plugins/kdb/db2/configure.in
index 1cf21cf9fe7433e1ca03d43af29ef89505d56d3b..0a81c4f76b8b122dcbc663582a7cac627a7e215e 100644 (file)
--- a/src/plugins/kdb/db2/configure.in
+++ b/src/plugins/kdb/db2/configure.in
@@ -1,6 +1,4 @@
 K5_AC_INIT(configure.in)
-enable_shared=yes
-build_dynobj=yes
 CONFIG_RULES
 AC_CHECK_HEADERS(unistd.h)
 AC_TYPE_MODE_T

diff --git a/src/plugins/kdb/db2/libdb2/configure.in b/src/plugins/kdb/db2/libdb2/configure.in
index 5c0455e24acdb9b3cc786acc30176c09483bf08a..a1b00d321384082d69d6d160d97de533dbb7f79f 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/configure.in
+++ b/src/plugins/kdb/db2/libdb2/configure.in
@@ -1,6 +1,5 @@
 K5_AC_INIT(db/db.c)
 AC_CONFIG_HEADER(include/config.h include/db-config.h)
-build_dynobj=yes
 CONFIG_RULES
 
 AC_PATH_PROG(FALSE,false,:)

diff --git a/src/plugins/locate/python/configure.in b/src/plugins/locate/python/configure.in
index fa910ac41fda57f70850814087ff812906b9e4cb..11e22152d85c0a5303c54bd0c076ef9036245cf5 100644 (file)
--- a/src/plugins/locate/python/configure.in
+++ b/src/plugins/locate/python/configure.in
@@ -1,6 +1,4 @@
 K5_AC_INIT(configure.in)
-enable_shared=yes
-build_dynobj=yes
 CONFIG_RULES
 AC_CHECK_HEADERS(Python.h python2.3/Python.h)
 dnl AC_CHECK_LIB(python2.3)

diff --git a/src/plugins/preauth/cksum_body/configure.in b/src/plugins/preauth/cksum_body/configure.in
index 3ae9a2e6204a31348ad145d0b3091321314b7875..53870b50797bccec21846d4efae551ae9951df05 100644 (file)
--- a/src/plugins/preauth/cksum_body/configure.in
+++ b/src/plugins/preauth/cksum_body/configure.in
@@ -1,6 +1,4 @@
 K5_AC_INIT(configure.in)
-enable_shared=yes
-build_dynobj=yes
 CONFIG_RULES
 
 AC_CHECK_HEADERS(errno.h string.h)

diff --git a/src/plugins/preauth/wpse/configure.in b/src/plugins/preauth/wpse/configure.in
index 3ae9a2e6204a31348ad145d0b3091321314b7875..53870b50797bccec21846d4efae551ae9951df05 100644 (file)
--- a/src/plugins/preauth/wpse/configure.in
+++ b/src/plugins/preauth/wpse/configure.in
@@ -1,6 +1,4 @@
 K5_AC_INIT(configure.in)
-enable_shared=yes
-build_dynobj=yes
 CONFIG_RULES
 
 AC_CHECK_HEADERS(errno.h string.h)