[Cvs-cvs] Changes to ccvs/m4/mbchar.m4

[Derek Robert Price]

Index: ccvs/m4/mbchar.m4
diff -u ccvs/m4/mbchar.m4:1.2 ccvs/m4/mbchar.m4:1.3
--- ccvs/m4/mbchar.m4:1.2       Mon Sep  5 19:35:17 2005
+++ ccvs/m4/mbchar.m4   Tue Oct  4 02:33:12 2005
@@ -1,4 +1,4 @@
-# mbchar.m4 serial 1
+# mbchar.m4 serial 2
 dnl Copyright (C) 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -9,13 +9,12 @@
 
 AC_DEFUN([gl_MBCHAR],
 [
-  AC_LIBSOURCES([mbchar.c, mbchar.h])
+  AC_REQUIRE([AC_GNU_SOURCE])
+  dnl The following line is that so the user can test
+  dnl HAVE_WCHAR_H && HAVE_WCTYPE_H before #include "mbchar.h".
   AC_CHECK_HEADERS_ONCE(wchar.h wctype.h)
-
-  if test x$ac_cv_header_wchar_h = xyes && test x$ac_cv_header_wctype_h = 
xyes; then
-       AC_LIBOBJ(mbchar)
+  dnl Compile mbchar.c only if HAVE_WCHAR_H && HAVE_WCTYPE_H.
+  if test $ac_cv_header_wchar_h = yes && test $ac_cv_header_wctype_h = yes; 
then
+    AC_LIBOBJ([mbchar])
   fi
-
-  AC_REQUIRE([AC_GNU_SOURCE])
-  :
 ])