[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
patches to use installed shared libraries
I have updated my patches (designed to use the existing versions of
libreadline, libcom_err, and libss, without installing replacements),
and now got everything working, up and past configure:
make[3]: Entering directory `/homes/bam/build/heimdal/lib/roken'
cd ../.. && automake --foreign lib/roken/Makefile
lib/roken/Makefile.am:12: library used but `LIBTOOL' not defined in `configure.in'
lib/roken/Makefile.am:158: invalid variable `nodist_include_HEADERS'
lib/roken/Makefile.am:17: invalid unused variable name: `nodist_make_roken_SOURCES'
not sure why it is complaining about libtool, but chances are I need a
newer version of automake :-(
The patches (including the existing patch to make libeditline libtool
controlled) are below - I would appreciate it if anyone could test
these...
Index: configure.in
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/configure.in,v
retrieving revision 1.1.1.20
diff -c -r1.1.1.20 configure.in
*** configure.in 2000/10/01 23:00:58 1.1.1.20
--- configure.in 2000/10/25 00:19:29
***************
*** 226,231 ****
--- 226,237 ----
[#include <stdio.h>
#include <readline.h>],-lreadline,,, READLINE)
+ AC_TEST_PACKAGE_NEW(com_err,
+ [#include <et/com_err.h>],-lcom_err,,, COM_ERR)
+
+ AC_TEST_PACKAGE_NEW(ss,
+ [#include <et/com_err.h>],-lss,,, SS)
+
AC_TEST_PACKAGE_NEW(hesiod,[#include <hesiod.h>],-lhesiod,,, HESIOD)
KRB_C_BIGENDIAN
***************
*** 553,558 ****
--- 559,566 ----
AC_FIND_FUNC_NO_LIBS(des_cbc_encrypt, crypto des)
KRB_READLINE
+ KRB_COM_ERR
+ KRB_SS
dnl telnet muck --------------------------------------------------
Index: admin/Makefile.am
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/admin/Makefile.am,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 Makefile.am
*** admin/Makefile.am 2000/01/07 23:55:16 1.1.1.2
--- admin/Makefile.am 2000/10/24 23:42:55
***************
*** 24,29 ****
$(top_builddir)/lib/krb5/libkrb5.la \
$(top_builddir)/lib/des/libdes.la \
$(top_builddir)/lib/asn1/libasn1.la \
! $(top_builddir)/lib/sl/libsl.la \
$(LIB_readline) \
$(LIB_roken)
--- 24,29 ----
$(top_builddir)/lib/krb5/libkrb5.la \
$(top_builddir)/lib/des/libdes.la \
$(top_builddir)/lib/asn1/libasn1.la \
! $(LIB_ss) \
$(LIB_readline) \
$(LIB_roken)
Index: cf/krb-com_err.m4
===================================================================
RCS file: krb-com_err.m4
diff -N krb-com_err.m4
*** /dev/null Thu May 18 18:17:41 2000
--- krb-com_err.m4 Wed Oct 25 09:28:56 2000
***************
*** 0 ****
--- 1,25 ----
+ dnl
+ dnl Tests for readline functions
+ dnl
+
+ dnl el_init
+
+ AC_DEFUN(KRB_COM_ERR,[
+ dnl com_err
+
+ ac_foo=no
+ if test "$with_com_err" = yes; then
+ :
+ elif test "$ac_cv_func_com_err" = yes; then
+ :
+ else
+ LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
+ fi
+ if test "$com_err_libdir"; then
+ DIR_com_err="com_err sl"
+ LIB_com_err="-rpath $com_err_libdir $LIB_com_err"
+ fi
+ AC_DEFINE(HAVE_COM_ERR, 1,
+ [Define if you have a com_err compatible library.])dnl
+
+ ])
Index: cf/krb-readline.m4
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/cf/krb-readline.m4,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 krb-readline.m4
*** cf/krb-readline.m4 2000/07/31 03:16:55 1.1.1.1
--- cf/krb-readline.m4 2000/10/24 22:18:00
***************
*** 27,35 ****
:
elif test "$ac_cv_func_el_init" = yes; then
ac_foo=yes
LIB_readline="\$(top_builddir)/lib/editline/libel_compat.a $LIB_el_init"
else
! LIB_readline='$(top_builddir)/lib/editline/libeditline.a'
fi
AM_CONDITIONAL(el_compat, test "$ac_foo" = yes)
if test "$readline_libdir"; then
--- 27,37 ----
:
elif test "$ac_cv_func_el_init" = yes; then
ac_foo=yes
+ DIR_readline="editline"
LIB_readline="\$(top_builddir)/lib/editline/libel_compat.a $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
***************
*** 39,42 ****
AC_DEFINE(HAVE_READLINE, 1,
[Define if you have a readline compatible library.])dnl
! ])
\ No newline at end of file
--- 41,44 ----
AC_DEFINE(HAVE_READLINE, 1,
[Define if you have a readline compatible library.])dnl
! ])
Index: cf/krb-ss.m4
===================================================================
RCS file: krb-ss.m4
diff -N krb-ss.m4
*** /dev/null Thu May 18 18:17:41 2000
--- krb-ss.m4 Wed Oct 25 10:41:56 2000
***************
*** 0 ****
--- 1,25 ----
+ dnl
+ dnl Tests for readline functions
+ dnl
+
+ dnl el_init
+
+ AC_DEFUN(KRB_SS,[
+ dnl com_err
+
+ ac_foo=no
+ if test "$with_com_err" = yes; then
+ :
+ elif test "$ac_cv_func_com_err" = yes; then
+ :
+ else
+ LIB_ss='$(top_builddir)/lib/sl/libss.la'
+ fi
+ if test "$com_err_libdir"; then
+ DIR_ss="sl"
+ LIB_ss="-rpath $ss_libdir $LIB_ss"
+ fi
+ AC_DEFINE(HAVE_SS, 1,
+ [Define if you have a com_err compatible library.])dnl
+
+ ])
Index: cf/test-package.m4
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/cf/test-package.m4,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 test-package.m4
*** cf/test-package.m4 2000/07/31 03:16:55 1.1.1.2
--- cf/test-package.m4 2000/10/24 23:10:32
***************
*** 2,8 ****
dnl
dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
! AC_DEFUN(AC_TEST_PACKAGE,[AC_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
AC_DEFUN(AC_TEST_PACKAGE_NEW,[
AC_ARG_WITH($1,
--- 2,8 ----
dnl
dnl AC_TEST_PACKAGE_NEW(package,headers,libraries,extra libs,default locations, conditional)
! AC_DEFUN(AC_TEST_PACKAGE,[MY_TEST_PACKAGE_NEW($1,[#include <$2>],$4,,$5)])
AC_DEFUN(AC_TEST_PACKAGE_NEW,[
AC_ARG_WITH($1,
***************
*** 39,45 ****
header_dirs=
lib_dirs=
d='$5'
! for i in $d; do
header_dirs="$header_dirs $i/include"
lib_dirs="$lib_dirs $i/lib$abilibdirext"
done
--- 39,45 ----
header_dirs=
lib_dirs=
d='$5'
! for i in $d /usr; do
header_dirs="$header_dirs $i/include"
lib_dirs="$lib_dirs $i/lib$abilibdirext"
done
***************
*** 72,77 ****
--- 72,78 ----
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"
ifval([$6],
***************
*** 80,85 ****
--- 81,87 ----
with_$1=yes
AC_MSG_RESULT([headers $ires, libraries $lres])
else
+ DIR_$1="$1"
INCLUDE_$1=
LIB_$1=
with_$1=no
***************
*** 88,93 ****
--- 90,96 ----
dnl 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)
])
Index: kadmin/Makefile.am
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/kadmin/Makefile.am,v
retrieving revision 1.1.1.8
diff -c -r1.1.1.8 Makefile.am
*** kadmin/Makefile.am 2000/10/01 23:01:08 1.1.1.8
--- kadmin/Makefile.am 2000/10/24 23:43:06
***************
*** 62,68 ****
kadmin_LDADD = \
$(top_builddir)/lib/kadm5/libkadm5clnt.la \
$(top_builddir)/lib/kadm5/libkadm5srv.la \
! $(top_builddir)/lib/sl/libsl.la \
$(LIB_readline) \
$(COMMON_LDADD) \
$(LIB_dlopen)
--- 62,68 ----
kadmin_LDADD = \
$(top_builddir)/lib/kadm5/libkadm5clnt.la \
$(top_builddir)/lib/kadm5/libkadm5srv.la \
! $(LIB_ss) \
$(LIB_readline) \
$(COMMON_LDADD) \
$(LIB_dlopen)
Index: lib/Makefile.am
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/Makefile.am,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 Makefile.am
*** lib/Makefile.am 2000/07/31 03:16:41 1.1.1.2
--- lib/Makefile.am 2000/10/24 22:29:18
***************
*** 12,16 ****
dir_dce = kdfs
endif
! SUBDIRS = @DIR_roken@ vers editline com_err sl asn1 des krb5 \
kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
--- 12,16 ----
dir_dce = kdfs
endif
! SUBDIRS = @DIR_roken@ vers @DIR_readline@ @DIR_com_err@ @DIR_ss@ asn1 des krb5 \
kafs hdb kadm5 gssapi auth $(dir_45) $(dir_otp) $(dir_dce)
Index: lib/asn1/Makefile.am
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/asn1/Makefile.am,v
retrieving revision 1.1.1.9
diff -c -r1.1.1.9 Makefile.am
*** lib/asn1/Makefile.am 2000/07/31 03:16:41 1.1.1.9
--- lib/asn1/Makefile.am 2000/10/24 23:43:53
***************
*** 86,92 ****
check_der_LDADD = \
libasn1.la \
! ../com_err/libcom_err.la \
$(LIB_roken)
asn1_print_LDADD = $(check_der_LDADD)
--- 86,92 ----
check_der_LDADD = \
libasn1.la \
! $(LIB_ss) \
$(LIB_roken)
asn1_print_LDADD = $(check_der_LDADD)
Index: lib/auth/sia/Makefile.am
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/auth/sia/Makefile.am,v
retrieving revision 1.1.1.3
diff -c -r1.1.1.3 Makefile.am
*** lib/auth/sia/Makefile.am 2000/08/29 23:48:01 1.1.1.3
--- lib/auth/sia/Makefile.am 2000/10/24 23:43:29
***************
*** 23,29 ****
$(top_builddir)/lib/asn1/.libs/libasn1.a \
$(LIB_krb4) \
$(top_builddir)/lib/des/.libs/libdes.a \
! $(top_builddir)/lib/com_err/.libs/libcom_err.a \
$(top_builddir)/lib/roken/.libs/libroken.a \
$(LIB_getpwnam_r) \
-lc
--- 23,29 ----
$(top_builddir)/lib/asn1/.libs/libasn1.a \
$(LIB_krb4) \
$(top_builddir)/lib/des/.libs/libdes.a \
! $(LIB_ss)
$(top_builddir)/lib/roken/.libs/libroken.a \
$(LIB_getpwnam_r) \
-lc
***************
*** 34,40 ****
$(top_builddir)/lib/asn1/.libs/libasn1.so \
$(LIB_krb4) \
$(top_builddir)/lib/des/.libs/libdes.so \
! $(top_builddir)/lib/com_err/.libs/libcom_err.so \
$(top_builddir)/lib/roken/.libs/libroken.so \
$(LIB_getpwnam_r) \
-lc
--- 34,40 ----
$(top_builddir)/lib/asn1/.libs/libasn1.so \
$(LIB_krb4) \
$(top_builddir)/lib/des/.libs/libdes.so \
! $(LIB_ss)
$(top_builddir)/lib/roken/.libs/libroken.so \
$(LIB_getpwnam_r) \
-lc
Index: lib/editline/Makefile.am
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/editline/Makefile.am,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -c -r1.1.1.2 -r1.2
*** lib/editline/Makefile.am 1999/08/06 00:12:42 1.1.1.2
--- lib/editline/Makefile.am 2000/10/08 22:21:05 1.2
***************
*** 4,10 ****
man_MANS = editline.3
! lib_LIBRARIES = libeditline.a
if el_compat
noinst_LIBRARIES = libel_compat.a
else
--- 4,11 ----
man_MANS = editline.3
! lib_LTLIBRARIES = libeditline.la
! libeditline_la_LDFLAGS = -static
if el_compat
noinst_LIBRARIES = libel_compat.a
else
***************
*** 16,28 ****
CHECK_LOCAL =
testit_LDADD = \
! libeditline.a \
$(LIB_tgetent) \
$(LIB_roken)
include_HEADERS = editline.h
! libeditline_a_SOURCES = complete.c editline.c sysunix.c \
editline.h roken_rename.h unix.h
libel_compat_a_SOURCES = edit_compat.c
--- 17,29 ----
CHECK_LOCAL =
testit_LDADD = \
! libeditline.la \
$(LIB_tgetent) \
$(LIB_roken)
include_HEADERS = editline.h
! libeditline_la_SOURCES = complete.c editline.c sysunix.c \
editline.h roken_rename.h unix.h
libel_compat_a_SOURCES = edit_compat.c
--
Brian May <bam@snoopy.apana.org.au>