diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-15 10:09:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-15 10:09:25 (GMT) |
| commit | e90980a42a9d7125c6d1c04f30b78a9b4b53b53c (patch) | |
| tree | b52fdd6b865595667b91e718201bb22fc390e2cc /unix/configure | |
| parent | 5160b7b4f3113bd0e3d614cc50dcfe26c3e451ad (diff) | |
| download | tk-e90980a42a9d7125c6d1c04f30b78a9b4b53b53c.zip tk-e90980a42a9d7125c6d1c04f30b78a9b4b53b53c.tar.gz tk-e90980a42a9d7125c6d1c04f30b78a9b4b53b53c.tar.bz2 | |
Sync unix/tcl.m4 with Tcl. Re-generate unix/configure
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/unix/configure b/unix/configure index 8806645..051a691 100755 --- a/unix/configure +++ b/unix/configure @@ -697,6 +697,7 @@ ZIP_INSTALL_OBJS ZIP_PROG_VFSSEARCH ZIP_PROG_OPTIONS ZIP_PROG +MACHER_PROG EXEEXT_FOR_BUILD CC_FOR_BUILD UNIX_FONT_OBJS @@ -8785,11 +8786,41 @@ printf "%s\n" "$bfd_cv_build_exeext" >&6; } # Find a native zip implementation # + MACHER_PROG="" ZIP_PROG="" ZIP_PROG_OPTIONS="" ZIP_PROG_VFSSEARCH="" ZIP_INSTALL_OBJS="" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for macher" >&5 +printf %s "checking for macher... " >&6; } + if test ${ac_cv_path_macher+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + search_path=`echo ${PATH} | sed -e 's/:/ /g'` + for dir in $search_path ; do + for j in `ls -r $dir/macher 2> /dev/null` \ + `ls -r $dir/macher 2> /dev/null` ; do + if test x"$ac_cv_path_macher" = x ; then + if test -f "$j" ; then + ac_cv_path_macher=$j + break + fi + fi + done + done + +fi + + if test -f "$ac_cv_path_macher" ; then + MACHER_PROG="$ac_cv_path_macher" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACHER_PROG" >&5 +printf "%s\n" "$MACHER_PROG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Found macher in environment" >&5 +printf "%s\n" "Found macher in environment" >&6; } + fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip" >&5 printf %s "checking for zip... " >&6; } if test ${ac_cv_path_zip+y} @@ -8836,6 +8867,7 @@ printf "%s\n" "No zip found on PATH. Building minizip" >&6; } + ZIPFS_BUILD=1 TK_ZIP_FILE=libtk${TK_MAJOR_VERSION}.${TK_MINOR_VERSION}${TK_PATCH_LEVEL}.zip else |