diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-24 09:04:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-11-24 09:04:42 (GMT) |
| commit | 6da9178069c3c923e3df144f28034f9d4fee60ed (patch) | |
| tree | 4a5e0a22eff7b111f66be0b99eafd00a78988233 /unix | |
| parent | fc12eac9417801a452f0e1c56bc3b89dfa8581bc (diff) | |
| download | tk-6da9178069c3c923e3df144f28034f9d4fee60ed.zip tk-6da9178069c3c923e3df144f28034f9d4fee60ed.tar.gz tk-6da9178069c3c923e3df144f28034f9d4fee60ed.tar.bz2 | |
sync tcl.m4 with Tcl version
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 12 | ||||
| -rw-r--r-- | unix/tcl.m4 | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/unix/configure b/unix/configure index efd289f..cf5ce30 100755 --- a/unix/configure +++ b/unix/configure @@ -7312,18 +7312,18 @@ 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <X11/Intrinsic.h> +#include <X11/Xlib.h> _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : # We can compile using X headers with no special include directory. ac_x_includes= else 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 @@ -7337,14 +7337,14 @@ 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 confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <X11/Intrinsic.h> +#include <X11/Xlib.h> int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 6955ace..2f114d7 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -3011,7 +3011,7 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [ done ]) if test -f "$ac_cv_path_zip" ; then - ZIP_PROG="$ac_cv_path_zip " + ZIP_PROG="$ac_cv_path_zip" AC_MSG_RESULT([$ZIP_PROG]) ZIP_PROG_OPTIONS="-rq" ZIP_PROG_VFSSEARCH="." @@ -3020,7 +3020,7 @@ AC_DEFUN([SC_ZIPFS_SUPPORT], [ else # It is not an error if an installed version of Zip can't be located. # We can use the locally distributed minizip instead - ZIP_PROG="../minizip${EXEEXT_FOR_BUILD}" + ZIP_PROG="./minizip${EXEEXT_FOR_BUILD}" ZIP_PROG_OPTIONS="-o -r" ZIP_PROG_VFSSEARCH="." ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}" |