diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 47ba136..63f4fb4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ client_wallet_LDFLAGS = @REMCTL_LDFLAGS@ client_wallet_LDADD = -lremctl kasetkey_kasetkey_CPPFLAGS = @AFS_CPPFLAGS@ kasetkey_kasetkey_LDFLAGS = @AFS_LDFLAGS@ -kasetkey_kasetkey_LDADD = -lafsauthent -lafsrpc -lpthread -lkrb4 +kasetkey_kasetkey_LDADD = @AFS_LIBS@ -lkrb4 dist_man_MANS = kasetkey/kasetkey.8 diff --git a/configure.ac b/configure.ac index ae4e34a..ad20c60 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_ARG_WITH([afs-libs], AC_HELP_STRING([--with-afs-libs=DIR], [Prefix for AFS libraries (for kasetkey)]), [if test x"$withval" != xno ; then - AFS_LDFLAGS="-L${withval}" + AFS_LDFLAGS="-L${withval} -L${withval}/afs" fi]) AC_SUBST([AFS_LDFLAGS]) @@ -59,6 +59,16 @@ AC_SEARCH_LIBS([socket], [socket], , AC_SEARCH_LIBS([res_search], [resolv], , [AC_SEARCH_LIBS([__res_search], [resolv])]) +save_LDFLAGS=$LDFLAGS +LDFLAGS="$AFS_LDFLAGS $LDFLAGS" +AC_CHECK_LIB([afsauthent], [KAM_DeleteUser], + [AFS_LIBS="-lafsauthent -lafsrpc -lpthread"], + [AFS_LIBS="-lkauth.krb -lauth.krb -lubik -lrxkad -lrx -llwp -lsys" + AFS_LIBS="${AFS_LIBS} -lcom_err -lafsutil"], + [-lpthread]) +LDFLAGS="$save_LDFLAGS" +AC_SUBST([AFS_LIBS]) + AC_CONFIG_HEADER([config.h]) AC_CONFIG_FILES([Makefile perl/Makefile.PL]) AC_CONFIG_FILES([tests/client/basic-t], [chmod +x tests/client/basic-t]) |