summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/clients/Makefile.in4
-rw-r--r--src/clients/configure.in24
-rw-r--r--src/clients/kdestroy/Makefile.in4
-rw-r--r--src/clients/kinit/Makefile.in4
-rw-r--r--src/clients/klist/Makefile.in4
-rw-r--r--src/clients/kpasswd/Makefile.in4
-rw-r--r--src/clients/ksu/Makefile.in4
-rw-r--r--src/clients/kvno/Makefile.in4
-rw-r--r--src/configure.in26
-rw-r--r--src/lib/kdb/Makefile.in4
-rw-r--r--src/lib/kdb/configure.in15
-rw-r--r--src/util/et/Makefile.in4
-rw-r--r--src/util/et/configure.in27
-rw-r--r--src/util/profile/Makefile.in4
-rw-r--r--src/util/profile/configure.in18
15 files changed, 42 insertions, 108 deletions
diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in
index f1c8be6e2..007e363d6 100644
--- a/src/clients/Makefile.in
+++ b/src/clients/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=..
myfulldir=clients
-mydir=.
+mydir=clients
BUILDTOP=$(REL)..
LOCAL_SUBDIRS= klist kinit kdestroy kpasswd ksu kvno kcpytkt kdeltkt
diff --git a/src/clients/configure.in b/src/clients/configure.in
deleted file mode 100644
index 32b698dc9..000000000
--- a/src/clients/configure.in
+++ /dev/null
@@ -1,24 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-AC_HEADER_STDARG
-AC_CHECK_FUNCS(getusershell lstat setenv unsetenv getenv inet_ntop)
-if test $ac_cv_func_setenv = no || test $ac_cv_func_unsetenv = no \
- || test $ac_cv_func_getenv = no; then
- SETENVOBJ=setenv.o
-else
- SETENVOBJ=
-fi
-AC_SUBST(SETENVOBJ)
-AC_CHECK_HEADERS(unistd.h pwd.h arpa/inet.h)
-case $krb5_cv_host in
-alpha*-dec-osf*)
- AC_CHECK_LIB(security,setluid,
- AC_DEFINE(HAVE_SETLUID,1,[Define if OSF/1 security lib provides setluid])
- KSU_LIBS="$KSU_LIBS -lsecurity"
- )
- ;;
-esac
-AC_SUBST(KSU_LIBS)
-V5_AC_OUTPUT_MAKEFILE(. klist kinit kvno kdestroy kpasswd ksu)
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index 8f95db889..c5ebf17d6 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
myfulldir=clients/kdestroy
-mydir=kdestroy
+mydir=clients/kdestroy
BUILDTOP=$(REL)..$(S)..
DEFS=
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index 0fa2db474..7a4c39dbd 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
myfulldir=clients/kinit
-mydir=kinit
+mydir=clients/kinit
BUILDTOP=$(REL)..$(S)..
DEFS=
diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in
index da5d604df..aa8cd526d 100644
--- a/src/clients/klist/Makefile.in
+++ b/src/clients/klist/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
myfulldir=clients/klist
-mydir=klist
+mydir=clients/klist
BUILDTOP=$(REL)..$(S)..
DEFS=
diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
index cbea1bbc5..aca1f1a6c 100644
--- a/src/clients/kpasswd/Makefile.in
+++ b/src/clients/kpasswd/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
myfulldir=clients/kpasswd
-mydir=kpasswd
+mydir=clients/kpasswd
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in
index 6aae021d5..995713196 100644
--- a/src/clients/ksu/Makefile.in
+++ b/src/clients/ksu/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
myfulldir=clients/ksu
-mydir=ksu
+mydir=clients/ksu
BUILDTOP=$(REL)..$(S)..
DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
DEFS=
diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
index cfdf5d18b..13c4a85c2 100644
--- a/src/clients/kvno/Makefile.in
+++ b/src/clients/kvno/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=./..
+thisconfigdir=../..
myfulldir=clients/kvno
-mydir=kvno
+mydir=clients/kvno
BUILDTOP=$(REL)..$(S)..
DEFS=
diff --git a/src/configure.in b/src/configure.in
index 119435a8a..c9e6c14fc 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -218,9 +218,19 @@ case $krb5_cv_host in
alpha*-dec-osf*)
AC_CHECK_LIB(security,setluid,
AC_DEFINE(HAVE_SETLUID,1,[Define if setluid provided in OSF/1 security library])
+ KSU_LIBS="-lsecurity"
)
;;
esac
+AC_SUBST(KSU_LIBS)
+dnl
+if test $ac_cv_func_setenv = no || test $ac_cv_func_unsetenv = no \
+ || test $ac_cv_func_getenv = no; then
+ SETENVOBJ=setenv.o
+else
+ SETENVOBJ=
+fi
+AC_SUBST(SETENVOBJ)
dnl
dnl Check what the return types for gethostbyname_r and getservbyname_r are.
dnl
@@ -549,6 +559,13 @@ AC_CHECK_TYPES([uint32_t, int32_t, uint64_t, int64_t, uint_least32_t, uintptr_t,
#endif
])
dnl
+dnl stuff for util/profile
+dnl
+dnl AC_KRB5_TCL already done
+DO_TCL=
+test "$TCL_LIBS" != "" && DO_TCL=ok
+AC_SUBST(DO_TCL)
+dnl
dnl Test for POSIX 2001 *printf support (X/Open System Interfaces extension
dnl to ANSI/ISO C 1999 specification). Specifically, positional
dnl specifications; not checking for other features like %zx at present.
@@ -608,7 +625,8 @@ AC_SUBST(HOST_TYPE)
dnl
dnl
if test "$COM_ERR_VERSION" = k5 ; then
- AC_CONFIG_SUBDIRS(util/et)
+dnl AC_CONFIG_SUBDIRS(util/et)
+ K5_GEN_MAKEFILE(util/et)
fi
if test "$SS_VERSION" = k5 ; then
AC_CONFIG_SUBDIRS(util/ss)
@@ -617,7 +635,7 @@ AC_CONFIG_SUBDIRS(util/profile lib/crypto lib/krb5 lib/des425 lib/apputils)
if test -n "$KRB4_LIB"; then
AC_CONFIG_SUBDIRS(lib/krb4)
fi
-AC_CONFIG_SUBDIRS(lib/kdb lib/gssapi lib/rpc lib/kadm5)
-AC_CONFIG_SUBDIRS(kadmin clients plugins/kdb/db2 appl tests)
+AC_CONFIG_SUBDIRS(lib/gssapi lib/rpc lib/kadm5)
+AC_CONFIG_SUBDIRS(kadmin plugins/kdb/db2 appl tests)
AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config])
-V5_AC_OUTPUT_MAKEFILE(. util util/support util/send-pr lib kdc slave krb524 config-files gen-manpages include include/kerberosIV)
+V5_AC_OUTPUT_MAKEFILE(. util util/support util/profile util/send-pr lib lib/kdb kdc slave krb524 config-files gen-manpages include include/kerberosIV clients clients/klist clients/kinit clients/kvno clients/kdestroy clients/kpasswd clients/ksu)
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 5efd65b2f..ebf95ddc7 100644
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../..
myfulldir=lib/kdb
-mydir=.
+mydir=lib/kdb
BUILDTOP=$(REL)..$(S)..
KRB5_RUN_ENV = @KRB5_RUN_ENV@
KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ;
diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
deleted file mode 100644
index 7d6a1ed47..000000000
--- a/src/lib/kdb/configure.in
+++ /dev/null
@@ -1,15 +0,0 @@
-K5_AC_INIT(configure.in)
-CONFIG_RULES
-AC_CHECK_HEADERS(unistd.h)
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-
-AC_CHECK_HEADERS(pthread.h)
-AC_CHECK_FUNCS(srand48 srand srandom umask)
-
-KRB5_RUN_FLAGS
-dnl The following is for check...
-KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in
index 250271fc9..184ca50fb 100644
--- a/src/util/et/Makefile.in
+++ b/src/util/et/Makefile.in
@@ -2,9 +2,9 @@ prefix=@prefix@
bindir=@bindir@
datadir=@datadir@
mydatadir=$(datadir)/et
-thisconfigdir=.
+thisconfigdir=../..
myfulldir=util/et
-mydir=.
+mydir=util/et
BUILDTOP=$(REL)..$(S)..
RELDIR=../util/et
SED = sed
diff --git a/src/util/et/configure.in b/src/util/et/configure.in
deleted file mode 100644
index 077eec61f..000000000
--- a/src/util/et/configure.in
+++ /dev/null
@@ -1,27 +0,0 @@
-K5_AC_INIT(error_table.y)
-CONFIG_RULES
-AC_C_CONST
-AC_PROG_LEX
-AC_PROG_YACC
-AC_PROG_AWK
-HAVE_YYLINENO
-DECLARE_SYS_ERRLIST
-dnl
-dnl Fancy caching of perror result...
-AC_MSG_CHECKING(for perror declaration)
-AC_CACHE_VAL(krb5_cv_decl_perror,
-[AC_EGREP_HEADER(perror, errno.h,
- krb5_cv_decl_perror=yes, krb5_cv_decl_perror=no)])dnl
-AC_MSG_RESULT($krb5_cv_decl_perror)
-if test $krb5_cv_decl_perror = yes; then
- AC_DEFINE(HDR_HAS_PERROR,1,[Define if errno.h declares perror])
-fi
-dnl
-AC_CHECK_FUNCS(strerror)
-AC_HEADER_STDARG
-AC_CHECK_HEADERS(stdlib.h)
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_LIBRARY_WITH_DEPS
-KRB5_BUILD_PROGRAM dnl for test programs
-KRB5_RUN_FLAGS dnl for test programs
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index e1b4bbce3..1175a3ef1 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -1,6 +1,6 @@
-thisconfigdir=.
+thisconfigdir=../..
myfulldir=util/profile
-mydir=.
+mydir=util/profile
BUILDTOP=$(REL)..$(S)..
PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)
diff --git a/src/util/profile/configure.in b/src/util/profile/configure.in
deleted file mode 100644
index 8003c28ec..000000000
--- a/src/util/profile/configure.in
+++ /dev/null
@@ -1,18 +0,0 @@
-K5_AC_INIT(prof_parse.c)
-CONFIG_RULES
-AC_C_CONST
-AC_CHECK_HEADERS(unistd.h stdlib.h pwd.h)
-AC_CHECK_FUNCS(stat access strdup)
-AC_CHECK_MEMBERS([struct stat.st_mtimensec,struct stat.st_mtimespec.tv_nsec,struct stat.st_mtim.tv_nsec],,,[#include <sys/types.h>
-#include <sys/stat.h>])
-AC_PROG_AWK
-AC_KRB5_TCL
-DO_TCL=
-test "$TCL_LIBS" != "" && DO_TCL=ok
-AC_SUBST(DO_TCL)
-KRB5_BUILD_LIBOBJS
-KRB5_BUILD_PROGRAM
-KRB5_BUILD_LIBRARY_WITH_DEPS
-KRB5_RUN_FLAGS
-AC_CONFIG_FILES(prtest, [chmod +x prtest])
-V5_AC_OUTPUT_MAKEFILE
generated by cgit (git 2.34.1) at 2024-09-21 06:25:37 +0000