diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-10-27 04:23:13 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-10-27 04:23:13 (GMT) |
| commit | 08a5977be6d47dbe4b3fa1bac892353f66dd2990 (patch) | |
| tree | 5d20a5124f9e13b0312a2e4d94a76d06d90238b7 /unix | |
| parent | e45899dfe4a136045461e8d0a243333b8ea5772d (diff) | |
| download | tk-08a5977be6d47dbe4b3fa1bac892353f66dd2990.zip tk-08a5977be6d47dbe4b3fa1bac892353f66dd2990.tar.gz tk-08a5977be6d47dbe4b3fa1bac892353f66dd2990.tar.bz2 | |
merge updates from HEAD
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 12 | ||||
| -rw-r--r-- | unix/configure.in | 2 | ||||
| -rw-r--r-- | unix/tk.spec | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/unix/configure b/unix/configure index 528fa24..d3565ff 100755 --- a/unix/configure +++ b/unix/configure @@ -9124,7 +9124,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. */ @@ -9132,7 +9132,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 @@ -9159,7 +9159,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 @@ -9173,18 +9173,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; } diff --git a/unix/configure.in b/unix/configure.in index da98e55..84b66a6 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.134.2.7 2007/10/15 18:38:40 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.134.2.8 2007/10/27 04:23:18 dgp Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) diff --git a/unix/tk.spec b/unix/tk.spec index 83dbbbc..19d02f8 100644 --- a/unix/tk.spec +++ b/unix/tk.spec @@ -1,4 +1,4 @@ -# $Id: tk.spec,v 1.25.2.2 2007/10/02 20:43:54 dgp Exp $ +# $Id: tk.spec,v 1.25.2.3 2007/10/27 04:23:18 dgp Exp $ # This file is the basis for a binary Tk Linux RPM. %{!?directory:%define directory /usr/local} |