Tue Jul 22 19:45:37 1997 Martin M. Hunt <hunt@cygnus.com>
* configure.in, aclocal.m4: Another fix to find the correct Tix library name. * configure: Rebuilt.
This commit is contained in:
Martin Hunt
parent
2b40778139
commit
6bc5b2fa96
4 changed files with 47 additions and 39 deletions
|
|
@ -1,3 +1,13 @@
|
||||||
|
start-sanitize-gdbtk
|
||||||
|
Tue Jul 22 19:45:37 1997 Martin M. Hunt <hunt@cygnus.com>
|
||||||
|
|
||||||
|
* configure.in, aclocal.m4: Another fix to find the
|
||||||
|
correct Tix library name.
|
||||||
|
|
||||||
|
* configure: Rebuilt.
|
||||||
|
|
||||||
|
end-sanitize-gdbtk
|
||||||
|
|
||||||
Tue Jul 22 12:11:48 1997 Michael Snyder (msnyder@cleaver.cygnus.com)
|
Tue Jul 22 12:11:48 1997 Michael Snyder (msnyder@cleaver.cygnus.com)
|
||||||
|
|
||||||
* config/mips/tm-mips64.h: longs, long longs, and pointers
|
* config/mips/tm-mips64.h: longs, long longs, and pointers
|
||||||
|
|
|
||||||
19
gdb/aclocal.m4
vendored
19
gdb/aclocal.m4
vendored
|
|
@ -524,25 +524,6 @@ fi
|
||||||
if test x"${ac_cv_c_tixh}" != x ; then
|
if test x"${ac_cv_c_tixh}" != x ; then
|
||||||
TIXHDIR="-I${ac_cv_c_tixh}"
|
TIXHDIR="-I${ac_cv_c_tixh}"
|
||||||
fi
|
fi
|
||||||
case "${host}" in
|
|
||||||
*-*-cygwin32*)
|
|
||||||
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
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
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(TIXHDIR)
|
||||||
AC_SUBST(TIXLIB)
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
||||||
39
gdb/configure
vendored
39
gdb/configure
vendored
|
|
@ -3006,27 +3006,25 @@ fi
|
||||||
if test x"${ac_cv_c_tixh}" != x ; then
|
if test x"${ac_cv_c_tixh}" != x ; then
|
||||||
TIXHDIR="-I${ac_cv_c_tixh}"
|
TIXHDIR="-I${ac_cv_c_tixh}"
|
||||||
fi
|
fi
|
||||||
case "${host}" in
|
|
||||||
*-*-cygwin32*)
|
|
||||||
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
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# now look for tix library stuff
|
||||||
|
TIXVERSION=4.1.7.6
|
||||||
|
. ${ac_cv_c_tclconfig}/tclConfig.sh
|
||||||
|
case "${host}" in
|
||||||
|
*-*-cygwin32*)
|
||||||
|
tixdir=../tix/win/tcl7.6
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
tixdir=../tix/unix/tk4.2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
|
||||||
|
TIXLIB="-L${tixdir} -ltix${TIXVERSION}"
|
||||||
|
else
|
||||||
|
TIXLIB="-L${tixdir} -ltix`echo ${TIXVERSION} | tr -d .`"
|
||||||
|
fi
|
||||||
|
|
||||||
ENABLE_GDBTK=1
|
ENABLE_GDBTK=1
|
||||||
|
|
||||||
|
|
@ -3049,6 +3047,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# end-sanitize-gdbtk
|
# end-sanitize-gdbtk
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -3192,7 +3191,7 @@ links="${links} nm.h"
|
||||||
fi
|
fi
|
||||||
# start-sanitize-gdbtk
|
# start-sanitize-gdbtk
|
||||||
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
|
||||||
echo "configure:3196: checking whether ln -s works" >&5
|
echo "configure:3195: checking whether ln -s works" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
|
|
@ -3412,11 +3411,11 @@ s%@TKHDIR@%$TKHDIR%g
|
||||||
s%@ITCLHDIR@%$ITCLHDIR%g
|
s%@ITCLHDIR@%$ITCLHDIR%g
|
||||||
s%@ITCLLIB@%$ITCLLIB%g
|
s%@ITCLLIB@%$ITCLLIB%g
|
||||||
s%@TIXHDIR@%$TIXHDIR%g
|
s%@TIXHDIR@%$TIXHDIR%g
|
||||||
s%@TIXLIB@%$TIXLIB%g
|
|
||||||
s%@ENABLE_GDBTK@%$ENABLE_GDBTK%g
|
s%@ENABLE_GDBTK@%$ENABLE_GDBTK%g
|
||||||
s%@X_CFLAGS@%$X_CFLAGS%g
|
s%@X_CFLAGS@%$X_CFLAGS%g
|
||||||
s%@X_LDFLAGS@%$X_LDFLAGS%g
|
s%@X_LDFLAGS@%$X_LDFLAGS%g
|
||||||
s%@X_LIBS@%$X_LIBS%g
|
s%@X_LIBS@%$X_LIBS%g
|
||||||
|
s%@TIXLIB@%$TIXLIB%g
|
||||||
s%@ENABLE_CFLAGS@%$ENABLE_CFLAGS%g
|
s%@ENABLE_CFLAGS@%$ENABLE_CFLAGS%g
|
||||||
s%@CONFIG_OBS@%$CONFIG_OBS%g
|
s%@CONFIG_OBS@%$CONFIG_OBS%g
|
||||||
s%@HLDFLAGS@%$HLDFLAGS%g
|
s%@HLDFLAGS@%$HLDFLAGS%g
|
||||||
|
|
|
||||||
|
|
@ -305,6 +305,23 @@ if test "${enable_gdbtk}" = "yes"; then
|
||||||
CY_AC_PATH_ITCLH
|
CY_AC_PATH_ITCLH
|
||||||
CY_AC_PATH_TIX
|
CY_AC_PATH_TIX
|
||||||
|
|
||||||
|
# now look for tix library stuff
|
||||||
|
TIXVERSION=4.1.7.6
|
||||||
|
. ${ac_cv_c_tclconfig}/tclConfig.sh
|
||||||
|
case "${host}" in
|
||||||
|
*-*-cygwin32*)
|
||||||
|
tixdir=../tix/win/tcl7.6
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
tixdir=../tix/unix/tk4.2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
|
||||||
|
TIXLIB="-L${tixdir} -ltix${TIXVERSION}"
|
||||||
|
else
|
||||||
|
TIXLIB="-L${tixdir} -ltix`echo ${TIXVERSION} | tr -d .`"
|
||||||
|
fi
|
||||||
|
|
||||||
ENABLE_GDBTK=1
|
ENABLE_GDBTK=1
|
||||||
|
|
||||||
# Include some libraries that Tcl and Tk want.
|
# Include some libraries that Tcl and Tk want.
|
||||||
|
|
@ -326,6 +343,7 @@ AC_SUBST(ENABLE_GDBTK)
|
||||||
AC_SUBST(X_CFLAGS)
|
AC_SUBST(X_CFLAGS)
|
||||||
AC_SUBST(X_LDFLAGS)
|
AC_SUBST(X_LDFLAGS)
|
||||||
AC_SUBST(X_LIBS)
|
AC_SUBST(X_LIBS)
|
||||||
|
AC_SUBST(TIXLIB)
|
||||||
# end-sanitize-gdbtk
|
# end-sanitize-gdbtk
|
||||||
|
|
||||||
AC_SUBST(ENABLE_CFLAGS)
|
AC_SUBST(ENABLE_CFLAGS)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue