aboutsummaryrefslogtreecommitdiff
path: root/gdb/aclocal.m4
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>1999-02-06 01:50:46 +0000
committerJim Ingham <jingham@apple.com>1999-02-06 01:50:46 +0000
commitb11485dae8764a26940696869b1bf05fdb5178b9 (patch)
tree2cc965db3a778c16e07999e43f5b1476c4d5ba77 /gdb/aclocal.m4
parent77e3189254f4d4584b51b7922c0b3b0d8bd2ecec (diff)
downloadgdb-b11485dae8764a26940696869b1bf05fdb5178b9.zip
gdb-b11485dae8764a26940696869b1bf05fdb5178b9.tar.gz
gdb-b11485dae8764a26940696869b1bf05fdb5178b9.tar.bz2
1999-02-05 James Ingham <jingham@cygnus.com>
* Makefile.in: Add GDBTK_CFLAGS - this is now used to hold -fwritable-strings when compiling with Tk8.1. * configure.in: Add GDBTK_CFLAGS, set it to -fwritable-strings for Tcl/Tk8.1 & greater. * acinclude.m4: Move the rest of the defines to find Itcl, Itk & Tix from aclocal.m4 to here. * aclocal.m4: regenerate. * configure: regenerate. * gdbtk-hooks.c (x_event): Tcl_ObjGetVar2 was removed from Tcl8.1. Use Tcl_GetVar2 instead. * gdbtk-hooks.c (gdbtk_trace_find): Fix up call to Tcl_GlobalEvalObj for Tcl/Tk 8.1. * gdbtk-hooks.c (gdbtk_trace_start_stop): Call to Tcl_EvalObj was inefficient, replace with call to Tcl_GlobalEval. * gdbtk.c: Don't swap out the Tcl_Alloc calls in gdbtk.c. We took care of that in Tcl itself for 8.1. * gdbtk.c: Remove const from the script string since Tcl8.1 has taken to scribbling sentinals into strings passed to it again... * gdbtk-cmds.c (wrapped_call): Change declaration of 1st arg from char * to PTR to eliminate warning. * gdbtk-cmds.c (perror_with_name_wrapper): Ditto
Diffstat (limited to 'gdb/aclocal.m4')
-rw-r--r--gdb/aclocal.m4112
1 files changed, 108 insertions, 4 deletions
diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 3c1e4ec..57f5c35 100644
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -16,8 +16,8 @@ dnl major rewriting for Tcl 7.5 by Don Libes <libes@nist.gov>
dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition.
sinclude(../bfd/acinclude.m4)
-dnl CY_AC_PATH_TCLCONFIG and CY_AC_LOAD_TCLCONFIG should be invoked
-dnl (in that order) before any other TCL macros. Similarly for TK.
+dnl This gets the standard macros, like the TCL, TK, etc ones.
+sinclude(../config/acinclude.m4)
dnl CYGNUS LOCAL: This gets the right posix flag for gcc
AC_DEFUN(CY_AC_TCL_LYNX_POSIX,
@@ -564,7 +564,6 @@ if test x"${no_itcl}" = x ; then
AC_MSG_RESULT(found $ITCLCONFIG)
fi
fi
-
])
# Defined as a separate macro so we don't have to cache the values
@@ -748,7 +747,7 @@ AC_SUBST(ITKHDIR)
# check for Tix headers.
-AC_DEFUN(CY_AC_PATH_TIX, [
+AC_DEFUN(CY_AC_PATH_TIXH, [
AC_MSG_CHECKING(for Tix private headers. srcdir=${srcdir})
if test x"${ac_cv_c_tixh}" = x ; then
for i in ${srcdir}/../tix ${srcdir}/../../tix ${srcdir}/../../../tix ; do
@@ -768,6 +767,111 @@ fi
AC_SUBST(TIXHDIR)
])
+AC_DEFUN(CY_AC_PATH_TIXCONFIG, [
+#
+# Ok, lets find the tix configuration
+# First, look for one uninstalled.
+# the alternative search directory is invoked by --with-itkconfig
+#
+
+if test x"${no_tix}" = x ; then
+ # we reset no_tix in case something fails here
+ no_tix=true
+ AC_ARG_WITH(tixconfig, [ --with-tixconfig directory containing tix configuration (tixConfig.sh)],
+ with_tixconfig=${withval})
+ AC_MSG_CHECKING([for Tix configuration])
+ AC_CACHE_VAL(ac_cv_c_tixconfig,[
+
+ # First check to see if --with-tixconfig was specified.
+ if test x"${with_tixconfig}" != x ; then
+ if test -f "${with_tixconfig}/tixConfig.sh" ; then
+ ac_cv_c_tixconfig=`(cd ${with_tixconfig}; pwd)`
+ else
+ AC_MSG_ERROR([${with_tixconfig} directory doesn't contain tixConfig.sh])
+ fi
+ fi
+
+ # then check for a private Tix library
+ if test x"${ac_cv_c_tixconfig}" = x ; then
+ for i in \
+ ../tix \
+ `ls -dr ../tix 2>/dev/null` \
+ ../../tix \
+ `ls -dr ../../tix 2>/dev/null` \
+ ../../../tix \
+ `ls -dr ../../../tix 2>/dev/null` ; do
+ echo "**** Looking at $i - with ${configdir}"
+ if test -f "$i/tixConfig.sh" ; then
+ ac_cv_c_tixconfig=`(cd $i; pwd)`
+ break
+ fi
+ done
+ fi
+ # check in a few common install locations
+ if test x"${ac_cv_c_tixconfig}" = x ; then
+ for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
+ echo "**** Looking at $i"
+ if test -f "$i/tixConfig.sh" ; then
+ ac_cv_c_tixconfig=`(cd $i; pwd)`
+ break
+ fi
+ done
+ fi
+ # check in a few other private locations
+ echo "**** Other private locations"
+ if test x"${ac_cv_c_tixconfig}" = x ; then
+ for i in \
+ ${srcdir}/../tix \
+ `ls -dr ${srcdir}/../tix 2>/dev/null` ; do
+ echo "**** Looking at $i - with ${configdir}"
+ if test -f "$i/${configdir}/tixConfig.sh" ; then
+ ac_cv_c_tixconfig=`(cd $i/${configdir}; pwd)`
+ break
+ fi
+ done
+ fi
+ ])
+ if test x"${ac_cv_c_tixconfig}" = x ; then
+ TIXCONFIG="# no Tix configs found"
+ AC_MSG_WARN(Can't find Tix configuration definitions)
+ else
+ no_tix=
+ TIXCONFIG=${ac_cv_c_tixconfig}/tixConfig.sh
+ AC_MSG_RESULT(found $TIXCONFIG)
+ fi
+fi
+
+])
+
+# Defined as a separate macro so we don't have to cache the values
+# from PATH_TIXCONFIG (because this can also be cached).
+AC_DEFUN(CY_AC_LOAD_TIXCONFIG, [
+ if test -f "$TIXCONFIG" ; then
+ . $TIXCONFIG
+ fi
+
+ AC_SUBST(TIX_VERSION)
+dnl not actually used, don't export to save symbols
+dnl AC_SUBST(TIX_MAJOR_VERSION)
+dnl AC_SUBST(TIX_MINOR_VERSION)
+dnl AC_SUBST(TIX_DEFS)
+
+dnl not used, don't export to save symbols
+dnl dnl AC_SUBST(TIX_LIB_FILE)
+
+dnl not used outside of configure
+dnl AC_SUBST(TIX_LIBS)
+dnl not used, don't export to save symbols
+dnl AC_SUBST(TIX_PREFIX)
+
+dnl not used, don't export to save symbols
+dnl AC_SUBST(TIX_EXEC_PREFIX)
+
+dnl AC_SUBST(TIX_BUILD_INCLUDES)
+ AC_SUBST(TIX_BUILD_LIB_SPEC)
+dnl AC_SUBST(TIX_LIB_SPEC)
+])
+
# serial 1