diff options
author | Ken Raeburn <raeburn@mit.edu> | 2007-03-25 23:08:05 +0000 |
---|---|---|
committer | Ken Raeburn <raeburn@mit.edu> | 2007-03-25 23:08:05 +0000 |
commit | 630b8dc0d25def1aafcb1897980ea1a6284d322d (patch) | |
tree | 64f46d14ace8273044e04d3e378150aa78364188 | |
parent | 98bd50dd0e5fd0d687808177d155399d29e1e076 (diff) | |
download | krb5-630b8dc0d25def1aafcb1897980ea1a6284d322d.zip krb5-630b8dc0d25def1aafcb1897980ea1a6284d322d.tar.gz krb5-630b8dc0d25def1aafcb1897980ea1a6284d322d.tar.bz2 |
Generate makefiles for two static libs plus the python plugin from the top-level configure script
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19270 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r-- | src/configure.in | 16 | ||||
-rw-r--r-- | src/lib/apputils/Makefile.in | 4 | ||||
-rw-r--r-- | src/lib/apputils/configure.in | 6 | ||||
-rw-r--r-- | src/plugins/locate/python/Makefile.in | 4 | ||||
-rw-r--r-- | src/plugins/locate/python/configure.in | 8 | ||||
-rw-r--r-- | src/util/ss/Makefile.in | 4 | ||||
-rw-r--r-- | src/util/ss/configure.in | 17 |
7 files changed, 14 insertions, 45 deletions
diff --git a/src/configure.in b/src/configure.in index 019ec5e..5870854 100644 --- a/src/configure.in +++ b/src/configure.in @@ -891,11 +891,10 @@ AC_SUBST(SUPPORTLIB_MAJOR) dnl dnl if test "$COM_ERR_VERSION" = k5 ; then -dnl AC_CONFIG_SUBDIRS(util/et) K5_GEN_MAKEFILE(util/et) fi if test "$SS_VERSION" = k5 ; then - AC_CONFIG_SUBDIRS(util/ss) + K5_GEN_MAKEFILE(util/ss) fi if test -n "$KRB4_LIB"; then K5_GEN_MAKEFILE(lib/krb4) @@ -920,12 +919,9 @@ if test -n "$OPENLDAP_PLUGIN"; then fi AC_SUBST(ldap_plugin_dir) -AC_CONFIG_SUBDIRS(lib/apputils plugins/kdb/db2 plugins/preauth/wpse plugins/preauth/cksum_body appl tests) -dnl -if false; then - AC_CHECK_HEADERS(Python.h python2.3/Python.h) - AC_CONFIG_SUBDIRS(plugins/locate/python) -fi +AC_CONFIG_SUBDIRS(plugins/kdb/db2 plugins/preauth/wpse plugins/preauth/cksum_body appl tests) + +AC_CHECK_HEADERS(Python.h python2.3/Python.h) AC_CONFIG_FILES(krb5-config, [chmod +x krb5-config]) V5_AC_OUTPUT_MAKEFILE(. @@ -950,9 +946,13 @@ V5_AC_OUTPUT_MAKEFILE(. lib/kadm5 lib/kadm5/clnt lib/kadm5/srv lib/kadm5/unit-test + lib/apputils + kdc slave krb524 config-files gen-manpages include include/kerberosIV + plugins/locate/python + clients clients/klist clients/kinit clients/kvno clients/kdestroy clients/kpasswd clients/ksu diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in index 38bb0f0..7c5e5e8 100644 --- a/src/lib/apputils/Makefile.in +++ b/src/lib/apputils/Makefile.in @@ -2,9 +2,9 @@ prefix=@prefix@ bindir=@bindir@ datadir=@datadir@ mydatadir=$(datadir)/apputils -thisconfigdir=. +thisconfigdir=../.. myfulldir=lib/apputils -mydir=. +mydir=lib/apputils BUILDTOP=$(REL)..$(S).. RELDIR=../lib/apputils SED = sed diff --git a/src/lib/apputils/configure.in b/src/lib/apputils/configure.in deleted file mode 100644 index 9d52465..0000000 --- a/src/lib/apputils/configure.in +++ /dev/null @@ -1,6 +0,0 @@ -K5_AC_INIT(daemon.c) -CONFIG_RULES -AC_REPLACE_FUNCS(daemon) -KRB5_BUILD_LIBRARY -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/plugins/locate/python/Makefile.in b/src/plugins/locate/python/Makefile.in index 0849926..ab36991 100644 --- a/src/plugins/locate/python/Makefile.in +++ b/src/plugins/locate/python/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=. +thisconfigdir=../../.. myfulldir=plugins/locate/python -mydir=. +mydir=plugins/locate/python BUILDTOP=$(REL)..$(S)..$(S).. LIBBASE=python diff --git a/src/plugins/locate/python/configure.in b/src/plugins/locate/python/configure.in deleted file mode 100644 index 11e2215..0000000 --- a/src/plugins/locate/python/configure.in +++ /dev/null @@ -1,8 +0,0 @@ -K5_AC_INIT(configure.in) -CONFIG_RULES -AC_CHECK_HEADERS(Python.h python2.3/Python.h) -dnl AC_CHECK_LIB(python2.3) - -KRB5_BUILD_LIBOBJS -KRB5_BUILD_LIBRARY -V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in index a11072b..f9610d3 100644 --- a/src/util/ss/Makefile.in +++ b/src/util/ss/Makefile.in @@ -1,6 +1,6 @@ -thisconfigdir=. +thisconfigdir=../.. myfulldir=util/ss -mydir=. +mydir=util/ss BUILDTOP=$(REL)..$(S).. SED = sed DEFS= diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in deleted file mode 100644 index 53e8178..0000000 --- a/src/util/ss/configure.in +++ /dev/null @@ -1,17 +0,0 @@ -K5_AC_INIT(ct.y) -CONFIG_RULES -AC_PROG_LEX -AC_PROG_YACC -AC_PROG_AWK -HAVE_YYLINENO -AC_CHECK_FUNCS(strdup) -CHECK_DIRENT -CHECK_WAIT_TYPE -CHECK_SIGNALS -CHECK_SIGPROCMASK -AC_TYPE_SIGNAL -AC_HEADER_STDARG -AC_CHECK_HEADERS(stdlib.h) -KRB5_BUILD_LIBRARY -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE |