[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Patches

To: heimdal-discuss@sics.se
Subject: Patches
From: Brian May <bam@snoopy.apana.org.au>
Date: 25 Apr 2002 11:34:17 +1000
Sender: owner-heimdal-discuss@sics.se

Hello,

Attached is some patches for Heimdal 0.4e that fix various problems I
have had with shared libraries in Heimdal.

This also means that Heimdal can use existing libraries, if already
installed (libroken, libcom_err, libsl, libss, libotp), eg. from
kerberos4kth, instead of building its own version.

Only thing I wasn't sure of is the GLOB_QUOTE and GLOB_<somethingelse>
definitions required by ftpd/ftp. kerberos4kth define these in glob.h,
not roken.h, and glob.h conflicts with glob.h in glibc/libc6. So, for
now, I have hardcoded these values.

In theory these patches should always do the right thing, even if the
libraries are not already installed, but I haven't tested this yet.

I also changed the RCSID macro, as the old definition was upsetting
newer versions of autoconf. autoconf still complains with errors,
but at least it seems to generate valid output.

The only other I may want to do, is use the installed version of
libeditline, instead of libreadline. I have been told that linking a
program against both libreadline and openssl is considered similar
to linking libreadline and openssl together, and Debian considers this a
breach of the GPL license. Something I am still discussing.

Thanks.

diff -ruN heimdal-0.4e-old/cf/Makefile.am.common heimdal-0.4e/cf/Makefile.am.common
--- heimdal-0.4e-old/cf/Makefile.am.common	Sat Sep  1 21:12:18 2001
+++ heimdal-0.4e/cf/Makefile.am.common	Thu Nov 15 11:59:31 2001
@@ -169,8 +169,7 @@
 endif
 
 if KRB5
-LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la \
-	$(top_builddir)/lib/asn1/libasn1.la
+LIB_krb5 = $(top_builddir)/lib/krb5/libkrb5.la
 LIB_gssapi = $(top_builddir)/lib/gssapi/libgssapi.la
 endif
 
diff -ruN heimdal-0.4e-old/configure.in heimdal-0.4e/configure.in
--- heimdal-0.4e-old/configure.in	Thu Sep  6 22:22:03 2001
+++ heimdal-0.4e/configure.in	Thu Nov 15 12:01:18 2001
@@ -86,14 +86,17 @@
 	LIB_openldap="-R $openldap_libdir $LIB_openldap"
 fi
 
-AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena, KRB4)
+AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,,,KRB4)
+if test "$krb4_libdir" = "/usr/lib"; then
+  krb4_libdir="";
+fi
 
 LIB_kdb=
 if test "$with_krb4" != "no"; then
 	save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS $INCLUDE_krb4"
 	save_LIBS="$LIBS"
-	LIBS="$LIB_krb4 -ldes $LIBS"
+	LIBS="$LIB_krb4 $LIBS"
 	EXTRA_LIB45=lib45.a
 	AC_SUBST(EXTRA_LIB45)
 	AC_CACHE_CHECK(for four valued krb_put_int, ac_cv_func_krb_put_int_four,
@@ -156,7 +159,7 @@
 	LIBS="$save_LIBS"
 	CFLAGS="$save_CFLAGS"
 	LIB_kdb="-lkdb -lkrb"
-	if test "$krb4_libdir"; then
+	if test "$krb4_libdir" != ""; then
 		LIB_krb4="-R $krb4_libdir $LIB_krb4"
 		LIB_kdb="-R $krb4_libdir -L$krb4_libdir $LIB_kdb"
 	fi
diff -ruN heimdal-0.4e-old/lib/asn1/Makefile.am heimdal-0.4e/lib/asn1/Makefile.am
--- heimdal-0.4e-old/lib/asn1/Makefile.am	Mon Sep  3 02:56:45 2001
+++ heimdal-0.4e/lib/asn1/Makefile.am	Thu Nov 15 11:59:31 2001
@@ -6,6 +6,8 @@
 
 lib_LTLIBRARIES = libasn1.la
 libasn1_la_LDFLAGS = -version-info 5:0:0
+libasn1_la_LIBADD = \
+	$(top_builddir)/lib/com_err/libcom_err.la
 
 libasn1_la_LIBADD = @LIB_com_err@
 
diff -ruN heimdal-0.4e-old/lib/editline/Makefile.am heimdal-0.4e/lib/editline/Makefile.am
--- heimdal-0.4e-old/lib/editline/Makefile.am	Wed Nov 15 10:22:29 2000
+++ heimdal-0.4e/lib/editline/Makefile.am	Thu Nov 15 11:59:31 2001
@@ -38,13 +38,13 @@
 	unix.h \
 	$(EXTRA_SOURCE)
 
-libeditline_la_LDFLAGS = -static
+libeditline_la_LDFLAGS = -no-undefined
 
 EXTRA_SOURCE = $(ES) 
 
 libel_compat_la_SOURCES = edit_compat.c
 
-libel_compat_la_LDFLAGS = -static
+libel_compat_la_LDFLAGS = -no-undefined
 
 EXTRA_DIST = $(man_MANS)
 
diff -ruN heimdal-0.4e-old/lib/krb5/Makefile.am heimdal-0.4e/lib/krb5/Makefile.am
--- heimdal-0.4e-old/lib/krb5/Makefile.am	Thu Sep  6 22:19:16 2001
+++ heimdal-0.4e/lib/krb5/Makefile.am	Thu Nov 15 11:59:31 2001
@@ -11,16 +11,15 @@
 check_PROGRAMS = n-fold-test string-to-key-test derived-key-test store-test
 TESTS = n-fold-test string-to-key-test derived-key-test store-test 
 
-LDADD = libkrb5.la \
-	$(LIB_des) \
-	$(top_builddir)/lib/asn1/libasn1.la \
-	$(LIB_roken)
+LDADD = libkrb5.la
 
 libkrb5_la_LIBADD = \
-	../com_err/error.lo ../com_err/com_err.lo \
+	$(LIB_res_search) \
+	$(top_builddir)/lib/com_err/libcom_err.la \
 	$(LIB_des) \
 	$(top_builddir)/lib/asn1/libasn1.la \
-	$(LIB_roken)
+	$(LIB_roken) \
+	$(LIB_dbopen)
 
 lib_LTLIBRARIES = libkrb5.la
 
diff -ruN heimdal-0.4e-old/lib/vers/Makefile.am heimdal-0.4e/lib/vers/Makefile.am
--- heimdal-0.4e-old/lib/vers/Makefile.am	Fri Aug 24 08:41:03 2001
+++ heimdal-0.4e/lib/vers/Makefile.am	Mon Nov 19 17:18:52 2001
@@ -14,11 +14,12 @@
 if KRB5
 ## need to link with des here; otherwise, if krb4 is shared the link
 ## will fail with unresolved references
-make_print_version_LDADD = $(LIB_krb4) -ldes
+make_print_version_LDADD = $(LIB_krb4)
 endif
 endif
 
 libvers_la_SOURCES	= print_version.c
+libvers_la_LDFLAGS	= -no-undefined
 
 print_version.lo: print_version.h
 
diff -ruN heimdal-0.4e-old/tools/krb5-config.in heimdal-0.4e/tools/krb5-config.in
--- heimdal-0.4e-old/tools/krb5-config.in	Mon Jan 29 17:56:51 2001
+++ heimdal-0.4e/tools/krb5-config.in	Thu Nov 15 11:59:31 2001
@@ -89,6 +89,9 @@
 if test "$do_libs" = "yes"; then
     lib_flags="-L${libdir}"
     case $library in
+    krb5)
+	lib_flags="$lib_flags -lkrb5"
+	;;
     gssapi)
 	lib_flags="$lib_flags -lgssapi"
 	;;
@@ -99,8 +102,8 @@
 	lib_flags="$lib_flags -lkadm5srv"
 	;;
     esac
-    lib_flags="$lib_flags -lkrb5 -lasn1 @LIB_des_appl@ -lroken"
-    lib_flags="$lib_flags @LIB_crypt@ @LIB_dbopen@ @LIBS@"
+#    lib_flags="$lib_flags -lkrb5 -lasn1 @LIB_des_appl@ -lroken"
+#    lib_flags="$lib_flags @LIB_crypt@ @LIB_dbopen@ @LIBS@"
     echo $lib_flags
 fi
 if test "$do_cflags" = "yes"; then

diff -ruN heimdal-0.4e-old/acconfig.h heimdal-0.4e/acconfig.h
--- heimdal-0.4e-old/acconfig.h	Thu Aug  9 18:41:44 2001
+++ heimdal-0.4e/acconfig.h	Tue Apr 23 14:04:11 2002
@@ -36,7 +36,7 @@
 #endif
 
 #define RCSID(msg) \
-static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
+static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 
 #undef PROTOTYPES
 
diff -ruN heimdal-0.4e-old/aclocal.m4 heimdal-0.4e/aclocal.m4
--- heimdal-0.4e-old/aclocal.m4	Thu Sep  6 22:22:21 2001
+++ heimdal-0.4e/aclocal.m4	Mon Apr 22 19:15:49 2002
@@ -26,7 +26,7 @@
 AC_DEFUN([upcase],[`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`])dnl
 AC_DEFUN([rk_CONFIG_HEADER],[AH_TOP([#ifndef RCSID
 #define RCSID(msg) \
-static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
+static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #endif
 
 #undef BINDIR 
diff -ruN heimdal-0.4e-old/admin/Makefile.am heimdal-0.4e/admin/Makefile.am
--- heimdal-0.4e-old/admin/Makefile.am	Tue Aug 28 18:31:19 2001
+++ heimdal-0.4e/admin/Makefile.am	Mon Apr 22 17:18:48 2002
@@ -24,6 +24,6 @@
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_des) \
 	$(top_builddir)/lib/asn1/libasn1.la \
-	$(top_builddir)/lib/sl/libsl.la \
+	$(LIB_sl) \
 	$(LIB_readline) \
 	$(LIB_roken)
diff -ruN heimdal-0.4e-old/appl/ftp/ftp/ftp_locl.h heimdal-0.4e/appl/ftp/ftp/ftp_locl.h
--- heimdal-0.4e-old/appl/ftp/ftp/ftp_locl.h	Thu Aug 23 06:30:19 2001
+++ heimdal-0.4e/appl/ftp/ftp/ftp_locl.h	Mon Apr 22 18:42:42 2002
@@ -128,6 +128,7 @@
 #include "pathnames.h"
 
 #include "roken.h"
+#define	GLOB_QUOTE	0x0400
 #include "security.h"
 
 /* des_read_pw_string */
diff -ruN heimdal-0.4e-old/appl/ftp/ftpd/ftpd_locl.h heimdal-0.4e/appl/ftp/ftpd/ftpd_locl.h
--- heimdal-0.4e-old/appl/ftp/ftpd/ftpd_locl.h	Wed Sep 20 00:16:44 2000
+++ heimdal-0.4e/appl/ftp/ftpd/ftpd_locl.h	Mon Apr 22 18:45:02 2002
@@ -135,6 +135,8 @@
 
 #include <err.h>
 #include "roken.h"
+#define	GLOB_QUOTE	0x0400
+#define GLOB_LIMIT	0x1000	
 
 #include "pathnames.h"
 #include "extern.h"
diff -ruN heimdal-0.4e-old/appl/ftp/ftpd/popen.c heimdal-0.4e/appl/ftp/ftpd/popen.c
--- heimdal-0.4e-old/appl/ftp/ftpd/popen.c	Tue Jun 19 20:00:25 2001
+++ heimdal-0.4e/appl/ftp/ftpd/popen.c	Mon Apr 22 18:45:51 2002
@@ -62,6 +62,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <roken.h>
+#define GLOB_QUOTE      0x0400
+#define GLOB_LIMIT      0x1000
 #include "extern.h"
 
 
diff -ruN heimdal-0.4e-old/appl/otp/Makefile.am heimdal-0.4e/appl/otp/Makefile.am
--- heimdal-0.4e-old/appl/otp/Makefile.am	Tue Aug 28 18:31:21 2001
+++ heimdal-0.4e/appl/otp/Makefile.am	Mon Apr 22 17:19:52 2002
@@ -12,4 +12,4 @@
 man_MANS = otp.1  otpprint.1
 
 LDADD = \
-	$(top_builddir)/lib/otp/libotp.la
+	$(LIB_otp)
diff -ruN heimdal-0.4e-old/cf/Makefile.am.common heimdal-0.4e/cf/Makefile.am.common
--- heimdal-0.4e-old/cf/Makefile.am.common	Fri Apr 19 09:22:39 2002
+++ heimdal-0.4e/cf/Makefile.am.common	Mon Apr 22 18:19:45 2002
@@ -55,6 +55,17 @@
 INCLUDE_readline = @INCLUDE_readline@
 LIB_readline = @LIB_readline@
 
+INCLUDE_roken = @INCLUDES_roken@
+LIB_roken = @LIB_roken@
+INCLUDE_com_err = @INCLUDE_com_err@
+LIB_com_err = @LIB_com_err@
+INCLUDE_sl = @INCLUDE_sl@
+LIB_sl = @LIB_sl@
+INCLUDE_ss = @INCLUDE_ss@
+LIB_ss = @LIB_ss@
+INCLUDE_otp = @INCLUDE_otp@
+LIB_otp = @LIB_otp@
+
 LEXLIB = @LEXLIB@
 
 install-suid-programs:
diff -ruN heimdal-0.4e-old/cf/krb-readline.m4 heimdal-0.4e/cf/krb-readline.m4
--- heimdal-0.4e-old/cf/krb-readline.m4	Wed Nov 15 11:47:08 2000
+++ heimdal-0.4e/cf/krb-readline.m4	Fri Apr 19 09:22:40 2002
@@ -28,16 +28,15 @@
 	:
 elif test "$ac_cv_func_el_init" = yes; then
 	ac_foo=yes
+	DIR_readline="editline"
 	LIB_readline="\$(top_builddir)/lib/editline/libel_compat.la $LIB_el_init"
 else
+	DIR_readline="editline"
 	LIB_readline='$(top_builddir)/lib/editline/libeditline.la'
 fi
 AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
-if test "$readline_libdir"; then
-	LIB_readline="-rpath $readline_libdir $LIB_readline"
-fi
 LIB_readline="$LIB_readline \$(LIB_tgetent)"
 AC_DEFINE(HAVE_READLINE, 1, 
 	[Define if you have a readline compatible library.])dnl
 
-])
\ No newline at end of file
+])
diff -ruN heimdal-0.4e-old/cf/misc.m4 heimdal-0.4e/cf/misc.m4
--- heimdal-0.4e-old/cf/misc.m4	Thu Jul 20 01:04:00 2000
+++ heimdal-0.4e/cf/misc.m4	Mon Apr 22 12:30:03 2002
@@ -3,7 +3,7 @@
 AC_DEFUN([upcase],[`echo $1 | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`])dnl
 AC_DEFUN([rk_CONFIG_HEADER],[AH_TOP([#ifndef RCSID
 #define RCSID(msg) \
-static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
+static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #endif
 
 #undef BINDIR 
@@ -24,4 +24,4 @@
 #define MaxHostNameLen (64+4)
 #define MaxPathLen (1024+4)
 
-])])
\ No newline at end of file
+])])
diff -ruN heimdal-0.4e-old/cf/roken.m4 heimdal-0.4e/cf/roken.m4
--- heimdal-0.4e-old/cf/roken.m4	Sun Jul  9 01:50:34 2000
+++ heimdal-0.4e/cf/roken.m4	Mon Apr 22 17:35:55 2002
@@ -34,10 +34,10 @@
 
 AC_TRY_CPP(
 [#include <roken.h>
-#if ROKEN_VERSION < $1
-#error old roken version, should be $1
-fail
-#endif
+//#if ROKEN_VERSION < $1
+//#error old roken version, should be $1
+//fail
+//#endif
 ],[roken_installed=yes; break])
 
 AC_MSG_RESULT($roken_installed)
@@ -50,12 +50,13 @@
   DIR_roken="roken"
   LIB_roken='$4'
   CPPFLAGS_roken='$5'
-  AC_CONFIG_SUBDIRS(lib/roken)
+dnl  AC_CONFIG_SUBDIRS(lib/roken)
 else
   LIB_roken="$i/lib/libroken.la"
   CPPFLAGS_roken="-I$i/include"
 fi
 
+AC_FIND_FUNC_NO_LIBS(crypt, crypt)dnl
 LIB_roken="${LIB_roken} \$(LIB_crypt) \$(LIB_dbopen)"
 
 AC_SUBST(LIB_roken)dnl
diff -ruN heimdal-0.4e-old/cf/test-package.m4 heimdal-0.4e/cf/test-package.m4
--- heimdal-0.4e-old/cf/test-package.m4	Fri Dec 15 15:54:24 2000
+++ heimdal-0.4e/cf/test-package.m4	Fri Apr 19 09:22:40 2002
@@ -39,7 +39,7 @@
 header_dirs=
 lib_dirs=
 d='$5'
-for i in $d; do
+for i in $d /usr; do
 	header_dirs="$header_dirs $i/include"
 	lib_dirs="$lib_dirs $i/lib$abilibdirext"
 done
@@ -72,6 +72,7 @@
 if test "$ires" -a "$lres" -a "$with_$1" != "no"; then
 	$1_includedir="$ires"
 	$1_libdir="$lres"
