Thu Aug 7 13:39:31 1997 Geoffrey Noer <noer@cygnus.com>

[deliverable/binutils-gdb.git] / gdb / aclocal.m4

diff --git a/gdb/aclocal.m4 b/gdb/aclocal.m4
index 770d1488524adeede5a9e5ea24b859aeae956122..0c00e52029fe93e8a25de57a81b52c4ff0c12820 100644 (file)
--- a/gdb/aclocal.m4
+++ b/gdb/aclocal.m4
@@ -74,8 +74,9 @@ AC_DEFUN(CY_AC_PATH_TCLH, [
 # be careful that we don't match stuff like tclX by accident.
 # the alternative search directory is involked by --with-tclinclude
 #
+
 no_tcl=true
-AC_MSG_CHECKING(for Tcl private headers)
+AC_MSG_CHECKING(for Tcl private headers. dir=${configdir})
 AC_ARG_WITH(tclinclude, [  --with-tclinclude       directory where tcl private headers are], with_tclinclude=${withval})
 AC_CACHE_VAL(ac_cv_c_tclh,[
 # first check to see if --with-tclinclude was specified
@@ -187,8 +188,8 @@ if test x"${no_tcl}" = x ; then
                `ls -dr ../../tcl[[7-9]]* 2>/dev/null` \
                ../../../tcl \
                `ls -dr ../../../tcl[[7-9]]* 2>/dev/null` ; do
-      if test -f "$i/unix/tclConfig.sh" ; then
-        ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+      if test -f "$i/${configdir}/tclConfig.sh" ; then
+        ac_cv_c_tclconfig=`(cd $i/${configdir}; pwd)`
        break
       fi
     done
@@ -207,8 +208,8 @@ if test x"${no_tcl}" = x ; then
     for i in \
                ${srcdir}/../tcl \
                `ls -dr ${srcdir}/../tcl[[7-9]]* 2>/dev/null` ; do
-      if test -f "$i/unix/tclConfig.sh" ; then
-        ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+      if test -f "$i/${configdir}/tclConfig.sh" ; then
+        ac_cv_c_tclconfig=`(cd $i/${configdir}; pwd)`
        break
       fi
     done
@@ -409,8 +410,8 @@ if test x"${no_tk}" = x ; then
                `ls -dr ../../tk[[4-9]]* 2>/dev/null` \
                ../../../tk \
                `ls -dr ../../../tk[[4-9]]* 2>/dev/null` ; do
-      if test -f "$i/unix/tkConfig.sh" ; then
-        ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
+      if test -f "$i/${configdir}/tkConfig.sh" ; then
+        ac_cv_c_tkconfig=`(cd $i/${configdir}; pwd)`
        break
       fi
     done
@@ -429,8 +430,8 @@ if test x"${no_tk}" = x ; then
     for i in \
                ${srcdir}/../tk \
                `ls -dr ${srcdir}/../tk[[4-9]]* 2>/dev/null` ; do
-      if test -f "$i/unix/tkConfig.sh" ; then
-        ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
+      if test -f "$i/${configdir}/tkConfig.sh" ; then
+        ac_cv_c_tkconfig=`(cd $i/${configdir}; pwd)`
        break
       fi
     done
@@ -472,9 +473,58 @@ dnl    AC_SUBST(TK_PREFIX)
 dnl not used, don't export to save symbols
 dnl    AC_SUBST(TK_EXEC_PREFIX)
 
+    AC_SUBST(TK_BUILD_INCLUDES)
     AC_SUBST(TK_XINCLUDES)
     AC_SUBST(TK_XLIBSW)
     AC_SUBST(TK_BUILD_LIB_SPEC)
     AC_SUBST(TK_LIB_SPEC)
 ])
 
+
+# check for Itcl headers. 
+
+AC_DEFUN(CY_AC_PATH_ITCLH, [
+AC_MSG_CHECKING(for Itcl private headers. srcdir=${srcdir})
+if test x"${ac_cv_c_itclh}" = x ; then
+  for i in ${srcdir}/../itcl ${srcdir}/../../itcl ${srcdir}/../../../itcl ; do
+    if test -f $i/src/itcl.h ; then
+      ac_cv_c_itclh=`(cd $i/src; pwd)`
+      break
+    fi
+  done
+fi
+if test x"${ac_cv_c_itclh}" = x ; then
+  ITCLHDIR="# no Itcl private headers found"
+  AC_MSG_ERROR([Can't find Itcl private headers])
+fi
+if test x"${ac_cv_c_itclh}" != x ; then
+     ITCLHDIR="-I${ac_cv_c_itclh}"
+fi
+# should always be here
+     ITCLLIB="../itcl/src/libitcl.a"
+AC_SUBST(ITCLHDIR)
+AC_SUBST(ITCLLIB)
+])
+
+# check for Tix headers. 
+
+AC_DEFUN(CY_AC_PATH_TIX, [
+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
+    if test -f $i/generic/tix.h ; then
+      ac_cv_c_tixh=`(cd $i/generic; pwd)`
+      break
+    fi
+  done
+fi
+if test x"${ac_cv_c_tixh}" = x ; then
+  TIXHDIR="# no Tix private headers found"
+  AC_MSG_ERROR([Can't find Tix private headers])
+fi
+if test x"${ac_cv_c_tixh}" != x ; then
+     TIXHDIR="-I${ac_cv_c_tixh}"
+fi
+AC_SUBST(TIXHDIR)
+])
+