summaryrefslogtreecommitdiffstats
path: root/src/kadmin/passwd
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1998-02-12 16:23:00 +0000
committerTheodore Tso <tytso@mit.edu>1998-02-12 16:23:00 +0000
commit981d6f23077665b3b99c2ce9c1cb0cc78003eec5 (patch)
tree9146dc74467695281c425b65347744cfffa65a92 /src/kadmin/passwd
parent98951dafa71eb4fe42c3ffa4766a0e5db9f657cf (diff)
downloadkrb5-981d6f23077665b3b99c2ce9c1cb0cc78003eec5.tar.gz
krb5-981d6f23077665b3b99c2ce9c1cb0cc78003eec5.tar.xz
krb5-981d6f23077665b3b99c2ce9c1cb0cc78003eec5.zip
Mass makefile/configure.in build system revamp
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10424 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/passwd')
-rw-r--r--src/kadmin/passwd/ChangeLog11
-rw-r--r--src/kadmin/passwd/Makefile.in2
-rw-r--r--src/kadmin/passwd/configure.in25
-rw-r--r--src/kadmin/passwd/unit-test/ChangeLog4
-rw-r--r--src/kadmin/passwd/unit-test/Makefile.in2
5 files changed, 19 insertions, 25 deletions
diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index 39d5d3bb5..85f78018f 100644
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/ChangeLog
@@ -1,3 +1,14 @@
+Thu Feb 12 10:22:47 1998 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * configure.in: Remove unused NetBSD kludge to prevent use of
+ USE_KDB5_LIBRARY, since these macros are obsolete.
+
+Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * configure.in: Removed use of DO_SUBDIRS.
+
+ * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
Fri Jan 30 15:29:28 1998 Tom Yu <tlyu@mit.edu>
* Makefile.in: Remove install rules.
diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in
index c94b72465..21758f512 100644
--- a/src/kadmin/passwd/Makefile.in
+++ b/src/kadmin/passwd/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I. -DUSE_KADM5_API_VERSION=1
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/kadmin/passwd/configure.in b/src/kadmin/passwd/configure.in
index d47ea63e8..cd597bbc3 100644
--- a/src/kadmin/passwd/configure.in
+++ b/src/kadmin/passwd/configure.in
@@ -1,32 +1,7 @@
AC_INIT(kpasswd.c)
CONFIG_RULES
AC_CONFIG_SUBDIRS(unit-test)
-DO_SUBDIRS
AC_PROG_INSTALL
AC_PROG_AWK
-
-dnl
-dnl The following is a kludge to get around a shared library problem
-dnl for NetBSD and Linux. We have to include -lkdb5 under Linux, and
-dnl we can't include -lkdb5 under NetBSD, due to various breakages in
-dnl each system's shared library implementation
-dnl
-
-dnl commented out for now --tlyu
-dnl
-ifelse([AC_MSG_CHECKING([for build host])
-AC_CACHE_VAL(krb5_cv_host, [export CC
-AC_CANONICAL_HOST
-krb5_cv_host=$host])
-AC_MSG_RESULT($krb5_cv_host)
-case $krb5_cv_host in
-*-*-*bsd*)
- echo "Skipping USE KDB5 LIBRARY on BSD to avoid libdb incompatibilites"
- ;;
-*)
- USE_KDB5_LIBRARY
- ;;
-esac])
-
KRB5_BUILD_PROGRAM
V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/passwd/unit-test/ChangeLog b/src/kadmin/passwd/unit-test/ChangeLog
new file mode 100644
index 000000000..ff5429640
--- /dev/null
+++ b/src/kadmin/passwd/unit-test/ChangeLog
@@ -0,0 +1,4 @@
+Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu>
+
+ * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
diff --git a/src/kadmin/passwd/unit-test/Makefile.in b/src/kadmin/passwd/unit-test/Makefile.in
index 8ffc57f2c..a98d94acf 100644
--- a/src/kadmin/passwd/unit-test/Makefile.in
+++ b/src/kadmin/passwd/unit-test/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
check unit-test:: unit-test-@DO_TEST@
unit-test-: