build fixes for arla 0.36.1
Björn Torkelsson
torkel at acc.umu.se
Mon Jun 21 20:25:30 CEST 2004
Hi,
Some fixes to make arla build on debian unstable.
Not really sure why I have to do the LIB_roken stuff, but it was the
only way to get it to build correctly.
/torkel
diff -ur arla-0.36.1.orig/appl/amon/Makefile.in arla-0.36.1/appl/amon/Makefile.in
--- arla-0.36.1.orig/appl/amon/Makefile.in 2003-11-05 00:03:19.000000000 +0100
+++ arla-0.36.1/appl/amon/Makefile.in 2004-06-20 12:38:54.000000000 +0200
@@ -91,7 +91,7 @@
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
PROG_BIN='$(APPL_BIN)'; for x in $$PROG_BIN; do \
f=`echo $$x | sed '$(transform)'`; \
- $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
+ $(top_builddir)/libtool --mode=install $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
done ;
uninstall:
@@ -101,7 +101,7 @@
done
amon: $(AMON_OBJS) $(LIBDEPENDS)
- $(top_builddir)/libtool $(CC) $(LDFLAGS) -o $@ $(AMON_OBJS) $(LIBS) $(AMON_LIBS)
+ $(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(AMON_OBJS) $(LIBS) $(AMON_LIBS)
Makefile: Makefile.in ../../config.status
cd ../..; CONFIG_FILES=appl/amon/Makefile CONFIG_HEADERS= $(SHELL) config.status
diff -ur arla-0.36.1.orig/appl/bos/Makefile.in arla-0.36.1/appl/bos/Makefile.in
--- arla-0.36.1.orig/appl/bos/Makefile.in 2003-11-05 00:03:08.000000000 +0100
+++ arla-0.36.1/appl/bos/Makefile.in 2004-06-20 12:34:40.000000000 +0200
@@ -97,7 +97,7 @@
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
PROG_BIN='$(APPL_BIN)'; for x in $$PROG_BIN; do \
f=`echo $$x | sed '$(transform)'`; \
- $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
+ $(top_builddir)/libtool --mode=install $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
done ;\
MANPAGES='$(MANPAGES)'; for x in $$MANPAGES; do \
n=`echo $$x | sed 's/\(.*\)\.[1-9a-zA-Z]*$$/\1/'`; \
@@ -121,7 +121,7 @@
done
bos: $(BOS_OBJS) $(LIBDEPENDS)
- $(top_builddir)/libtool $(CC) $(LDFLAGS) -o $@ $(BOS_OBJS) $(LIBS)
+ $(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(BOS_OBJS) $(LIBS)
Makefile: Makefile.in ../../config.status
cd ../..; CONFIG_FILES=appl/bos/Makefile CONFIG_HEADERS= $(SHELL) config.status
diff -ur arla-0.36.1.orig/appl/fs/Makefile.in arla-0.36.1/appl/fs/Makefile.in
--- arla-0.36.1.orig/appl/fs/Makefile.in 2003-11-05 00:02:56.000000000 +0100
+++ arla-0.36.1/appl/fs/Makefile.in 2004-06-20 12:15:26.000000000 +0200
@@ -111,7 +111,7 @@
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
PROG_BIN='$(APPL_BIN)'; for x in $$PROG_BIN; do \
f=`echo $$x | sed '$(transform)'`; \
- $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
+ $(top_builddir)/libtool --mode=install $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
done ;\
$(MKINSTALLDIRS) $(DESTDIR)$(mandir) ; \
MANPAGES='$(MANPAGES)'; for x in $$MANPAGES; do \
@@ -136,7 +136,7 @@
done
fs: $(FS_OBJS) $(LIBDEPENDS)
- $(top_builddir)/libtool $(CC) $(LDFLAGS) -o $@ $(FS_OBJS) $(LIBS)
+ $(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(FS_OBJS) $(LIBS)
Makefile: Makefile.in ../../config.status
cd ../..; CONFIG_FILES=appl/fs/Makefile CONFIG_HEADERS= $(SHELL) config.status
diff -ur arla-0.36.1.orig/appl/perf/Makefile.in arla-0.36.1/appl/perf/Makefile.in
--- arla-0.36.1.orig/appl/perf/Makefile.in 2003-11-08 19:00:41.000000000 +0100
+++ arla-0.36.1/appl/perf/Makefile.in 2004-06-20 12:44:13.000000000 +0200
@@ -82,7 +82,7 @@
$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
PROG_BIN='$(APPL_BIN)'; for x in $$PROG_BIN; do \
f=`echo $$x | sed '$(transform)'`; \
- $(INSTALL_PROGRAM) $$x $(DESTDIR)$(sbindir)/$$f; \
+ $(top_builddir)/libtool --mode=install $(INSTALL_PROGRAM) $$x $(DESTDIR)$(sbindir)/$$f; \
done
uninstall:
@@ -92,7 +92,7 @@
done
afsfsperf: $(AFSFSPERF_OBJS) $(LIBDEPENDS)
- $(top_builddir)/libtool $(CC) $(LDFLAGS) -o $@ $(AFSFSPERF_OBJS) $(LIBS)
+ $(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(AFSFSPERF_OBJS) $(LIBS)
Makefile: Makefile.in ../../config.status
cd ../..; CONFIG_FILES=appl/perf/Makefile CONFIG_HEADERS= $(SHELL) config.status
diff -ur arla-0.36.1.orig/appl/vos/Makefile.in arla-0.36.1/appl/vos/Makefile.in
--- arla-0.36.1.orig/appl/vos/Makefile.in 2004-06-09 01:54:26.000000000 +0200
+++ arla-0.36.1/appl/vos/Makefile.in 2004-06-20 12:35:18.000000000 +0200
@@ -107,7 +107,7 @@
$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
PROG_BIN='$(APPL_BIN)'; for x in $$PROG_BIN; do \
f=`echo $$x | sed '$(transform)'`; \
- $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
+ $(top_builddir)/libtool --mode=install $(INSTALL_PROGRAM) $$x $(DESTDIR)$(bindir)/$$f; \
done ;\
$(MKINSTALLDIRS) $(DESTDIR)$(mandir) ; \
MANPAGES='$(MANPAGES)'; for x in $$MANPAGES; do \
@@ -132,7 +132,7 @@
done
vos: $(VOS_OBJS) $(LIBDEPENDS)
- $(top_builddir)/libtool $(CC) $(LDFLAGS) -o $@ $(VOS_OBJS) $(LIBS)
+ $(top_builddir)/libtool --mode=link $(CC) $(LDFLAGS) -o $@ $(VOS_OBJS) $(LIBS)
Makefile: Makefile.in ../../config.status
cd ../..; CONFIG_FILES=appl/vos/Makefile CONFIG_HEADERS= $(SHELL) config.status
diff -ur arla-0.36.1.orig/arlad/Makefile.in arla-0.36.1/arlad/Makefile.in
--- arla-0.36.1.orig/arlad/Makefile.in 2004-04-28 16:45:32.000000000 +0200
+++ arla-0.36.1/arlad/Makefile.in 2004-06-20 12:42:26.000000000 +0200
@@ -206,12 +206,12 @@
$(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
PROG_SBIN='$(ARLA_SBIN)'; for x in $$PROG_SBIN; do \
f=`echo $$x | sed '$(transform)'`; \
- $(INSTALL_PROGRAM) $$x $(DESTDIR)$(sbindir)/$$f; \
+ $(top_builddir)/libtool --mode=install $(INSTALL_PROGRAM) $$x $(DESTDIR)$(sbindir)/$$f; \
done ; \
$(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) ; \
PROG_LIBEXEC='$(ARLA_LIBEXEC)'; for x in $$PROG_LIBEXEC; do \
f=`echo $$x | sed '$(transform)'`; \
- $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/$$f; \
+ $(top_builddir)/libtool --mode=install $(INSTALL_PROGRAM) $$x $(DESTDIR)$(libexecdir)/$$f; \
done ; \
$(MKINSTALLDIRS) $(DESTDIR)$(mandir) ; \
MANPAGES='$(MANPAGES)'; for x in $$MANPAGES; do \
diff -ur arla-0.36.1.orig/cf/check-kerberos.m4 arla-0.36.1/cf/check-kerberos.m4
--- arla-0.36.1.orig/cf/check-kerberos.m4 2004-06-13 14:01:17.000000000 +0200
+++ arla-0.36.1/cf/check-kerberos.m4 2004-06-19 16:45:59.000000000 +0200
@@ -305,6 +305,11 @@
if test "$ac_cv_found_krb4" = "yes"; then
with_krb4=yes
+
+ if expr "x$KRB4_LIB_FLAGS" : ".*-lcrypto" > /dev/null ; then
+ AC_DEFINE(HAVE_OPENSSL, 1, [define if you have openssl])
+ fi
+
AC_DEFINE(KERBEROS, 1, [define if you have kerberos])
AC_DEFINE(HAVE_KRB4, 1, [define if you have kerberos 4])
fi
diff -ur arla-0.36.1.orig/ChangeLog arla-0.36.1/ChangeLog
--- arla-0.36.1.orig/ChangeLog 2004-06-15 11:57:15.000000000 +0200
+++ arla-0.36.1/ChangeLog 2004-06-21 20:19:42.000000000 +0200
@@ -1,3 +1,27 @@
+2004-06-21 Björn Torkelsson <torkel at acc.umu.se>
+
+ * appl/amon/Makefile.in,
+ appl/bos/Makefile.in,
+ appl/fs/Makefile.in,
+ appl/perf/Makefile.in,
+ appl/vos/Makefile.in,
+ arlad/Makefile.in,
+ include/Makefile.in,
+ rx/Makefile.in: use libtool for install
+
+ * arla-0.36.1/cf/check-kerberos.m4: define HAVE_OPENSSL if krb4
+ requires it too, not only if krb5 requires it
+
+ * arla-0.36.1/lwp/Makefile.in,
+ arla-0.36.1/rx/Makefile.in,
+ tools/release-tools/Makefile.in: make sure LIB_roken dependencies
+ are defined
+
+ * arla-0.36.1/Makefile.am.common: remove .x.c rule. already defined in
+ cf/Makefile.am.common
+
+ * tools/release-tools/Makefile.in: 1G
+
2004-06-15 Love <lha at hummel.it.su.se>
* Release 0.36.1
diff -ur arla-0.36.1.orig/include/Makefile.in arla-0.36.1/include/Makefile.in
--- arla-0.36.1.orig/include/Makefile.in 2003-03-06 20:54:36.000000000 +0100
+++ arla-0.36.1/include/Makefile.in 2004-06-20 11:11:04.000000000 +0200
@@ -76,7 +76,7 @@
done
bits: $(BITS_OBJECTS)
- $(top_builddir)/libtool $(CC) -o $@ $(BITS_OBJECTS) $(LIBS)
+ $(top_builddir)/libtool --mode=link $(CC) -o $@ $(BITS_OBJECTS) $(LIBS)
bits.o: bits.c
diff -ur arla-0.36.1.orig/lwp/Makefile.in arla-0.36.1/lwp/Makefile.in
--- arla-0.36.1.orig/lwp/Makefile.in 2004-04-28 16:41:48.000000000 +0200
+++ arla-0.36.1/lwp/Makefile.in 2004-06-19 12:16:36.000000000 +0200
@@ -50,6 +50,10 @@
REALCFLAGS = $(INCLUDES) @DEFS@ @CFLAGS@ -DFD_SPEED_HACK -DDEBUG \
$(CFLAGS) @PLWP_INC_FLAGS@
+LIB_roken = @LIB_roken@
+LIB_crypt = @LIB_crypt@
+LIB_dbopen = @LIB_dbopen@
+
LIB = liblwp.a
include_HEADERS = lock.h preempt.h timer.h
@@ -90,9 +94,9 @@
$(SHELL) make-process.o.sh
testlwp: testlwp.o liblwp.a
- $(top_builddir)/libtool --mode=link $(CC) -o testlwp testlwp.o -L. -llwp @LIB_roken@ @PLWP_LIB_FLAGS@
+ $(top_builddir)/libtool --mode=link $(CC) -o testlwp testlwp.o -L. -llwp $(LIB_roken) @PLWP_LIB_FLAGS@
rw: rw.o liblwp.a
- $(top_builddir)/libtool --mode=link $(CC) -o rw rw.o -L. -llwp @LIB_roken@ @PLWP_LIB_FLAGS@
+ $(top_builddir)/libtool --mode=link $(CC) -o rw rw.o -L. -llwp $(LIB_roken) @PLWP_LIB_FLAGS@
.c.o:
$(CC) -c $(CPPFLAGS) $(DEFS) $(REALCFLAGS) -I$(srcdir) -I. $<
diff -ur arla-0.36.1.orig/Makefile.am.common arla-0.36.1/Makefile.am.common
--- arla-0.36.1.orig/Makefile.am.common 2002-04-24 15:38:55.000000000 +0200
+++ arla-0.36.1/Makefile.am.common 2004-06-21 20:19:26.000000000 +0200
@@ -2,11 +2,6 @@
include $(top_srcdir)/cf/Makefile.am.common
-SUFFIXES += .x
-
-.x.c:
- @cmp -s $< $@ 2> /dev/null || cp $< $@
-
CHECK_LOCAL = $(PROGRAMS)
check-local::
diff -ur arla-0.36.1.orig/rx/Makefile.in arla-0.36.1/rx/Makefile.in
--- arla-0.36.1.orig/rx/Makefile.in 2003-10-03 19:27:07.000000000 +0200
+++ arla-0.36.1/rx/Makefile.in 2004-06-20 12:40:21.000000000 +0200
@@ -30,6 +30,10 @@
INCLUDES = -I$(srcdir) -I../include -I$(srcdir)/../include \
@INC_roken@ -I$(srcdir)/../lib/cmd
+LIB_roken = @LIB_roken@
+LIB_crypt = @LIB_crypt@
+LIB_dbopen = @LIB_dbopen@
+
LIB = librx.a
include_HEADERS = rx.h rx_clock.h rx_event.h rx_globs.h rx_mach.h rx_misc.h \
rx_multi.h rx_null.h rx_pkt.h rx_queue.h rx_trace.h \
@@ -95,8 +99,8 @@
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
$(MKINSTALLDIRS) $(DESTDIR)$(includedir)/rx
$(MKINSTALLDIRS) $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
- $(INSTALL_PROGRAM) rxdebug $(DESTDIR)$(bindir)/rxdebug
- $(INSTALL_PROGRAM) rxperf $(DESTDIR)$(sbindir)/rxperf
+ $(top_builddir)/libtool --mode=install $(INSTALL_PROGRAM) rxdebug $(DESTDIR)$(bindir)/rxdebug
+ $(top_builddir)/libtool --mode=install $(INSTALL_PROGRAM) rxperf $(DESTDIR)$(sbindir)/rxperf
$(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/$(LIB)
for x in $(include_HEADERS); do \
$(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(includedir)/rx/$$x; \
@@ -144,16 +148,16 @@
-$(RANLIB) $@
test_rx_clock: $(test_rx_clock_OBJECTS) $(LIB)
- $(top_builddir)/libtool $(CC) -o $@ $(test_rx_clock_OBJECTS) -L. -lrx $(LIBS)
+ $(top_builddir)/libtool --mode=link $(CC) -o $@ $(test_rx_clock_OBJECTS) -L. -lrx $(LIBS)
rxdebug: $(rxdebug_OBJECTS) $(LIB)
- $(top_builddir)/libtool $(CC) -o $@ $(rxdebug_OBJECTS) -L. -lrx $(LIBS) -L../lwp -llwp @PLWP_LIB_FLAGS@ ../lib/ko/libko.la @LIB_roken@ @LIBS@
+ $(top_builddir)/libtool --mode=link $(CC) -o $@ $(rxdebug_OBJECTS) -L. -lrx $(LIBS) -L../lwp -llwp @PLWP_LIB_FLAGS@ ../lib/ko/libko.la $(LIB_roken) @LIBS@
rxperf: $(rxperf_OBJECTS) $(LIB)
- $(top_builddir)/libtool $(CC) -o $@ $(rxperf_OBJECTS) -L. -lrx $(LIBS) -L../lwp -llwp @PLWP_LIB_FLAGS@ @LIBS@
+ $(top_builddir)/libtool --mode=link $(CC) -o $@ $(rxperf_OBJECTS) -L. -lrx $(LIBS) -L../lwp -llwp @PLWP_LIB_FLAGS@ @LIBS@
rx_trace: $(rx_trace_OBJECTS) $(LIB)
- $(top_builddir)/libtool $(CC) -o $@ $(rx_trace_OBJECTS) -L. -lrx $(LIBS) -L../lwp -llwp @PLWP_LIB_FLAGS@ @LIB_roken@ @LIBS@
+ $(top_builddir)/libtool --mode=link $(CC) -o $@ $(rx_trace_OBJECTS) -L. -lrx $(LIBS) -L../lwp -llwp @PLWP_LIB_FLAGS@ $(LIB_roken) @LIBS@
TAGS: $(SOURCES)
etags $(SOURCES)
diff -ur arla-0.36.1.orig/tools/release-tools/Makefile.in arla-0.36.1/tools/release-tools/Makefile.in
--- arla-0.36.1.orig/tools/release-tools/Makefile.in 2004-06-03 12:38:43.000000000 +0200
+++ arla-0.36.1/tools/release-tools/Makefile.in 2004-06-19 17:40:35.000000000 +0200
@@ -46,7 +46,10 @@
KAFS_LIBS = @AIX_EXTRA_KAFS@ @KAFS_LIBS@
LIB_tgetent = @LIB_tgetent@
LIB_readline = @LIB_readline@
-LIBS = @LIB_roken@ @LIBS@
+LIB_roken = @LIB_roken@
+LIB_crypt = @LIB_crypt@
+LIB_dbopen = @LIB_dbopen@
+LIBS = $(LIB_roken) @LIBS@
LIBDEPENDS =
More information about the Arla-drinkers
mailing list