summaryrefslogtreecommitdiffstats
path: root/unix/configure
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-12-13 15:23:41 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-12-13 15:23:41 (GMT)
commitad22aa264a6389aad9cd820032d1f8cca5832914 (patch)
tree4d11bd34c1edaf312cd42b5180cd01bf3fbc7a72 /unix/configure
parent3d75268cfe0948ae13452dc01b24cdba45c80201 (diff)
downloadtk-ad22aa264a6389aad9cd820032d1f8cca5832914.zip
tk-ad22aa264a6389aad9cd820032d1f8cca5832914.tar.gz
tk-ad22aa264a6389aad9cd820032d1f8cca5832914.tar.bz2
merge stable branch onto HEAD
Diffstat (limited to 'unix/configure')
-rwxr-xr-xunix/configure14
1 files changed, 7 insertions, 7 deletions
diff --git a/unix/configure b/unix/configure
index de9b59e..bbe6c9e 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1337,7 +1337,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
TK_VERSION=8.5
TK_MAJOR_VERSION=8
TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="b3"
+TK_PATCH_LEVEL=".0"
VERSION=${TK_VERSION}
LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru sv"
@@ -9406,7 +9406,7 @@ ac_x_header_dirs='
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Intrinsic.h.
+ # Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -9414,7 +9414,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9441,7 +9441,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Intrinsic.h"; then
+ if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
break
fi
@@ -9455,18 +9455,18 @@ if test "$ac_x_libraries" = no; then
# See if we find them without any special options.
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
- LIBS="-lXt $LIBS"
+ LIBS="-lX11 $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
int
main ()
{
-XtMalloc (0)
+XrmInitialize ()
;
return 0;
}