diff options
| author | mdejong <mdejong> | 2002-07-23 17:22:24 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2002-07-23 17:22:24 (GMT) |
| commit | ff2303e56665cf56fbe9eb41a11bbf04df2556af (patch) | |
| tree | 69b8f6fb1614979bf1911e7064b2f6c1210d0538 | |
| parent | b39f34de9807e5ba4c36539d29795fd971b72abf (diff) | |
| download | tcl-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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | unix/tcl.m4 | 15 |
2 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2002-07-23 Mo DeJong <mdejong@users.sourceforge.net> + + * 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. + 2002-07-22 Vince Darley <vincentdarley@users.sourceforge.net> * generic/tclIOUtil.c: made tclNativeFilesystem static 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 |