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

my changes to date



Not included:

a) xnlock.man has a bad extension, it should be xnlock.1

b) libss and libcom_err still conflicts with built in version. I have
disabled the configure code (although it is still there) to fix these
problems because of incompatibilities between the libraries.

c) in the future, I might rename krb-sl.m4 (+ etc) to krb-ss.m4, but
will await replies to my previous E-Mail first.

What is included:

a) readline is used instead of edit line if available

b) other important patches which have appeared on this mailing list.

Index: configure.in
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/configure.in,v
retrieving revision 1.1.1.20
retrieving revision 1.2
diff -c -r1.1.1.20 -r1.2
*** configure.in	2000/10/01 23:00:58	1.1.1.20
--- configure.in	2000/11/08 08:30:06	1.2
***************
*** 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(sl,
+ [#include <et/com_err.h>],-lsl,,, SL)
+ 
  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_SL
  
  dnl telnet muck --------------------------------------------------
  
Index: admin/Makefile.am
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/admin/Makefile.am,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -c -r1.1.1.2 -r1.2
*** admin/Makefile.am	2000/01/07 23:55:16	1.1.1.2
--- admin/Makefile.am	2000/11/08 08:30:10	1.2
***************
*** 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_sl@ \
  	$(LIB_readline) \
  	$(LIB_roken)
Index: appl/ftp/ftp/ftp_var.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftp/ftp_var.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -c -r1.1.1.2 -r1.2
*** appl/ftp/ftp/ftp_var.h	2000/07/31 03:16:33	1.1.1.2
--- appl/ftp/ftp/ftp_var.h	2000/10/04 23:06:57	1.2
***************
*** 52,57 ****
--- 52,58 ----
  extern int	connected;		/* connected to server */
  extern int	fromatty;		/* input is from a terminal */
  extern int	interactive;		/* interactively prompt on m* cmds */
+ extern int	lineedit;		/* use line-editing */
  extern int	debug;			/* debugging level */
  extern int	bell;			/* ring bell on cmd completion */
  extern int	doglob;			/* glob local file names */
Index: appl/ftp/ftp/globals.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftp/globals.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -c -r1.1.1.2 -r1.2
*** appl/ftp/ftp/globals.c	2000/07/31 03:16:33	1.1.1.2
--- appl/ftp/ftp/globals.c	2000/10/04 23:06:57	1.2
***************
*** 11,16 ****
--- 11,17 ----
  int	connected;		/* connected to server */
  int	fromatty;		/* input is from a terminal */
  int	interactive;		/* interactively prompt on m* cmds */
+ int	lineedit;		/* use line-editing */
  int	debug;			/* debugging level */
  int	bell;			/* ring bell on cmd completion */
  int	doglob;			/* glob local file names */
Index: appl/ftp/ftp/main.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftp/main.c,v
retrieving revision 1.1.1.4
retrieving revision 1.3
diff -c -r1.1.1.4 -r1.3
*** appl/ftp/ftp/main.c	2000/07/31 03:16:33	1.1.1.4
--- appl/ftp/ftp/main.c	2000/10/04 23:06:57	1.3
***************
*** 36,42 ****
   */
  
  #include "ftp_locl.h"
! RCSID("$Id: main.c,v 1.28 2000/06/21 02:46:10 assar Exp $");
  
  int
  main(int argc, char **argv)
--- 36,42 ----
   */
  
  #include "ftp_locl.h"
! RCSID("$Id: main.c,v 1.29 2000/10/04 06:08:54 assar Exp $");
  
  int
  main(int argc, char **argv)
***************
*** 54,63 ****
  	doglob = 1;
  	interactive = 1;
  	autologin = 1;
  	passivemode = 0; /* passive mode not active */
          use_kerberos = 1;
  
! 	while ((ch = getopt(argc, argv, "dginptvK")) != -1) {
  		switch (ch) {
  		case 'd':
  			options |= SO_DEBUG;
--- 54,64 ----
  	doglob = 1;
  	interactive = 1;
  	autologin = 1;
+ 	lineedit = 1;
  	passivemode = 0; /* passive mode not active */
          use_kerberos = 1;
  
! 	while ((ch = getopt(argc, argv, "dgilnptvK")) != -1) {
  		switch (ch) {
  		case 'd':
  			options |= SO_DEBUG;
***************
*** 72,77 ****
--- 73,81 ----
  			interactive = 0;
  			break;
  
+ 		case 'l':
+ 			lineedit = 0;
+ 			break;
  		case 'n':
  			autologin = 0;
  			break;
***************
*** 94,100 ****
  
  		default:
  		    fprintf(stderr,
!                             "usage: ftp [-dginptvK] [host [port]]\n");
  		    exit(1);
  		}
  	}
--- 98,104 ----
  
  		default:
  		    fprintf(stderr,
!                             "usage: ftp [-dgilnptvK] [host [port]]\n");
  		    exit(1);
  		}
  	}
***************
*** 206,215 ****
  }
  */
  
- #ifndef HAVE_READLINE
- 
  static char *
! readline(char *prompt)
  {
      char buf[BUFSIZ];
      printf ("%s", prompt);
--- 210,217 ----
  }
  */
  
  static char *
! simple_readline(char *prompt)
  {
      char buf[BUFSIZ];
      printf ("%s", prompt);
***************
*** 221,226 ****
--- 223,236 ----
      return strdup(buf);
  }
  
+ #ifndef HAVE_READLINE
+ 
+ static char *
+ readline(char *prompt)
+ {
+     return simple_readline (prompt);
+ }
+ 
  static void
  add_history(char *p)
  {
***************
*** 249,258 ****
      for (;;) {
  	if (fromatty) {
  	    char *p;
  	    p = readline("ftp> ");
! 	    if(p == NULL)
  		quit(0, 0);
  	    strlcpy(line, p, sizeof(line));
  	    add_history(p);
  	    free(p);
  	} else{
--- 259,274 ----
      for (;;) {
  	if (fromatty) {
  	    char *p;
+ 	    if (lineedit)
  	    p = readline("ftp> ");
! 	    else
! 		p = simple_readline("ftp> ");
! 	    if(p == NULL) {
! 		printf("\n");
  		quit(0, 0);
+ 	    }
  	    strlcpy(line, p, sizeof(line));
+ 	    if (lineedit)
  	    add_history(p);
  	    free(p);
  	} else{
Index: appl/ftp/ftp/security.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftp/security.c,v
retrieving revision 1.1.1.7
retrieving revision 1.3
diff -c -r1.1.1.7 -r1.3
*** appl/ftp/ftp/security.c	2000/02/16 02:38:56	1.1.1.7
--- appl/ftp/ftp/security.c	2000/11/08 06:27:32	1.3
***************
*** 237,243 ****
  	ret = sec_get_data(fd, &in_buffer, data_prot);
  	if (ret < 0)
  	    return -1;
! 	if(ret == 0 || in_buffer.size == 0) {
  	    if(rx)
  		in_buffer.eof_flag = 1;
  	    return rx;
--- 237,243 ----
  	ret = sec_get_data(fd, &in_buffer, data_prot);
  	if (ret < 0)
  	    return -1;
! 	if(ret == 0 && in_buffer.size == 0) {
  	    if(rx)
  		in_buffer.eof_flag = 1;
  	    return rx;
Index: appl/popper/pop_pass.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/popper/pop_pass.c,v
retrieving revision 1.1.1.3
retrieving revision 1.5
diff -c -r1.1.1.3 -r1.5
*** appl/popper/pop_pass.c	2000/05/19 05:23:42	1.1.1.3
--- appl/popper/pop_pass.c	2000/05/19 05:33:06	1.5
***************
*** 197,203 ****
  	    p->ipaddr, p->user);
  
      /*  Build the name of the user's maildrop */
!     snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
  
      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
  	/*  Make a temporary copy of the user's maildrop */
--- 197,218 ----
  	    p->ipaddr, p->user);
  
      /*  Build the name of the user's maildrop */
! 
!     /* Try ~/Maildir */
!     if (pw->pw_dir != NULL)
! 	{
!         snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Maildir");
! 	}
!     if(pw->pw_dir != NULL && stat(p->drop_name, &st) < 0)
! 	{
!     	/* else try ~/Mailbox */
! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", pw->pw_dir, "Mailbox");
! 	}
!     if(pw->pw_dir == NULL || stat(p->drop_name, &st) < 0)
! 	{
!     	/* else try /var/spool/mail/userid */
! 	snprintf(p->drop_name, sizeof(p->drop_name), "%s/%s", POP_MAILDIR, p->user);
! 	}
  
      if(stat(p->drop_name, &st) < 0 || !S_ISDIR(st.st_mode)){
  	/*  Make a temporary copy of the user's maildrop */
Index: cf/Makefile.am.common
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/cf/Makefile.am.common,v
retrieving revision 1.1.1.7
retrieving revision 1.2
diff -c -r1.1.1.7 -r1.2
*** cf/Makefile.am.common	2000/08/29 23:48:03	1.1.1.7
--- cf/Makefile.am.common	2000/11/08 08:30:13	1.2
***************
*** 10,16 ****
  
  CP	= cp
  
! COMPILE_ET = $(top_builddir)/lib/com_err/compile_et
  
  ## set build_HEADERZ to headers that should just be installed in build tree
  
--- 10,16 ----
  
  CP	= cp
  
! COMPILE_ET = @COMPILE_ET@
  
  ## set build_HEADERZ to headers that should just be installed in build tree
  
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
--- /tmp/bam/cvsebhzvb	Wed Nov  8 19:50:28 2000
***************
*** 0 ****
--- 1,35 ----
+ 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
+ 	COMPILE_ET='compile_et'
+ #elif test "$ac_cv_func_com_err" = yes; then
+ #	COMPILE_ET='compile_et'
+ else
+ 	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
+ 	DIR_com_err="com_err"
+ 	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
+ fi
+ 
+ if true; then
+ #	!FIXME! why doesn't built in version on com_err work?
+ 	COMPILE_ET='$(top_builddir)/lib/com_err/compile_et'
+ 	DIR_com_err="com_err"
+ 	LIB_com_err='$(top_builddir)/lib/com_err/libcom_err.la'
+ fi
+ 
+ #if test "$com_err_libdir"; then
+ #	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
+ 
+ ])
+ AC_SUBST(COMPILE_ET)
Index: cf/krb-readline.m4
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/cf/krb-readline.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.3
diff -c -r1.1.1.1 -r1.3
*** cf/krb-readline.m4	2000/07/31 03:16:55	1.1.1.1
--- cf/krb-readline.m4	2000/11/08 08:30:13	1.3
***************
*** 27,42 ****
  	:
  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
! 	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
--- 27,44 ----
  	:
  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
! #	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
  
! ])
Index: cf/krb-sl.m4
===================================================================
RCS file: krb-sl.m4
diff -N krb-sl.m4
*** /dev/null	Thu May 18 18:17:41 2000
--- /tmp/bam/cvsfYImhz	Wed Nov  8 19:50:28 2000
***************
*** 0 ****
--- 1,25 ----
+ dnl
+ dnl Tests for readline functions
+ dnl
+ 
+ dnl el_init
+ 
+ AC_DEFUN(KRB_SL,[
+ dnl com_err
+ 
+ ac_foo=no
+ if test "$with_sl" = yes; then
+ 	:
+ #elif test "$ac_cv_func_sl" = yes; then
+ #	:
+ else
+ 	DIR_sl="sl"
+ 	LIB_sl='$(top_builddir)/lib/sl/libsl.la'
+ fi
+ #if test "$sl_libdir"; then
+ #	LIB_sl="-rpath $sl_libdir $LIB_sl"
+ #fi
+ AC_DEFINE(HAVE_SL, 1, 
+ 	[Define if you have a sl 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
retrieving revision 1.2
diff -c -r1.1.1.2 -r1.2
*** cf/test-package.m4	2000/07/31 03:16:55	1.1.1.2
--- cf/test-package.m4	2000/11/08 08:30:13	1.2
***************
*** 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
retrieving revision 1.2
diff -c -r1.1.1.8 -r1.2
*** kadmin/Makefile.am	2000/10/01 23:01:08	1.1.1.8
--- kadmin/Makefile.am	2000/11/08 08:30:13	1.2
***************
*** 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_sl@ \
  	$(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
retrieving revision 1.2
diff -c -r1.1.1.2 -r1.2
*** lib/Makefile.am	2000/07/31 03:16:41	1.1.1.2
--- lib/Makefile.am	2000/11/08 08:30:14	1.2
***************
*** 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_sl@ 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
retrieving revision 1.2
diff -c -r1.1.1.9 -r1.2
*** lib/asn1/Makefile.am	2000/07/31 03:16:41	1.1.1.9
--- lib/asn1/Makefile.am	2000/11/08 08:30:14	1.2
***************
*** 82,92 ****
  	$(BUILT_SOURCES)
  
  asn1_compile_LDADD = \
! 	$(LIB_roken) $(LEXLIB)
  
  check_der_LDADD = \
  	libasn1.la \
! 	../com_err/libcom_err.la \
  	$(LIB_roken)
  
  asn1_print_LDADD = $(check_der_LDADD)
--- 82,92 ----
  	$(BUILT_SOURCES)
  
  asn1_compile_LDADD = \
!         $(LIB_roken) $(LEXLIB)
  
  check_der_LDADD = \
  	libasn1.la \
! 	@LIB_com_err@ \
  	$(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
retrieving revision 1.2
diff -c -r1.1.1.3 -r1.2
*** lib/auth/sia/Makefile.am	2000/08/29 23:48:01	1.1.1.3
--- lib/auth/sia/Makefile.am	2000/11/08 08:30:14	1.2
***************
*** 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_sl@
  	$(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_sl@
  	$(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
  
Index: lib/roken/Makefile.am
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/Makefile.am,v
retrieving revision 1.1.1.18
retrieving revision 1.7
diff -c -r1.1.1.18 -r1.7
*** lib/roken/Makefile.am	2000/08/29 23:47:55	1.1.1.18
--- lib/roken/Makefile.am	2000/11/08 08:30:16	1.7
***************
*** 155,161 ****
  	parse_bytes.h parse_time.h parse_units.h	\
  	resolve.h roken-common.h		\
  	$(err_h) $(fnmatch_h) $(glob_h) rtbl.h xdbm.h
! nodist_include_HEADERS = roken.h
  
  if have_err_h
  err_h =
--- 155,161 ----
  	parse_bytes.h parse_time.h parse_units.h	\
  	resolve.h roken-common.h		\
  	$(err_h) $(fnmatch_h) $(glob_h) rtbl.h xdbm.h
! #!#nodist_include_HEADERS = roken.h
  
  if have_err_h
  err_h =
-- 
Brian May <bam@snoopy.apana.org.au>