* 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.

3 files changed, 12 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 48eb04ca50d..a8c8b84b34a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-25  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * dispextern.c (xstrcasecmp): Define to library function
+        strcasecmp if available.
+        * xfaces.c: Do not use xstrcasecmp if strcasecmp is available.
+
 2012-06-25  Andreas Schwab  <schwab@linux-m68k.org>
 
         * keyboard.c (menu_bar_items, menu_bar_item, read_key_sequence):
diff --git a/src/dispextern.h b/src/dispextern.h
index 63c23b8962f..d541d181fbf 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3216,7 +3216,11 @@ void unload_color (struct frame *, unsigned long);
 char *choose_face_font (struct frame *, Lisp_Object *, Lisp_Object,
                         int *);
 void prepare_face_for_display (struct frame *, struct face *);
+#ifdef HAVE_STRCASECMP
+#define xstrcasecmp(x,y) strcasecmp ((x), (y))
+#else
 int xstrcasecmp (const char *, const char *);
+#endif
 int lookup_named_face (struct frame *, Lisp_Object, int);
 int lookup_basic_face (struct frame *, int);
 int smaller_face (struct frame *, int, int);
diff --git a/src/xfaces.c b/src/xfaces.c
index 32d1499b85a..f2cd0eb6af8 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -716,6 +716,7 @@ x_free_gc (struct frame *f, GC gc)
 }
 #endif  /* HAVE_NS */
 
+#ifndef HAVE_STRCASECMP
 /* Like strcasecmp/stricmp.  Used to compare parts of font names which
    are in ISO8859-1.  */
 
@@ -737,7 +738,7 @@ xstrcasecmp (const char *s1, const char *s2)
     return *s2 == 0 ? 0 : -1;
   return 1;
 }
-
+#endif /* HAVE_STRCASECMP */
 
 /* If FRAME is nil, return a pointer to the selected frame.
    Otherwise, check that FRAME is a live frame, and return a pointer