diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-03-02 15:25:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-03-02 15:25:48 (GMT) |
| commit | 2bfe6d6fe88823a6503112161f9c67115ad4282c (patch) | |
| tree | b4baccc367d18e68b92a29f0c3ba34667ad172dc | |
| parent | 235c5c8253f70274485df3e3a4f38401ff5c1f4d (diff) | |
| download | tk-2bfe6d6fe88823a6503112161f9c67115ad4282c.zip tk-2bfe6d6fe88823a6503112161f9c67115ad4282c.tar.gz tk-2bfe6d6fe88823a6503112161f9c67115ad4282c.tar.bz2 | |
Revert part of [032c1ee138449c93dfa885fab07796783945e174|032c1ee138]: Only the patchlevel should have been changed, nothing else.
FossilOrigin-Name: 42f2cbd8d5f6c97d23eaaad9c1863c74453439b5
| -rwxr-xr-x | unix/configure | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure index 3958a6b..5ffc3fa 100755 --- a/unix/configure +++ b/unix/configure @@ -9598,7 +9598,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. */ @@ -9606,7 +9606,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 @@ -9633,7 +9633,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 @@ -9647,18 +9647,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; } |