diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-11-30 21:21:48 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-11-30 21:21:48 (GMT) |
| commit | a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a (patch) | |
| tree | 24ccb2318d04412685b1a4262df7c33df0864d34 /unix/configure | |
| parent | ddb9e825e0b85f216d172f8b537257c8d58b0de9 (diff) | |
| parent | b8bfd3505b511a3cc94297df7f04c55505d6df2c (diff) | |
| download | tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.zip tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.gz tk-a24fdcc2b9295b493a9cd9e7632be98c5ddb3f6a.tar.bz2 | |
merge 8.5
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/unix/configure b/unix/configure index 41380f8..f6c4ff7 100755 --- a/unix/configure +++ b/unix/configure @@ -7086,7 +7086,7 @@ fi MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' if test "${SHLIB_SUFFIX}" = ".dll"; then - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;' DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" else @@ -10008,7 +10008,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. */ @@ -10016,7 +10016,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 @@ -10043,7 +10043,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 @@ -10057,18 +10057,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; } |