Remove KRB5_BUILD_LIBRARY_STATIC; always use KRB5_BUILD_LIBRARY

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

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c6c6a36bffa0f6f61fe866bd370d5a9a15e3dce0..2f02c5fe7189c6b5a035acce74ab9d4ae711dd8b 100644 (file)
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1116,20 +1116,6 @@ AC_SUBST(HESIOD_DEFS)
 AC_SUBST(HESIOD_LIBS)])
 
 
-dnl
-dnl KRB5_BUILD_LIBRARY_STATIC
-dnl
-dnl Force static library build.
-
-AC_DEFUN(KRB5_AC_FORCE_STATIC,[dnl
-AC_BEFORE([$0],[KRB5_LIB_AUX])dnl
-# krb5_force_static=yes
-])
-AC_DEFUN(KRB5_BUILD_LIBRARY_STATIC,
-dnl Use define rather than AC_DEFUN to avoid ordering problems.
-[AC_REQUIRE([KRB5_AC_FORCE_STATIC])dnl
-KRB5_BUILD_LIBRARY])
-
 dnl
 dnl KRB5_BUILD_LIBRARY
 dnl

diff --git a/src/appl/libpty/configure.in b/src/appl/libpty/configure.in
index 0de77897e26b0ad5c64bd2cc0e7c9c7254ed268c..22af7023df52c4127fcefcb6c6ce1dfdc657c884 100644 (file)
--- a/src/appl/libpty/configure.in
+++ b/src/appl/libpty/configure.in
@@ -255,7 +255,7 @@ fi
 dnl
 KRB5_AC_INET6
 AC_C_CONST
-KRB5_BUILD_LIBRARY_STATIC
+KRB5_BUILD_LIBRARY
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_PROGRAM
 KRB5_RUN_FLAGS

diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in
index 04173afc4c854e6f72b212b9eb3074cd1e49429c..d4870ec0830d2b7e387e8fbfedc2d0573f0dd399 100644 (file)
--- a/src/appl/telnet/configure.in
+++ b/src/appl/telnet/configure.in
@@ -24,7 +24,7 @@ else
        AC_MSG_RESULT(Kerberos 4 authentication enabled)
        AC_DEFINE(KRB4,1,[Define if krb4 authentication is enabled])
 fi
-KRB5_BUILD_LIBRARY_STATIC
+KRB5_BUILD_LIBRARY
 KRB5_BUILD_LIBOBJS
 dnl
 old_LIBS="$LIBS"

diff --git a/src/lib/apputils/configure.in b/src/lib/apputils/configure.in
index 73e9a87aa657123f55f70ca7b73190ba21023bae..9d5246549368fffa7aaea0bb93ebaed0e07ec73e 100644 (file)
--- a/src/lib/apputils/configure.in
+++ b/src/lib/apputils/configure.in
@@ -1,6 +1,6 @@
 K5_AC_INIT(daemon.c)
 CONFIG_RULES
 AC_REPLACE_FUNCS(daemon)
-KRB5_BUILD_LIBRARY_STATIC
+KRB5_BUILD_LIBRARY
 KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in
index f68c533808f327f8ce9a9d02cc0897ed268cd53c..53e81781f8444545d14f87e00a91028698e935d2 100644 (file)
--- a/src/util/ss/configure.in
+++ b/src/util/ss/configure.in
@@ -12,6 +12,6 @@ CHECK_SIGPROCMASK
 AC_TYPE_SIGNAL
 AC_HEADER_STDARG
 AC_CHECK_HEADERS(stdlib.h)
-KRB5_BUILD_LIBRARY_STATIC
+KRB5_BUILD_LIBRARY
 KRB5_BUILD_LIBOBJS
 V5_AC_OUTPUT_MAKEFILE