+	DIR_$1=
 	INCLUDE_$1="-I$$1_includedir"
 	LIB_$1="-L$$1_libdir $3"
 	m4_ifval([$6],
@@ -80,6 +81,7 @@
 	with_$1=yes
 	AC_MSG_RESULT([headers $ires, libraries $lres])
 else
+	DIR_$1=
 	INCLUDE_$1=
 	LIB_$1=
 	with_$1=no
@@ -88,6 +90,7 @@
 dnl m4_ifval([$6],
 dnl 	AM_CONDITIONAL($6, test "$with_$1" = yes)
 dnl 	AM_CONDITIONAL(upcase($1), test "$with_$1" = yes))
+AC_SUBST(DIR_$1)
 AC_SUBST(INCLUDE_$1)
 AC_SUBST(LIB_$1)
 ])
diff -ruN heimdal-0.4e-old/configure.in heimdal-0.4e/configure.in
--- heimdal-0.4e-old/configure.in	Fri Apr 19 09:22:39 2002
+++ heimdal-0.4e/configure.in	Mon Apr 22 18:16:24 2002
@@ -72,9 +72,10 @@
 
 rk_DB
 
-dnl AC_ROKEN(10,[/usr/heimdal /usr/athena],[lib/roken],[$(top_builddir)/lib/roken/libroken.la],[-I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken])
-
-rk_ROKEN(lib/roken)
+AC_ROKEN(10,[/usr/heimdal /usr/athena],[lib/roken],[$(top_builddir)/lib/roken/libroken.la],[-I$(top_builddir)/lib/roken -I$(top_srcdir)/lib/roken])
+if ! test "$roken_installed" = yes; then
+	rk_ROKEN(lib/roken)
+fi
 LIB_roken="\$(top_builddir)/lib/vers/libvers.la $LIB_roken"
 
 AC_TEST_PACKAGE_NEW(openldap,
@@ -213,6 +214,26 @@
  #include <readline.h>],-lreadline,,, READLINE)
 
 AC_TEST_PACKAGE_NEW(hesiod,[#include <hesiod.h>],-lhesiod,,, HESIOD)
+
+AC_TEST_PACKAGE_NEW(sl,,-lsl,,,SL)
+if ! test "$with_sl" = yes; then
+	DIR_sl="sl"
+	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
+fi
+AC_TEST_PACKAGE_NEW(ss,,-lss,,,SS)
+if ! test "$with_sl" = yes; then
+	DIR_sl="sl"
+	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
+	DIR_ss=""
+	LIB_ss='$(top_builddir)/lib/sl/libss.la'
+fi
+if test "$otp" = "yes"; then
+  AC_TEST_PACKAGE_NEW(otp,,-lotp,,,OTP)
+  if ! test "$with_otp" = yes; then
+	DIR_otp="otp"
+	LIB_otp='$(top_builddir)/lib/otp/libotp.la'
+  fi
+fi
 
 KRB_C_BIGENDIAN
 AC_C_INLINE
diff -ruN heimdal-0.4e-old/include/config.h.in heimdal-0.4e/include/config.h.in
--- heimdal-0.4e-old/include/config.h.in	Thu Sep  6 22:39:55 2001
+++ heimdal-0.4e/include/config.h.in	Mon Apr 22 18:06:07 2002
@@ -2,7 +2,7 @@
 
 #ifndef RCSID
 #define RCSID(msg) \
-static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
+static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #endif
 
 #undef BINDIR 
@@ -1258,7 +1258,7 @@
 #endif
 
 #define RCSID(msg) \
-static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
+static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 
 #undef PROTOTYPES
 
diff -ruN heimdal-0.4e-old/kadmin/Makefile.am heimdal-0.4e/kadmin/Makefile.am
--- heimdal-0.4e-old/kadmin/Makefile.am	Tue Aug 28 18:31:26 2001
+++ heimdal-0.4e/kadmin/Makefile.am	Mon Apr 22 17:20:22 2002
@@ -62,7 +62,7 @@
 kadmin_LDADD = \
 	$(top_builddir)/lib/kadm5/libkadm5clnt.la \
 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
-	$(top_builddir)/lib/sl/libsl.la \
+	$(LIB_sl) \
 	$(LIB_readline) \
 	$(LDADD_common) \
 	$(LIB_dlopen)
diff -ruN heimdal-0.4e-old/lib/Makefile.am heimdal-0.4e/lib/Makefile.am
--- heimdal-0.4e-old/lib/Makefile.am	Wed Aug 29 04:44:41 2001
+++ heimdal-0.4e/lib/Makefile.am	Mon Apr 22 18:17:53 2002
@@ -5,12 +5,9 @@
 if KRB4
 dir_45 = 45
 endif
-if OTP
-dir_otp = otp
-endif
 if DCE
 dir_dce = kdfs
 endif
 
-SUBDIRS = @DIR_roken@ vers editline @DIR_com_err@ sl asn1 @DIR_des@ krb5 \
-	kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
+SUBDIRS = @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_sl@ asn1 @DIR_des@ krb5 \
+	kafs hdb kadm5 gssapi auth $(dir_45) @DIR_otp@ $(dir_dce)
diff -ruN heimdal-0.4e-old/lib/asn1/Makefile.am heimdal-0.4e/lib/asn1/Makefile.am
--- heimdal-0.4e-old/lib/asn1/Makefile.am	Fri Apr 19 09:22:39 2002
+++ heimdal-0.4e/lib/asn1/Makefile.am	Mon Apr 22 17:50:34 2002
@@ -7,7 +7,7 @@
 lib_LTLIBRARIES = libasn1.la
 libasn1_la_LDFLAGS = -version-info 5:0:0
 libasn1_la_LIBADD = \
-	$(top_builddir)/lib/com_err/libcom_err.la
+	$(LIB_com_err)
 
 libasn1_la_LIBADD = @LIB_com_err@
 
diff -ruN heimdal-0.4e-old/lib/auth/afskauthlib/Makefile.am heimdal-0.4e/lib/auth/afskauthlib/Makefile.am
--- heimdal-0.4e-old/lib/auth/afskauthlib/Makefile.am	Sun Jul 15 14:21:07 2001
+++ heimdal-0.4e/lib/auth/afskauthlib/Makefile.am	Mon Apr 22 17:20:54 2002
@@ -23,7 +23,7 @@
 	$(COMPILE) -c $<
 
 if KRB4
-KAFS = $(top_builddir)/lib/kafs/libkafs.la
+KAFS = $(LIB_kafs)
 endif
 
 if KRB5
@@ -33,7 +33,7 @@
 	$(top_builddir)/lib/asn1/libasn1.la	\
 	$(LIB_krb4)				\
 	$(LIB_des)				\
-	$(top_builddir)/lib/roken/libroken.la	\
+	$(LIB_roken)	\
 	-lc
 
 else
@@ -42,7 +42,7 @@
 	$(KAFS)	\
 	$(LIB_krb4)				\
 	$(LIB_des)				\
-	$(top_builddir)/lib/roken/libroken.la	\
+	$(LIB_roken)	\
 	-lc
 endif
 
diff -ruN heimdal-0.4e-old/lib/gssapi/Makefile.am heimdal-0.4e/lib/gssapi/Makefile.am
--- heimdal-0.4e-old/lib/gssapi/Makefile.am	Tue Aug 28 21:21:17 2001
+++ heimdal-0.4e/lib/gssapi/Makefile.am	Mon Apr 22 18:14:22 2002
@@ -6,7 +6,7 @@
 
 lib_LTLIBRARIES = libgssapi.la
 libgssapi_la_LDFLAGS = -version-info 3:4:2
-libgssapi_la_LIBADD  = ../krb5/libkrb5.la $(LIB_des) ../asn1/libasn1.la ../roken/libroken.la
+libgssapi_la_LIBADD  = ../krb5/libkrb5.la $(LIB_des) ../asn1/libasn1.la $(LIB_roken)
 
 include_HEADERS = gssapi.h
 
diff -ruN heimdal-0.4e-old/lib/hdb/Makefile.am heimdal-0.4e/lib/hdb/Makefile.am
--- heimdal-0.4e-old/lib/hdb/Makefile.am	Tue Aug 28 18:31:31 2001
+++ heimdal-0.4e/lib/hdb/Makefile.am	Mon Apr 22 17:59:29 2002
@@ -38,7 +38,7 @@
 
 include_HEADERS = hdb.h hdb_err.h hdb_asn1.h hdb-protos.h hdb-private.h
 
-libhdb_la_LIBADD = ../krb5/libkrb5.la ../asn1/libasn1.la ../roken/libroken.la $(LIB_openldap) $(DBLIB) $(LIB_NDBM)
+libhdb_la_LIBADD = ../krb5/libkrb5.la ../asn1/libasn1.la $(LIB_roken) $(LIB_openldap) $(DBLIB) $(LIB_NDBM)
 
 $(libhdb_la_OBJECTS): $(srcdir)/hdb-protos.h $(srcdir)/hdb-private.h
 
diff -ruN heimdal-0.4e-old/lib/kadm5/Makefile.am heimdal-0.4e/lib/kadm5/Makefile.am
--- heimdal-0.4e-old/lib/kadm5/Makefile.am	Tue Aug 28 09:00:13 2001
+++ heimdal-0.4e/lib/kadm5/Makefile.am	Mon Apr 22 18:10:38 2002
@@ -7,8 +7,8 @@
 libkadm5clnt_la_LDFLAGS = -version-info 6:2:2
 sbin_PROGRAMS = dump_log replay_log truncate_log
 
-libkadm5srv_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la ../roken/libroken.la
-libkadm5clnt_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la ../roken/libroken.la
+libkadm5srv_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la $(LIB_roken)
+libkadm5clnt_la_LIBADD = ../krb5/libkrb5.la ../hdb/libhdb.la $(LIB_roken)
 
 libexec_PROGRAMS = ipropd-master ipropd-slave
 
diff -ruN heimdal-0.4e-old/lib/kafs/Makefile.am heimdal-0.4e/lib/kafs/Makefile.am
--- heimdal-0.4e-old/lib/kafs/Makefile.am	Mon Sep  3 05:37:53 2001
+++ heimdal-0.4e/lib/kafs/Makefile.am	Mon Apr 22 18:28:48 2002
@@ -42,9 +42,9 @@
 endif # KRB4
 
 if KRB5
-libkafs_la_LIBADD = ../krb5/libkrb5.la ../roken/libroken.la $(DEPLIB_krb4)
+libkafs_la_LIBADD = ../krb5/libkrb5.la $(LIB_roken) $(DEPLIB_krb4)
 else
-libkafs_la_LIBADD = ../roken/libroken.la $(DEPLIB_krb4)
+libkafs_la_LIBADD = $(LIB_roken) $(DEPLIB_krb4)
 endif # KRB5
 
 lib_LTLIBRARIES = $(AFSLIBS)
diff -ruN heimdal-0.4e-old/lib/krb5/Makefile.am heimdal-0.4e/lib/krb5/Makefile.am
--- heimdal-0.4e-old/lib/krb5/Makefile.am	Fri Apr 19 09:22:39 2002
+++ heimdal-0.4e/lib/krb5/Makefile.am	Mon Apr 22 17:50:00 2002
@@ -15,7 +15,7 @@
 
 libkrb5_la_LIBADD = \
 	$(LIB_res_search) \
-	$(top_builddir)/lib/com_err/libcom_err.la \
+	$(LIB_com_err) \
 	$(LIB_des) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken) \
diff -ruN heimdal-0.4e-old/lib/roken/acconfig.h heimdal-0.4e/lib/roken/acconfig.h
--- heimdal-0.4e-old/lib/roken/acconfig.h	Sun Jul  9 00:22:08 2000
+++ heimdal-0.4e/lib/roken/acconfig.h	Mon Apr 22 18:24:01 2002
@@ -12,7 +12,7 @@
 #endif
 
 #define RCSID(msg) \
-static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
+static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 
 #undef PROTOTYPES

Prev by Date: Re: KDC connections
Next by Date: RE: KDC connections
Prev by thread: RE: KDC connections
Next by thread: su problems
Index(es):
- Date
- Thread