Mon Jul 21 22:24:07 1997 Martin M. Hunt <hunt@cygnus.com>

	* aclocal.m4: Search for the correct tix library.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e5357c1..37a190d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+start-sanitize-gdbtk
+Mon Jul 21 22:24:07 1997  Martin M. Hunt  <hunt@cygnus.com>
+
+       * aclocal.m4: Search for the correct tix library. 
+end-sanitize-gdbtk
+       
 Thu Jul 17 11:38:46 1997  Michael Snyder  (msnyder@cleaver.cygnus.com)
 
        * partial-stab.h (case N_BINCL): detect missing partial symtab.

diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 50fb1f0..39cbd11 100644 (file)
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -524,12 +524,23 @@ fi
 if test x"${ac_cv_c_tixh}" != x ; then
      TIXHDIR="-I${ac_cv_c_tixh}"
 fi
-# need to do better than this...
 case "${host}" in
 *-*-cygwin32*)
-  TIXLIB="../tix/win/tk4.2/libtix4.1.7.6.a" ;;
+  for i in ../tix/win/tk4.2/libtix4.1.7.6.a ../tix/win/tk4.2/libtix4176.a ; do
+    if test -f $i ; then
+       TIXLIB=${i}
+      break
+    fi 
+  done 
+  ;;
 *)
-  TIXLIB="../tix/unix/tk4.2/libtix4.1.7.6.a" ;;
+  for i in ../tix/unix/tk4.2/libtix4.1.7.6.a ../tix/unix/tk4.2/libtix4176.a ; do
+    if test -f ${i} ; then
+       TIXLIB=${i}
+      break
+    fi
+  done
+  ;;
 esac 
 AC_SUBST(TIXHDIR)
 AC_SUBST(TIXLIB)