Remove `#pragma }'.

* gtk/gtkfeatures.h.in: Remove `#pragma }'.

* gdk/gdki18n.h: Update to use new `glib' widechar defines.

* configure.in (CFLAGS): Don't use test -z "echo .. | grep".  Use
case instead.
(wchar.h, wctype.h, iswalnum): Duplicate widechar tests from `glib'.
(GDK_WLIBS): New variable.  Lists extra libraries needed to use
widechar functions.
* gtk-config.in (--libs): List $GDK_WLIBS, too.

4 files changed, 83 insertions, 19 deletions

diff --git a/configure.in b/configure.in
index e820fd7e13..88e0ba4f8d 100644
--- a/configure.in
+++ b/configure.in
@@ -91,21 +91,26 @@ AM_PROG_CC_STDC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 
+changequote(,)dnl
 if test "x$GCC" = "xyes"; then
-  if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
-    CFLAGS="$CFLAGS -Wall"
-  fi
+  case " $CFLAGS " in
+  *[\ \	]-Wall[\ \	]*) ;;
+  *) CFLAGS="$CFLAGS -Wall" ;;
+  esac
 
   if test "x$enable_ansi" = "xyes"; then
-    if test -z "`echo "$CFLAGS" | grep "\-ansi" 2> /dev/null`" ; then
-      CFLAGS="$CFLAGS -ansi"
-    fi
-
-    if test -z "`echo "$CFLAGS" | grep "\-pedantic" 2> /dev/null`" ; then
-      CFLAGS="$CFLAGS -pedantic"
-    fi
+    case " $CFLAGS " in
+    *[\ \	]-ansi[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -ansi" ;;
+    esac
+
+    case " $CFLAGS " in
+    *[\ \	]-pedantic[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -pedantic" ;;
+    esac
   fi
 fi
+changequote([,])dnl
 
 # define a MAINT-like variable REBUILD which is set if Perl
 # and awk are found, so autogenerated sources can be rebuilt
@@ -181,17 +186,18 @@ if test x$with_glib = x ; then
 else
   # Use uninstalled glib (assume they got the version right)
 
-  if test -x $with_glib/glib-config ; then 
+  GLIB_CONFIG=$with_glib/glib-config
+  if test -x $GLIB_CONFIG ; then 
     :
   else
     AC_MSG_ERROR([GLIB directory ($with_glib) not present or not configured])
   fi
 
   # For use in gtk-config
-  glib_cflags=`$with_glib/glib-config --cflags`
-  glib_libs=`$with_glib/glib-config --libs`
+  glib_cflags=`$GLIB_CONFIG --cflags`
+  glib_libs=`$GLIB_CONFIG --libs`
 
-  glib_release=`$with_glib/glib-config --version | sed 's%\\.[[0-9]]*$%%'`
+  glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
 
   # canonicalize relative paths
   case $with_glib in 
@@ -426,6 +432,65 @@ else
     fi
 fi
 
+# Duplicate `widechar' tests from `glib'.
+# Check for wchar.h
+if test x = y; then
+  # will not be executed
+  # hack so as not to update `acconfig.h'
+  AC_CHECK_HEADERS(wchar.h wctype.h)
+  AC_CHECK_FUNCS(broken_wctype)
+fi
+
+AC_MSG_CHECKING(for wchar.h)
+AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
+if test $gtk_ok = yes; then
+   ac_kludge=HAVE_WCHAR_H
+   AC_DEFINE($ac_kludge)
+fi
+AC_MSG_RESULT($gtk_ok)
+
+# Check for wctype.h (for iswalnum)
+
+AC_MSG_CHECKING(for wctype.h)
+AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no)
+if test $gtk_ok = yes; then
+   ac_kludge=HAVE_WCTYPE_H
+   AC_DEFINE($ac_kludge)
+fi
+AC_MSG_RESULT($gtk_ok)
+
+# in Solaris 2.5, `iswalnum' is in -lw
+GDK_WLIBS=
+AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
+
+# The following is necessary for Linux libc-5.4.38
+oLIBS="$LIBS"
+LIBS="$LIBS $GDK_WLIBS"
+AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
+AC_TRY_LINK([#include <stdlib.h>],[
+#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
+#  ifdef HAVE_WCTYPE_H
+#    include <wctype.h>
+#  else
+#    ifdef HAVE_WCHAR_H
+#      include <wchar.h>
+#    endif
+#  endif
+#else
+#  define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
+#endif
+iswalnum((wchar_t) 0);
+], gtk_ok=yes, gtk_ok=no)
+LIBS="$oLIBS"
+
+if test $gtk_ok = no; then
+   ac_kludge=HAVE_BROKEN_WCTYPE
+   AC_DEFINE($ac_kludge)
+   GDK_WLIBS=
+fi
+AC_MSG_RESULT($gtk_ok)
+AC_SUBST(GDK_WLIBS)
+
 AC_OUTPUT([
 Makefile
 gtk-config
diff --git a/gdk/gdki18n.h b/gdk/gdki18n.h
index 9cd1ba9778..f2bf8553df 100644
--- a/gdk/gdki18n.h
+++ b/gdk/gdki18n.h
@@ -146,11 +146,11 @@ extern int _g_mbtowc (wchar_t *wstr, const char *str, size_t len);
 
 #endif /* X_LOCALE */
 
-#if !defined(HAVE_BROKEN_WCTYPE) && (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H)) && !defined(X_LOCALE)
-#  ifdef HAVE_WCTYPE_H
+#if !defined(G_HAVE_BROKEN_WCTYPE) && (defined(G_HAVE_WCTYPE_H) || defined(G_HAVE_WCHAR_H)) && !defined(X_LOCALE)
+#  ifdef G_HAVE_WCTYPE_H
 #    include <wctype.h>
 #  else
-#    ifdef HAVE_WCHAR_H
+#    ifdef G_HAVE_WCHAR_H
 #      include <wchar.h>
 #    endif
 #  endif
diff --git a/gtk-config.in b/gtk-config.in
index 234aa179a5..2726e946db 100644
--- a/gtk-config.in
+++ b/gtk-config.in
@@ -64,7 +64,7 @@ while test $# -gt 0; do
           fi
         fi
       done
-      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ -lm
+      echo $libdirs @x_ldflags@ -lgtk -lgdk $my_glib_libs @x_libs@ @GDK_WLIBS@ -lm
       ;;
     *)
       echo "${usage}" 1>&2
diff --git a/gtk/gtkfeatures.h.in b/gtk/gtkfeatures.h.in
index 21bfc2bcdd..4ce0bf7aa6 100644
--- a/gtk/gtkfeatures.h.in
+++ b/gtk/gtkfeatures.h.in
@@ -22,7 +22,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#pragma }
 #endif /* __cplusplus */