* configure.in (AC_CHECK_FUNCS): Detect library functions

strcasecmp and strncasecmp.
* lib-src/etags.c (etags_strcasecmp, etags_strncasecmp): Define to
library functions strcasecmp and strncasecmp if available.
* lwlib/lwlib.c (my_strcasecmp): Rename to lwlib_strcasecmp, which
may be defined to library function strcasecmp if available.
* src/dispextern.c (xstrcasecmp): Define to library function
strcasecmp if available.
* src/xfaces.c: Do not use xstrcasecmp if strcasecmp is available.

2 files changed, 17 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index a573cd88d10..a04fe215f99 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-25  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * etags.c (etags_strcasecmp, etags_strncasecmp): Define to
+        library functions strcasecmp and strncasecmp if available.
+
 2012-06-24  Paul Eggert  <eggert@cs.ucla.edu>
 
         Switch from NO_RETURN to C11's _Noreturn (Bug#11750).
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 71f153163ef..f44c1c05393 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -389,8 +389,16 @@ static char *savenstr (const char *, int);
 static char *savestr (const char *);
 static char *etags_strchr (const char *, int);
 static char *etags_strrchr (const char *, int);
+#ifdef HAVE_STRCASECMP
+#define etags_strcasecmp(x,y) strcasecmp ((x), (y))
+#else
 static int etags_strcasecmp (const char *, const char *);
+#endif
+#ifdef HAVE_STRNCASECMP
+#define etags_strncasecmp(x,y,z) strncasecmp ((x), (y), (z))
+#else
 static int etags_strncasecmp (const char *, const char *, int);
+#endif
 static char *etags_getcwd (void);
 static char *relative_filename (char *, char *);
 static char *absolute_filename (char *, char *);
@@ -6320,6 +6328,7 @@ etags_strchr (register const char *sp, register int c)
   return NULL;
 }
 
+#ifndef HAVE_STRCASECMP
 /*
  * Compare two strings, ignoring case for alphabetic characters.
  *
@@ -6338,7 +6347,9 @@ etags_strcasecmp (register const char *s1, register const char *s2)
           ? lowcase (*s1) - lowcase (*s2)
           : *s1 - *s2);
 }
+#endif /* HAVE_STRCASECMP */
 
+#ifndef HAVE_STRNCASECMP
 /*
  * Compare two strings, ignoring case for alphabetic characters.
  * Stop after a given number of characters
@@ -6361,6 +6372,7 @@ etags_strncasecmp (register const char *s1, register const char *s2, register in
             ? lowcase (*s1) - lowcase (*s2)
             : *s1 - *s2);
 }
+#endif /* HAVE_STRCASECMP */
 
 /* Skip spaces (end of string is not space), return new pointer. */
 static char *