From d602662b36b7322573e83fe80c3ab820992073c9 Mon Sep 17 00:00:00 2001
From: Chris Maynard <Christopher.Maynard@GTECH.COM>
Date: Wed, 10 Jul 2013 16:18:37 +0000
Subject: Add strnatcmp by Martin Pool for 'natural order' string comparisons,
 and make use of it in editcap and mergecap for listing encapsulation types. 
 For example: Before:     user0 - USER 0     user1 - USER 1     user10 - USER
 10     user11 - USER 11     user12 - USER 12     user13 - USER 13     user14
 - USER 14     user15 - USER 15     user2 - USER 2     user3 - USER 3    
 user4 - USER 4     user5 - USER 5     user6 - USER 6     user7 - USER 7    
 user8 - USER 8     user9 - USER 9

After:
    user0 - USER 0
    user1 - USER 1
    user2 - USER 2
    user3 - USER 3
    user4 - USER 4
    user5 - USER 5
    user6 - USER 6
    user7 - USER 7
    user8 - USER 8
    user9 - USER 9
    user10 - USER 10
    user11 - USER 11
    user12 - USER 12
    user13 - USER 13
    user14 - USER 14
    user15 - USER 15


svn path=/trunk/; revision=50482
---
 Makefile.common | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile.common')

diff --git a/Makefile.common b/Makefile.common
index 79880dc534..447af8694f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -161,12 +161,13 @@ text2pcap_INCLUDES = \
 mergecap_SOURCES = \
 	mergecap.c \
 	merge.c \
-	svnversion.h
+	epan/strnatcmp.c
 
 # editcap specifics
 editcap_SOURCES = \
 	editcap.c	\
 	epan/crypt/md5.c \
+	epan/strnatcmp.c \
 	$(WTAP_PLUGIN_SOURCES)
 
 # reordercap specifics
-- 
cgit v1.2.1