Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific

there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).

svn path=/trunk/; revision=50650

CMakeLists.txt

@@ -930,7 +930,6 @@ if(BUILD_mergecap)
 	set(mergecap_FILES
 		mergecap.c
 		merge.c
-		epan/strnatcmp.c
 		svnversion.h
 		${WTAP_PLUGIN_SOURCES}
 	)
@@ -984,7 +983,6 @@ if(BUILD_editcap)
 	set(editcap_FILES
 		editcap.c
 		epan/crypt/md5.c
-		epan/strnatcmp.c
 		${WTAP_PLUGIN_SOURCES}
 	)
 	add_executable(editcap ${editcap_FILES})

Makefile.common

@@ -150,14 +150,12 @@ text2pcap_INCLUDES = \
 # mergecap specifics
 mergecap_SOURCES = \
 	mergecap.c \
-	merge.c \
+	merge.c
-	epan/strnatcmp.c
 
 # editcap specifics
 editcap_SOURCES = \
 	editcap.c	\
 	epan/crypt/md5.c \
-	epan/strnatcmp.c \
 	$(WTAP_PLUGIN_SOURCES)
 
 # reordercap specifics

editcap.c

@@ -76,7 +76,8 @@
 #endif
 
 #include <wsutil/privileges.h>
-#include "wsutil/report_err.h"
+#include <wsutil/report_err.h>
+#include <wsutil/strnatcmp.h>
 
 /*
  * The symbols declared in the below are exported from libwireshark,
@@ -89,7 +90,6 @@
 #include "epan/crypt/md5.h"
 #include "epan/plugins.h"
 #include "epan/filesystem.h"
-#include "epan/strnatcmp.h"
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
 

epan/CMakeLists.txt

@@ -1485,7 +1485,6 @@ set(LIBWIRESHARK_FILES
 	sna-utils.c
 	stat_cmd_args.c
 	stats_tree.c
-	strnatcmp.c
 	strutil.c
 	stream.c
 	t35.c

epan/Makefile.common

@@ -86,7 +86,6 @@ LIBWIRESHARK_SRC =		\
 	sna-utils.c		\
 	stat_cmd_args.c		\
 	stats_tree.c		\
-	strnatcmp.c		\
 	strutil.c		\
 	stream.c		\
 	t35.c			\
@@ -243,7 +242,6 @@ LIBWIRESHARK_INCLUDES =		\
 	stats_tree.h		\
 	stats_tree_priv.h	\
 	stream.h		\
-	strnatcmp.h		\
 	strutil.h		\
 	t35.h			\
 	tap.h			\

mergecap.c

@@ -47,9 +47,10 @@
 #include "wsutil/wsgetopt.h"
 #endif
 
+#include "wsutil/strnatcmp.h"
+
 #define WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT /* wsutil/wsgetopt.h set export behavior above. */
-#include "epan/strnatcmp.h"
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
 

wsutil/CMakeLists.txt

@@ -49,6 +49,7 @@ set(WSUTIL_FILES
   mpeg-audio.c
   nstime.c
   privileges.c
+  strnatcmp.c
   str_util.c
   report_err.c
   tempfile.c

wsutil/Makefile.common

@@ -43,6 +43,7 @@ LIBWSUTIL_SRC = 	\
 	mpeg-audio.c	\
 	nstime.c	\
 	privileges.c	\
+	strnatcmp.c	\
 	str_util.c	\
 	report_err.c	\
 	tempfile.c	\
@@ -63,6 +64,7 @@ LIBWSUTIL_INCLUDES = 	\
 	mpeg-audio.h	\
 	nstime.h	\
 	privileges.h	\
+	strnatcmp.h	\
 	str_util.h	\
 	report_err.h	\
 	tempfile.h	\