From 1512548423972f22199521d9d5525d0c55a30f31 Mon Sep 17 00:00:00 2001
From: Jason Molenda <jmolenda@apple.com>
Date: Fri, 12 Jun 1998 21:23:44 +0000
Subject: [PATCH] Fri Jun 12 14:22:55 1998  Jason Molenda 
 (crash@bugshack.cygnus.com)

        * configure.in (LIBS): Add -lw to the list of libraries if needed.

-lw needed on Solaris to get wctype().  wctype() needed by new gnu-regex.c.
---
 gdb/ChangeLog    | 13 +++++++++++
 gdb/configure    | 57 +++++++++++++++++++++++++++++++++++++++++-------
 gdb/configure.in |  3 +++
 3 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 08e649ee48..d3ab7bf327 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jun 12 14:22:55 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* configure.in (LIBS): Add -lw to the list of libraries if needed.
+
+Thu Jun 11 15:05:10 1998  Jason Molenda  (crash@bugshack.cygnus.com)
+
+	* btowc.c: Removed.
+	* configure.in: Don't see if we need to replace btowc().
+	* Makefile.in: Don't include LIBOBJS.
+	* configure: Regenerated.
+	* gnu-regex.c (regex_compile): Only support i18n [:foo:] if
+	we have btowc().
+
 Wed Jun 10 15:39:14 1998  Stu Grossman  <grossman@babylon-5.cygnus.com>
 
 	* c-exp.y:  Fix problems with parsing "'foo.bar'::func".  Some languages
diff --git a/gdb/configure b/gdb/configure
index 2e6f2f71b2..89f4331e13 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -5500,6 +5500,47 @@ esac
 fi
 # end-sanitize-sky
 
+echo $ac_n "checking for wctype in -lw""... $ac_c" 1>&6
+echo "configure:5505: checking for wctype in -lw" >&5
+ac_lib_var=`echo w'_'wctype | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lw  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5513 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char wctype();
+
+int main() {
+wctype()
+; return 0; }
+EOF
+if { (eval echo configure:5524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lw"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
 
 
 
@@ -5643,7 +5684,7 @@ links="${links} nm.h"
 fi
 # start-sanitize-gdbtk
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:5647: checking whether ln -s works" >&5
+echo "configure:5688: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5678,19 +5719,19 @@ fi
 
 
 echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6
-echo "configure:5682: checking for Cygwin32 environment" >&5
+echo "configure:5723: checking for Cygwin32 environment" >&5
 if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5687 "configure"
+#line 5728 "configure"
 #include "confdefs.h"
 
 int main() {
 return __CYGWIN32__;
 ; return 0; }
 EOF
-if { (eval echo configure:5694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_cygwin32=yes
 else
@@ -5707,19 +5748,19 @@ echo "$ac_t""$am_cv_cygwin32" 1>&6
 CYGWIN32=
 test "$am_cv_cygwin32" = yes && CYGWIN32=yes
 echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6
-echo "configure:5711: checking for Mingw32 environment" >&5
+echo "configure:5752: checking for Mingw32 environment" >&5
 if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5716 "configure"
+#line 5757 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:5723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_mingw32=yes
 else
@@ -5738,7 +5779,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:5742: checking for executable suffix" >&5
+echo "configure:5783: checking for executable suffix" >&5
 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
diff --git a/gdb/configure.in b/gdb/configure.in
index 0e3021e054..f17e481191 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -475,6 +475,9 @@ AC_ARG_WITH(sim-funit,
 esac])dnl
 # end-sanitize-sky
 
+dnl Solaris puts wctype in /usr/lib/libw.a
+AC_CHECK_LIB(w, wctype, [LIBS="$LIBS -lw"])
+
 AC_SUBST(ENABLE_CFLAGS)
 
 AC_SUBST(CONFIG_OBS)