diff options
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/ChangeLog | 6 | ||||
| -rw-r--r-- | zebra/Makefile.am | 6 | ||||
| -rw-r--r-- | zebra/main.c | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog index da3210e1..cf18a7d1 100644 --- a/zebra/ChangeLog +++ b/zebra/ChangeLog @@ -1,3 +1,9 @@ +2004-06-30 Greg Troxel <gdt@poblano.ir.bbn.com> + + * main.c: define thread_master variable so that linking with + libzebra.so doesn't fail. Arguably zclient.o should be in a + separate library, but this is far less disruptive. + 2004-06-12 Robert Olsson <Robert.Olsson at data.slu.se> * Added IRDP support. diff --git a/zebra/Makefile.am b/zebra/Makefile.am index 6b494e75..0782894c 100644 --- a/zebra/Makefile.am +++ b/zebra/Makefile.am @@ -30,7 +30,7 @@ noinst_HEADERS = \ connected.h ioctl.h rib.h rt.h zserv.h redistribute.h debug.h rtadv.h \ interface.h ipforward.h irdp.h -zebra_LDADD = ../lib/libzebra.a $(otherobj) $(LIBCAP) $(LIB_IPV6) +zebra_LDADD = $(otherobj) $(LIBCAP) $(LIB_IPV6) -L../lib -lzebra zebra_DEPENDENCIES = $(otherobj) @@ -42,8 +42,8 @@ EXTRA_DIST = if_ioctl.c if_ioctl_solaris.c if_netlink.c if_proc.c \ ioctl.c ioctl_solaris.c \ GNOME-SMI GNOME-PRODUCT-ZEBRA-MIB -#client : client_main.o ../lib/libzebra.a -# $(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6) +#client : client_main.o -L../lib -lzebra +# $(CC) -g -o client client_main.o -L../lib -lzebra $(LIBS) $(LIB_IPV6) quaggaconfdir = $(sysconfdir) diff --git a/zebra/main.c b/zebra/main.c index 1083ae57..6d40d708 100644 --- a/zebra/main.c +++ b/zebra/main.c @@ -48,6 +48,9 @@ struct zebra_t zebrad = pid_t old_pid; pid_t pid; +/* Pacify zclient.o in libzebra, which expects this variable. */ +struct thread_master *master; + /* Route retain mode flag. */ int retain_mode = 0; |