summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2002-07-23 17:24:24 (GMT)
committermdejong <mdejong>2002-07-23 17:24:24 (GMT)
commitbdfafb84af17bc64ae9fe74c9154ab9db405b8ce (patch)
treec3a7a1bde3f2a49160db0056ae9e0bd9d5621bd0
parentcd3f3476d23910bafba9039f999389c4a8a01735 (diff)
downloadtk-bdfafb84af17bc64ae9fe74c9154ab9db405b8ce.zip
tk-bdfafb84af17bc64ae9fe74c9154ab9db405b8ce.tar.gz
tk-bdfafb84af17bc64ae9fe74c9154ab9db405b8ce.tar.bz2
* unix/configure: Regen.
* unix/tcl.m4: Update from Tcl.
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure18
-rw-r--r--unix/tcl.m415
3 files changed, 21 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index b8c4cc8..73b81e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-23 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/configure: Regen.
+ * unix/tcl.m4: Update from Tcl.
+
2002-07-22 Mo DeJong <mdejong@users.sourceforge.net>
* library/choosedir.tcl (tk::dialog::file::chooseDir):
diff --git a/unix/configure b/unix/configure
index 0c3f85d..566d60b 100755
--- a/unix/configure
+++ b/unix/configure
@@ -4078,7 +4078,7 @@ rm -f conftest*
if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
echo $ac_n "checking for X11 header files""... $ac_c" 1>&6
echo "configure:4081: checking for X11 header files" >&5
- XINCLUDES="# no special path needed"
+ found_xincludes="no"
cat > conftest.$ac_ext <<EOF
#line 4084 "configure"
#include "confdefs.h"
@@ -4088,35 +4088,35 @@ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
- :
+ rm -rf conftest*
+ found_xincludes="yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
- XINCLUDES="nope"
+ found_xincludes="no"
fi
rm -f conftest*
- if test "$XINCLUDES" = nope; then
+ 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
echo "$ac_t""$i" 1>&6
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
echo "$ac_t""couldn't find any!" 1>&6
- XINCLUDES="# no include files found"
fi
if test "$no_x" = yes; then
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