Re: timeval.lo compile problems with heimdal-0.2r

[Assar Westerlund <assar@sics.se>]

Erland Lewin <erl@voxi.com> writes:
> I'm having problems building heimdal-0.2r under Linux 2.2.14.
> 
> configured with --enable-shared --enable-kaserver
> 
> /usr/src/heimdal-0.2r/lib/roken/timeval.c:51: multiple definition of 
> &pi0;timevalfix'

Yeah, there was a duplicate timeval in lib/roken/Makefile.am which
sometimes but not always causes a problem.  The appended patch should
fix the problem

/assar

diff -ruw heimdal-0.2r/lib/roken/Makefile.am heimdal-0.2r-guld/lib/roken/Makefile.am
--- heimdal-0.2r/lib/roken/Makefile.am	Mon Apr  3 02:13:52 2000
+++ heimdal-0.2r-guld/lib/roken/Makefile.am	Sun Apr 16 05:32:42 2000
@@ -62,7 +62,6 @@
 	strcollect.c		\
 	timeval.c		\
 	tm2time.c		\
-	timeval.c		\
 	verify.c		\
 	warnerr.c		\
 	xdbm.h
diff -ruw heimdal-0.2r/lib/roken/Makefile.in heimdal-0.2r-guld/lib/roken/Makefile.in
--- heimdal-0.2r/lib/roken/Makefile.in	Mon Apr  3 04:22:14 2000
+++ heimdal-0.2r-guld/lib/roken/Makefile.in	Sun Apr 16 05:34:02 2000
@@ -193,7 +193,7 @@
 
 @KRB4_TRUE@@KRB5_TRUE@make_print_version_LDADD =  $(LIB_krb4) -ldes
 
-libroken_la_SOURCES =  	base64.c			concat.c			emalloc.c			eread.c				erealloc.c			estrdup.c			ewrite.c			getaddrinfo_hostspec.c		get_default_username.c		get_window_size.c		getarg.c			getnameinfo_verified.c		issuid.c			k_getpwnam.c			k_getpwuid.c			mini_inetd.c			net_read.c			net_write.c			parse_bytes.c			parse_time.c			parse_units.c			print_version.c			resolve.c			roken_gethostby.c		signal.c			simple_exec.c			snprintf.c			socket.c			strcollect.c			timeval.c			tm2time.c			timeval.c			verify.c			warnerr.c			xdbm.h
+libroken_la_SOURCES =  	base64.c			concat.c			emalloc.c			eread.c				erealloc.c			estrdup.c			ewrite.c			getaddrinfo_hostspec.c		get_default_username.c		get_window_size.c		getarg.c			getnameinfo_verified.c		issuid.c			k_getpwnam.c			k_getpwuid.c			mini_inetd.c			net_read.c			net_write.c			parse_bytes.c			parse_time.c			parse_units.c			print_version.c			resolve.c			roken_gethostby.c		signal.c			simple_exec.c			snprintf.c			socket.c			strcollect.c			timeval.c			tm2time.c			verify.c			warnerr.c			xdbm.h
 
 
 EXTRA_libroken_la_SOURCES =  	chown.c				copyhostent.c			daemon.c			err.c				err.h				errx.c				fchown.c			flock.c				fnmatch.c			fnmatch.h			freeaddrinfo.c			freehostent.c			gai_strerror.c			getaddrinfo.c			getdtablesize.c			getegid.c			geteuid.c			getgid.c			gethostname.c			getipnodebyaddr.c		getipnodebyname.c		getnameinfo.c			getopt.c			gettimeofday.c			getuid.c			getusershell.c			glob.h				hstrerror.c			inet_aton.c			inet_ntop.c			inet_pton.c			initgroups.c			innetgr.c			iruserok.c			lstat.c				memmove.c			mkstemp.c			putenv.c			rcmd.c				readv.c				recvmsg.c			sendmsg.c			setegid.c			setenv.c			seteuid.c			strcasecmp.c			strdup.c			strerror.c			strftime.c			strlcat.c			strlcpy.c			strlwr.c			strncasecmp.c			strndup.c			strnlen.c			strptime.c			strsep.c			strtok_r.c			strupr.c			swab.c				unsetenv.c			verr.c				verrx.c				vsyslog.c			vwarn.c				vwarnx.c			warn.c				warnx.c				writev.c
@@ -236,7 +236,7 @@
 mini_inetd.lo net_read.lo net_write.lo parse_bytes.lo parse_time.lo \
 parse_units.lo print_version.lo resolve.lo roken_gethostby.lo signal.lo \
 simple_exec.lo snprintf.lo socket.lo strcollect.lo timeval.lo \
-tm2time.lo timeval.lo verify.lo warnerr.lo
+tm2time.lo verify.lo warnerr.lo
 check_PROGRAMS =  parse_bytes-test$(EXEEXT) strpftime-test$(EXEEXT) \
 getaddrinfo-test$(EXEEXT) snprintf-test$(EXEEXT)
 noinst_PROGRAMS =  make-roken$(EXEEXT) make-print-version$(EXEEXT)