diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2002-09-03 23:18:41 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2002-09-03 23:18:41 +0000 |
| commit | f7c4a6f160688185e96c2d7bb34512a34bdcd088 (patch) | |
| tree | ba3cf8ca588061fc1e0aac1f664d50b634f286cf | |
| parent | e19c6792f4ebecc6063edf661fb93b8025ef179e (diff) | |
| download | krb5-f7c4a6f160688185e96c2d7bb34512a34bdcd088.tar.gz krb5-f7c4a6f160688185e96c2d7bb34512a34bdcd088.tar.xz krb5-f7c4a6f160688185e96c2d7bb34512a34bdcd088.zip | |
Support SS_LIB=... at configure time
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14828 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/aclocal.m4 | 6 | ||||
| -rw-r--r-- | src/config/ChangeLog | 1 | ||||
| -rw-r--r-- | src/config/pre.in | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bac1817994..25b579c1a2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,8 @@ * aclocal.m4 (KRB_INCLUDE): Put in-tree include dirs before previous contents of CPPFLAGS. + (KRB5_AC_CHOOSE_SS): Let user specify SS_LIB=..., substitute it + into generated makefiles. 2002-09-03 Ezra Peisach <epeisach@bu.edu> diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 51bd0b7e7e..b54b07c4be 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1435,11 +1435,15 @@ AC_SUBST(COM_ERR_VERSION) AC_DEFUN([KRB5_AC_CHOOSE_SS],[ AC_ARG_WITH(system-ss, AC_HELP_STRING(--with-system-ss,use system -lss and mk_cmds @<:@default: use a private version@:>@)) +AC_ARG_VAR(SS_LIB,[system libraries for 'ss' package, if --with-system-ss was specified [-lss]]) if test "x$with_system_ss" = xyes ; then SS_VERSION=sys - # check for various libraries we might need + # todo: check for various libraries we might need + # in the meantime... + test "x${SS_LIB+set}" = xset || SS_LIB=-lss else SS_VERSION=k5 fi +AC_SUBST(SS_LIB) AC_SUBST(SS_VERSION) ]) diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 27b611715a..1988dca225 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -3,6 +3,7 @@ * libobj.in (.c.so, .c.po): Put LOCALINCLUDES before CPPFLAGS. * pre.in (ALL_CFLAGS): Put LOCALINCLUDES before CPPFLAGS. + (SS_LIB-sys): Use @SS_LIB@ substitution. 2002-08-29 Ken Raeburn <raeburn@mit.edu> diff --git a/src/config/pre.in b/src/config/pre.in index 0379a03bb1..b9237ffdea 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -246,7 +246,7 @@ SS_DEPS-k5 = $(BUILDTOP)/include/ss/ss.h $(BUILDTOP)/include/ss/ss_err.h GEN_LIB = @GEN_LIB@ SS_LIB = $(SS_LIB-@SS_VERSION@) -SS_LIB-sys = -lss +SS_LIB-sys = @SS_LIB@ SS_LIB-k5 = $(TOPLIBD)/libss.a KDB5_LIB = -lkdb5 DB_LIB = -ldb |