diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-03 13:59:04 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-03 14:29:13 +0100 |
| commit | 55c728031529910cd8358bedb90f75d363afeb4b (patch) | |
| tree | 5553cc267888f3b26e43af9fe2d6697b80361b8f /ospfclient | |
| parent | Merge pull request #153 from LabNConsulting/working/2.0/patch-set/rr-part2 (diff) | |
| download | frr-55c728031529910cd8358bedb90f75d363afeb4b.tar.xz frr-55c728031529910cd8358bedb90f75d363afeb4b.zip | |
*: Convert libzebra -> libfrr
The library libzebra that is installed with FRR will
conflict with Quagga. So let's rename it to libfrr.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'ospfclient')
| -rw-r--r-- | ospfclient/Makefile.am | 4 | ||||
| -rw-r--r-- | ospfclient/ospfclient.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am index 1fca431a1..003918ffc 100644 --- a/ospfclient/Makefile.am +++ b/ospfclient/Makefile.am @@ -5,7 +5,7 @@ AM_CFLAGS = $(WERROR) lib_LTLIBRARIES = libospfapiclient.la libospfapiclient_la_LDFLAGS = -version-info 0:0:0 -libospfapiclient_la_LIBADD = ../ospfd/libospf.la ../lib/libzebra.la +libospfapiclient_la_LIBADD = ../ospfd/libospf.la ../lib/libfrr.la sbin_PROGRAMS = ospfclient @@ -21,7 +21,7 @@ ospfclient_SOURCES = \ ospfclient.c ospfclient_LDADD = libospfapiclient.la \ - ../ospfd/libospf.la ../lib/libzebra.la @LIBCAP@ + ../ospfd/libospf.la ../lib/libfrr.la @LIBCAP@ ospfclient_CFLAGS = $(AM_CFLAGS) ospfclient_LDFLAGS = $(AM_LDFLAGS) diff --git a/ospfclient/ospfclient.c b/ospfclient/ospfclient.c index 1716ebeca..9a77a64cc 100644 --- a/ospfclient/ospfclient.c +++ b/ospfclient/ospfclient.c @@ -52,7 +52,7 @@ struct zebra_privs_t ospfd_privs = }; /* The following includes are specific to this application. For - example it uses threads from libzebra, however your application is + example it uses threads from libfrr, however your application is free to use any thread library (like pthreads). */ #include "ospfd/ospf_dump.h" /* for ospf_lsa_header_dump */ |