Don't use our own strlcat/strlcpy when we notice the system

has it's own version. refs appneta#115
baigubulu · Nov 28, 2013 · 6f45329 · 6f45329
1 parent b43c035
commit 6f45329
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 1 deletion.
diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -1,6 +1,7 @@
+if ! SYSTEM_STRLCPY
 noinst_LIBRARIES = libstrl.a
-
 libstrl_a_SOURCES = strlcat.c strlcpy.c
+endif
 
 noinst_HEADERS = strlcpy.h tree.h queue.h sll.h
 

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -22,7 +22,9 @@ endif
 
 AM_CFLAGS = -I.. -I../.. $(LNAV_CFLAGS) @LDNETINC@
 
+if ! SYSTEM_STRLCPY
 libcommon_a_LIBADD = ../../lib/libstrl.a
+endif
 
 noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
 		 fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \

diff --git a/src/common/cidr.c b/src/common/cidr.c
@@ -34,7 +34,9 @@
 #include "config.h"
 #include "defines.h"
 #include "common.h"
+#ifndef HAVE_STRLCPY
 #include "lib/strlcpy.h"
+#endif 
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/common/tcpdump.c b/src/common/tcpdump.c
@@ -59,7 +59,10 @@
 #endif
 
 #include "tcpdump.h"
+
+#ifndef HAVE_STRLCPY
 #include "lib/strlcpy.h"
+#endif 
 
 #ifdef DEBUG
 extern int debug;

diff --git a/src/defines.h.in b/src/defines.h.in
@@ -26,7 +26,9 @@
 
 #include "@LPCAPINC@"
 
+#ifndef HAVE_STRLCPY
 #include "lib/strlcpy.h"
+#endif
 #include "common/list.h"
 #include "common/cidr.h"