summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authormdejong <mdejong>2002-07-23 17:22:24 (GMT)
committermdejong <mdejong>2002-07-23 17:22:24 (GMT)
commitff2303e56665cf56fbe9eb41a11bbf04df2556af (patch)
tree69b8f6fb1614979bf1911e7064b2f6c1210d0538 /unix/tcl.m4
parentb39f34de9807e5ba4c36539d29795fd971b72abf (diff)
downloadtcl-ff2303e56665cf56fbe9eb41a11bbf04df2556af.zip
tcl-ff2303e56665cf56fbe9eb41a11bbf04df2556af.tar.gz
tcl-ff2303e56665cf56fbe9eb41a11bbf04df2556af.tar.bz2
* unix/tcl.m4 (SC_PATH_X): Set XINCLUDES to "" instead
of "# no special path needed" or "# no include files found" when x headers cannot be located.
Diffstat (limited to 'unix/tcl.m4')
-rw-r--r--unix/tcl.m415
1 files changed, 7 insertions, 8 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index a7f15dd..c0ea91e 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1736,28 +1736,27 @@ AC_DEFUN(SC_PATH_X, [
fi
if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
AC_MSG_CHECKING(for X11 header files)
- XINCLUDES="# no special path needed"
- AC_TRY_CPP([#include <X11/Intrinsic.h>], , XINCLUDES="nope")
- if test "$XINCLUDES" = nope; then
+ found_xincludes="no"
+ AC_TRY_CPP([#include <X11/Intrinsic.h>], found_xincludes="yes", found_xincludes="no")
+ if test "$found_xincludes" = "no"; then
dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
for i in $dirs ; do
if test -r $i/X11/Intrinsic.h; then
AC_MSG_RESULT($i)
XINCLUDES=" -I$i"
+ found_xincludes="yes"
break
fi
done
fi
else
if test "$x_includes" != ""; then
- XINCLUDES=-I$x_includes
- else
- XINCLUDES="# no special path needed"
+ XINCLUDES="-I$x_includes"
+ found_xincludes="yes"
fi
fi
- if test "$XINCLUDES" = nope; then
+ if test found_xincludes = "no"; then
AC_MSG_RESULT(couldn't find any!)
- XINCLUDES="# no include files found"
fi
if test "$no_x" = yes; then