summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rwxr-xr-xunix/configure66
-rw-r--r--unix/tcl.m43
3 files changed, 47 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index f9e6f0e..35758f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-09-15 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/configure: Regen.
+ * unix/tcl.m4 (SC_CONFIG_CFLAGS): Add PEEK_XCLOSEIM
+ define under Linux. This is used by Tk to double
+ check that an X input context is cleaned up
+ before it is closed.
+
2002-09-12 David Gravereaux <davygrvy@pobox.com>
* win/coffbase.txt: Added BLT to the virtual base address
diff --git a/unix/configure b/unix/configure
index f005092..68efe06 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6056,6 +6056,12 @@ fi
EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
fi
+ # XIM peeking works under XFree86.
+ cat >> confdefs.h <<\EOF
+#define PEEK_XCLOSEIM 1
+EOF
+
+
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
@@ -6072,17 +6078,17 @@ fi
else
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
-echo "configure:6076: checking for dld.h" >&5
+echo "configure:6082: checking for dld.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6081 "configure"
+#line 6087 "configure"
#include "confdefs.h"
#include <dld.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6092: \"$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*
@@ -6140,17 +6146,17 @@ fi
# Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:6144: checking for dlfcn.h" >&5
+echo "configure:6150: checking for dlfcn.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6149 "configure"
+#line 6155 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6160: \"$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*
@@ -6178,9 +6184,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
echo $ac_n "checking for ELF""... $ac_c" 1>&6
-echo "configure:6182: checking for ELF" >&5
+echo "configure:6188: checking for ELF" >&5
cat > conftest.$ac_ext <<EOF
-#line 6184 "configure"
+#line 6190 "configure"
#include "confdefs.h"
#ifdef __ELF__
@@ -6538,17 +6544,17 @@ EOF
# that don't grok the -Bexport option. Test that it does.
hold_ldflags=$LDFLAGS
echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6
-echo "configure:6542: checking for ld accepts -Bexport flag" >&5
+echo "configure:6548: checking for ld accepts -Bexport flag" >&5
LDFLAGS="${LDFLAGS} -Wl,-Bexport"
cat > conftest.$ac_ext <<EOF
-#line 6545 "configure"
+#line 6551 "configure"
#include "confdefs.h"
int main() {
int i;
; return 0; }
EOF
-if { (eval echo configure:6552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
found=yes
else
@@ -6595,9 +6601,9 @@ rm -f conftest*
if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
-echo "configure:6599: checking sys/exec.h" >&5
+echo "configure:6605: checking sys/exec.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6601 "configure"
+#line 6607 "configure"
#include "confdefs.h"
#include <sys/exec.h>
int main() {
@@ -6615,7 +6621,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:6619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
tcl_ok=usable
else
@@ -6633,9 +6639,9 @@ EOF
else
echo $ac_n "checking a.out.h""... $ac_c" 1>&6
-echo "configure:6637: checking a.out.h" >&5
+echo "configure:6643: checking a.out.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6639 "configure"
+#line 6645 "configure"
#include "confdefs.h"
#include <a.out.h>
int main() {
@@ -6653,7 +6659,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:6657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
tcl_ok=usable
else
@@ -6671,9 +6677,9 @@ EOF
else
echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
-echo "configure:6675: checking sys/exec_aout.h" >&5
+echo "configure:6681: checking sys/exec_aout.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6677 "configure"
+#line 6683 "configure"
#include "confdefs.h"
#include <sys/exec_aout.h>
int main() {
@@ -6691,7 +6697,7 @@ int main() {
; return 0; }
EOF
-if { (eval echo configure:6695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
tcl_ok=usable
else
@@ -6845,7 +6851,7 @@ fi
echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
-echo "configure:6849: checking for build with symbols" >&5
+echo "configure:6855: checking for build with symbols" >&5
# Check whether --enable-symbols or --disable-symbols was given.
if test "${enable_symbols+set}" = set; then
enableval="$enable_symbols"
@@ -6871,7 +6877,7 @@ fi
echo $ac_n "checking for build with memory debugging""... $ac_c" 1>&6
-echo "configure:6875: checking for build with memory debugging" >&5
+echo "configure:6881: checking for build with memory debugging" >&5
# Check whether --enable-memdebug or --disable-memdebug was given.
if test "${enable_memdebug+set}" = set; then
enableval="$enable_memdebug"
@@ -6904,17 +6910,17 @@ TCL_DBGX=${DBGX}
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6908: checking for $ac_hdr" >&5
+echo "configure:6914: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6913 "configure"
+#line 6919 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6924: \"$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*
@@ -6944,17 +6950,17 @@ done
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6948: checking for $ac_hdr" >&5
+echo "configure:6954: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 6953 "configure"
+#line 6959 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6964: \"$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*
@@ -6981,7 +6987,7 @@ fi
done
echo $ac_n "checking FIONBIO vs. O_NONBLOCK for nonblocking I/O""... $ac_c" 1>&6
-echo "configure:6985: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5
+echo "configure:6991: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5
if test -f /usr/lib/NextStep/software_version; then
system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
else
@@ -7044,7 +7050,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
echo $ac_n "checking how to package libraries""... $ac_c" 1>&6
-echo "configure:7048: checking how to package libraries" >&5
+echo "configure:7054: checking how to package libraries" >&5
# Check whether --enable-framework or --disable-framework was given.
if test "${enable_framework+set}" = set; then
enableval="$enable_framework"
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 31f43a9..45ccfe0 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1117,6 +1117,9 @@ dnl AC_CHECK_TOOL(AR, ar, :)
EXTRA_CFLAGS="${EXTRA_CFLAGS} -fno-inline"
fi
+ # XIM peeking works under XFree86.
+ AC_DEFINE(PEEK_XCLOSEIM)
+
;;
GNU*)
SHLIB_CFLAGS="-fPIC"