Mercurial > vim

comparison src/auto/configure @ 26542:b74e4c3618f8 v8.2.3800

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3800: when cross compiling the output of "uname" cannot be set Commit: https://github.com/vim/vim/commit/6840a0ffe8d27a8773a500ba17550cdf2ad12cbc Author: Bram Moolenaar <Bram@vim.org> Date: Mon Dec 13 20:37:59 2021 +0000 patch 8.2.3800: when cross compiling the output of "uname" cannot be set Problem: When cross compiling the output of "uname" cannot be set. (Ben Reeves) Solution: Use cache variables. (closes #9338)
author Bram Moolenaar <Bram@vim.org>
date Mon, 13 Dec 2021 21:45:04 +0100
parents 13e09dc59f0f
children fccd67ae58c8
comparison
equal deleted inserted replaced
26541:5555bfb99bdb 26542:b74e4c3618f8
4543 sh ./toolcheck 1>&6 4543 sh ./toolcheck 1>&6
4544 fi 4544 fi
4545 4545
4546 OS_EXTRA_SRC=""; OS_EXTRA_OBJ="" 4546 OS_EXTRA_SRC=""; OS_EXTRA_OBJ=""
4547 4547
4548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking uname" >&5
4549 $as_echo_n "checking uname... " >&6; }
4550 if test "x$vim_cv_uname_output" = "x" ; then
4551 vim_cv_uname_output=`(uname) 2>/dev/null`
4552 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output" >&5
4553 $as_echo "$vim_cv_uname_output" >&6; }
4554 else
4555 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output (cached)" >&5
4556 $as_echo "$vim_cv_uname_output (cached)" >&6; }
4557 fi
4558
4559 { $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5
4560 $as_echo_n "checking uname -r... " >&6; }
4561 if test "x$vim_cv_uname_r_output" = "x" ; then
4562 vim_cv_uname_r_output=`(uname -r) 2>/dev/null`
4563 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output" >&5
4564 $as_echo "$vim_cv_uname_r_output" >&6; }
4565 else
4566 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output (cached)" >&5
4567 $as_echo "$vim_cv_uname_r_output (cached)" >&6; }
4568 fi
4569
4570 { $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5
4571 $as_echo_n "checking uname -m... " >&6; }
4572 if test "x$vim_cv_uname_m_output" = "x" ; then
4573 vim_cv_uname_m_output=`(uname -m) 2>/dev/null`
4574 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output" >&5
4575 $as_echo "$vim_cv_uname_m_output" >&6; }
4576 else
4577 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output (cached)" >&5
4578 $as_echo "$vim_cv_uname_m_output (cached)" >&6; }
4579 fi
4580
4548 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Haiku" >&5 4581 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Haiku" >&5
4549 $as_echo_n "checking for Haiku... " >&6; } 4582 $as_echo_n "checking for Haiku... " >&6; }
4550 case `uname` in 4583 case $vim_cv_uname_output in
4551 Haiku) HAIKU=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 4584 Haiku) HAIKU=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4552 $as_echo "yes" >&6; };; 4585 $as_echo "yes" >&6; };;
4553 *) HAIKU=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4586 *) HAIKU=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4554 $as_echo "no" >&6; };; 4587 $as_echo "no" >&6; };;
4555 esac 4588 esac
4556 4589
4557 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QNX" >&5 4590 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for QNX" >&5
4558 $as_echo_n "checking for QNX... " >&6; } 4591 $as_echo_n "checking for QNX... " >&6; }
4559 case `uname` in 4592 case $vim_cv_uname_output in
4560 QNX) OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o 4593 QNX) OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o
4561 test -z "$with_x" && with_x=no 4594 test -z "$with_x" && with_x=no
4562 QNX=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 4595 QNX=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4563 $as_echo "yes" >&6; };; 4596 $as_echo "yes" >&6; };;
4564 *) QNX=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 4597 *) QNX=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4565 $as_echo "no" >&6; };; 4598 $as_echo "no" >&6; };;
4566 esac 4599 esac
4567 4600
4568 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5 4601 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5
4569 $as_echo_n "checking for Darwin (Mac OS X)... " >&6; } 4602 $as_echo_n "checking for Darwin (Mac OS X)... " >&6; }
4570 if test "`(uname) 2>/dev/null`" = Darwin; then 4603 if test "$vim_cv_uname_output" = Darwin; then
4571 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 4604 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4572 $as_echo "yes" >&6; } 4605 $as_echo "yes" >&6; }
4573 MACOS_X=yes 4606 MACOS_X=yes
4574 CPPFLAGS="$CPPFLAGS -DMACOS_X" 4607 CPPFLAGS="$CPPFLAGS -DMACOS_X"
4575 4608
4966 4999
4967 5000
4968 if test "$cf_cv_ebcdic" = "yes"; then 5001 if test "$cf_cv_ebcdic" = "yes"; then
4969 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for z/OS Unix" >&5 5002 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for z/OS Unix" >&5
4970 $as_echo_n "checking for z/OS Unix... " >&6; } 5003 $as_echo_n "checking for z/OS Unix... " >&6; }
4971 case `uname` in 5004 case $vim_cv_uname_output in
4972 OS/390) zOSUnix="yes"; 5005 OS/390) zOSUnix="yes";
4973 if test "$CC" = "cc"; then 5006 if test "$CC" = "cc"; then
4974 ccm="$_CC_CCMODE" 5007 ccm="$_CC_CCMODE"
4975 ccn="CC" 5008 ccn="CC"
4976 else 5009 else
5611 LUA_LIBS="" 5644 LUA_LIBS=""
5612 LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS" 5645 LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS"
5613 fi 5646 fi
5614 if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \ 5647 if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \
5615 test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \ 5648 test "x$MACOS_X" = "xyes" && test "x$vi_cv_with_luajit" != "xno" && \
5616 test "`(uname -m) 2>/dev/null`" = "x86_64"; then 5649 test "$vim_cv_uname_m_output" = "x86_64"; then
5617 LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS" 5650 LUA_LIBS="-pagezero_size 10000 -image_base 100000000 $LUA_LIBS"
5618 fi 5651 fi
5619 fi 5652 fi
5620 if test "$fail_if_missing" = "yes" -a "$lua_ok" != "yes"; then 5653 if test "$fail_if_missing" = "yes" -a "$lua_ok" != "yes"; then
5621 as_fn_error $? "could not configure lua" "$LINENO" 5 5654 as_fn_error $? "could not configure lua" "$LINENO" 5
5848 fi 5881 fi
5849 MZSCHEME_LIBS="-L${path} -lmzscheme -lmzgc" 5882 MZSCHEME_LIBS="-L${path} -lmzscheme -lmzgc"
5850 fi 5883 fi
5851 if test "$GCC" = yes; then 5884 if test "$GCC" = yes; then
5852 MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${path}" 5885 MZSCHEME_LIBS="${MZSCHEME_LIBS} -Wl,-rpath -Wl,${path}"
5853 elif test "`(uname) 2>/dev/null`" = SunOS && 5886 elif test "$vim_cv_uname_output" = SunOS &&
5854 uname -r | grep '^5' >/dev/null; then 5887 echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
5855 MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${path}" 5888 MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${path}"
5856 fi 5889 fi
5857 fi 5890 fi
5858 fi 5891 fi
5859 if test "X$MZSCHEME_LIBS" != "X"; then 5892 if test "X$MZSCHEME_LIBS" != "X"; then
6490 6523
6491 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 6524 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
6492 $as_echo_n "checking if -pthread should be used... " >&6; } 6525 $as_echo_n "checking if -pthread should be used... " >&6; }
6493 threadsafe_flag= 6526 threadsafe_flag=
6494 thread_lib= 6527 thread_lib=
6495 if test "`(uname) 2>/dev/null`" != Darwin; then 6528 if test "$vim_cv_uname_output" != Darwin; then
6496 test "$GCC" = yes && threadsafe_flag="-pthread" 6529 test "$GCC" = yes && threadsafe_flag="-pthread"
6497 if test "`(uname) 2>/dev/null`" = FreeBSD; then 6530 if test "$vim_cv_uname_output" = FreeBSD; then
6498 threadsafe_flag="-D_THREAD_SAFE" 6531 threadsafe_flag="-D_THREAD_SAFE"
6499 thread_lib="-pthread" 6532 thread_lib="-pthread"
6500 fi 6533 fi
6501 if test "`(uname) 2>/dev/null`" = SunOS; then 6534 if test "$vim_cv_uname_output" = SunOS; then
6502 threadsafe_flag="-pthreads" 6535 threadsafe_flag="-pthreads"
6503 fi 6536 fi
6504 fi 6537 fi
6505 libs_save_old=$LIBS 6538 libs_save_old=$LIBS
6506 if test -n "$threadsafe_flag"; then 6539 if test -n "$threadsafe_flag"; then
6838 6871
6839 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 6872 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5
6840 $as_echo_n "checking if -pthread should be used... " >&6; } 6873 $as_echo_n "checking if -pthread should be used... " >&6; }
6841 threadsafe_flag= 6874 threadsafe_flag=
6842 thread_lib= 6875 thread_lib=
6843 if test "`(uname) 2>/dev/null`" != Darwin; then 6876 if test "$vim_cv_uname_output" != Darwin; then
6844 test "$GCC" = yes && threadsafe_flag="-pthread" 6877 test "$GCC" = yes && threadsafe_flag="-pthread"
6845 if test "`(uname) 2>/dev/null`" = FreeBSD; then 6878 if test "$vim_cv_uname_output" = FreeBSD; then
6846 threadsafe_flag="-D_THREAD_SAFE" 6879 threadsafe_flag="-D_THREAD_SAFE"
6847 thread_lib="-pthread" 6880 thread_lib="-pthread"
6848 fi 6881 fi
6849 if test "`(uname) 2>/dev/null`" = SunOS; then 6882 if test "$vim_cv_uname_output" = SunOS; then
6850 threadsafe_flag="-pthreads" 6883 threadsafe_flag="-pthreads"
6851 fi 6884 fi
6852 fi 6885 fi
6853 libs_save_old=$LIBS 6886 libs_save_old=$LIBS
6854 if test -n "$threadsafe_flag"; then 6887 if test -n "$threadsafe_flag"; then
7468 trylib=tcl$ver$ext 7501 trylib=tcl$ver$ext
7469 if test -f "$try/lib$trylib" ; then 7502 if test -f "$try/lib$trylib" ; then
7470 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5 7503 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5
7471 $as_echo "$try/lib$trylib" >&6; } 7504 $as_echo "$try/lib$trylib" >&6; }
7472 TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm" 7505 TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
7473 if test "`(uname) 2>/dev/null`" = SunOS && 7506 if test "$vim_cv_uname_output" = SunOS &&
7474 uname -r | grep '^5' >/dev/null; then 7507 echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
7475 TCL_LIBS="$TCL_LIBS -R $try" 7508 TCL_LIBS="$TCL_LIBS -R $try"
7476 fi 7509 fi
7477 break 3 7510 break 3
7478 fi 7511 fi
7479 done 7512 done
8909 if test -d "$x_includes" && test ! -d "$x_libraries"; then 8942 if test -d "$x_includes" && test ! -d "$x_libraries"; then
8910 x_libraries=`echo "$x_includes" | sed s/include/lib/` 8943 x_libraries=`echo "$x_includes" | sed s/include/lib/`
8911 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Corrected X libraries to $x_libraries" >&5 8944 { $as_echo "$as_me:${as_lineno-$LINENO}: result: Corrected X libraries to $x_libraries" >&5
8912 $as_echo "Corrected X libraries to $x_libraries" >&6; } 8945 $as_echo "Corrected X libraries to $x_libraries" >&6; }
8913 X_LIBS="$X_LIBS -L$x_libraries" 8946 X_LIBS="$X_LIBS -L$x_libraries"
8914 if test "`(uname) 2>/dev/null`" = SunOS && 8947 if test "$vim_cv_uname_output" = SunOS &&
8915 uname -r | grep '^5' >/dev/null; then 8948 echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
8916 X_LIBS="$X_LIBS -R $x_libraries" 8949 X_LIBS="$X_LIBS -R $x_libraries"
8917 fi 8950 fi
8918 fi 8951 fi
8919 8952
8920 if test -d "$x_libraries" && test ! -d "$x_includes"; then 8953 if test -d "$x_libraries" && test ! -d "$x_includes"; then
9734 GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` 9767 GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0`
9735 GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` 9768 GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0`
9736 9769
9737 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeBSD" >&5 9770 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeBSD" >&5
9738 $as_echo_n "checking for FreeBSD... " >&6; } 9771 $as_echo_n "checking for FreeBSD... " >&6; }
9739 if test "`(uname) 2>/dev/null`" = FreeBSD; then 9772 if test "$vim_cv_uname_output" = FreeBSD; then
9740 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 9773 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
9741 $as_echo "yes" >&6; } 9774 $as_echo "yes" >&6; }
9742 GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE" 9775 GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE"
9743 GNOME_LIBS="$GNOME_LIBS -pthread" 9776 GNOME_LIBS="$GNOME_LIBS -pthread"
9744 else 9777 else
10218 $as_echo "in default path" >&6; } 10251 $as_echo "in default path" >&6; }
10219 else 10252 else
10220 if test -n "$GUI_LIB_LOC"; then 10253 if test -n "$GUI_LIB_LOC"; then
10221 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUI_LIB_LOC" >&5 10254 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUI_LIB_LOC" >&5
10222 $as_echo "$GUI_LIB_LOC" >&6; } 10255 $as_echo "$GUI_LIB_LOC" >&6; }
10223 if test "`(uname) 2>/dev/null`" = SunOS && 10256 if test "$vim_cv_uname_output" = SunOS &&
10224 uname -r | grep '^5' >/dev/null; then 10257 echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then
10225 GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC" 10258 GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC"
10226 fi 10259 fi
10227 fi 10260 fi
10228 fi 10261 fi
10229 MOTIF_LIBNAME=-lXm 10262 MOTIF_LIBNAME=-lXm
10766 $as_echo "no" >&6; } 10799 $as_echo "no" >&6; }
10767 fi 10800 fi
10768 10801
10769 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5 10802 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5
10770 $as_echo_n "checking for CYGWIN or MSYS environment... " >&6; } 10803 $as_echo_n "checking for CYGWIN or MSYS environment... " >&6; }
10771 case `uname` in 10804 case $vim_cv_uname_output in
10772 CYGWIN*|MSYS*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 10805 CYGWIN*|MSYS*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
10773 $as_echo "yes" >&6; } 10806 $as_echo "yes" >&6; }
10774 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5 10807 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5
10775 $as_echo_n "checking for CYGWIN clipboard support... " >&6; } 10808 $as_echo_n "checking for CYGWIN clipboard support... " >&6; }
10776 if test "x$with_x" = "xno" ; then 10809 if test "x$with_x" = "xno" ; then
11963 conftest$ac_exeext conftest.$ac_ext 11996 conftest$ac_exeext conftest.$ac_ext
11964 olibs="$LIBS" 11997 olibs="$LIBS"
11965 else 11998 else
11966 { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5 11999 { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5
11967 $as_echo "empty: automatic terminal library selection" >&6; } 12000 $as_echo "empty: automatic terminal library selection" >&6; }
11968 case "`uname -s 2>/dev/null`" in 12001 case "$vim_cv_uname_output" in
11969 OSF1|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";; 12002 OSF1|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";;
11970 *) tlibs="tinfo ncurses termlib termcap curses";; 12003 *) tlibs="tinfo ncurses termlib termcap curses";;
11971 esac 12004 esac
11972 for libname in $tlibs; do 12005 for libname in $tlibs; do
11973 as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh` 12006 as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh`