diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2007-03-25 23:07:21 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2007-03-25 23:07:21 +0000 |
| commit | 9bda2b0f51ffc82011416d98da619b8e7e315736 (patch) | |
| tree | 7c30d58813cc685ffb51ce96004fe6abb3b3fca6 /src | |
| parent | 67add7ce15f01e788d8cecbc60c61fb47d5e759f (diff) | |
| download | krb5-9bda2b0f51ffc82011416d98da619b8e7e315736.tar.gz krb5-9bda2b0f51ffc82011416d98da619b8e7e315736.tar.xz krb5-9bda2b0f51ffc82011416d98da619b8e7e315736.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/aclocal.m4 | 14 | ||||
| -rw-r--r-- | src/appl/libpty/configure.in | 2 | ||||
| -rw-r--r-- | src/appl/telnet/configure.in | 2 | ||||
| -rw-r--r-- | src/lib/apputils/configure.in | 2 | ||||
| -rw-r--r-- | src/util/ss/configure.in | 2 |
5 files changed, 4 insertions, 18 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index c6c6a36bf..2f02c5fe7 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1117,20 +1117,6 @@ 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 dnl Pull in the necessary stuff to create the libraries. diff --git a/src/appl/libpty/configure.in b/src/appl/libpty/configure.in index 0de77897e..22af7023d 100644 --- 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 04173afc4..d4870ec08 100644 --- 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 73e9a87aa..9d5246549 100644 --- 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 f68c53380..53e81781f 100644 --- 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 |