From bb3d9f43d3e65689d982033a6491ec40443dbb96 Mon Sep 17 00:00:00 2001
From: Keith Seitz <keiths@cygnus>
Date: Thu, 15 Jan 1998 01:19:00 +0000
Subject: [PATCH]         * configure.in (--enable-gdbtk): If tcl was built
 with --enable-shared,         use TCL_SHLIB_SUFFIX to specify the suffix of
 the library file so that         we don't expect to see "libfoo.a" instead of
 "libfoo.{so,sl, etc}".         * configure: Regenerate.

---
 gdb/ChangeLog-gdbtk |  8 ++++++++
 gdb/configure       | 25 +++++++++++++++----------
 gdb/configure.in    |  9 +++++++--
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/gdb/ChangeLog-gdbtk b/gdb/ChangeLog-gdbtk
index 91fb22405c..3b493014ef 100644
--- a/gdb/ChangeLog-gdbtk
+++ b/gdb/ChangeLog-gdbtk
@@ -1,3 +1,11 @@
+Wed Jan 14 16:38:44 1998  Keith Seitz  <keiths@pizza.cygnus.com>
+
+	* configure.in (--enable-gdbtk): If tcl was built with --enable-shared,
+	use TCL_SHLIB_SUFFIX to specify the suffix of the library file so that
+	we don't expect to see "libfoo.a" instead of "libfoo.{so,sl, etc}".
+
+	* configure: Regenerate.
+	
 Wed Dec 31 16:50:26 1998  Keith Seitz  (keiths@onions.cygnus.com)
  
         * gdbtk.c (gdb_actions_command): extract and save step count
diff --git a/gdb/configure b/gdb/configure
index fad76eddf3..0a2262e70a 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -3118,12 +3118,17 @@ fi
 		tixdir=../tix/unix/tk8.0
 		;;
 	   esac 
+	   if test "${TCL_SHARED_BUILD}" = "1"; then
+		TIX_LIB_EXT="${TCL_SHLIB_SUFFIX}"
+	   else
+		TIX_LIB_EXT=".a"
+	   fi
 	   if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 		TIXLIB="-L${tixdir} -ltix${TIXVERSION}"
-		TIX_DEPS="${tixdir}/libtix${TIXVERSION}.a"
+		TIX_DEPS="${tixdir}/libtix${TIXVERSION}${TIX_LIB_EXT}"
 	   else
 		TIXLIB="-L${tixdir} -ltix`echo ${TIXVERSION} | tr -d .`"
-		TIX_DEPS="${tixdir}/libtix`echo ${TIXVERSION} | tr -d .`.a"
+		TIX_DEPS="${tixdir}/libtix`echo ${TIXVERSION} | tr -d .`${TIX_LIB_EXT}"
 	   fi
 
 	   ENABLE_GDBTK=1
@@ -3300,7 +3305,7 @@ links="${links} nm.h"
 fi
 # start-sanitize-gdbtk
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:3304: checking whether ln -s works" >&5
+echo "configure:3309: 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
@@ -3335,19 +3340,19 @@ fi
 
 
 echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6
-echo "configure:3339: checking for Cygwin32 environment" >&5
+echo "configure:3344: 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 3344 "configure"
+#line 3349 "configure"
 #include "confdefs.h"
 
 int main() {
 return __CYGWIN32__;
 ; return 0; }
 EOF
-if { (eval echo configure:3351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_cygwin32=yes
 else
@@ -3364,19 +3369,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:3368: checking for Mingw32 environment" >&5
+echo "configure:3373: 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 3373 "configure"
+#line 3378 "configure"
 #include "confdefs.h"
 
 int main() {
 return __MINGW32__;
 ; return 0; }
 EOF
-if { (eval echo configure:3380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   am_cv_mingw32=yes
 else
@@ -3395,7 +3400,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes
 
 
 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:3399: checking for executable suffix" >&5
+echo "configure:3404: 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 438796e453..2089f294d3 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -359,12 +359,17 @@ if test "${enable_gdbtk}" = "yes"; then
 		tixdir=../tix/unix/tk8.0
 		;;
 	   esac 
+	   if test "${TCL_SHARED_BUILD}" = "1"; then
+		TIX_LIB_EXT="${TCL_SHLIB_SUFFIX}"
+	   else
+		TIX_LIB_EXT=".a"
+	   fi
 	   if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
 		TIXLIB="-L${tixdir} -ltix${TIXVERSION}"
-		TIX_DEPS="${tixdir}/libtix${TIXVERSION}.a"
+		TIX_DEPS="${tixdir}/libtix${TIXVERSION}${TIX_LIB_EXT}"
 	   else
 		TIXLIB="-L${tixdir} -ltix`echo ${TIXVERSION} | tr -d .`"
-		TIX_DEPS="${tixdir}/libtix`echo ${TIXVERSION} | tr -d .`.a"
+		TIX_DEPS="${tixdir}/libtix`echo ${TIXVERSION} | tr -d .`${TIX_LIB_EXT}"
 	   fi
 
 	   ENABLE_GDBTK=1