From 5e8d667bbfafeb25db4a59657af9aa2615102fe3 Mon Sep 17 00:00:00 2001 From: Antoine Jacoutot Date: Sat, 17 Dec 2016 15:55:01 +0100 Subject: [PATCH] Fix for heimdal >= 7 --- Makefile.inc | 1 - login_krb5-or-pwd/Makefile | 4 ++-- login_krb5/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index fd58ec9..f799cc6 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,6 +1,5 @@ CPPFLAGS+= -Wall LDADD+= -lutil -LDFLAGS+= -Wl,-rpath=/usr/local/heimdal/lib BINOWN= root BINGRP= auth diff --git a/login_krb5-or-pwd/Makefile b/login_krb5-or-pwd/Makefile index 5e14e48..56bcce4 100644 --- a/login_krb5-or-pwd/Makefile +++ b/login_krb5-or-pwd/Makefile @@ -6,9 +6,9 @@ MAN= ${PROG}.8 CPPFLAGS+= -DPASSWD -DKRB5 CPPFLAGS+= -I${.CURDIR}/../login_passwd -CPPFLAGS+= $$(/usr/local/heimdal/bin/krb5-config --cflags) -I/usr/local/include +CPPFLAGS+= $$(/usr/local/heimdal/bin/krb5-config --cflags) -LDADD+= $$(/usr/local/heimdal/bin/krb5-config --libs) -L/usr/local/lib +LDADD+= $$(/usr/local/heimdal/bin/krb5-config --deps --libs) .PATH: ${.CURDIR}/../login_passwd ${.CURDIR}/../login_krb5 diff --git a/login_krb5/Makefile b/login_krb5/Makefile index 0d29e0d..445d582 100644 --- a/login_krb5/Makefile +++ b/login_krb5/Makefile @@ -6,9 +6,9 @@ MAN= ${PROG}.8 CPPFLAGS+= -DKRB5 CPPFLAGS+= -I${.CURDIR}/../login_passwd -CPPFLAGS+= $$(/usr/local/heimdal/bin/krb5-config --cflags) -I/usr/local/include +CPPFLAGS+= $$(/usr/local/heimdal/bin/krb5-config --cflags) -LDADD+= $$(/usr/local/heimdal/bin/krb5-config --libs) -L/usr/local/lib +LDADD+= $$(/usr/local/heimdal/bin/krb5-config --deps --libs) .PATH: ${.CURDIR}/../login_passwd -- 2.11.4.GIT