From 105fe1ec3cc21a74ab6148dc34642e2d82b107f7 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Sun, 25 Mar 2007 23:06:04 +0000
Subject: [PATCH] Remove separate KRB5_BUILD_LIBRARY_WITH_DEPS macro, just use
 KRB5_BUILD_LIBRARY

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19260 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/aclocal.m4                                | 15 +++------------
 src/configure.in                              |  2 +-
 src/plugins/kdb/db2/configure.in              |  2 +-
 src/plugins/kdb/ldap/libkdb_ldap/configure.in |  2 +-
 src/plugins/locate/python/configure.in        |  2 +-
 src/plugins/preauth/cksum_body/configure.in   |  2 +-
 src/plugins/preauth/wpse/configure.in         |  2 +-
 7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index f48dbe2f6..3450d2f4f 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -1112,14 +1112,6 @@ AC_SUBST(HESIOD_DEFS)
 AC_SUBST(HESIOD_LIBS)])
 
 
-dnl
-dnl KRB5_BUILD_LIBRARY
-dnl
-dnl Pull in the necessary stuff to create the libraries.
-
-AC_DEFUN(KRB5_BUILD_LIBRARY,
-[KRB5_BUILD_LIBRARY_WITH_DEPS])
-
 dnl
 dnl KRB5_BUILD_LIBRARY_STATIC
 dnl
@@ -1137,12 +1129,11 @@ KRB5_BUILD_LIBRARY
 LIBINSTLIST=])
 
 dnl
-dnl KRB5_BUILD_LIBRARY_WITH_DEPS
+dnl KRB5_BUILD_LIBRARY
 dnl
-dnl Like KRB5_BUILD_LIBRARY, but adds in explicit dependencies in the
-dnl generated shared library.
+dnl Pull in the necessary stuff to create the libraries.
 
-AC_DEFUN(KRB5_BUILD_LIBRARY_WITH_DEPS,
+AC_DEFUN(KRB5_BUILD_LIBRARY,
 [AC_REQUIRE([KRB5_LIB_AUX])dnl
 AC_REQUIRE([AC_PROG_LN_S])dnl
 AC_REQUIRE([AC_PROG_RANLIB])dnl
diff --git a/src/configure.in b/src/configure.in
index 8bd817057..019ec5ef9 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -41,7 +41,7 @@ dnl configure.in...
 dnl
 AC_CHECK_FUNCS(memmove)
 KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
+KRB5_BUILD_LIBRARY
 KRB5_BUILD_PROGRAM
 dnl for slave
 AC_TYPE_MODE_T
diff --git a/src/plugins/kdb/db2/configure.in b/src/plugins/kdb/db2/configure.in
index 9f958db12..1cf21cf9f 100644
--- a/src/plugins/kdb/db2/configure.in
+++ b/src/plugins/kdb/db2/configure.in
@@ -20,7 +20,7 @@ KRB5_RUN_FLAGS
 dnl The following is for check...
 KRB5_BUILD_PROGRAM
 KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
+KRB5_BUILD_LIBRARY
 if test "$DB_VERSION" = k5 ; then
   AC_CONFIG_SUBDIRS(libdb2)
 fi
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/configure.in b/src/plugins/kdb/ldap/libkdb_ldap/configure.in
index aee691607..61271a8f4 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/configure.in
+++ b/src/plugins/kdb/ldap/libkdb_ldap/configure.in
@@ -31,6 +31,6 @@ KRB5_RUN_FLAGS
 dnl The following is for check...
 KRB5_BUILD_PROGRAM
 KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
+KRB5_BUILD_LIBRARY
 dnl
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/plugins/locate/python/configure.in b/src/plugins/locate/python/configure.in
index 34f8306b5..fa910ac41 100644
--- a/src/plugins/locate/python/configure.in
+++ b/src/plugins/locate/python/configure.in
@@ -6,5 +6,5 @@ AC_CHECK_HEADERS(Python.h python2.3/Python.h)
 dnl AC_CHECK_LIB(python2.3)
 
 KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
+KRB5_BUILD_LIBRARY
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/plugins/preauth/cksum_body/configure.in b/src/plugins/preauth/cksum_body/configure.in
index 868dfd594..3ae9a2e62 100644
--- a/src/plugins/preauth/cksum_body/configure.in
+++ b/src/plugins/preauth/cksum_body/configure.in
@@ -9,6 +9,6 @@ KRB5_RUN_FLAGS
 dnl The following is for check...
 KRB5_BUILD_PROGRAM
 KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
+KRB5_BUILD_LIBRARY
 AC_CONFIG_HEADERS(config.h)
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/plugins/preauth/wpse/configure.in b/src/plugins/preauth/wpse/configure.in
index 868dfd594..3ae9a2e62 100644
--- a/src/plugins/preauth/wpse/configure.in
+++ b/src/plugins/preauth/wpse/configure.in
@@ -9,6 +9,6 @@ KRB5_RUN_FLAGS
 dnl The following is for check...
 KRB5_BUILD_PROGRAM
 KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
+KRB5_BUILD_LIBRARY
 AC_CONFIG_HEADERS(config.h)
 V5_AC_OUTPUT_MAKEFILE
-- 
2.26.2